diff options
| author | bjculkin <bjculkin@mix.wvu.edu> | 2017-04-11 17:51:51 -0400 |
|---|---|---|
| committer | bjculkin <bjculkin@mix.wvu.edu> | 2017-04-11 17:51:51 -0400 |
| commit | 675ae734dd7b7a47d93ee3527dd1eb7195be047b (patch) | |
| tree | 9d6901c63bd50a645e92d8b192013b3b201d8ecf /dice-lang/src/bjc/dicelang/expr | |
| parent | 40858cee415643769ee5f6216b0cd4335996ff2f (diff) | |
Cleanup
Diffstat (limited to 'dice-lang/src/bjc/dicelang/expr')
| -rw-r--r-- | dice-lang/src/bjc/dicelang/expr/Lexer.java | 8 | ||||
| -rw-r--r-- | dice-lang/src/bjc/dicelang/expr/Shunter.java | 10 | ||||
| -rw-r--r-- | dice-lang/src/bjc/dicelang/expr/Token.java | 4 |
3 files changed, 12 insertions, 10 deletions
diff --git a/dice-lang/src/bjc/dicelang/expr/Lexer.java b/dice-lang/src/bjc/dicelang/expr/Lexer.java index 3147463..52be56c 100644 --- a/dice-lang/src/bjc/dicelang/expr/Lexer.java +++ b/dice-lang/src/bjc/dicelang/expr/Lexer.java @@ -1,11 +1,11 @@ package bjc.dicelang.expr; -import java.util.LinkedList; -import java.util.List; - import bjc.utils.funcdata.IList; import bjc.utils.parserutils.splitter.ConfigurableTokenSplitter; +import java.util.LinkedList; +import java.util.List; + /** * Implements the lexer for simple expression operations. * @@ -32,7 +32,7 @@ public class Lexer { * * @param inp * The input command. - * + * * @param tks * The token state. * diff --git a/dice-lang/src/bjc/dicelang/expr/Shunter.java b/dice-lang/src/bjc/dicelang/expr/Shunter.java index bbece0f..3b2bee2 100644 --- a/dice-lang/src/bjc/dicelang/expr/Shunter.java +++ b/dice-lang/src/bjc/dicelang/expr/Shunter.java @@ -41,10 +41,11 @@ public class Shunter { int leftPriority = tok.type.operatorPriority; int rightPriority; - if(curOp == null) + if(curOp == null) { rightPriority = 0; - else + } else { rightPriority = curOp.type.operatorPriority; + } boolean isHigherPrec = leftPriority >= rightPriority; @@ -59,10 +60,11 @@ public class Shunter { leftPriority = tok.type.operatorPriority; - if(curOp == null) + if(curOp == null) { rightPriority = 0; - else + } else { rightPriority = curOp.type.operatorPriority; + } isHigherPrec = leftPriority >= rightPriority; } diff --git a/dice-lang/src/bjc/dicelang/expr/Token.java b/dice-lang/src/bjc/dicelang/expr/Token.java index 2a73d0b..dac90aa 100644 --- a/dice-lang/src/bjc/dicelang/expr/Token.java +++ b/dice-lang/src/bjc/dicelang/expr/Token.java @@ -33,10 +33,10 @@ public class Token { * * @param type * The type of this token. - * + * * @param raw * The string this token came from. - * + * * @param toks * The state for this token */ |
