Formatting

1 files changed, 102 insertions, 101 deletions

diff --git a/dice-lang/src/bjc/dicelang/Evaluator.java b/dice-lang/src/bjc/dicelang/Evaluator.java
index 286af5c..5ecff25 100644
--- a/dice-lang/src/bjc/dicelang/Evaluator.java
+++ b/dice-lang/src/bjc/dicelang/Evaluator.java
@@ -58,13 +58,16 @@ public class Evaluator {
 
 		ctx.isDebug = false;
 		ctx.thunk = (itr) -> {
-			// Deliberately finish the iterator, but ignore results. It's only for stepwise evaluation
-			// but we don't know if stepping the iterator causes something to happen
-			while(itr.hasNext()) itr.next();
+			// Deliberately finish the iterator, but ignore results.
+			// It's only for stepwise evaluation
+			// but we don't know if stepping the iterator causes
+			// something to happen
+			while (itr.hasNext())
+				itr.next();
 		};
 
-		return comm.topDownTransform(this::pickEvaluationType,
-				(node) -> this.evaluateNode(node, ctx)).getHead().resultVal;
+		return comm.topDownTransform(this::pickEvaluationType, (node) -> this.evaluateNode(node, ctx))
+				.getHead().resultVal;
 	}
 
 	// @FIXME Something's broken with step evaluation
