progress

Rift-Org · Jun 25, 2024 · f74d1ea · f74d1ea
1 parent 2dfbd6f
commit f74d1ea
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 21 deletions.
diff --git a/include/utils/literals.hh b/include/utils/literals.hh
@@ -39,7 +39,9 @@ namespace rift
     /// @brief casts token to a number
     extern any castNumber(const Token& tok);
     /// @brief casts token to a number then to a string for printing
-    extern std::string castNumberString(const any& val);
+    extern std::string castNumberString(const any& val, bool err = true);
     /// @brief casts token to a string
-    extern std::string castString(const Token& tok);
+    extern std::string castString(const Token& tok, bool err = true);
+    /// @brief casts token to a string for printing
+    extern std::string castAnyString(const Token& token);
 }
diff --git a/lib/ast/eval.cc b/lib/ast/eval.cc
@@ -218,7 +218,7 @@ namespace rift
         Token Visitor::visit_print_stmt(const StmtPrint& stmt) const
         {
             Token val = stmt.expr->accept(*this);
-            std::string res = castString(val);
+            std::string res = castAnyString(val);
             if (res.at(0) == '"' && res.at(res.size()-1) == '"') 
                 res = res.substr(1, res.size()-2);
             std::cout << res << std::endl;

diff --git a/lib/ast/parser.cc b/lib/ast/parser.cc
@@ -154,20 +154,22 @@ namespace rift
 
         std::unique_ptr<Expr> Parser::assignment()
         {
-            if (match({Token(TokenType::IDENTIFIER, "", "", line)})) {
-                if (peek(Token(TokenType::SEMICOLON, ";", "", line))) {
-                    prevance();
-                    return equality();
+            if(peekNext() == Token(TokenType::EQUAL, "=", "", line)) {
+                if (match({Token(TokenType::IDENTIFIER, "", "", line)})) {
+                    if (peek(Token(TokenType::SEMICOLON, ";", "", line))) {
+                        prevance();
+                        return equality();
+                    }
+                    auto idt = peekPrev();
+                    consume(Token(TokenType::EQUAL, "=", "", line), std::unique_ptr<ParserException>(new ParserException("Expected '=' after variable name")));
+                    auto expr = assignment();
+                    if (expr == nullptr) rift::error::report(line, "assignment", "Expected expression after variable name", peekPrev(), ParserException("Expected expression after variable name"));
+
+                    // assignemnt operator expects lhs to be already declared
+                    if (rift::ast::Environment::getInstance().getEnv(castString(idt)) == Token())
+                        rift::error::report(line, "assignment", "🛑 Undefined variable '" + castString(idt) + "' at line: " + castNumberString(idt.line), idt, ParserException("Undefined variable '" + castString(idt) + "'"));
+                    return std::unique_ptr<Assign>(new Assign(idt, std::move(expr)));
                 }
-                auto idt = peekPrev();
-                consume(Token(TokenType::EQUAL, "=", "", line), std::unique_ptr<ParserException>(new ParserException("Expected '=' after variable name")));
-                auto expr = assignment();
-                if (expr == nullptr) rift::error::report(line, "assignment", "Expected expression after variable name", peekPrev(), ParserException("Expected expression after variable name"));
-
-                // assignemnt operator expects lhs to be already declared
-                if (rift::ast::Environment::getInstance().getEnv(castString(idt)) == Token())
-                    rift::error::report(line, "assignment", "🛑 Undefined variable '" + castString(idt) + "' at line: " + castNumberString(idt.line), idt, ParserException("Undefined variable '" + castString(idt) + "'"));
-                return std::unique_ptr<Assign>(new Assign(idt, std::move(expr)));
             }
 
             return equality();

diff --git a/lib/utils/literals.cc b/lib/utils/literals.cc
@@ -81,7 +81,7 @@ namespace rift
         return "";
     }
 
-    std::string castNumberString(const any& val) {
+    std::string castNumberString(const any& val, bool err) {
         if (val.type() == typeid(double)) {
             return std::to_string(std::any_cast<double>(val));
         } else if (val.type() == typeid(float)) {
@@ -105,12 +105,12 @@ namespace rift
         } else if (val.type() == typeid(Token)) {
             return castNumberString(std::any_cast<Token>(val).getLiteral());
         }
-
-        rift::error::runTimeError("Expected a number or token");
+        if (err)
+            rift::error::runTimeError("Expected a number or token");
         return "";
     }
 
-    std::string castString(const Token& tok) {
+    std::string castString(const Token& tok, bool err) {
         any val = tok.getLiteral();
         if (val.type() == typeid(std::string)) {
             return std::any_cast<std::string>(val);
@@ -126,8 +126,21 @@ namespace rift
             return std::string(1, std::any_cast<signed char>(val));
         }
 
-        rift::error::runTimeError("Expected a string");
+        if (err)
+            rift::error::runTimeError("Expected a string");
         return "";
     }
+
+    std::string castAnyString(const Token& tok)
+    {
+        std::string str = castNumberString(tok.getLiteral(), false);
+        if (str.empty()) {
+            str = castString(tok, false);
+            if (str.empty()) {
+                rift::error::runTimeError("Expected a string or number");
+            }
+        }
+        return str;
+    }
 }