diff options
Diffstat (limited to 'main/core/runtime')
| -rw-r--r-- | main/core/runtime/Scope.java | 3 | ||||
| -rw-r--r-- | main/core/runtime/builtins/AsIntBuiltinFunction.java | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/main/core/runtime/Scope.java b/main/core/runtime/Scope.java index e3bf899..0bf8907 100644 --- a/main/core/runtime/Scope.java +++ b/main/core/runtime/Scope.java @@ -26,7 +26,8 @@ public class Scope { public DataContainer resolveSymbol(String symbol, List<DataContainer> params) throws InterpreterException { if (functions.containsKey(symbol)) { - return functions.get(symbol).evaluate(params); + DataContainer r = functions.get(symbol).evaluate(params); + return r; } if (variables.containsKey(symbol)) { return variables.get(symbol); diff --git a/main/core/runtime/builtins/AsIntBuiltinFunction.java b/main/core/runtime/builtins/AsIntBuiltinFunction.java index 3e1c71c..210e1e4 100644 --- a/main/core/runtime/builtins/AsIntBuiltinFunction.java +++ b/main/core/runtime/builtins/AsIntBuiltinFunction.java @@ -5,7 +5,6 @@ import com.jantuomi.interpreter.main.core.parser.datatype.DataContainer; import com.jantuomi.interpreter.main.core.parser.datatype.IntegerDataContainer; import com.jantuomi.interpreter.main.core.parser.datatype.StringDataContainer; import com.jantuomi.interpreter.main.core.runtime.Function; -import com.jantuomi.interpreter.main.exception.ExceptionManager; import com.jantuomi.interpreter.main.exception.InterpreterException; import java.util.Arrays; @@ -30,7 +29,7 @@ public class AsIntBuiltinFunction extends Function { @Override public DataContainer evaluate(List<DataContainer> params) throws InterpreterException { if (params.size() != 1) { - ExceptionManager.raise(InterpreterException.ExceptionType.SyntaxError, -1, "amount of parameters to as_int"); + return null; } DataContainer param = params.get(0); int i = 0; @@ -39,8 +38,6 @@ public class AsIntBuiltinFunction extends Function { i = Integer.parseInt(((StringDataContainer) param).getData()); } catch (NumberFormatException ex) { - ExceptionManager.raise(InterpreterException.ExceptionType.SyntaxError, -1, - String.format("parameter %s to as_int", param.toString())); return null; } } |
