From bb27392419549bb40cbc4f194e38f471d2b9f63d Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Thu, 28 Jul 2016 16:45:16 -0400 Subject: Format/cleanup pass --- dice-lang/.settings/org.eclipse.core.resources.prefs | 2 -- dice-lang/lang-desc.md | 2 +- dice-lang/lang-impl.html | 13 ------------- .../src/main/java/bjc/dicelang/ast/ArithmeticCollapser.java | 4 ++-- dice-lang/src/main/java/bjc/dicelang/ast/DiceASTParser.java | 2 +- dice-lang/src/main/java/bjc/dicelang/ast/DummyResult.java | 10 +++++----- .../bjc/dicelang/ast/optimization/ConstantCollapser.java | 6 ++++-- 7 files changed, 13 insertions(+), 26 deletions(-) delete mode 100644 dice-lang/.settings/org.eclipse.core.resources.prefs delete mode 100644 dice-lang/lang-impl.html diff --git a/dice-lang/.settings/org.eclipse.core.resources.prefs b/dice-lang/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index d0482e7..0000000 --- a/dice-lang/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/lang-impl.html=UTF-8 diff --git a/dice-lang/lang-desc.md b/dice-lang/lang-desc.md index 1d3fdd1..efa9567 100644 --- a/dice-lang/lang-desc.md +++ b/dice-lang/lang-desc.md @@ -55,5 +55,5 @@ last -> 30 ``` We also have let, for binding things in the context of an -expression. However, let isn't quite working at the moment +expression. However, it is not as useful at the moment, because blocks don't exist yet. ## Arrays diff --git a/dice-lang/lang-impl.html b/dice-lang/lang-impl.html deleted file mode 100644 index 62fddf6..0000000 --- a/dice-lang/lang-impl.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - -

Language implementation details

First, a command is read from the user, and - checked to see if it has any interpreter pragmas - in it. If so, the interpreter pragma is handled - and we move onto the next command.

- - \ No newline at end of file diff --git a/dice-lang/src/main/java/bjc/dicelang/ast/ArithmeticCollapser.java b/dice-lang/src/main/java/bjc/dicelang/ast/ArithmeticCollapser.java index 7537005..2b9eaa4 100644 --- a/dice-lang/src/main/java/bjc/dicelang/ast/ArithmeticCollapser.java +++ b/dice-lang/src/main/java/bjc/dicelang/ast/ArithmeticCollapser.java @@ -43,7 +43,7 @@ final class ArithmeticCollapser implements IOperatorCollapser { currentState, accumulatedState) -> { // Force evaluation of accumulated state to prevent // certain bugs from occuring - //accumulatedState.merge((l, r) -> null); + // accumulatedState.merge((l, r) -> null); return reduceStates(accumulatedState, currentState); }; @@ -101,7 +101,7 @@ final class ArithmeticCollapser implements IOperatorCollapser { + ") or current dummy (" + ((DummyResult) currentValue).getData() + ")."); - + return new Pair<>(result, accumulatedTree); } diff --git a/dice-lang/src/main/java/bjc/dicelang/ast/DiceASTParser.java b/dice-lang/src/main/java/bjc/dicelang/ast/DiceASTParser.java index 0d57c57..9a36951 100644 --- a/dice-lang/src/main/java/bjc/dicelang/ast/DiceASTParser.java +++ b/dice-lang/src/main/java/bjc/dicelang/ast/DiceASTParser.java @@ -53,7 +53,7 @@ public class DiceASTParser { throw new InputMismatchException( "Floating point literals are not supported"); } - + return new VariableDiceNode(leafNode); } diff --git a/dice-lang/src/main/java/bjc/dicelang/ast/DummyResult.java b/dice-lang/src/main/java/bjc/dicelang/ast/DummyResult.java index eeda874..a84bb7c 100644 --- a/dice-lang/src/main/java/bjc/dicelang/ast/DummyResult.java +++ b/dice-lang/src/main/java/bjc/dicelang/ast/DummyResult.java @@ -10,11 +10,6 @@ public class DummyResult implements IResult { dummyData = data; } - @Override - public ResultType getType() { - return ResultType.DUMMY; - } - /** * Get the data in this dummy * @@ -24,6 +19,11 @@ public class DummyResult implements IResult { return dummyData; } + @Override + public ResultType getType() { + return ResultType.DUMMY; + } + @Override public String toString() { return "Dummy with reason " + dummyData; diff --git a/dice-lang/src/main/java/bjc/dicelang/ast/optimization/ConstantCollapser.java b/dice-lang/src/main/java/bjc/dicelang/ast/optimization/ConstantCollapser.java index 35148fa..95badd2 100644 --- a/dice-lang/src/main/java/bjc/dicelang/ast/optimization/ConstantCollapser.java +++ b/dice-lang/src/main/java/bjc/dicelang/ast/optimization/ConstantCollapser.java @@ -64,8 +64,10 @@ public class ConstantCollapser implements IOptimizationPass { } ComplexDice dice = new ComplexDice( - DiceASTUtils.literalToExpression(children.getByIndex(0)), - DiceASTUtils.literalToExpression(children.getByIndex(1))); + DiceASTUtils.literalToExpression( + children.getByIndex(0)), + DiceASTUtils.literalToExpression( + children.getByIndex(1))); if (dice.canOptimize()) { return new Tree<>( -- cgit v1.2.3