'and' and 'or' operators are now evaluated using logic shortcut (this behaviour can be changed setting system var '_bool_shortcut' to false

parser_test.go

@@ -18,15 +18,9 @@ func TestParser(t *testing.T) {
 		wantErr    error
 	}
 
-	//	ctx := newTestContext()
-	ctx := NewSimpleFuncStore()
-	ctx.SetValue("var1", int64(123))
-	ctx.SetValue("var2", "abc")
-	// ctx.addFunc("add", addFunc)
-	importMathFuncs(ctx)
-
 	// inputs1 := []inputType{
-	// 	{`x=2 but x*10`, int64(20), nil},
+	// 	{`true AND true`, true, nil},
+	// 	{`"a" < "b" AND ~ 2 == 1`, true, nil},
 	// }
 
 	inputs := []inputType{
@@ -125,17 +119,27 @@ func TestParser(t *testing.T) {
 		/* 93 */ {`2+3 but 5*2`, int64(10), nil},
 		/* 94 */ {`add(1,2) but var2`, "abc", nil},
 		/* 95 */ {`x=2`, int64(2), nil},
-		/* 95 */ {`x=2 but x*10`, int64(20), nil},
+		/* 96 */ {`x=2 but x*10`, int64(20), nil},
+		/* 97 */ {`false and true`, false, nil},
+		/* 98 */ {`false and (x==2)`, false, nil},
+		/* 99 */ {`false and (x=2 but x==2) or x==2`, nil, errors.New(`undefined variable "x"`)},
+		/*100 */ {`false or true`, true, nil},
+		/*101 */ {`false or (x==2)`, nil, errors.New(`undefined variable "x"`)},
 	}
 	succeeded := 0
 	failed := 0
 
-	parser := NewParser(ctx)
 	for i, input := range inputs {
 		var expr *ast
 		var gotResult any
 		var gotErr error
 
+		ctx := NewSimpleFuncStore()
+		ctx.SetValue("var1", int64(123))
+		ctx.SetValue("var2", "abc")
+		importMathFuncs(ctx)
+		parser := NewParser(ctx)
+
 		logTest(t, i+1, input.source, input.wantResult, input.wantErr)
 
 		r := strings.NewReader(input.source)
@@ -167,7 +171,7 @@ func TestParser(t *testing.T) {
 	t.Log(fmt.Sprintf("test count: %d, succeeded count: %d, failed count: %d", len(inputs), succeeded, failed))
 }
 
-func TestListParser(t *testing.T) {
+func NoTestListParser(t *testing.T) {
 	type inputType struct {
 		source     string
 		wantResult any