src/compiler/compiler.c

@@ -162,8 +162,7 @@ static void readLabel(Compiler* cmp){
             return;
         }
 
-        if(!isAlphabeticalLower(c) && !isAlphabeticalUpper(c) && !isDigit(c) &&
+        if(!isAlphabeticalLower(c) && !isAlphabeticalUpper(c) && !isDigit(c)){
-            c != '_' && c != '.'){
             setError(Error_unexpectedCharacter(c));
             return;
         }
@@ -188,7 +187,7 @@ static void readArguments(Compiler* cmp){
     while(cmp->pos < cmp->code_len){
         c = cmp->code[cmp->pos];
         // end of line
-        if(c == '\r' || c == '\n' || c == ';'){
+        if(c == '\r' || c == '\n'){
             tok.length = cmp->pos - tok.begin;
             if(tok.length > 0)
                 List_Token_push(&cmp->tokens, tok);
@@ -223,7 +222,7 @@ static void readInstruction(Compiler* cmp){
     while(cmp->pos < cmp->code_len){
         char c = cmp->code[cmp->pos];
         // end of line
-        if(c == '\r' || c == '\n' || c == ';'){
+        if(c == '\r' || c == '\n'){
             tok.length = cmp->pos - tok.begin;
             List_Token_push(&cmp->tokens, tok);
             // cmp->line will be increased in lex()
@@ -252,83 +251,6 @@ static void readInstruction(Compiler* cmp){
     List_Token_push(&cmp->tokens, tok);
 }
 
-static void readChar(Compiler* cmp){
-    Token tok = Token_construct(TokenType_Char, cmp->pos, 0);
-    cmp->pos++;
-    cmp->column++;
-    
-    while(cmp->pos < cmp->code_len){
-        char c = cmp->code[cmp->pos];
-        // end of line
-        if(c == '\r' || c == '\n'){
-            setError(Error_unexpectedCharacter(cmp->code[--cmp->pos]));
-            return;
-        }
-
-        if(c == '\''){
-            tok.length = cmp->pos - tok.begin + 1;
-            List_Token_push(&cmp->tokens, tok);
-            return;
-        }
-
-        cmp->column++;
-        cmp->pos++;
-    }
-    
-    // end of file
-    setError(Error_endOfFile);
-}
-
-static void readString(Compiler* cmp){
-    Token tok = Token_construct(TokenType_String, cmp->pos, 0);
-    cmp->pos++;
-    cmp->column++;
-    
-    while(cmp->pos < cmp->code_len){
-        char c = cmp->code[cmp->pos];
-        // end of line
-        if(c == '\r' || c == '\n'){
-            setError(Error_unexpectedCharacter(cmp->code[--cmp->pos]));
-            return;
-        }
-
-        if(c == '"'){
-            tok.length = cmp->pos - tok.begin + 1;
-            List_Token_push(&cmp->tokens, tok);
-            return;
-        }
-
-        cmp->column++;
-        cmp->pos++;
-    }
-    
-    // end of file
-    setError(Error_endOfFile);
-}
-
-static void readNumber(Compiler* cmp){
-    Token tok = Token_construct(TokenType_Number, cmp->pos, 0);
-    cmp->pos++;
-    cmp->column++;
-    
-    while(cmp->pos < cmp->code_len){
-        char c = cmp->code[cmp->pos];
-
-        if(c == '\r' || c == '\n' || c == ' ' || c == '\t' || c == ',' || c == ';'){
-            tok.length = cmp->pos - tok.begin;
-            List_Token_push(&cmp->tokens, tok);
-            return;
-        }
-
-        cmp->column++;
-        cmp->pos++;
-    }
-    
-    // end of file
-    tok.length = cmp->pos - tok.begin;
-    List_Token_push(&cmp->tokens, tok);
-}
-
 static bool lex(Compiler* cmp){
     returnErrorIf_auto(cmp->state != CompilerState_Initial);
     cmp->state = CompilerState_Lexing;
@@ -348,21 +270,14 @@ static bool lex(Compiler* cmp){
             case '.':
                 readLabel(cmp);
                 break;
-            case '"':
-                readString(cmp);
-                break;
-            case '\'':
-                readChar(cmp);
-                break;
             default:
                 // try read instruction
-                if(isAlphabeticalLower(c) || isAlphabeticalUpper(c))
+                if(isAlphabeticalLower(c) || isAlphabeticalUpper(c)){
                     readInstruction(cmp);
-                else if(isDigit(c))
-                    readNumber(cmp);
-                else returnError(Error_unexpectedCharacter(c));
                     break;
                 }
+                else returnError(Error_unexpectedCharacter(c));
+        }
 
         if(cmp->state == CompilerState_Error)
             return false;
@@ -443,8 +358,9 @@ bool Compiler_compileTasm(Compiler* cmp, cstr source_file_name, cstr out_file_na
             char* tokstr = malloc(4096);
             strncpy(tokstr, cmp->code + t.begin, t.length);
             tokstr[t.length] = 0;
-            printf("[l:%3u, c:%3u] %s '%s'\n", 
+            printf("[l:%u, c:%u](pos:%u, size:%u) %s '%s'\n", 
                 pos.line, pos.column,
+                t.begin, t.length,
                 TokenType_toString(t.type), tokstr);
             free(tokstr);
         }

src/compiler/token.c

@@ -1,19 +1,15 @@
 #include "token.h"
 
-static cstr _TokenType_str[] = {
+static cstr TokenType_str[] = {
     "Unset",
     "SingleLineComment",
     "MultiLineComment",
     "Label",
     "Instruction",
     "Argument",
-    "Number",
+    "Data",
-    "Char",
-    "String",
 };
 
 cstr TokenType_toString(TokenType t){
-    if(t >= sizeof(_TokenType_str) / sizeof(cstr))
+    return TokenType_str[t];
-        return "!!INDEX_ERROR!!";
-    return _TokenType_str[t];
 }

src/compiler/token.h

@@ -8,17 +8,16 @@ typedef enum TokenType {
     TokenType_Label,
     TokenType_Instruction,
     TokenType_Argument,
-    TokenType_Number,
+    TokenType_Data,
-    TokenType_Char,
+    /* there is a place for 2 values left (TokenType must occupy 4 bits) */
-    TokenType_String,
 } TokenType;
 
 cstr TokenType_toString(TokenType t);
 
 typedef struct Token {
     u32 begin;          // some index in Compiler->code
-    u32 length : 24;    // length in characters (24 bits)
+    u32 length : 28;    // length in characters (28 bits)
-    TokenType type : 8; // type of token (8 bits)
+    TokenType type : 4; // type of token (4 bits)
 } Token;
 
 #define Token_construct(TYPE, BEGIN, END) ((Token){ .type = TYPE, .begin = BEGIN, .length = END })