fixing loop dynamic expression

ELENA-LANG · Jul 14, 2021 · 39df7c0 · 39df7c0
1 parent f72b5e8
commit 39df7c0
Show file tree

Hide file tree

Showing 3 changed files with 68 additions and 3 deletions.
diff --git a/src50/system/dynamic/expressions/expressions.l b/src50/system/dynamic/expressions/expressions.l
@@ -227,9 +227,9 @@ namespace expressions
 //           
 //        static Expression Assigning(ScopeVariable variable, Expression expr)
 //            = new AssigningExpression(variable, expr);
-//              
-//        static Expression Assigning(string variable, Expression expr)
-//            = new AssigningExpression(new ScopeVariable(variable), expr);
+
+        static Expression Assigning(string variable, Expression expr)
+            = new AssigningExpression(variable, expr);
 
         static Expression DeclareAndAssigning(string variable, Expression expr)
             = new DeclaringAndAssigningExpression(variable, expr);
@@ -691,6 +691,9 @@ namespace expressions
 
                 declare(ScopeIdentifier variable)
                 {
+                    int index := variables.Length + 1;
+                    scope.reserve(index);
+
                     variables.append(variable)
                 }            
             };
@@ -1393,6 +1396,12 @@ namespace expressions
             this expression := expression
         }
 
+        constructor(string variable, Expression expression)
+        {
+            this variable := ScopeIdentifier.Variable(variable);
+            this expression := expression
+        }
+
         bool IsOperation = false;
 
         int prepare(ExpressionScope scope)

diff --git a/tests/system/main.l b/tests/system/main.l
@@ -39,6 +39,7 @@ public program()
     //templateExtensionTest();
 
     ifExpressionTest();
+    loopExpressionTest();
 
     console.writeLine:"--- Passed ---"
 }
diff --git a/tests/system/test_arithm.l b/tests/system/test_arithm.l
@@ -834,3 +834,58 @@ public ifExpressionTest()
 
     console.writeLine("done")    
 }
+
+public loopExpressionTest()
+{
+    console.write("loopExpressionTest..");
+
+    auto c := DynamicSingleton.new(
+                Expression.Method(
+                   "eval",
+                   Expression.CodeBlock(      
+                      Expression.DeclareAndAssigning(
+                        "i",
+                        Expression.Constant(0)
+                      ),          
+                      Expression.DeclareAndAssigning(
+                        "k",
+                        Expression.Constant(0)
+                      ),          
+                      Expression.Loop(                      
+                          Expression.MessageCall(
+                            new Message("less[2]"),
+                            Expression.Variable("i"),
+                            Expression.Variable("n")
+                          ),                             
+                          Expression.CodeBlock(
+                            Expression.Assigning(
+                                "k",
+                                Expression.MessageCall(
+                                    new Message("add[2]"),                          
+                                    Expression.Variable("k"),
+                                    Expression.Constant(2)
+                                )
+                            ), 
+                            Expression.Assigning(
+                                "i",
+                                Expression.MessageCall(
+                                    new Message("add[2]"),                          
+                                    Expression.Variable("i"),
+                                    Expression.Constant(1)
+                                )
+                            ) 
+                          )                     
+                      ),
+                      Expression.Variable("k")
+                   ),
+                   ScopeIdentifier.Variable("n")
+                )
+             );
+
+    var o := c.compile();
+
+    Assert.ifEqual(o.eval(4), 8);
+    Assert.ifEqual(o.eval(0), 0);
+
+    console.writeLine("done")    
+}