From 96e868388c7617136e916c27ddd90694c0bb8356 Mon Sep 17 00:00:00 2001 From: bjculkin Date: Mon, 27 Feb 2017 10:34:25 -0500 Subject: More refactoring --- dice-lang/src/bjc/dicelang/v2/EvaluatorResult.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'dice-lang/src/bjc/dicelang/v2/EvaluatorResult.java') diff --git a/dice-lang/src/bjc/dicelang/v2/EvaluatorResult.java b/dice-lang/src/bjc/dicelang/v2/EvaluatorResult.java index 510d5e9..bac4d2d 100644 --- a/dice-lang/src/bjc/dicelang/v2/EvaluatorResult.java +++ b/dice-lang/src/bjc/dicelang/v2/EvaluatorResult.java @@ -1,5 +1,8 @@ package bjc.dicelang.v2; +import bjc.dicelang.v2.dice.Die; +import bjc.dicelang.v2.dice.DieExpression; +import bjc.dicelang.v2.dice.DieList; import bjc.utils.data.ITree; import bjc.utils.data.Tree; @@ -15,7 +18,7 @@ public class EvaluatorResult { // off of the result type public long intVal; public double floatVal; - public DiceBox.DieExpression diceVal; + public DieExpression diceVal; public String stringVal; // Original node data @@ -51,22 +54,22 @@ public class EvaluatorResult { floatVal = dVal; } - public EvaluatorResult(EvaluatorResult.Type typ, DiceBox.DieExpression dVal) { + public EvaluatorResult(EvaluatorResult.Type typ, DieExpression dVal) { this(typ); diceVal = dVal; } - public EvaluatorResult(EvaluatorResult.Type typ, DiceBox.Die dVal) { + public EvaluatorResult(EvaluatorResult.Type typ, Die dVal) { this(typ); - diceVal = new DiceBox.DieExpression(dVal); + diceVal = new DieExpression(dVal); } - public EvaluatorResult(EvaluatorResult.Type typ, DiceBox.DieList dVal) { + public EvaluatorResult(EvaluatorResult.Type typ, DieList dVal) { this(typ); - diceVal = new DiceBox.DieExpression(dVal); + diceVal = new DieExpression(dVal); } public EvaluatorResult(EvaluatorResult.Type typ, String strang) { -- cgit v1.2.3