Implemented general enhancements

2 files changed, 10 insertions, 12 deletions

diff --git a/main/exception/ExceptionManager.java b/main/exception/ExceptionManager.java
index dbb59d3..2dd46f5 100644
--- a/main/exception/ExceptionManager.java
+++ b/main/exception/ExceptionManager.java
@@ -1,7 +1,5 @@
 package com.jantuomi.interpreter.main.exception;
 
-import java.util.List;
-
 /**
  * Created by jan on 10.6.2016.
  */
@@ -16,7 +14,7 @@ public class ExceptionManager {
         return instance;
     }
 
-    public static void raise(InterpreterException.ExceptionType ex, int line, List<String> args) throws InterpreterException {
+    public static void raise(InterpreterException.ExceptionType ex, int line, String... args) throws InterpreterException {
         InterpreterException e = new InterpreterException(ex, line, args);
         throw e;
     }
diff --git a/main/exception/InterpreterException.java b/main/exception/InterpreterException.java
index 26e39fd..1565df9 100644
--- a/main/exception/InterpreterException.java
+++ b/main/exception/InterpreterException.java
@@ -2,7 +2,6 @@ package com.jantuomi.interpreter.main.exception;
 
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -14,7 +13,8 @@ public class InterpreterException extends Exception {
         IllegalTokenError,
         UnknownOperatorError,
         SyntaxError,
-        TypeError
+        TypeError,
+        ArgumentError
     }
 
     public static Map<ExceptionType, String> errorTexts = new HashMap<>();
@@ -24,20 +24,20 @@ public class InterpreterException extends Exception {
         errorTexts.put(ExceptionType.UnknownOperatorError, "Unexpected operator %s found.");
         errorTexts.put(ExceptionType.SyntaxError, "Unexpected %s.");
         errorTexts.put(ExceptionType.TypeError, "Incompatible types %s and %s.");
+        errorTexts.put(ExceptionType.ArgumentError, "Function %s requires %s arguments.");
     }
 
     private ExceptionType exceptionType;
 
-    public InterpreterException(ExceptionType exceptionType, int line, List<String> args) {
-        super(formatMessage(exceptionType.toString() + what(exceptionType), line, args));
+    public InterpreterException(ExceptionType exceptionType, int line, String... args) {
+        super(formatMessage(exceptionType.toString() + ": " + what(exceptionType), line, args), null, false, false);
         this.exceptionType = exceptionType;
     }
 
-    private static String formatMessage(String message, int line, List<String> args) {
-        for (String arg : args) {
-            message = String.format(message, arg);
-        }
-        return String.format("line %d: ", line) + message;
+    private static String formatMessage(String message, int line, String... args) {
+
+        message = String.format(message, args);
+        return String.format("\nline %d: ", line) + message;
     }
 
     public static String what(ExceptionType type) {