From fa02123ab00be8b8fe212c5d34ed021f1b63de74 Mon Sep 17 00:00:00 2001 From: Jan Tuomi Date: Wed, 22 Jun 2016 22:33:33 +0300 Subject: Add double type and fix exception types --- main/core/parser/ast/AdditionNode.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'main/core/parser/ast/AdditionNode.java') diff --git a/main/core/parser/ast/AdditionNode.java b/main/core/parser/ast/AdditionNode.java index 0820370..00db230 100644 --- a/main/core/parser/ast/AdditionNode.java +++ b/main/core/parser/ast/AdditionNode.java @@ -2,6 +2,7 @@ package com.jantuomi.interpreter.main.core.parser.ast; import com.jantuomi.interpreter.main.core.parser.datatype.DataContainer; import com.jantuomi.interpreter.main.core.tokenizer.token.Token; +import com.jantuomi.interpreter.main.exception.ExceptionManager; import com.jantuomi.interpreter.main.exception.InterpreterException; import java.util.Arrays; @@ -22,7 +23,13 @@ public class AdditionNode extends BinaryOperatorNode { DataContainer operand2 = rhs.evaluate(); DataContainer result = operand1.add(operand2); - return result; + if (result != null) { + return result; + } else { + ExceptionManager.raise(InterpreterException.ExceptionType.TypeError, source.getLine(), + operand1.getType().toString(), operand2.getType().toString()); + return null; + } } @Override -- cgit v1.3