Merge pull request #15 from brwhale/feature/EarlyReturn

Fix bug with if with no else clause eating the rest of the function a…
brwhale · May 2, 2023 · b8224e6 · b8224e6
2 parents 02242ef + ad94097
commit b8224e6
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 3 deletions.
diff --git a/src/Library/KataScript.hpp b/src/Library/KataScript.hpp
@@ -54,6 +54,7 @@ namespace KataScript {
         bool lastStatementClosedScope = false;
         bool lastStatementWasElse = false;
         bool lastTokenEndCurlBraket = false;
+        bool lastStatementWasIf = false;
         uint64_t currentLine = 0;
         ParseState prevState = ParseState::beginExpression;
         ModulePrivilegeFlags allowedModulePrivileges;

diff --git a/src/Library/parsing.hpp b/src/Library/parsing.hpp
@@ -530,11 +530,22 @@ namespace KataScript {
         auto tempState = parseState;
         switch (parseState) {
         case ParseState::beginExpression:
-        {
+        {            
+            if (lastTokenEndCurlBraket && lastStatementWasIf) {
+                if (token != ";" && token != "}" && token != "else") {
+                    lastStatementWasIf = false;
+                    parse(";");
+                    parse(token);
+                    return;
+                }
+            }
+
             bool wasElse = false;
             bool closedScope = false;
             bool closedExpr = false;
             bool isEndCurlBracket = false;
+            lastStatementWasIf = false;
+
             if (token == "fn" || token == "func" || token == "function") {
                 parseState = ParseState::defineFunc;
             } else if (token == "var") {
@@ -576,10 +587,11 @@ namespace KataScript {
                 clearParseStacks();
             } else if (token == "}") {
                 wasElse = !currentExpression || currentExpression->type != ExpressionType::IfElse;
+                lastStatementWasIf = currentExpression && currentExpression->type == ExpressionType::IfElse;
                 bool wasFreefunc = !currentExpression || (currentExpression->type == ExpressionType::FunctionDef
                     && get<FunctionExpression>(currentExpression->expression).function->getFunction()->type == FunctionType::free);
                 closedExpr = closeCurrentExpression();
-                if (!closedExpr && wasFreefunc || parseScope->name == "__anon") {
+                if (!closedExpr && (wasFreefunc || parseScope->name == "__anon")) {
                     closeScope(parseScope);
                 }
                 closedScope = true;
@@ -598,8 +610,9 @@ namespace KataScript {
             }
             if (!closedExpr && (closedScope && lastStatementClosedScope || (!lastStatementWasElse && !wasElse && lastTokenEndCurlBraket))) {
                 bool wasIfExpr = currentExpression && currentExpression->type == ExpressionType::IfElse;
+                auto oldExpr = &currentExpression;
                 closeDanglingIfExpression();
-                if (closedScope && wasIfExpr && currentExpression->type != ExpressionType::IfElse) {
+                if (closedScope && wasIfExpr && &currentExpression == oldExpr) {
                     closeCurrentExpression();
                     closedScope = false;
                 }

diff --git a/src/Tests/KataScriptTests.cpp b/src/Tests/KataScriptTests.cpp
@@ -1909,6 +1909,23 @@ namespace KataScriptTests {
         Assert::AreEqual(KataScript::Type::Int, val->getType());
         Assert::AreEqual(KataScript::Int(2), val->getInt());
     }
+
+    TEST_METHOD(CatchUnElsedIfBeforeForeach) {
+        interpreter.evaluate(
+            "var statsDict = dictionary();"s +
+            "fn testfunc(Name) {" +
+                "statsDict[Name] = 3;" +
+                "var allComplete = true;" +
+                "if (allComplete) { statsDict[Name] = 4; }" +
+                "foreach (stat; statsDict) { if (stat > 3) {allComplete = false; } }" +
+                "if (allComplete) { return 7; } else { return 8; }" +
+"} var j = testfunc(\"test\");"s        
+        );
+
+        auto val = interpreter.resolveVariable("j"s);
+        Assert::AreEqual(KataScript::Type::Int, val->getType());
+        Assert::AreEqual(KataScript::Int(8), val->getInt());
+    }
 
 	// todo add more tests