Исправлено некорректное обновление переменных внутри функций

Author: aNNiMON

src/com/annimon/ownlang/lib/UserDefinedFunction.java

@@ -44,12 +44,12 @@ public Value execute(Value... values) {
         try {
             Variables.push();
             for (int i = 0; i < size; i++) {
-                Variables.set(getArgsName(i), values[i]);
+                Variables.define(getArgsName(i), values[i]);
             }
             // Optional args if exists
             for (int i = size; i < totalArgsCount; i++) {
                 final Argument arg = arguments.get(i);
-                Variables.set(arg.getName(), arg.getValueExpr().eval());
+                Variables.define(arg.getName(), arg.getValueExpr().eval());
             }
             body.execute();
             return NumberValue.ZERO;

src/com/annimon/ownlang/parser/ast/DestructuringAssignmentStatement.java

@@ -41,7 +41,7 @@ private void execute(ArrayValue array) {
         for (int i = 0; i < size; i++) {
             final String variable = variables.get(i);
             if (variable != null) {
-                Variables.set(variable, array.get(i));
+                Variables.define(variable, array.get(i));
             }
         }
     }
@@ -50,7 +50,7 @@ private void execute(MapValue map) {
         for (Map.Entry<Value, Value> entry : map) {
             final String variable = variables.get(i);
             if (variable != null) {
-                Variables.set(variable, new ArrayValue(
+                Variables.define(variable, new ArrayValue(
                         new Value[] { entry.getKey(), entry.getValue() }
                 ));
             }

src/com/annimon/ownlang/parser/ast/MatchExpression.java

@@ -47,7 +47,7 @@ public Value eval() {
                         return evalResult(p.result);
                     }
                 } else {
-                    Variables.set(pattern.variable, value);
+                    Variables.define(pattern.variable, value);
                     if (optMatches(p)) {
                         final Value result = evalResult(p.result);;
                         Variables.remove(pattern.variable);
@@ -84,7 +84,7 @@ private boolean matchListPattern(ArrayValue array, ListPattern p) {
 
             case 1: // match arr { case [x]: x = arr ... }
                 final String variable = parts.get(0);
-                Variables.set(variable, array);
+                Variables.define(variable, array);
                 if (optMatches(p)) {
                     return true;
                 }
@@ -107,7 +107,7 @@ private boolean matchListPattern(ArrayValue array, ListPattern p) {
     private boolean matchListPatternEqualsSize(ListPattern p, List<String> parts, int partsSize, ArrayValue array) {
         // Set variables
         for (int i = 0; i < partsSize; i++) {
-            Variables.set(parts.get(i), array.get(i));
+            Variables.define(parts.get(i), array.get(i));
         }
         if (optMatches(p)) {
             // Clean up will be provided after evaluate result
@@ -124,14 +124,14 @@ private boolean matchListPatternWithTail(ListPattern p, List<String> parts, int
         // Set element variables
         final int lastPart = partsSize - 1;
         for (int i = 0; i < lastPart; i++) {
-            Variables.set(parts.get(i), array.get(i));
+            Variables.define(parts.get(i), array.get(i));
         }
         // Set tail variable
         final ArrayValue tail = new ArrayValue(arraySize - partsSize + 1);
         for (int i = lastPart; i < arraySize; i++) {
             tail.set(i - lastPart, array.get(i));
         }
-        Variables.set(parts.get(lastPart), tail);
+        Variables.define(parts.get(lastPart), tail);
         // Check optional condition
         if (optMatches(p)) {
             // Clean up will be provided after evaluate result

tests.own

@@ -32,9 +32,9 @@ def testTypes() {
   assertSameType(0, 0.0)
 }
 
-def testFail() {
+/*def testFail() {
   assertTrue(false)
-}
+}*/
 
 def testScope() {
   x = 5
@@ -47,4 +47,13 @@ def testScope() {
   assertEquals(15, x)
 }
 
+def testFibonacci() {
+  def fib(n) {
+    if n < 2 return n
+    return fib(n-2) + fib(n-1)
+  }
+  assertEquals(3, fib(4))
+  assertEquals(21, fib(8))
+}
+
 println runTests()