fix

IntrinsicLabsAI · Apr 10, 2024 · 8fee4c3 · 8fee4c3
1 parent 083f729
commit 8fee4c3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/src/compiler.test.ts b/src/compiler.test.ts
@@ -15,7 +15,7 @@ test("union types", () => {
 root ::= Person
 Person ::= "{"   ws   "\"age\":"   ws   (  stringlist | numberlist  )   "}"
 Personlist ::= "[]" | "["   ws   Person   (","   ws   Person)*   "]"
-string ::= "\""   ((  [^"\x7F\x00-\x1F] | "\\"   (  ["\\/bfnrt] | "u"   [0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F]  )  ))*   "\""
+string ::= "\""   ((  [^"\x7F\x00-\x1F] | "\\"   (  ["\\/bfnrt] | "u"   [0-9a-fA-F]   [0-9a-fA-F]   [0-9a-fA-F]   [0-9a-fA-F]  )  ))*   "\""
 boolean ::= "true" | "false"
 ws ::= [ \t\n]*
 number ::= [0-9]+   "."?   [0-9]*
@@ -40,7 +40,7 @@ test("Single interface generation", () => {
 root ::= PostalAddress
 PostalAddress ::= "{"   ws   "\"streetNumber\":"   ws   number   ","   ws   "\"street\":"   ws   string   ","   ws   "\"city\":"   ws   string   ","   ws   "\"state\":"   ws   string   ","   ws   "\"postalCode\":"   ws   number   "}"
 PostalAddresslist ::= "[]" | "["   ws   PostalAddress   (","   ws   PostalAddress)*   "]"
-string ::= "\""   ((  [^"\x7F\x00-\x1F] | "\\"   (  ["\\/bfnrt] | "u"   [0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F]  )  ))*   "\""
+string ::= "\""   ((  [^"\x7F\x00-\x1F] | "\\"   (  ["\\/bfnrt] | "u"   [0-9a-fA-F]   [0-9a-fA-F]   [0-9a-fA-F]   [0-9a-fA-F]  )  ))*   "\""
 boolean ::= "true" | "false"
 ws ::= [ \t\n]*
 number ::= [0-9]+   "."?   [0-9]*
@@ -69,7 +69,7 @@ root ::= PostalAddress
 PostalAddress ::= "{"   ws   "\"streetNumber\":"   ws   number   ","   ws   "\"type\":"   ws   AddressType   ","   ws   "\"street\":"   ws   string   ","   ws   "\"city\":"   ws   string   ","   ws   "\"state\":"   ws   string   ","   ws   "\"postalCode\":"   ws   number   "}"
 PostalAddresslist ::= "[]" | "["   ws   PostalAddress   (","   ws   PostalAddress)*   "]"
 AddressType ::= "\"business\"" | "\"home\""
-string ::= "\""   ((  [^"\x7F\x00-\x1F] | "\\"   (  ["\\/bfnrt] | "u"   [0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F]  )  ))*   "\""
+string ::= "\""   ((  [^"\x7F\x00-\x1F] | "\\"   (  ["\\/bfnrt] | "u"   [0-9a-fA-F]   [0-9a-fA-F]   [0-9a-fA-F]   [0-9a-fA-F]  )  ))*   "\""
 boolean ::= "true" | "false"
 ws ::= [ \t\n]*
 number ::= [0-9]+   "."?   [0-9]*
@@ -104,7 +104,7 @@ WorkExperience ::= "{"   ws   "\"company\":"   ws   string   ","   ws   "\"jobTi
 WorkExperiencelist ::= "[]" | "["   ws   WorkExperience   (","   ws   WorkExperience)*   "]"
 JobCandidate ::= "{"   ws   "\"name\":"   ws   string   ","   ws   "\"jobs\":"   ws   WorkExperiencelist   "}"
 JobCandidatelist ::= "[]" | "["   ws   JobCandidate   (","   ws   JobCandidate)*   "]"
-string ::= "\""   ((  [^"\x7F\x00-\x1F] | "\\"   (  ["\\/bfnrt] | "u"   [0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F]  )  ))*   "\""
+string ::= "\""   ((  [^"\x7F\x00-\x1F] | "\\"   (  ["\\/bfnrt] | "u"   [0-9a-fA-F]   [0-9a-fA-F]   [0-9a-fA-F]   [0-9a-fA-F]  )  ))*   "\""
 boolean ::= "true" | "false"
 ws ::= [ \t\n]*
 number ::= [0-9]+   "."?   [0-9]*
