fix not priority issue.

sdcb · Jan 9, 2018 · fabbf06 · fabbf06
1 parent c646b46
commit fabbf06
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/sdmap/src/sdmap/Parser/G4/SdmapParser.g4 b/sdmap/src/sdmap/Parser/G4/SdmapParser.g4
@@ -33,14 +33,14 @@ if:
 	CloseSql;
 
 boolExpression: 
+    OpNot boolExpression                                     #BoolOpNot     |
     SYNTAX OpenBrace nsSyntax? (Comma nsSyntax)* CloseBrace  #BoolFunc      |
 	Bool                                                     #BoolLeteral   |
 	OpenBrace boolExpression CloseBrace                      #BoolBrace     |
 	nsSyntax (Equal | NotEqual) Null                         #BoolNull      |
 	nsSyntax                                                 #BoolNsSyntax  |
 	boolExpression OpAnd boolExpression                      #BoolOpAnd     |
-	boolExpression OpOr  boolExpression                      #BoolOpOr      |
-	OpNot boolExpression                                     #BoolOpNot;
+	boolExpression OpOr  boolExpression                      #BoolOpOr;
 
 macro:
 	Hash SYNTAX OpenAngleBracket

diff --git a/sdmap/test/sdmap.test/IfTest.cs b/sdmap/test/sdmap.test/IfTest.cs
@@ -60,7 +60,7 @@ public void AllTest()
             rt.AddSourceCode(code);
             var result = rt.Emit("v1", new
             {
-                A = true, 
+                A = true,
                 B = new[] { 1, 2, 3 }
             });
             Assert.Equal("Emit", result);
@@ -137,5 +137,19 @@ public void BooleanUnCheckTest(bool flag)
             });
             Assert.Equal("", result);
         }
+
+        [Fact]
+        public void TwoIsEmptyWithOr()
+        {
+            var code = "sql v1{#if(!isEmpty(A) || !isEmpty(B))   {OK}}";
+            var rt = new SdmapCompiler();
+            rt.AddSourceCode(code);
+            var result1 = rt.Emit("v1", new { A = "", B = "" });
+            var result2 = rt.Emit("v1", new { A = new int[0], B = "abc" });
+            var result3 = rt.Emit("v1", new { A = "b", B = "b" });
+            Assert.Equal("", result1);
+            Assert.Equal("OK", result2);
+            Assert.Equal("OK", result3);
+        }
     }
 }