From: Georgi Gerganov <redacted>
Date: Tue, 5 Mar 2024 13:56:24 +0000 (+0200)
Subject: Revert "grammars : don't allow to output unescaped new line in string (#5885)"
X-Git-Tag: upstream/0.0.4488~2139
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=82cb31eb93fd19b74115e0f0133225d1dfdbfdbc;p=pkg%2Fggml%2Fsources%2Fllama.cpp

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

This reverts commit b1a4e994fde929300d4aeb1deb8320c59cb6edec.
---

diff --git a/grammars/json.gbnf b/grammars/json.gbnf
index 34e014d5..a9537cdf 100644
--- a/grammars/json.gbnf
+++ b/grammars/json.gbnf
@@ -15,7 +15,7 @@ array  ::=
 
 string ::=
   "\"" (
-    [^"\\\n] |
+    [^"\\] |
     "\\" (["\\/bfnrt] | "u" [0-9a-fA-F] [0-9a-fA-F] [0-9a-fA-F] [0-9a-fA-F]) # escapes
   )* "\"" ws
 
diff --git a/grammars/json_arr.gbnf b/grammars/json_arr.gbnf
index fd5740ee..ef53e77a 100644
--- a/grammars/json_arr.gbnf
+++ b/grammars/json_arr.gbnf
@@ -24,7 +24,7 @@ array  ::=
 
 string ::=
   "\"" (
-    [^"\\\n] |
+    [^"\\] |
     "\\" (["\\/bfnrt] | "u" [0-9a-fA-F] [0-9a-fA-F] [0-9a-fA-F] [0-9a-fA-F]) # escapes
   )* "\"" ws