moved exception handler, fixes #861

src/main/java/carpet/script/Fluff.java

@@ -166,34 +166,36 @@ public abstract class Fluff
         @Override
         public LazyValue lazyEval(Context cc, Context.Type type, Expression e, Tokenizer.Token t, final List<LazyValue> lazyParams)
         {
-            try
-            {
-                return new LazyValue()
-                { // eager evaluation always ignores the required type and evals params by none default
-                    private List<Value> params;
 
-                    public Value evalValue(Context c, Context.Type type) {
+            return new LazyValue()
-                        ILazyFunction.checkInterrupts();
+            { // eager evaluation always ignores the required type and evals params by none default
+                private List<Value> params;
+                public Value evalValue(Context c, Context.Type type)
+                {
+                    ILazyFunction.checkInterrupts();
+                    try
+                    {
                         return AbstractFunction.this.eval(getParams(c));
                     }
-
+                    catch (RuntimeException exc)
-                    private List<Value> getParams(Context c) {
+                    {
-                        if (params == null) {
+                        throw Expression.handleCodeException(cc, exc, e, t);
-                            // very likely needs to be dynamic, so not static like here, or remember if it was.
-                            params = unpackArgs(lazyParams, c, Context.Type.NONE);
-                        }
-                        else
-                        {
-                            CarpetSettings.LOG.error("How did we get here 1");
-                        }
-                        return params;
                     }
-                };
+                }
-            }
+                private List<Value> getParams(Context c)
-            catch (RuntimeException exc)
+                {
-            {
+                    if (params == null)
-                throw Expression.handleCodeException(cc, exc, e, t);
+                    {
-            }
+                        // very likely needs to be dynamic, so not static like here, or remember if it was.
+                        params = unpackArgs(lazyParams, c, Context.Type.NONE);
+                    }
+                    else
+                    {
+                        CarpetSettings.LOG.error("How did we get here 1");
+                    }
+                    return params;
+                }
+            };
         }
     }