@@ -76,14 +79,14 @@ public class Evaluator {
 		return new TopDownTransformIterator<>(this::pickEvaluationType, (node, thnk) -> {
 			ctx.thunk = thnk;
 
-			return this.evaluateNode(node, ctx);	
+			return this.evaluateNode(node, ctx);
 		}, comm);
 	}
 
 	private TopDownTransformResult pickEvaluationType(Node nd) {
-		switch(nd.type) {
+		switch (nd.type) {
 		case UNARYOP:
-			switch(nd.operatorType) {
+			switch (nd.operatorType) {
 			case COERCE:
 				return TopDownTransformResult.RTRANSFORM;
 			default:
@@ -95,7 +98,7 @@ public class Evaluator {
 	}
 
 	private ITree<Node> evaluateNode(ITree<Node> ast, Context ctx) {
-		switch(ast.getHead().type) {
+		switch (ast.getHead().type) {
 		case UNARYOP:
 			return evaluateUnaryOp(ast, ctx);
 		case BINOP:
@@ -113,54 +116,56 @@ public class Evaluator {
 	}
 
 	private ITree<Node> evaluateUnaryOp(ITree<Node> ast, Context ctx) {
-		if(ast.getChildrenCount() != 1) {
+		if (ast.getChildrenCount() != 1) {
 			Errors.inst.printError(EK_EVAL_UNUNARY, Integer.toString(ast.getChildrenCount()));
 			return new Tree<>(FAIL(ast));
 		}
 
-		switch(ast.getHead().operatorType) {
+		switch (ast.getHead().operatorType) {
 		/*
 		 * @TODO move coercing to its own class
 		 */
 		case COERCE:
 			ITree<Node> toCoerce = ast.getChild(0);
-			ITree<Node> retVal   = new Tree<>(toCoerce.getHead());
+			ITree<Node> retVal = new Tree<>(toCoerce.getHead());
 			Deque<ITree<Node>> children = new LinkedList<>();
 
 			CoerceSteps curLevel = CoerceSteps.INTEGER;
 
-			for(int i = 0; i < toCoerce.getChildrenCount(); i++) {
-				ITree<Node> child    = toCoerce.getChild(i);
+			for (int i = 0; i < toCoerce.getChildrenCount(); i++) {
+				ITree<Node> child = toCoerce.getChild(i);
 				ITree<Node> nChild = null;
 
-				if(ctx.isDebug) {
+				if (ctx.isDebug) {
 					Iterator<ITree<Node>> nd = stepDebug(child);
 
-					for(; nd.hasNext(); nChild = nd.next()) {
+					for (; nd.hasNext(); nChild = nd.next()) {
 						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();
+				Node childNode = nChild.getHead();
 				EvaluatorResult res = childNode.resultVal;
 
-				if(res.type == FLOAT) curLevel = CoerceSteps.FLOAT;
+				if (res.type == FLOAT)
+					curLevel = CoerceSteps.FLOAT;
 
 				children.add(nChild);
 			}
 
-			for(ITree<Node> child : children) {
+			for (ITree<Node> child : children) {
 				Node nd = child.getHead();
 				EvaluatorResult res = nd.resultVal;
 
-				switch(res.type) {
+				switch (res.type) {
 				case INT:
-					if(curLevel == CoerceSteps.FLOAT) {
-						nd.resultVal = new EvaluatorResult(FLOAT, (double)res.intVal);
+					if (curLevel == CoerceSteps.FLOAT) {
+						nd.resultVal = new EvaluatorResult(FLOAT, (double) res.intVal);
 					}
 				default:
 					// Do nothing
@@ -174,23 +179,21 @@ public class Evaluator {
 		case DICESCALAR:
 			EvaluatorResult opr = ast.getChild(0).getHead().resultVal;
 
-			if(opr.type != INT) {
+			if (opr.type != INT) {
 				Errors.inst.printError(EK_EVAL_INVDCREATE, opr.type.toString());
 			}
 
 			return new Tree<>(new Node(Node.Type.RESULT,
-						   new EvaluatorResult(DICE,
-							   new ScalarDie(opr.intVal))));
+					new EvaluatorResult(DICE, new ScalarDie(opr.intVal))));
 		case DICEFUDGE:
 			EvaluatorResult oprn = ast.getChild(0).getHead().resultVal;
 
-			if(oprn.type != INT) {
+			if (oprn.type != INT) {
 				Errors.inst.printError(EK_EVAL_INVDCREATE, oprn.type.toString());
 			}
 
 			return new Tree<>(new Node(Node.Type.RESULT,
-						   new EvaluatorResult(DICE,
-							   new FudgeDie(oprn.intVal))));
+					new EvaluatorResult(DICE, new FudgeDie(oprn.intVal))));
 		default:
 			Errors.inst.printError(EK_EVAL_INVUNARY, ast.getHead().operatorType.toString());
 			return new Tree<>(FAIL(ast));
@@ -200,67 +203,63 @@ public class Evaluator {
 	private ITree<Node> evaluateBinaryOp(ITree<Node> ast, Context ctx) {
 		Token.Type binOp = ast.getHead().operatorType;
 
-		if(ast.getChildrenCount() != 2) {
-			Errors.inst.printError(EK_EVAL_INVBIN, Integer.toString(ast.getChildrenCount()), ast.toString());
+		if (ast.getChildrenCount() != 2) {
+			Errors.inst.printError(EK_EVAL_INVBIN, Integer.toString(ast.getChildrenCount()),
+					ast.toString());
 
 			return new Tree<>(FAIL(ast));
 		}
 
-		ITree<Node> left  = ast.getChild(0);
+		ITree<Node> left = ast.getChild(0);
 		ITree<Node> right = ast.getChild(1);
 
-		switch(binOp) {
+		switch (binOp) {
 		case ADD:
 		case SUBTRACT:
 		case MULTIPLY:
 		case DIVIDE:
 		case IDIVIDE:
-			return evaluateMathBinary(binOp,
-					left.getHead().resultVal, right.getHead().resultVal,
-					ctx);
+			return evaluateMathBinary(binOp, left.getHead().resultVal, right.getHead().resultVal, ctx);
 		case DICEGROUP:
 		case DICECONCAT:
 		case DICELIST:
-			return evaluateDiceBinary(binOp,
-					left.getHead().resultVal, right.getHead().resultVal,
-					ctx);
+			return evaluateDiceBinary(binOp, left.getHead().resultVal, right.getHead().resultVal, ctx);
 		case STRCAT:
 		case STRREP:
-			return evaluateStringBinary(binOp,
-					left.getHead().resultVal, right.getHead().resultVal,
-					ctx);
+			return evaluateStringBinary(binOp, left.getHead().resultVal, right.getHead().resultVal, ctx);
 		default:
 			Errors.inst.printError(EK_EVAL_UNBIN, binOp.toString());
 			return new Tree<>(FAIL(ast));
 		}
 	}
 
-	private ITree<Node> evaluateStringBinary(Token.Type op,
-			EvaluatorResult left, EvaluatorResult right, Context ctx) {
-		if(left.type != STRING) {
+	private ITree<Node> evaluateStringBinary(Token.Type op, EvaluatorResult left, EvaluatorResult right,
+			Context ctx) {
+		if (left.type != STRING) {
 			Errors.inst.printError(EK_EVAL_INVSTRING, left.type.toString());
 			return new Tree<>(FAIL(left));
 		}
 
 		String strang = left.stringVal;
 
-		switch(op) {
+		switch (op) {
 		case STRCAT:
-			if(right.type != STRING) {
+			if (right.type != STRING) {
 				Errors.inst.printError(EK_EVAL_UNSTRING, right.type.toString());
 				return new Tree<>(FAIL(right));
 			} else {
 				String strung = right.stringVal;
-				return new Tree<>(new Node(Node.Type.RESULT, new EvaluatorResult(STRING, strang + strung)));
+				return new Tree<>(new Node(Node.Type.RESULT,
+						new EvaluatorResult(STRING, strang + strung)));
 			}
 		case STRREP:
-			if(right.type != INT) {
+			if (right.type != INT) {
 				Errors.inst.printError(EK_EVAL_INVSTRING, right.type.toString());
 				return new Tree<>(FAIL(right));
 			} else {
 				String res = strang;
 				long count = right.intVal;
-				for(long i = 1; i < count; i++) {
+				for (long i = 1; i < count; i++) {
 					res += strang;
 				}
 				return new Tree<>(new Node(Node.Type.RESULT, new EvaluatorResult(STRING, res)));
@@ -271,25 +270,27 @@ public class Evaluator {
 		}
 	}
 
-	private ITree<Node> evaluateDiceBinary(Token.Type op,
-			EvaluatorResult left, EvaluatorResult right, Context ctx) {
+	private ITree<Node> evaluateDiceBinary(Token.Type op, EvaluatorResult left, EvaluatorResult right,
+			Context ctx) {
 		EvaluatorResult res = null;
 
-		switch(op) {
+		switch (op) {
 		case DICEGROUP:
-			if(left.type == DICE && !left.diceVal.isList) {
-				if(right.type == DICE && !right.diceVal.isList) {
+			if (left.type == DICE && !left.diceVal.isList) {
+				if (right.type == DICE && !right.diceVal.isList) {
 					res = new EvaluatorResult(DICE,
 							new SimpleDie(left.diceVal.scalar, right.diceVal.scalar));
 				} else if (right.type == INT) {
-					res = new EvaluatorResult(DICE, new SimpleDie(left.diceVal.scalar, right.intVal));
+					res = new EvaluatorResult(DICE,
+							new SimpleDie(left.diceVal.scalar, right.intVal));
 				} else {
 					Errors.inst.printError(EK_EVAL_INVDGROUP, right.type.toString());
 					return new Tree<>(FAIL(right));
 				}
-			} else if(left.type == INT) {
-				if(right.type == DICE && !right.diceVal.isList) {
-					res = new EvaluatorResult(DICE, new SimpleDie(left.intVal, right.diceVal.scalar));
+			} else if (left.type == INT) {
+				if (right.type == DICE && !right.diceVal.isList) {
+					res = new EvaluatorResult(DICE,
+							new SimpleDie(left.intVal, right.diceVal.scalar));
 				} else if (right.type == INT) {
 					res = new EvaluatorResult(DICE, new SimpleDie(left.intVal, right.intVal));
 				} else {
@@ -301,22 +302,22 @@ public class Evaluator {
 				return new Tree<>(FAIL(left));
 			}
 		case DICECONCAT:
-			if(left.type != DICE || left.diceVal.isList) {
+			if (left.type != DICE || left.diceVal.isList) {
 				Errors.inst.printError(EK_EVAL_INVDICE, left.type.toString());
 				return new Tree<>(FAIL(left));
-			} else if(right.type != DICE || right.diceVal.isList) {
+			} else if (right.type != DICE || right.diceVal.isList) {
 				Errors.inst.printError(EK_EVAL_INVDICE, right.type.toString());
 				return new Tree<>(FAIL(right));
 			} else {
-				res = new EvaluatorResult(DICE, 
+				res = new EvaluatorResult(DICE,
 						new CompoundDie(left.diceVal.scalar, right.diceVal.scalar));
 			}
 			break;
 		case DICELIST:
-			if(left.type != DICE || left.diceVal.isList) {
+			if (left.type != DICE || left.diceVal.isList) {
 				Errors.inst.printError(EK_EVAL_INVDICE, left.type.toString());
 				return new Tree<>(FAIL(left));
-			} else if(right.type != DICE || right.diceVal.isList) {
+			} else if (right.type != DICE || right.diceVal.isList) {
 				Errors.inst.printError(EK_EVAL_INVDICE, right.type.toString());
 				return new Tree<>(FAIL(right));
 			} else {
@@ -332,100 +333,100 @@ public class Evaluator {
 		return new Tree<>(new Node(Node.Type.RESULT, res));
 	}
 
-	private ITree<Node> evaluateMathBinary(Token.Type op,
-			EvaluatorResult left, EvaluatorResult right, Context ctx) {
-		if(left.type == STRING || right.type == STRING) {
+	private ITree<Node> evaluateMathBinary(Token.Type op, EvaluatorResult left, EvaluatorResult right,
+			Context ctx) {
+		if (left.type == STRING || right.type == STRING) {
 			Errors.inst.printError(EK_EVAL_STRINGMATH);
 			return new Tree<>(FAIL());
-		} else if(left.type == FAILURE || right.type == FAILURE) {
+		} else if (left.type == FAILURE || right.type == FAILURE) {
 			return new Tree<>(FAIL());
-		} else if(left.type == INT && right.type != INT) {
+		} else if (left.type == INT && right.type != INT) {
 			Errors.inst.printError(EK_EVAL_MISMATH);
 			return new Tree<>(FAIL(right));
-		} else if(left.type == FLOAT && right.type != FLOAT) {
+		} else if (left.type == FLOAT && right.type != FLOAT) {
 			Errors.inst.printError(EK_EVAL_MISMATH);
 			return new Tree<>(FAIL(right));
-		} else if(left.type == DICE && right.type != DICE) {
+		} else if (left.type == DICE && right.type != DICE) {
 			Errors.inst.printError(EK_EVAL_MISMATH);
 			return new Tree<>(FAIL(right));
-		} else if(right.type == INT && left.type != INT) {
+		} else if (right.type == INT && left.type != INT) {
 			Errors.inst.printError(EK_EVAL_MISMATH);
 			return new Tree<>(FAIL(left));
-		} else if(right.type == FLOAT && left.type != FLOAT) {
+		} else if (right.type == FLOAT && left.type != FLOAT) {
 			Errors.inst.printError(EK_EVAL_MISMATH);
 			return new Tree<>(FAIL(left));
-		} else if(right.type == DICE && left.type != DICE) {
+		} else if (right.type == DICE && left.type != DICE) {
 			Errors.inst.printError(EK_EVAL_MISMATH);
 			return new Tree<>(FAIL(left));
 		}
 
 		EvaluatorResult res = null;
 
-		switch(op) {
+		switch (op) {
 		case ADD:
-			if(left.type == INT) {
+			if (left.type == INT) {
 				res = new EvaluatorResult(INT, left.intVal + right.intVal);
-			} else if(left.type == DICE) {
-				if(left.diceVal.isList) {
+			} else if (left.type == DICE) {
+				if (left.diceVal.isList) {
 					Errors.inst.printError(EK_EVAL_INVDICE, left.toString());
 					return new Tree<>(FAIL(left));
-				} else if(right.diceVal.isList) {
+				} else if (right.diceVal.isList) {
 					Errors.inst.printError(EK_EVAL_INVDICE, right.toString());
 					return new Tree<>(FAIL(right));
 				}
 
-				res = new EvaluatorResult(DICE, new MathDie(MathDie.MathOp.ADD,
-							left.diceVal.scalar, right.diceVal.scalar));
+				res = new EvaluatorResult(DICE, new MathDie(MathDie.MathOp.ADD, left.diceVal.scalar,
+						right.diceVal.scalar));
 			} else {
 				res = new EvaluatorResult(FLOAT, left.floatVal + right.floatVal);
 			}
 			break;
 		case SUBTRACT:
-			if(left.type == INT) {
+			if (left.type == INT) {
 				res = new EvaluatorResult(INT, left.intVal - right.intVal);
-			} else if(left.type == DICE) {
-				if(left.diceVal.isList) {
+			} else if (left.type == DICE) {
+				if (left.diceVal.isList) {
 					Errors.inst.printError(EK_EVAL_INVDICE, left.toString());
 					return new Tree<>(FAIL(left));
-				} else if(right.diceVal.isList) {
+				} else if (right.diceVal.isList) {
 					Errors.inst.printError(EK_EVAL_INVDICE, right.toString());
 					return new Tree<>(FAIL(right));
 				}
 
 				res = new EvaluatorResult(DICE, new MathDie(MathDie.MathOp.SUBTRACT,
-							left.diceVal.scalar, right.diceVal.scalar));
+						left.diceVal.scalar, right.diceVal.scalar));
 			} else {
 				res = new EvaluatorResult(FLOAT, left.floatVal - right.floatVal);
 			}
 			break;
 		case MULTIPLY:
-			if(left.type == INT) {
+			if (left.type == INT) {
 				res = new EvaluatorResult(INT, left.intVal * right.intVal);
-			} else if(left.type == DICE) {
-				if(left.diceVal.isList) {
+			} else if (left.type == DICE) {
+				if (left.diceVal.isList) {
 					Errors.inst.printError(EK_EVAL_INVDICE, left.toString());
 					return new Tree<>(FAIL(left));
-				} else if(right.diceVal.isList) {
+				} else if (right.diceVal.isList) {
 					Errors.inst.printError(EK_EVAL_INVDICE, right.toString());
 					return new Tree<>(FAIL(right));
 				}
 
 				res = new EvaluatorResult(DICE, new MathDie(MathDie.MathOp.MULTIPLY,
-							left.diceVal.scalar, right.diceVal.scalar));
+						left.diceVal.scalar, right.diceVal.scalar));
 			} else {
 				res = new EvaluatorResult(FLOAT, left.floatVal * right.floatVal);
 			}
 			break;
 		case DIVIDE:
-			if(left.type == INT) {
-				if(right.intVal == 0) {
+			if (left.type == INT) {
+				if (right.intVal == 0) {
 					Errors.inst.printError(EK_EVAL_DIVZERO);
 					res = new EvaluatorResult(FAILURE, right);
 				} else {
 					res = new EvaluatorResult(FLOAT, left.intVal / right.intVal);
 				}
-			} else if(left.type == FLOAT) {
-				if(right.floatVal == 0) {
+			} else if (left.type == FLOAT) {
+				if (right.floatVal == 0) {
 					Errors.inst.printError(EK_EVAL_DIVZERO);
 					res = new EvaluatorResult(FAILURE, right);
 				} else {
@@ -437,15 +438,15 @@ public class Evaluator {
 			}
 			break;
 		case IDIVIDE:
-			if(left.type == INT) {
-				if(right.intVal == 0) {
+			if (left.type == INT) {
+				if (right.intVal == 0) {
 					Errors.inst.printError(EK_EVAL_DIVZERO);
 					res = new EvaluatorResult(FAILURE, right);
 				} else {
 					res = new EvaluatorResult(INT, (int) (left.intVal / right.intVal));
 				}
-			} else if(left.type == FLOAT) {
-				if(right.floatVal == 0) {
+			} else if (left.type == FLOAT) {
+				if (right.floatVal == 0) {
 					Errors.inst.printError(EK_EVAL_DIVZERO);
 					res = new EvaluatorResult(FAILURE, right);
 				} else {
@@ -467,7 +468,7 @@ public class Evaluator {
 	private ITree<Node> evaluateTokenRef(Token tk, Context ctx) {
 		EvaluatorResult res = null;
 
-		switch(tk.type) {
+		switch (tk.type) {
 		case INT_LIT:
 			res = new EvaluatorResult(INT, tk.intValue);
 			break;
@@ -478,7 +479,7 @@ public class Evaluator {
 			res = new EvaluatorResult(DICE, tk.diceValue);
 			break;
 		case STRING_LIT:
-			res = new EvaluatorResult(STRING, eng.getStringLiteral((int)(tk.intValue)));
+			res = new EvaluatorResult(STRING, eng.getStringLiteral((int) (tk.intValue)));
 			break;
 		default:
 			Errors.inst.printError(EK_EVAL_UNTOK, tk.type.toString());