Fixed precedence of logical operators (#704)

pkg/compiler/compiler_ternary_test.go

@@ -83,6 +83,20 @@ func TestTernaryOperator(t *testing.T) {
 			So(string(out), ShouldEqual, `["no value",2,4,6]`)
 		}
 	})
+
+	Convey("Multi expression", t, func() {
+		out := compiler.New().MustCompile(`
+			RETURN 0 && true ? "1" : "some"
+		`).MustRun(context.Background())
+
+		So(string(out), ShouldEqual, `"some"`)
+
+		out = compiler.New().MustCompile(`
+			RETURN length([]) > 0 && true ? "1" : "some"
+		`).MustRun(context.Background())
+
+		So(string(out), ShouldEqual, `"some"`)
+	})
 }
 
 func BenchmarkTernaryOperator(b *testing.B) {

pkg/parser/antlr/FqlParser.g4

@@ -325,9 +325,9 @@ rangeOperand
 
 expression
     : unaryOperator right=expression
-    | condition=expression ternaryOperator=QuestionMark onTrue=expression? Colon onFalse=expression
     | left=expression logicalAndOperator right=expression
     | left=expression logicalOrOperator right=expression
+    | condition=expression ternaryOperator=QuestionMark onTrue=expression? Colon onFalse=expression
     | predicate
     ;