Home Explore Help
Sign In
cturan
/
llama.cpp
mirror of https://github.com/cturan/llama.cpp
1
0
Fork 0
Files Issues 0 Wiki
Browse Source

grammars : don't allow to output unescaped new line in string (#5885)

* Don't allow grammar json array to output unescaped new line in string

* Don't allow new line in json object string
ExtReMLapin 1 year ago
parent
61d1c88e15
commit
b1a4e994fd
2 changed files with 2 additions and 2 deletions
Unified View Show Diff Stats
  1. 1 1
      grammars/json.gbnf
  2. 1 1
      grammars/json_arr.gbnf

+ 1 - 1
grammars/json.gbnf
View File 

@@ -15,7 +15,7 @@ array  ::=
 
 
 
 string ::=
 
 string ::=
 
   "\"" (
 
   "\"" (
 
-    [^"\\] |
 
+    [^"\\\n] |
 
     "\\" (["\\/bfnrt] | "u" [0-9a-fA-F] [0-9a-fA-F] [0-9a-fA-F] [0-9a-fA-F]) # escapes
 
     "\\" (["\\/bfnrt] | "u" [0-9a-fA-F] [0-9a-fA-F] [0-9a-fA-F] [0-9a-fA-F]) # escapes
 
   )* "\"" ws
 
   )* "\"" ws

+ 1 - 1
grammars/json_arr.gbnf
View File 

@@ -24,7 +24,7 @@ array  ::=
 
 
 
 string ::=
 
 string ::=
 
   "\"" (
 
   "\"" (
 
-    [^"\\] |
 
+    [^"\\\n] |
 
     "\\" (["\\/bfnrt] | "u" [0-9a-fA-F] [0-9a-fA-F] [0-9a-fA-F] [0-9a-fA-F]) # escapes
 
     "\\" (["\\/bfnrt] | "u" [0-9a-fA-F] [0-9a-fA-F] [0-9a-fA-F] [0-9a-fA-F]) # escapes
 
   )* "\"" ws
 
   )* "\"" ws