fix: fix the wrong type transform for equal

fefit · Nov 5, 2021 · 6a2a8a5 · 6a2a8a5
1 parent b4fb886
commit 6a2a8a5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/lib/expression/expression.go b/lib/expression/expression.go
@@ -783,6 +783,7 @@ func (op *OperatorToken) Validate(tokens []AnyToken) (retryToken AnyToken, err e
 	switch prev.(type) {
 	case *NumberToken, *IdentifierToken, *RightBracketToken, *RightSquareBracketToken:
 	case *OperatorToken, nil:
+		// only allow unary token !
 		if name != "!" {
 			return nil, fmt.Errorf("wrong operator token")
 		}
@@ -1340,6 +1341,7 @@ func (exp *Expression) toAst(tokens []AnyToken, isInFunc bool) (*TokenNode, erro
 			if i+1 < total {
 				next = lasts[i+1]
 				if cur, ok := next.(*TokenNode); ok {
+					// multiple unary node
 					nextNode = cur.Node
 					isNextTokenNode = true
 				} else {

diff --git a/lib/expression/expression_test.go b/lib/expression/expression_test.go
@@ -1,8 +1,6 @@
 package expression
 
 import (
-	"fmt"
-	"log"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -17,7 +15,6 @@ func assertTokenList(t *testing.T, code string, types ...string) {
 	for i, token := range tokens {
 		actualType := typeOf(token)
 		toBeType := types[i]
-		log.Println(actualType, toBeType, fmt.Sprintf("%#v", token))
 		assert.Equal(t, actualType, toBeType, "the type is not matched")
 	}
 }
@@ -99,3 +96,10 @@ func TestTokenize(t *testing.T) {
 		assertTokenList(t, "$time|strtotime|date_format:\"Y-m-d\"", "IdentifierToken", "OperatorToken", "IdentifierToken", "OperatorToken", "IdentifierToken", "OperatorToken", "StringToken")
 	})
 }
+
+func TestToAst(t *testing.T) {
+	t.Run("Test to ast", func(t *testing.T) {
+		_, err := exp.Parse("!!!!!$a.b != \"1\"")
+		assert.Nil(t, err)
+	})
+}
diff --git a/lib/generator/generator.go b/lib/generator/generator.go
@@ -110,7 +110,8 @@ func (gen *Generator) wrapToFloat(node *Node, options *GenOptions, parseOptions
 	fn := toFloatFn
 	if _, ok := compareFnNames[op]; ok {
 		isNative = true
-		if op == "==" {
+		// if equal or not equal
+		if op == "==" || op == "!=" {
 			fn = toFloatOrString
 		}
 	}
@@ -196,8 +197,8 @@ func (gen *Generator) parseRecursive(node *Node, options *GenOptions, parseOptio
 	noObjectIndex, parseConf, captures := parseOptions.NoObjectIndex, parseOptions.Conf, parseOptions.Captures
 	curType := node.Type
 	conf := gen.Conf
-	isNot := node.Operator == "!"
-	if isNot {
+	isUnaryNot := node.Operator == "!"
+	if isUnaryNot {
 		str.WriteString("(not ")
 	}
 	if curType == "raw" {
@@ -437,7 +438,7 @@ func (gen *Generator) parseRecursive(node *Node, options *GenOptions, parseOptio
 		}
 		str.WriteString(")")
 	}
-	if isNot {
+	if isUnaryNot {
 		str.WriteString(")")
 	}
 	return noDelimit, nil