From cdc53ece11756090243096d59f85ed27661c0ba7 Mon Sep 17 00:00:00 2001 From: tianqiao Date: Fri, 17 Nov 2017 11:28:25 +0800 Subject: [PATCH] =?UTF-8?q?add=202>1:-1:-2=20=E7=9A=84=E8=B4=9F=E5=8F=B7?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ql/util/express/parse/ExpressParse.java | 2 ++ .../com/ql/util/express/test/MinusOperatorTest.java | 12 +++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/ql/util/express/parse/ExpressParse.java b/src/main/java/com/ql/util/express/parse/ExpressParse.java index a002f1e..546934a 100644 --- a/src/main/java/com/ql/util/express/parse/ExpressParse.java +++ b/src/main/java/com/ql/util/express/parse/ExpressParse.java @@ -108,6 +108,8 @@ public class ExpressParse { && ( result.get(result.size() - 2).isTypeEqualsOrChild("OP_LIST") || result.get(result.size() - 2).isTypeEqualsOrChild(",") || result.get(result.size() - 2).isTypeEqualsOrChild("return") + || result.get(result.size() - 2).isTypeEqualsOrChild("?") + || result.get(result.size() - 2).isTypeEqualsOrChild(":") ) && result.get(result.size() - 2).isTypeEqualsOrChild(")")==false && result.get(result.size() - 2).isTypeEqualsOrChild("]")==false diff --git a/src/test/java/com/ql/util/express/test/MinusOperatorTest.java b/src/test/java/com/ql/util/express/test/MinusOperatorTest.java index e1db20f..4884eb3 100644 --- a/src/test/java/com/ql/util/express/test/MinusOperatorTest.java +++ b/src/test/java/com/ql/util/express/test/MinusOperatorTest.java @@ -11,10 +11,20 @@ import org.junit.Test; public class MinusOperatorTest { @Test - public void testChange_1() throws Exception { + public void operatorReturn() throws Exception { ExpressRunner runner = new ExpressRunner(false,true); IExpressContext context = new DefaultContext(); String test1 = "return -50"; System.out.println(runner.execute(test1, context, null, true, false)); } + + + @Test + public void operatorThreeLogic() throws Exception { + ExpressRunner runner = new ExpressRunner(false,true); + IExpressContext context = new DefaultContext(); + String test1 = "2>-1?-1:-2;"; + System.out.println(runner.execute(test1, context, null, true, false)); + } + } -- GitLab