Simplify ExpressionException.errorMaker

Why was this a lambda?
This commit is contained in:
altrisi committed 2022-10-08 14:57:32 +02:00
1 parent db031b175b
commit 3f5eac7472
1 file changed
+3 -5
@@ -2,7 +2,6 @@ package carpet.script.exception;
import carpet.script.Context; import carpet.script.Context;
import carpet.script.Expression; import carpet.script.Expression;
import carpet.script.Fluff;
import carpet.script.Tokenizer; import carpet.script.Tokenizer;
import carpet.script.value.FunctionValue; import carpet.script.value.FunctionValue;
import carpet.utils.Messenger; import carpet.utils.Messenger;
@@ -51,9 +50,8 @@ public class ExpressionException extends StacklessRuntimeException implements Re
context = c; context = c;
} }
private static final Fluff.TriFunction<Expression, Tokenizer.Token, String, List<String>> errorMaker = (expr, /*Nullable*/ token, errmessage) -> private static List<String> makeError(Expression expr, /*Nullable*/Tokenizer.Token token, String errmessage)
{ {
List<String> errMsg = new ArrayList<>(); List<String> errMsg = new ArrayList<>();
errmessage += expr.getModuleName() == null?"":(" in "+expr.getModuleName()); errmessage += expr.getModuleName() == null?"":(" in "+expr.getModuleName());
if (token != null) if (token != null)
@@ -72,7 +70,7 @@ public class ExpressionException extends StacklessRuntimeException implements Re
} }
errMsg.add(errmessage); errMsg.add(errmessage);
return errMsg; return errMsg;
}; }
synchronized static String makeMessage(Context c, Expression e, Tokenizer.Token t, String message) throws ExpressionException 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", alternative);
} }
} }
return String.join("\n", errorMaker.apply(e, t, message)); return String.join("\n", makeError(e, t, message));
} }
@Override @Override