diff --git a/src/main/java/org/scijava/parsington/Tokens.java b/src/main/java/org/scijava/parsington/Tokens.java index f0d3d89..17d30ed 100644 --- a/src/main/java/org/scijava/parsington/Tokens.java +++ b/src/main/java/org/scijava/parsington/Tokens.java @@ -61,7 +61,7 @@ public static boolean isComma(final Object o) { } public static boolean isCharacter(final Object o, final Character c) { - return o instanceof Character && ((Character) o).equals(c); + return o instanceof Character && o.equals(c); } public static boolean isMatchingGroup(final Object o, final Group g) { diff --git a/src/main/java/org/scijava/parsington/eval/StandardTreeEvaluator.java b/src/main/java/org/scijava/parsington/eval/StandardTreeEvaluator.java index a29308d..6e3981e 100644 --- a/src/main/java/org/scijava/parsington/eval/StandardTreeEvaluator.java +++ b/src/main/java/org/scijava/parsington/eval/StandardTreeEvaluator.java @@ -49,7 +49,7 @@ default Object execute(final Operator op, final SyntaxTree tree) { // Handle short-circuiting operators first. if (op == Operators.LOGICAL_AND) { final Object leftValue = value(evaluate(tree.child(0))); - if (leftValue instanceof Boolean && !((Boolean) leftValue).booleanValue()) { + if (leftValue instanceof Boolean && !(Boolean) leftValue) { // Left side is false, so entire expression will be false. return false; } @@ -58,7 +58,7 @@ default Object execute(final Operator op, final SyntaxTree tree) { } else if (op == Operators.LOGICAL_OR) { final Object leftValue = value(evaluate(tree.child(0))); - if (leftValue instanceof Boolean && ((Boolean) leftValue).booleanValue()) { + if (leftValue instanceof Boolean && (Boolean) leftValue) { // Left side is true, so entire expression will be true. return true; }