From 79ee129fc0d36ad10bceb942262f2842419c030c Mon Sep 17 00:00:00 2001 From: bjculkin Date: Mon, 27 Feb 2017 10:08:50 -0500 Subject: Pacakge reorganization --- dice-lang/src/bjc/dicelang/v2/Evaluator.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'dice-lang/src/bjc/dicelang/v2/Evaluator.java') diff --git a/dice-lang/src/bjc/dicelang/v2/Evaluator.java b/dice-lang/src/bjc/dicelang/v2/Evaluator.java index 904c8bc..047e12f 100644 --- a/dice-lang/src/bjc/dicelang/v2/Evaluator.java +++ b/dice-lang/src/bjc/dicelang/v2/Evaluator.java @@ -6,14 +6,14 @@ import bjc.utils.data.Tree; import bjc.utils.data.TopDownTransformIterator; import bjc.utils.data.TopDownTransformResult; +import static bjc.dicelang.v2.Errors.ErrorKey.*; +import static bjc.dicelang.v2.EvaluatorResult.Type.*; + import java.util.Deque; import java.util.Iterator; import java.util.LinkedList; import java.util.function.Consumer; -import static bjc.dicelang.v2.Errors.ErrorKey.*; -import static bjc.dicelang.v2.EvaluatorResult.Type.*; - public class Evaluator { private static enum CoerceSteps { INTEGER, FLOAT; @@ -128,12 +128,12 @@ public class Evaluator { Iterator> nd = stepDebug(child); for(; nd.hasNext(); nChild = nd.next()) { - ctx.thunk.accept(new SingleIterator(child)); + ctx.thunk.accept(new SingleIterator<>(child)); } } else { nChild = new Tree<>(new Node(Node.Type.RESULT, evaluate(child))); - if(nChild != null) ctx.thunk.accept(new SingleIterator(nChild)); + if(nChild != null) ctx.thunk.accept(new SingleIterator<>(nChild)); } Node childNode = nChild.getHead(); -- cgit v1.2.3