fix replaceAndOr()

mei-rune · May 16, 2024 · 112b5c0 · 112b5c0
1 parent 638dc69
commit 112b5c0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/core/xml_expression.go b/core/xml_expression.go
@@ -430,7 +430,7 @@ func replaceAndOr(s string) string {
 		c := runes[i]
 		// fmt.Println("****", s, " pos ", string(c))
 		switch c {
-		case '"':			
+		case '"':
 			if inSingleStr {
 			} else if inDoubleStr {
 				if isEscaping {
@@ -600,7 +600,7 @@ func replaceAndOr(s string) string {
 				}
 			}
 		default:
-			if unicode.IsSpace(c) {
+			if !isEscaping && !inSingleStr && !inDoubleStr && unicode.IsSpace(c) {
 				if or_index == 2 {
 					sb.WriteString("||")
 				} else {

diff --git a/core/xml_expression_test.go b/core/xml_expression_test.go
@@ -340,6 +340,16 @@ func TestReplaceAndOr(t *testing.T) {
       txt: "a \"lte\" lte b", 
       result: "a \"lte\" <= b",
     },
+
+    {
+      txt: "abc = \" a=b and c = 2 or a gt c or a lt b and a gte 9 or c lte 10 \"", 
+      result: "abc = \" a=b and c = 2 or a gt c or a lt b and a gte 9 or c lte 10 \"", 
+    },
+
+    {
+      txt: "abc = ' a=b and c = 2 or a gt c or a lt b and a gte 9 or c lte 10 '", 
+      result: "abc = ' a=b and c = 2 or a gt c or a lt b and a gte 9 or c lte 10 '",
+    },
 	} {
 		s := replaceAndOr(test.txt)
 		if s != test.result {