fix a bug of neg number

Update compiler.h

scripts/get_opcodes.py

@@ -1,13 +0,0 @@
-import os
-import re
-
-with open("src/opcodes.h", "rt", encoding='utf-8') as f:
-    text = f.read()
-
-# opcodes = re.findall(r"OP_(\w+)", text)
-
-# print('\n'.join([f"OPCODE({o})" + o for o in opcodes]))
-
-text = re.sub(r"OP_(\w+)", lambda m: f"OPCODE({m.group(1)})", text)
-
-print(text.replace(',', ''))

src/compiler.h

@@ -154,29 +154,26 @@ public:
     }
 
     void eatNumber() {
-        char c = *(parser->token_start);
+        static const std::regex pattern("^[+-]?([0-9]+)(\\.[0-9]+)?");
-        bool is_float = false;
+        std::smatch m;
-        while (isdigit(parser->peekChar())) parser->eatChar();
 
-        if (parser->peekChar() == '.' && isdigit(parser->peekNextChar())) {
+        const char* i = parser->token_start;
-            parser->matchChar('.');
+        while(*i != '\n' && *i != '\0') i++;
-            is_float = true;
+        std::string s = std::string(parser->token_start, i);
-            while (isdigit(parser->peekChar())) parser->eatChar();
-        }
 
-        errno = 0;
+        try{
-        PyVar value = vm->None;
+            if (std::regex_search(s, m, pattern)) {
-        if(is_float){
+                // here is m.length()-1, since the first char is eaten by lexToken()
-            value = vm->PyFloat(atof(parser->token_start));
+                for(int j=0; j<m.length()-1; j++) parser->eatChar();
+                if (m[2].matched) {
+                    parser->setNextToken(TK("@num"), vm->PyFloat(std::stof(m[0])));
                 } else {
-            value = vm->PyInt(atoi(parser->token_start));
+                    parser->setNextToken(TK("@num"), vm->PyInt(std::stoi(m[0])));
                 }  
-        if (errno == ERANGE) {
-            const char* start = parser->token_start;
-            int len = (int)(parser->current_char - start);
-            throw SyntaxError(path, parser->makeErrToken(), "number literal too large: %.*s", len, start);
             }
-        parser->setNextToken(TK("@num"), value);
+        }catch(std::exception& e){
+            throw SyntaxError(path, parser->makeErrToken(), "invalid number (%s)", e.what());
+        }
     }
 
     // Lex the next token and set it as the next token.
@@ -206,7 +203,11 @@ public:
                 case '>': parser->setNextTwoCharToken('=', TK(">"), TK(">=")); return;
                 case '<': parser->setNextTwoCharToken('=', TK("<"), TK("<=")); return;
                 case '+': parser->setNextTwoCharToken('=', TK("+"), TK("+=")); return;
-                case '-': parser->setNextTwoCharToken('=', TK("-"), TK("-=")); return;
+                case '-': {
+                    if(isdigit(parser->peekChar())) eatNumber();
+                    else parser->setNextTwoCharToken('=', TK("-"), TK("-="));
+                    return;
+                }
                 case '!':
                     if(parser->matchChar('=')) parser->setNextToken(TK("!="));
                     else SyntaxError(path, parser->makeErrToken(), "expected '=' after '!'");
@@ -308,9 +309,9 @@ public:
     }
 
     void exprFString() {
+        static const std::regex pattern(R"(\{(.*?)\})");
         PyVar value = parser->previous.value;
         std::string s = vm->PyStr_AS_C(value).str();
-        std::regex pattern(R"(\{(.*?)\})");
         std::sregex_iterator begin(s.begin(), s.end(), pattern);
         std::sregex_iterator end;
         int size = 0;

src/parser.h

@@ -238,7 +238,6 @@ struct Parser {
         this->line_start = source;
 
         this->nexts.push(Token{TK("@sof"), token_start, 0, current_line});
-
         this->indents.push(0);
     }
 };

src/vm.h

@@ -165,7 +165,7 @@ public:
         callstack.push(frame);
         while(!frame->isEnd()){
             const ByteCode& byte = frame->readCode();
-            //printf("%s (%d) stack_size: %d\n", OP_NAMES[byte.op], byte.arg, frame->stackSize());
+            printf("%s (%d) stack_size: %d\n", OP_NAMES[byte.op], byte.arg, frame->stackSize());
 
             switch (byte.op)
             {