summaryrefslogtreecommitdiff
path: root/BJC-Utils2/src/main/java/bjc/utils/parserutils/ShuntingYard.java
diff options
context:
space:
mode:
authorbculkin2442 <bjculkin@mix.wvu.edu>2016-04-17 15:01:44 -0400
committerbculkin2442 <bjculkin@mix.wvu.edu>2016-04-17 15:01:44 -0400
commit77fcc58d1facffbc3af50be8c05985350e9f1355 (patch)
treeb7b81d24c107e644924dc526f8bb034efc62d2dc /BJC-Utils2/src/main/java/bjc/utils/parserutils/ShuntingYard.java
parenta5850915df72f5968fd1b281eb9e455d50c580ee (diff)
Code maintenace and changes
Diffstat (limited to 'BJC-Utils2/src/main/java/bjc/utils/parserutils/ShuntingYard.java')
-rw-r--r--BJC-Utils2/src/main/java/bjc/utils/parserutils/ShuntingYard.java13
1 files changed, 9 insertions, 4 deletions
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 a60cb01..9c7618b 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/parserutils/ShuntingYard.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/parserutils/ShuntingYard.java
@@ -161,10 +161,15 @@ public class ShuntingYard<E> {
operators.put(operatorToken, precedence);
}
- private boolean isHigherPrec(String operator, String rightOperator) {
- return (operators.containsKey(rightOperator) && operators
- .get(rightOperator).getPrecedence() >= operators
- .get(operator).getPrecedence());
+ private boolean isHigherPrec(String leftOperator,
+ String rightOperator) {
+ boolean operatorExists = operators.containsKey(rightOperator);
+
+ boolean hasHigherPrecedence =
+ operators.get(rightOperator).getPrecedence() >= operators
+ .get(leftOperator).getPrecedence();
+
+ return (operatorExists && hasHigherPrecedence);
}
/**