diff --git a/src/main/java/carpet/script/exception/ExpressionException.java b/src/main/java/carpet/script/exception/ExpressionException.java index 3ce14883..64d97af2 100644 --- a/src/main/java/carpet/script/exception/ExpressionException.java +++ b/src/main/java/carpet/script/exception/ExpressionException.java @@ -2,7 +2,6 @@ package carpet.script.exception; import carpet.script.Context; import carpet.script.Expression; -import carpet.script.Fluff; import carpet.script.Tokenizer; import carpet.script.value.FunctionValue; import carpet.utils.Messenger; @@ -51,9 +50,8 @@ public class ExpressionException extends StacklessRuntimeException implements Re context = c; } - private static final Fluff.TriFunction> errorMaker = (expr, /*Nullable*/ token, errmessage) -> + private static List makeError(Expression expr, /*Nullable*/Tokenizer.Token token, String errmessage) { - List errMsg = new ArrayList<>(); errmessage += expr.getModuleName() == null?"":(" in "+expr.getModuleName()); if (token != null) @@ -72,7 +70,7 @@ public class ExpressionException extends StacklessRuntimeException implements Re } errMsg.add(errmessage); return errMsg; - }; + } synchronized static String makeMessage(Context c, Expression e, Tokenizer.Token t, String message) throws ExpressionException { @@ -84,7 +82,7 @@ public class ExpressionException extends StacklessRuntimeException implements Re return String.join("\n", alternative); } } - return String.join("\n", errorMaker.apply(e, t, message)); + return String.join("\n", makeError(e, t, message)); } @Override