Небольшие исправления

Author: aNNiMON

src/main/java/com/annimon/ownlang/parser/Parser.java

@@ -219,12 +219,15 @@ private Statement doWhileStatement() {
 
     private Statement forStatement() {
         int foreachIndex = lookMatch(0, TokenType.LPAREN) ? 1 : 0;
-        if (lookMatch(foreachIndex, TokenType.WORD) && lookMatch(foreachIndex + 1, TokenType.COLON)) {
+        if (lookMatch(foreachIndex, TokenType.WORD)
+                && lookMatch(foreachIndex + 1, TokenType.COLON)) {
             // for v : arr || for (v : arr)
             return foreachArrayStatement();
         }
-        if (lookMatch(foreachIndex, TokenType.WORD) && lookMatch(foreachIndex + 1, TokenType.COMMA)
-                && lookMatch(foreachIndex + 2, TokenType.WORD) && lookMatch(foreachIndex + 3, TokenType.COLON)) {
+        if (lookMatch(foreachIndex, TokenType.WORD)
+                && lookMatch(foreachIndex + 1, TokenType.COMMA)
+                && lookMatch(foreachIndex + 2, TokenType.WORD)
+                && lookMatch(foreachIndex + 3, TokenType.COLON)) {
             // for key, value : arr || for (key, value : arr)
             return foreachMapStatement();
         }
@@ -242,23 +245,29 @@ && lookMatch(foreachIndex + 2, TokenType.WORD) && lookMatch(foreachIndex + 3, To
     }
 
     private ForeachArrayStatement foreachArrayStatement() {
+        // for x : arr
         boolean optParentheses = match(TokenType.LPAREN);
         final String variable = consume(TokenType.WORD).getText();
         consume(TokenType.COLON);
         final Expression container = expression();
-        if (optParentheses) consume(TokenType.RPAREN); // close opt parentheses
+        if (optParentheses) {
+            consume(TokenType.RPAREN); // close opt parentheses
+        }
         final Statement statement = statementOrBlock();
         return new ForeachArrayStatement(variable, container, statement);
     }
 
     private ForeachMapStatement foreachMapStatement() {
+        // for k, v : map
         boolean optParentheses = match(TokenType.LPAREN);
         final String key = consume(TokenType.WORD).getText();
         consume(TokenType.COMMA);
         final String value = consume(TokenType.WORD).getText();
         consume(TokenType.COLON);
         final Expression container = expression();
-        if (optParentheses) consume(TokenType.RPAREN); // close opt parentheses
+        if (optParentheses) {
+            consume(TokenType.RPAREN); // close opt parentheses
+        }
         final Statement statement = statementOrBlock();
         return new ForeachMapStatement(key, value, container, statement);
     }
@@ -440,13 +449,14 @@ private Expression assignment() {
     }
 
     private Expression assignmentStrict() {
+        // x[0].prop += ...
         final int position = pos;
         final Expression targetExpr = qualifiedName();
         if (!(targetExpr instanceof Accessible)) {
             pos = position;
             return null;
         }
-        
+
         final TokenType currentType = get(0).getType();
         if (!ASSIGN_OPERATORS.containsKey(currentType)) {
             pos = position;
@@ -696,13 +706,15 @@ private Expression primary() {
         }
 
         if (match(TokenType.COLONCOLON)) {
+            // ::method reference
             final String functionName = consume(TokenType.WORD).getText();
             return new FunctionReferenceExpression(functionName);
         }
         if (match(TokenType.MATCH)) {
             return match();
         }
         if (match(TokenType.DEF)) {
+            // anonymous function def(args) ...
             final Arguments arguments = arguments();
             final Statement statement = statementBody();
             return new ValueExpression(new UserDefinedFunction(arguments, statement));
@@ -818,14 +830,18 @@ private Number createNumber(String text, int radix) {
 
     private Token consume(TokenType type) {
         final Token current = get(0);
-        if (type != current.getType()) throw new ParseException("Token " + current + " doesn't match " + type);
+        if (type != current.getType()) {
+            throw new ParseException("Token " + current + " doesn't match " + type);
+        }
         pos++;
         return current;
     }
 
     private boolean match(TokenType type) {
         final Token current = get(0);
-        if (type != current.getType()) return false;
+        if (type != current.getType()) {
+            return false;
+        }
         pos++;
         return true;
     }

src/main/java/com/annimon/ownlang/parser/ast/FunctionalExpression.java

@@ -43,11 +43,11 @@ public Value eval() {
         final Function f = consumeFunction(functionExpr);
         CallStack.enter(functionExpr.toString(), f);
         try {
-            return f.execute(values);
+            final Value result = f.execute(values);
+            CallStack.exit();
+            return result;
         } catch (ArgumentsMismatchException | TypeException | VariableDoesNotExistsException ex) {
             throw new RuntimeException(ex.getMessage() + " in function " + functionExpr, ex);
-        } finally {
-            CallStack.exit();
         }
     }