diff options
| author | bculkin2442 <bjculkin@mix.wvu.edu> | 2016-03-27 16:31:03 -0400 |
|---|---|---|
| committer | bculkin2442 <bjculkin@mix.wvu.edu> | 2016-03-27 16:31:03 -0400 |
| commit | df2e59a13fb6576d5e3e91d63e21cc4b6dd64e2d (patch) | |
| tree | 12691d6e2353bd4b5656ce902ec14de9c7b175a3 /BJC-Utils2/src/main | |
| parent | 04460639bc75ffcb9ebf90efe6feccc444525b28 (diff) | |
Mild formatting tweaks
Diffstat (limited to 'BJC-Utils2/src/main')
| -rw-r--r-- | BJC-Utils2/src/main/java/bjc/utils/dice/ast/DiceASTParser.java | 8 | ||||
| -rw-r--r-- | BJC-Utils2/src/main/java/bjc/utils/parserutils/ShuntingYard.java | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/BJC-Utils2/src/main/java/bjc/utils/dice/ast/DiceASTParser.java b/BJC-Utils2/src/main/java/bjc/utils/dice/ast/DiceASTParser.java index b25f5b4..38c514a 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/dice/ast/DiceASTParser.java +++ b/BJC-Utils2/src/main/java/bjc/utils/dice/ast/DiceASTParser.java @@ -39,13 +39,13 @@ public class DiceASTParser { * @return An AST built from the passed in string */ public AST<IDiceASTNode> buildAST(String exp) { - FunctionalList<String> tokens = - FunctionalStringTokenizer.fromString(exp).toList((s) -> s); + FunctionalList<String> tokens = FunctionalStringTokenizer + .fromString(exp).toList((s) -> s); FunctionalList<String> shunted = yard.postfix(tokens, (s) -> s); - AST<String> rawAST = - TreeConstructor.constructTree(shunted, this::isOperator); + AST<String> rawAST = TreeConstructor.constructTree(shunted, + this::isOperator, (op) -> false, null); AST<IDiceASTNode> bakedAST = rawAST.transmuteAST((tok) -> { if (isOperator(tok)) { diff --git a/BJC-Utils2/src/main/java/bjc/utils/parserutils/ShuntingYard.java b/BJC-Utils2/src/main/java/bjc/utils/parserutils/ShuntingYard.java index 8dfe9fa..e607a1a 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/parserutils/ShuntingYard.java +++ b/BJC-Utils2/src/main/java/bjc/utils/parserutils/ShuntingYard.java @@ -18,7 +18,7 @@ import bjc.utils.funcdata.FunctionalList; * The type of tokens being shunted */ public class ShuntingYard<E> { - + /** * A enum representing the fundamental operator types * |