Merge pull request #1713 from yuce/allow-backslash-cr-in-pql-strings

Allow backslash, carriage return in PQL strings

pql/parser_test.go

@@ -75,19 +75,20 @@ func TestParser_Parse(t *testing.T) {
 
 	// Parse with only arguments.
 	t.Run("ArgumentsOnly", func(t *testing.T) {
-		q, err := pql.ParseString(`MyCall( key= value, foo="bar", age = 12 , bool0=true, bool1=false, x=null  )`)
+		q, err := pql.ParseString(`MyCall( key= value, foo='bar', age = 12 , bool0=true, bool1=false, x=null, escape="\" \\escape\n"  )`)
 		if err != nil {
 			t.Fatal(err)
 		} else if !reflect.DeepEqual(q.Calls[0],
 			&pql.Call{
 				Name: "MyCall",
 				Args: map[string]interface{}{
-					"key":   "value",
-					"foo":   "bar",
-					"age":   int64(12),
-					"bool0": true,
-					"bool1": false,
-					"x":     nil,
+					"key":    "value",
+					"foo":    "bar",
+					"age":    int64(12),
+					"bool0":  true,
+					"bool1":  false,
+					"x":      nil,
+					"escape": "\" \\escape\n",
 				},
 			},
 		) {

pql/pql.peg

@@ -45,12 +45,12 @@ item <- ( 'null' &(comma / sp close) { p.addVal(nil) }
          / < '-'? [0-9]+ ('.'[0-9]*)? > { p.addNumVal(buffer[begin:end]) }
          / < '-'? '.'[0-9]+ > { p.addNumVal(buffer[begin:end]) }
          / < ([[A-Z]] / [0-9] / '-' / '_' / ':')+ > { p.addVal(buffer[begin:end]) }
-         / '"' < doublequotedstring > '"' { p.addVal(buffer[begin:end]) }
+         / < '"'  doublequotedstring '"' > { s, _ := strconv.Unquote(buffer[begin:end]); p.addVal(s) }
          / '\'' < singlequotedstring > '\'' { p.addVal(buffer[begin:end]) }
          )
 
-doublequotedstring <- ( [^"\\\n] / '\\n' / '\\\"' / '\\\'' / '\\\\' )*
-singlequotedstring <- ( [^'\\\n] / '\\n' / '\\\"' / '\\\'' / '\\\\' )*
+doublequotedstring <- ( '\\\"' / [^"] )*
+singlequotedstring <- ( '\\\'' / [^'] )*
 
 fieldExpr <- [[A-Z]] ( [[A-Z]] / [0-9] / '_' / '-' )*
 field <- <fieldExpr / reserved> { p.addField(buffer[begin:end]) }