Better handling of deep-quoting argument strings

pkg/expressions/argSplitter.go

@@ -22,11 +22,18 @@ func splitTokenizedArguments(s string) []string {
 			sb.WriteRune(runes[i])
 		} else if r == '"' && !quoted {
 			quoted = true
+			if tokenDepth > 0 {
+				sb.WriteRune('"')
+			}
 		} else if r == '"' && quoted {
 			quoted = false
-			// Always append, even if empty
-			args = append(args, sb.String())
-			sb.Reset()
+			if tokenDepth > 0 {
+				sb.WriteRune('"')
+			} else {
+				// Always append, even if empty
+				args = append(args, sb.String())
+				sb.Reset()
+			}
 		} else if r == '{' && !quoted {
 			tokenDepth++
 			sb.WriteRune(r)

pkg/expressions/argSplitter_test.go

@@ -42,11 +42,19 @@ func TestEscaping(t *testing.T) {
 }
 
 func TestEmptyString(t *testing.T) {
-	tokens := splitTokenizedArguments(`a "bc" ""`)
-	assert.Equal(t, []string{"a", "bc", ""}, tokens)
+	assert.Equal(t, []string{"a", "bc", ""}, splitTokenizedArguments(`a "bc" ""`))
+	assert.Equal(t, []string{"a", "bc", "", "def"}, splitTokenizedArguments(`a bc "" def`))
 }
 
 func TestQuotedBraces(t *testing.T) {
 	tokens := splitTokenizedArguments(`a "{bc\"" def`)
 	assert.Equal(t, []string{"a", "{bc\"", "def"}, tokens)
 }
+
+func TestDeepQuoting(t *testing.T) {
+	tokens := splitTokenizedArguments(`if {eq {0} "abc def"} abc`)
+	assert.Equal(t, []string{"if", `{eq {0} "abc def"}`, "abc"}, tokens)
+
+	tokens2 := splitTokenizedArguments(`eq {0} "abc def"`)
+	assert.Equal(t, []string{"eq", "{0}", "abc def"}, tokens2)
+}

pkg/expressions/funcs_test.go

@@ -68,6 +68,7 @@ func TestIfStatement(t *testing.T) {
 	testExpression(t, mockContext("abc", "q"),
 		`{if {0} {1} efg} {if {0} abc} {if {not {0}} a b} {if "" a} {if "" a b}`,
 		"q abc b  b")
+	testExpression(t, mockContext("abc efg"), `{if {eq {0} "abc efg"} beq}`, "beq")
 }
 
 func TestComparisonEquality(t *testing.T) {