fix(expr): fix priority

Change-Id: I5e7601b9a7ed623021282f14ff512e92247223be

Author: andeya

expr.go

@@ -189,14 +189,21 @@ func (p *Expr) checkSyntax() error {
 **/
 
 func sortPriority(e ExprNode) {
+	for subSortPriority(e) {
+	}
+}
+
+func subSortPriority(e ExprNode) bool {
 	if e == nil {
-		return
+		return false
 	}
-	sortPriority(e.LeftOperand())
-	sortPriority(e.RightOperand())
+	leftChanged := subSortPriority(e.LeftOperand())
+	rightChanged := subSortPriority(e.RightOperand())
 	if getPriority(e) > getPriority(e.LeftOperand()) {
 		leftOperandToParent(e)
+		return true
 	}
+	return leftChanged || rightChanged
 }
 
 func getPriority(e ExprNode) (i int) {

expr_test.go

@@ -136,6 +136,7 @@ func TestPriority(t *testing.T) {
 		expr string
 		val  interface{}
 	}{
+		{expr: "false||true&&8==8", val: true},
 		{expr: "1+2>5-4", val: true},
 		{expr: "1+2*4/2", val: 5.0},
 		{expr: "(true||false)&&false||false", val: false},

spec_operator.go

@@ -14,7 +14,9 @@
 
 package tagexpr
 
-import "math"
+import (
+	"math"
+)
 
 // --------------------------- Operator ---------------------------
 
@@ -212,7 +214,7 @@ type andExprNode struct{ exprBackground }
 func newAndExprNode() ExprNode { return &andExprNode{} }
 
 func (ae *andExprNode) Run(currField string, tagExpr *TagExpr) interface{} {
-	for _, e := range []ExprNode{ae.leftOperand, ae.rightOperand} {
+	for _, e := range [2]ExprNode{ae.leftOperand, ae.rightOperand} {
 		switch r := e.Run(currField, tagExpr).(type) {
 		case float64:
 			if r == 0 {
@@ -240,7 +242,7 @@ type orExprNode struct{ exprBackground }
 func newOrExprNode() ExprNode { return &orExprNode{} }
 
 func (oe *orExprNode) Run(currField string, tagExpr *TagExpr) interface{} {
-	for _, e := range []ExprNode{oe.leftOperand, oe.rightOperand} {
+	for _, e := range [2]ExprNode{oe.leftOperand, oe.rightOperand} {
 		switch r := e.Run(currField, tagExpr).(type) {
 		case float64:
 			if r != 0 {