Вывод информации о стеке вызовов при ошибке

Author: aNNiMON

src/com/annimon/ownlang/Main.java

@@ -1,5 +1,8 @@
 package com.annimon.ownlang;
 
+import com.annimon.ownlang.lib.CallStack;
+import com.annimon.ownlang.lib.Function;
+import com.annimon.ownlang.lib.Functions;
 import com.annimon.ownlang.parser.Lexer;
 import com.annimon.ownlang.parser.Parser;
 import com.annimon.ownlang.parser.Token;
@@ -74,6 +77,18 @@ private static void run(String input, boolean showTokens, boolean showAst) {
         program.accept(new FunctionAdder());
 //        program.accept(new VariablePrinter());
         program.accept(new AssignValidator());
-        program.execute();
+        try {
+            program.execute();
+        } catch (Exception ex) {
+            handleException(Thread.currentThread(), ex);
+        }
+    }
+    
+    public static void handleException(Thread thread, Throwable throwable) {
+        System.err.printf("%s in %s\n", throwable.getMessage(), thread.getName());
+        for (CallStack.CallInfo call : CallStack.getCalls()) {
+            System.err.printf("\tat %s\n", call);
+        }
+        throwable.printStackTrace();
     }
 }

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

@@ -0,0 +1,36 @@
+package com.annimon.ownlang.lib;
+
+import java.util.Deque;
+import java.util.concurrent.ConcurrentLinkedDeque;
+
+public final class CallStack {
+    
+    private static final Deque<CallInfo> calls = new ConcurrentLinkedDeque<CallInfo>();;
+    
+    public static synchronized void enter(String name, Function function) {
+        calls.push(new CallInfo(name, function));
+    }
+    
+    public static synchronized void exit() {
+        calls.pop();
+    }
+
+    public static synchronized Deque<CallInfo> getCalls() {
+        return calls;
+    }
+    
+    public static class CallInfo {
+        String name;
+        Function function;
+
+        public CallInfo(String name, Function function) {
+            this.name = name;
+            this.function = function;
+        }
+
+        @Override
+        public String toString() {
+            return String.format("%s: %s", name, function.toString().trim());
+        }
+    }
+}

src/com/annimon/ownlang/lib/modules/functions/std_thread.java

@@ -1,5 +1,6 @@
 package com.annimon.ownlang.lib.modules.functions;
 
+import com.annimon.ownlang.Main;
 import com.annimon.ownlang.exceptions.ArgumentsMismatchException;
 import com.annimon.ownlang.lib.*;
 
@@ -24,7 +25,9 @@ public Value execute(Value... args) {
             System.arraycopy(args, 1, params, 0, params.length);
         }
 
-        new Thread(() -> body.execute(params)).start();
+        final Thread thread = new Thread(() -> body.execute(params));
+        thread.setUncaughtExceptionHandler(Main::handleException);
+        thread.start();
         return NumberValue.ZERO;
     }
 }

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

@@ -31,7 +31,11 @@ public Value eval() {
         for (int i = 0; i < size; i++) {
             values[i] = arguments.get(i).eval();
         }
-        return consumeFunction(functionExpr).execute(values);
+        final Function f = consumeFunction(functionExpr);
+        CallStack.enter(functionExpr.toString(), f);
+        final Value result = f.execute(values);
+        CallStack.exit();
+        return result;
     }
 
     private Function consumeFunction(Expression expr) {