From f3b8e894c1212e0c494601d2ef04f94e4ee1ae7d Mon Sep 17 00:00:00 2001
From: jantuomi <jans.tuomi@gmail.com>
Date: Wed, 3 Aug 2016 09:09:15 +0300
Subject: Change "Malformed syntax tree" error to SyntaxError

Remove dead code
Change SyntaxError message
---
 src/main/com/jantuomi/tunkki/core/parser/ASTGenerator.java          | 3 ++-
 src/main/com/jantuomi/tunkki/core/runtime/Interpreter.java          | 1 -
 src/main/com/jantuomi/tunkki/exception/types/SyntaxTunkkiError.java | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/main')

diff --git a/src/main/com/jantuomi/tunkki/core/parser/ASTGenerator.java b/src/main/com/jantuomi/tunkki/core/parser/ASTGenerator.java
index 7d8e231..d1221df 100644
--- a/src/main/com/jantuomi/tunkki/core/parser/ASTGenerator.java
+++ b/src/main/com/jantuomi/tunkki/core/parser/ASTGenerator.java
@@ -3,6 +3,7 @@ package com.jantuomi.tunkki.core.parser;
 import com.jantuomi.tunkki.core.parser.ast.ASTNode;
 import com.jantuomi.tunkki.core.parser.tokenizer.token.Token;
 import com.jantuomi.tunkki.exception.types.GeneralTunkkiError;
+import com.jantuomi.tunkki.exception.types.SyntaxTunkkiError;
 import com.jantuomi.tunkki.exception.types.TunkkiError;
 
 import java.util.ArrayList;
@@ -35,7 +36,7 @@ public class ASTGenerator {
         try {
             root.print(0);
         } catch (NullPointerException ex) {
-            throw new GeneralTunkkiError(-1, "Malformed syntax tree.");
+            throw new SyntaxTunkkiError(-1, "Illegal syntax.");
         }
 
         System.out.println("### AST Tree end ###");
diff --git a/src/main/com/jantuomi/tunkki/core/runtime/Interpreter.java b/src/main/com/jantuomi/tunkki/core/runtime/Interpreter.java
index ef9a2c6..e9ee999 100644
--- a/src/main/com/jantuomi/tunkki/core/runtime/Interpreter.java
+++ b/src/main/com/jantuomi/tunkki/core/runtime/Interpreter.java
@@ -28,7 +28,6 @@ public class Interpreter {
             }
             catch (NullPointerException ex) {
                 continue;
-                //throw new TunkkiError(TunkkiError.ExceptionType.GeneralError, -1, "Malformed input.");
             }
 
             if (data != null) {
diff --git a/src/main/com/jantuomi/tunkki/exception/types/SyntaxTunkkiError.java b/src/main/com/jantuomi/tunkki/exception/types/SyntaxTunkkiError.java
index 08d230b..fce4ef5 100644
--- a/src/main/com/jantuomi/tunkki/exception/types/SyntaxTunkkiError.java
+++ b/src/main/com/jantuomi/tunkki/exception/types/SyntaxTunkkiError.java
@@ -10,7 +10,7 @@ public class SyntaxTunkkiError extends TunkkiError {
 
     @Override
     public String what() {
-        return "Unexpected %s.";
+        return "%s";
     }
 
     @Override
-- 
cgit v1.3