Fix conflicts

This commit is contained in:
tidwall 2018-09-17 10:11:44 -07:00
commit 64c369cb32
2 changed files with 5 additions and 1 deletions

View File

@ -59,7 +59,7 @@ Path syntax
----------- -----------
A path is a series of keys separated by a dot. A path is a series of keys separated by a dot.
The dot and colon characters can be escaped with '\\'. The dot and colon characters can be escaped with ``\``.
```json ```json
{ {

View File

@ -121,6 +121,10 @@ func TestBasic(t *testing.T) {
`{":\1":{"this":[null,null,null,null,{".HI":4}]}}`, `{":\1":{"this":[null,null,null,null,{".HI":4}]}}`,
``, ``,
"\\:\\\\1.this.4.\\.HI", `4`) "\\:\\\\1.this.4.\\.HI", `4`)
testRaw(t, setRaw,
`{"app.token":"cde"}`,
`{"app.token":"abc"}`,
"app\\.token", `"cde"`)
testRaw(t, setRaw, testRaw(t, setRaw,
`{"b":{"this":{"😇":""}}}`, `{"b":{"this":{"😇":""}}}`,
``, ``,