Removed raw-enums

lexer/inc/Token.h

@@ -4,92 +4,81 @@
 
 namespace PashaBibko::LXC::Lexer
 {
-    namespace TokenClass
+    enum class TokenClass : unsigned short
     {
-        // Bitmask for different token classes //
-        enum ClassMask : unsigned short
-        {
-            // Mathematical and logic operators //
-            Operator		= 1 << (1 + 8),
+        // Mathematical and logic operators //
+        Operator		= 1 << (1 + 8),
 
-            // Special words defined by the compiler //
-            Keyword			= 1 << (2 + 8),
+        // Special words defined by the compiler //
+        Keyword			= 1 << (2 + 8),
 
-            // Words such as literals and identifiers //
-            UserDefined		= 1 << (3 + 8),
+        // Words such as literals and identifiers //
+        UserDefined		= 1 << (3 + 8),
 
-            // Symbols in the source like (? , . ! <) //
-            Symbols			= 1 << (4 + 8),
+        // Symbols in the source like (? , . ! <) //
+        Symbols			= 1 << (4 + 8),
 
-            // Tokens not defined by previous classes //
-            Misc			= 1 << (5 + 8)
-        };
+        // Tokens not defined by previous classes //
+        Misc			= 1 << (5 + 8)
     };
 
     struct LexerContext;
     
+    // Enum of token type organised by their token class //
+    enum class TokenType : unsigned short
+    {
+        // === Operators === //
+
+        Add				= (unsigned short)TokenClass::Operator,
+        Sub,
+        Mul,
+        Div,
+        Mod,
+        Eql,
+
+        // === Keywords === //
+
+        For				= (unsigned short)TokenClass::Keyword,
+        While,
+        If,
+        ElseIf,
+        Else,
+        Return,
+        FunctionDef,
+
+        // === User defined === //
+
+        StringLiteral	= (unsigned short)TokenClass::UserDefined,
+        NumLiteral,
+        Identifier,
+
+        // === Symbols === //
+
+        Assign			= (unsigned short)TokenClass::Symbols,
+        Colon,
+        CloseBracket,
+        OpenBracket,
+        CloseBrace,
+        OpenBrace,
+        CloseParen,
+        OpenParen,
+        CloseCrocodile,
+        OpenCrocodile,
+        Comma,
+
+        // === Misc === //
+
+        End_of_file		= (unsigned short)TokenClass::Misc,
+
+        UNDEFINED = 65535 // Invalid token type (max number)
+    };
+
     // Data type for storing the output of the lexer //
     class Token final
     {
         public:
-            // Enum of token type organised by their token class //
-            enum TokenType : unsigned short
-            {
-                // === Operators === //
-
-                Add				= TokenClass::Operator,
-                Sub,
-                Mul,
-                Div,
-                Mod,
-
-                Eql,
-
-                // === Keywords === //
-
-                For				= TokenClass::Keyword,
-                While,
-                If,
-                ElseIf,
-                Else,
-                Return,
-
-                FunctionDef,
-
-                // === User defined === //
-
-                StringLiteral	= TokenClass::UserDefined,
-                NumLiteral,
-                Identifier,
-
-                // === Symbols === //
-
-                Assign			= TokenClass::Symbols,
-                Colon,
-
-                CloseBracket,
-                OpenBracket,
-
-                CloseBrace,
-                OpenBrace,
-
-                CloseParen,
-                OpenParen,
-
-                CloseCrocodile,
-                OpenCrocodile,
-
-                Comma,
-
-                // === Misc === //
-
-                End_of_file		= TokenClass::Misc,
-
-                UNDEFINED = 65535 // Invalid token type (max number)
-            };
-
             // Util function calculating wether a token is of a given class //
-            template<TokenClass::ClassMask mask> static constexpr bool IsTypeClass(TokenType type) 
+            template<TokenClass mask> static constexpr bool IsTypeClass(TokenType type) 
 	        {
 		        using T = std::underlying_type_t<TokenType>;
 	            return static_cast<T>(type) & static_cast<T>(mask);
@@ -132,7 +121,7 @@ namespace PashaBibko::LXC::Lexer
     };
 
     // Function for converting token types to their equivalent C-Strings //
-    const char* TokenTypeToCStr(Token::TokenType type);
+    const char* TokenTypeToCStr(TokenType type);
 
     // Typedef for the output type of how the Lexer outputs //
     typedef std::vector<Token> LexerOutput;