From 77fcc58d1facffbc3af50be8c05985350e9f1355 Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Sun, 17 Apr 2016 15:01:44 -0400 Subject: Code maintenace and changes --- .../src/main/java/bjc/utils/parserutils/ShuntingYard.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'BJC-Utils2/src/main/java/bjc/utils/parserutils/ShuntingYard.java') 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 { 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); } /** -- cgit v1.2.3