From 6b2e58c60a540874e17f7b50e9f892811275f0ff Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Mon, 6 Mar 2017 14:51:54 -0500 Subject: Error messages Forgot an error message --- dice-lang/src/bjc/dicelang/Errors.java | 6 ++++++ dice-lang/src/bjc/dicelang/Evaluator.java | 2 ++ 2 files changed, 8 insertions(+) diff --git a/dice-lang/src/bjc/dicelang/Errors.java b/dice-lang/src/bjc/dicelang/Errors.java index 729ecc2..8c2b1d5 100644 --- a/dice-lang/src/bjc/dicelang/Errors.java +++ b/dice-lang/src/bjc/dicelang/Errors.java @@ -55,6 +55,8 @@ public class Errors { EK_EVAL_UNDICE, // Incorrect type to dice group operator EK_EVAL_INVDGROUP, + // Incorrect type to dice creation operator + EK_EVAL_INVDCREATE, // Incorrect type to other dice operator EK_EVAL_INVDICE, // Mismatched types to math operator @@ -176,6 +178,10 @@ public class Errors { case EK_EVAL_UNDICE: System.out.printf("\tERROR: Unknown dice operator %s\n", args[0]); break; + case EK_EVAL_INVDCREATE: + System.out.printf("\tERROR: Dice creation operator expects integers," + + " not %s\n", args[0]); + break; case EK_EVAL_INVDGROUP: System.out.printf("\tERROR: Dice group operator expects scalar dice or integers," + " not %s\n", args[0]); diff --git a/dice-lang/src/bjc/dicelang/Evaluator.java b/dice-lang/src/bjc/dicelang/Evaluator.java index 1284479..0fadd60 100644 --- a/dice-lang/src/bjc/dicelang/Evaluator.java +++ b/dice-lang/src/bjc/dicelang/Evaluator.java @@ -172,6 +172,7 @@ public class Evaluator { EvaluatorResult opr = ast.getChild(0).getHead().resultVal; if(opr.type != INT) { + Errors.inst.printError(EK_EVAL_INVDCREATE, opr.type); } return new Tree<>(new Node(Node.Type.RESULT, @@ -181,6 +182,7 @@ public class Evaluator { EvaluatorResult oprn = ast.getChild(0).getHead().resultVal; if(oprn.type != INT) { + Errors.inst.printError(EK_EVAL_INVDCREATE, oprn.type); } return new Tree<>(new Node(Node.Type.RESULT, -- cgit v1.2.3