feat: Support escape delims in string

Change-Id: Idde50fd5af463368743c381cf555e2e382276d61

Author: andeya

README.md

@@ -109,6 +109,8 @@ NOTE: **The `exprName` under the same struct field cannot be the same！**
 |`true` `false`|boolean|
 |`0` `0.0`|float64 "0"|
 |`''`|String|
+|`\\'`| Escape `'` delims in string|
+|`\"`| Escape `"` delims in string|
 |`nil`|nil, undefined|
 |`!`|not, suitable for `bool`, `string`, `float64`, `nil`, `$` and `()`|
 |`+`|Digital addition or string splicing|

spec_operand.go

@@ -150,23 +150,43 @@ func readPairedSymbol(p *string, left, right rune) *string {
 	var last1 = left
 	var last2 rune
 	var leftLevel, rightLevel int
+	var escapeIndexes = make(map[int]bool)
+	var realEqual, escapeEqual bool
 	for i, r := range s {
-		if r == right && (last1 != '\\' || last2 == '\\') {
+		if realEqual, escapeEqual = equalRune(right, r, last1, last2); realEqual {
 			if leftLevel == rightLevel {
 				*p = s[i+1:]
-				sub := s[:i]
-				return &sub
+				var sub = make([]rune, 0, i)
+				for k, v := range s[:i] {
+					if !escapeIndexes[k] {
+						sub = append(sub, v)
+					}
+				}
+				s = string(sub)
+				return &s
 			}
 			rightLevel++
-		} else if r == left && (last1 != '\\' || last2 == '\\') {
+		} else if escapeEqual {
+			escapeIndexes[i-1] = true
+		} else if realEqual, escapeEqual = equalRune(left, r, last1, last2); realEqual {
 			leftLevel++
+		} else if escapeEqual {
+			escapeIndexes[i-1] = true
 		}
 		last2 = last1
 		last1 = r
 	}
 	return nil
 }
 
+func equalRune(a, b, last1, last2 rune) (real, escape bool) {
+	if a == b {
+		real = last1 != '\\' || last2 == '\\'
+		escape = last1 == '\\' && last2 != '\\'
+	}
+	return
+}
+
 func getBoolOpposite(expr *string) (string, *bool) {
 	last := strings.TrimLeft(*expr, "!")
 	n := len(*expr) - len(last)

spec_test.go

@@ -22,19 +22,22 @@ import (
 
 func TestReadPairedSymbol(t *testing.T) {
 	var cases = []struct {
-		expr         string
-		val          string
-		lastExprNode string
-		left, right  rune
+		left, right             rune
+		expr, val, lastExprNode string
 	}{
-		{expr: "'true '+'a'", val: "true ", lastExprNode: "+'a'", left: '\'', right: '\''},
-		{expr: "((0+1)/(2-1)*9)%2", val: "(0+1)/(2-1)*9", lastExprNode: "%2", left: '(', right: ')'},
+		{left: '\'', right: '\'', expr: "'true '+'a'", val: "true ", lastExprNode: "+'a'"},
+		{left: '(', right: ')', expr: "((0+1)/(2-1)*9)%2", val: "(0+1)/(2-1)*9", lastExprNode: "%2"},
+		{left: '(', right: ')', expr: `(\)\(\))`, val: `)()`},
+		{left: '\'', right: '\'', expr: `'\\'`, val: `\\`},
+		{left: '\'', right: '\'', expr: `'\'\''`, val: `''`},
 	}
 	for _, c := range cases {
 		t.Log(c.expr)
 		expr := c.expr
 		got := readPairedSymbol(&expr, c.left, c.right)
-		if *got != c.val || expr != c.lastExprNode {
+		if got == nil {
+			t.Fatalf("expr: %q, got: %v, %q, want: %q, %q", c.expr, got, expr, c.val, c.lastExprNode)
+		} else if *got != c.val || expr != c.lastExprNode {
 			t.Fatalf("expr: %q, got: %q, %q, want: %q, %q", c.expr, *got, expr, c.val, c.lastExprNode)
 		}
 	}

validator/README.md

@@ -118,6 +118,8 @@ type T struct {
 |`true` `false`|boolean|
 |`0` `0.0`|float64 "0"|
 |`''`|String|
+|`\\'`| Escape `'` delims in string|
+|`\"`| Escape `"` delims in string|
 |`nil`|nil, undefined|
 |`!`|not, suitable for `bool`, `string`, `float64`, `nil`, `$` and `()`|
 |`+`|Digital addition or string splicing|