diff options
| author | bculkin2442 <bjculkin@mix.wvu.edu> | 2016-07-28 16:45:16 -0400 |
|---|---|---|
| committer | bculkin2442 <bjculkin@mix.wvu.edu> | 2016-07-28 16:45:16 -0400 |
| commit | bb27392419549bb40cbc4f194e38f471d2b9f63d (patch) | |
| tree | 981e5d506441b678d307df0999a24a0ea95cbb88 /dice-lang | |
| parent | d80f404865656b6d1a8faf41cecdd61343adcd0b (diff) | |
Format/cleanup pass
Diffstat (limited to 'dice-lang')
7 files changed, 13 insertions, 26 deletions
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 @@ -<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - </head> - <body> - <h1 id="language-implementation-details">Language implementation details</h1> - <p>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.</p> - </body> -</html>
\ 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 * @@ -25,6 +20,11 @@ public class DummyResult implements IResult { } @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<>( |