Fix string elements

ygg-lang · Nov 28, 2023 · f69e23a · f69e23a
1 parent ea5dcd6
commit f69e23a
Show file tree

Hide file tree

Showing 7 changed files with 734 additions and 312 deletions.
diff --git a/projects/json5-parser/grammars/json5.ygg b/projects/json5-parser/grammars/json5.ygg
@@ -33,12 +33,24 @@ class Array {
 }
 
 atomic class String {
-    | '"' (StringEscaped | ANY) '"'
-    | "'" (StringEscaped | ANY) "'"
+    | '"' StringElement* '"'
+    | "'" StringElement* "'"
 }
 
-atomic class StringEscaped {
-    '\' ANY
+atomic union StringElement {
+    | '\' HexDigit #HexDigit
+    | '\' Escaped  #Escaped
+    | StringText   #StringText
+}
+
+class HexDigit {
+    /[0-9a-fA-F]{4}/
+}
+class Escaped {
+    ANY
+}
+class StringText {
+    /[^"'\\]+/
 }
 
 atomic class Number {