fix(parser): fix std::invalid_argument thrown by std::stoi

Swirl/include/tokenizer/Tokenizer.h

@@ -80,6 +80,7 @@ class TokenStream {
         return ret;
     }
 
+
     std::string readEscaped(char _end, char apnd = 0) {
         uint8_t is_escaped = false;
         std::string ret;
@@ -183,6 +184,7 @@ class TokenStream {
             };
     }
 
+
     Token next(bool _showTNw = false, bool _showTWs = false, bool _modifyCurTk = true) {
         Token cur_tk = readNextTok();
 

Swirl/src/parser/parser.cpp

@@ -113,7 +113,6 @@ std::unique_ptr<FuncCall> Parser::parseCall() {
 
     parseExpr( call_node->ident);
 
-    std::cout << "first arg parsed" << std::endl;
 //    std::function<void()> parseArgs = [this, &call_node, &parseArgs]() -> void {
 //        if (m_Stream.p_CurTk.value == "," && m_Stream.p_CurTk.type == PUNC) {
 //            m_Stream.next();
@@ -192,11 +191,15 @@ void Parser::parseExpr(const std::string id) {
 
             case NUMBER:
                 std::cout << "num: " << m_Stream.p_CurTk.value << std::endl;
-                if (m_Stream.p_CurTk.value.find('.') != std::string::npos)
-                    push_to_expr(std::make_shared<Double>(std::stod(m_Stream.p_CurTk.value)));
-                else
-                    push_to_expr(std::make_shared<Int>(std::stoi(m_Stream.p_CurTk.value)));
-                m_Stream.next();
+
+                try {
+                    if (m_Stream.p_CurTk.value.find('.') != std::string::npos)
+                        push_to_expr(std::make_shared<Double>(std::stod(m_Stream.p_CurTk.value)));
+                    else
+                        push_to_expr(std::make_shared<Int>(std::stoi(m_Stream.p_CurTk.value)));
+                    m_Stream.next();
+                } catch (const std::invalid_argument& _) { return; }
+
                 continue;
 
             case IDENT:

tests/test1.sw

@@ -1,2 +1,2 @@
 
-t_func("a" + "b", 123)
+t_func("322" + 32, 123)