fixed in expression

Author: ackava

.gitignore

@@ -356,3 +356,4 @@ MigrationBackup/
 /Test/Test.csproj
 /YantraJS.Network/Generated
 /YantraJS.Core/Generated
+.idea

YantraJS.Core.Tests/Imported/StatementTests.cs

@@ -10,7 +10,7 @@ namespace YantraJS.Core.Tests.Imported
     /// <summary>
     /// Language statement tests.
     /// </summary>
-    //[TestClass]
+    // [TestClass]
     public class StatementTests : TestBase
     {
         [TestMethod]
@@ -99,6 +99,14 @@ function test() {
                         test();
                     }());
                 }");
+
+            Execute(@"
+                var a;
+                var b = { a: 1 }; 
+                for(a in b) {
+                    console.log(a);
+                }
+            ");
         }
 
         [TestMethod]

YantraJS.Core.Tests/YantraJS.Core.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <IsPackable>false</IsPackable>
 	 <IsTestProject>true</IsTestProject>
   </PropertyGroup>

YantraJS.Core/FastParser/Parser/FastParser.ForStatement.cs

@@ -83,35 +83,48 @@ bool ForStatement(out AstStatement node)
                 AstExpression? ofTarget = null;
                 AstExpression? test = null;
                 AstExpression? update = null;
-
-                if (stream.CheckAndConsume(TokenTypes.In))
+                
+                // we need to check if beginNode contains `in` expression
+                // as `a in b` is a valid single expression
+                if (beginNode is AstBinaryExpression b
+                    && b.Operator == TokenTypes.In
+                    && stream.CheckAndConsume(TokenTypes.BracketEnd))
                 {
                     @in = true;
-                    if (!Expression(out inTarget))
-                        throw stream.Unexpected();
-                    stream.Expect(TokenTypes.BracketEnd);
-                }
-                else if (stream.CheckAndConsumeContextualKeyword(FastKeywords.of))
-                {
-                    of = true;
-                    if (!Expression(out ofTarget))
-                        throw stream.Unexpected();
-                    stream.Expect(TokenTypes.BracketEnd);
+                    beginNode = b.Left;
+                    inTarget = b.Right;
                 }
-                else if (ExpressionSequence(out test, TokenTypes.SemiColon, true))
+                else
                 {
-                    // case of automatic semicolon insertion
-                    if (test.End.Type == TokenTypes.BracketEnd)
-                        throw stream.Unexpected();
-                    if (test.Type == FastNodeType.EmptyExpression)
-                        test = null;
-                    if (!ExpressionSequence(out update, TokenTypes.BracketEnd, true))
-                        throw stream.Unexpected();
-                    if (update.Type == FastNodeType.EmptyExpression)
-                        update = null;
-                }
-                else stream.Unexpected();
 
+                    if (stream.CheckAndConsume(TokenTypes.In))
+                    {
+                        @in = true;
+                        if (!Expression(out inTarget))
+                            throw stream.Unexpected();
+                        stream.Expect(TokenTypes.BracketEnd);
+                    }
+                    else if (stream.CheckAndConsumeContextualKeyword(FastKeywords.of))
+                    {
+                        of = true;
+                        if (!Expression(out ofTarget))
+                            throw stream.Unexpected();
+                        stream.Expect(TokenTypes.BracketEnd);
+                    }
+                    else if (ExpressionSequence(out test, TokenTypes.SemiColon, true))
+                    {
+                        // case of automatic semicolon insertion
+                        if (test.End.Type == TokenTypes.BracketEnd)
+                            throw stream.Unexpected();
+                        if (test.Type == FastNodeType.EmptyExpression)
+                            test = null;
+                        if (!ExpressionSequence(out update, TokenTypes.BracketEnd, true))
+                            throw stream.Unexpected();
+                        if (update.Type == FastNodeType.EmptyExpression)
+                            update = null;
+                    }
+                    else stream.Unexpected();
+                }
 
                 AstStatement statement;
                 if (stream.CheckAndConsume(TokenTypes.CurlyBracketStart))

YantraJS/Properties/launchSettings.json

@@ -2,19 +2,19 @@
   "profiles": {
     "Yantra TypeScript": {
       "commandName": "Project",
-      "commandLineArgs": "..\\..\\..\\..\\YantraTests\\Modules\\ts\\index.js"
+      "commandLineArgs": "../../../../YantraTests/Modules/ts/index.js"
     },
     "Yantra Box2d": {
       "commandName": "Project",
-      "commandLineArgs": "..\\..\\..\\..\\YantraTests\\Modules\\box2d\\index.js"
+      "commandLineArgs": "../../../../YantraTests/Modules/box2d/index.js"
     },
     "Yantra CodeLoad": {
       "commandName": "Project",
-      "commandLineArgs": "..\\..\\..\\..\\YantraTests\\Modules\\code-load\\code-loade.js"
+      "commandLineArgs": "../../../../YantraTests/Modules/code-load/index.js"
     },
     "Yantra XF-Samples": {
       "commandName": "Project",
-      "commandLineArgs": "..\\..\\..\\..\\YantraJS.Core.Tests\\Generator\\Files\\es5\\Index\\Index.pack.js"
+      "commandLineArgs": "../../../../YantraJS.Core.Tests/Generator/Files/es5/Index/Index.pack.js"
     },
     "Yantra REPL": {
       "commandName": "Project",
@@ -26,7 +26,7 @@
     },
     "Yantra File": {
       "commandName": "Project",
-      "commandLineArgs": "D:\\git\\github\\yantrajs\\yantra\\YantraJS.Core.Tests\\Generator\\Files\\es6\\Syntax\\linq\\linqjs.js"
+      "commandLineArgs": "D:/git/github/yantrajs/yantra/YantraJS.Core.Tests/Generator/Files/es6/Syntax/linq/linqjs.js"
     }
   }
 }

YantraTests/Modules/code-load/index.js

@@ -1 +1 @@
-import "./code-load.js";
+import * as a1 from "./code-load.js";