moved exception handler, fixes #861

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

@@ -166,19 +166,26 @@ 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)
-                    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);
+                    }
+                }
+                private List<Value> getParams(Context c)
+                {
+                    if (params == null)
+                    {
                         // very likely needs to be dynamic, so not static like here, or remember if it was.
                         params = unpackArgs(lazyParams, c, Context.Type.NONE);
                     }
@@ -190,11 +197,6 @@ public abstract class Fluff
                 }
             };
         }
-            catch (RuntimeException exc)
-            {
-                throw Expression.handleCodeException(cc, exc, e, t);
-            }
-        }
     }
 
     public abstract static class AbstractLazyOperator implements ILazyOperator