From 047fdb72f31f2e692d0217074f44952016108c0b Mon Sep 17 00:00:00 2001 From: rusEfi Date: Wed, 18 Jan 2017 13:03:38 -0500 Subject: [PATCH] auto-sync --- .../models/src/com/autsia/bracer/test/BracerParserTest.java | 1 + .../src/com/fathzer/soft/javaluator/AbstractEvaluator.java | 2 +- java_console/models/src/com/rusefi/test/ParserTest.java | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/java_console/models/src/com/autsia/bracer/test/BracerParserTest.java b/java_console/models/src/com/autsia/bracer/test/BracerParserTest.java index 0e9e7b5f34..16bb51d86c 100644 --- a/java_console/models/src/com/autsia/bracer/test/BracerParserTest.java +++ b/java_console/models/src/com/autsia/bracer/test/BracerParserTest.java @@ -59,6 +59,7 @@ public class BracerParserTest { assertParse("2 1 >", "2 > 1"); assertParse("rpm 0 >", "rpm > false"); assertParse("rpm 0 >", "(rpm > false)"); + assertParse("rpm user0 > clt user2 > |", "(rpm > user0) or (clt > user2)"); assertParse("rpm user0 > clt user2 > | vbatt user1 > |", "(rpm > user0) or (clt > user2) or (vbatt > user1)"); } diff --git a/java_console/models/src/com/fathzer/soft/javaluator/AbstractEvaluator.java b/java_console/models/src/com/fathzer/soft/javaluator/AbstractEvaluator.java index 64aaa6cf78..e3e9e7e45d 100644 --- a/java_console/models/src/com/fathzer/soft/javaluator/AbstractEvaluator.java +++ b/java_console/models/src/com/fathzer/soft/javaluator/AbstractEvaluator.java @@ -351,7 +351,7 @@ public abstract class AbstractEvaluator { if (sc.isOperator() && ((token.getAssociativity().equals(Operator.Associativity.LEFT) && (token.getPrecedence() <= sc.getPrecedence())) || (token.getPrecedence() < sc.getPrecedence()))) { - stackRPN.push(sc.getLiteral()); + stackRPN.push(sc.getOperator().getRpnSymbol()); // Pop o2 off the stack, onto the output queue; output(values, stack.pop(), evaluationContext); } else { diff --git a/java_console/models/src/com/rusefi/test/ParserTest.java b/java_console/models/src/com/rusefi/test/ParserTest.java index 93069de99f..a8fe996977 100644 --- a/java_console/models/src/com/rusefi/test/ParserTest.java +++ b/java_console/models/src/com/rusefi/test/ParserTest.java @@ -13,7 +13,8 @@ public class ParserTest { assertParse("2 1 >", "2 > 1"); assertParse("rpm 0 >", "rpm > false"); assertParse("rpm 0 >", "(rpm > false)"); -// assertParse("rpm user0 > clt user2 > | vbatt user1 > |", "(rpm > user0) or (clt > user2) or (vbatt > user1)"); + assertParse("rpm user0 > clt user2 > |", "(rpm > user0) or (clt > user2)"); +//todo assertParse("rpm user0 > clt user2 > | vbatt user1 > |", "(rpm > user0) or (clt > user2) or (vbatt > user1)"); } private void assertParse(String rpn, String expression) {