@@ -159,7 +159,7 @@ OrderStatus ::= "\"Pending\"" | "\"Shipped\"" | "\"Delivered\"" | "\"Canceled\""
 Product ::= "{"   ws   "\"id\":"   ws   number   ","   ws   "\"name\":"   ws   string   ","   ws   "\"description\":"   ws   string   ","   ws   "\"price\":"   ws   number   ","   ws   "\"category\":"   ws   ProductCategory   "}"
 Productlist ::= "[]" | "["   ws   Product   (","   ws   Product)*   "]"
 ProductCategory ::= "\"Electronics\"" | "\"Clothing\"" | "\"Food\""
-string ::= "\""   ((  [^"\x7F\x00-\x1F] | "\\"   (  ["\\/bfnrt] | "u"   [0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F]  )  ))*   "\""
+string ::= "\""   ((  [^"\x7F\x00-\x1F] | "\\"   (  ["\\/bfnrt] | "u"   [0-9a-fA-F]   [0-9a-fA-F]   [0-9a-fA-F]   [0-9a-fA-F]  )  ))*   "\""
 boolean ::= "true" | "false"
 ws ::= [ \t\n]*
 number ::= [0-9]+   "."?   [0-9]*
@@ -240,7 +240,7 @@ Car ::= "{"   ws   "\"make\":"   ws   string   ","   ws   "\"model\":"   ws   st
 Carlist ::= "[]" | "["   ws   Car   (","   ws   Car)*   "]"
 CarAndOwner ::= "{"   ws   "\"car\":"   ws   Car   ","   ws   "\"owner\":"   ws   Owner   "}"
 CarAndOwnerlist ::= "[]" | "["   ws   CarAndOwner   (","   ws   CarAndOwner)*   "]"
-string ::= "\""   ((  [^"\x7F\x00-\x1F] | "\\"   (  ["\\/bfnrt] | "u"   [0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F]  )  ))*   "\""
+string ::= "\""   ((  [^"\x7F\x00-\x1F] | "\\"   (  ["\\/bfnrt] | "u"   [0-9a-fA-F]   [0-9a-fA-F]   [0-9a-fA-F]   [0-9a-fA-F]  )  ))*   "\""
 boolean ::= "true" | "false"
 ws ::= [ \t\n]*
 number ::= [0-9]+   "."?   [0-9]*
@@ -386,7 +386,7 @@ Car ::= "{"   ws   "\"make\":"   ws   string   ","   ws   "\"model\":"   ws   st
 Carlist ::= "[]" | "["   ws   Car   (","   ws   Car)*   "]"
 CarAndOwner ::= "{"   ws   "\"car\":"   ws   Car   ","   ws   "\"owner\":"   ws   Owner   "}"
 CarAndOwnerlist ::= "[]" | "["   ws   CarAndOwner   (","   ws   CarAndOwner)*   "]"
-string ::= "\""   ((  [^"\x7F\x00-\x1F] | "\\"   (  ["\\/bfnrt] | "u"   [0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F]  )  ))*   "\""
+string ::= "\""   ((  [^"\x7F\x00-\x1F] | "\\"   (  ["\\/bfnrt] | "u"   [0-9a-fA-F]   [0-9a-fA-F]   [0-9a-fA-F]   [0-9a-fA-F]  )  ))*   "\""
 boolean ::= "true" | "false"
 ws ::= [ \t\n]*
 number ::= [0-9]+   "."?   [0-9]*

diff --git a/src/util.ts b/src/util.ts
@@ -31,7 +31,11 @@ const STRING_ELEM: GrammarElement = {
               charPattern(/["\\/bfnrt]/g), // WS escape sequences
               sequence( // Unicode escape sequences
                 literal(`u`),
-                charPattern(/[0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F]/g)))))),
+                sequence(
+                  charPattern(/[0-9a-fA-F]/g),
+                  charPattern(/[0-9a-fA-F]/g),
+                  charPattern(/[0-9a-fA-F]/g),
+                  charPattern(/[0-9a-fA-F]/g))))))),
         "star"),
       literal(`"`))
   ],