@@ -53,19 +53,19 @@ class Schema(BaseModel):
5353basic_integer_1_1 ::= ("" | ("-")) (=([1-9] [0-9]*))
5454basic_escape_2 ::= (([\"\\/bfnrt]) | ("u" [A-Fa-f0-9] [A-Fa-f0-9] [A-Fa-f0-9] [A-Fa-f0-9])) (=(basic_string_sub_2))
5555basic_string_sub_2 ::= (("\"") | ([^\0-\x1f\"\\\r\n] basic_string_sub_2) | ("\\" basic_escape_2 basic_string_sub_2)) (=([ \n\t]* [,}\]:]))
56- basic_number_9 ::= ((basic_number_7_2 basic_number_3_2 basic_number_6_2)) (=(root_part_0_2 [ \n\t]* "}"))
56+ basic_number_9 ::= ((basic_number_1_2 basic_number_7_2 basic_number_3_2 basic_number_6_2)) (=(root_part_0_2 [ \n\t]* "}"))
5757basic_string_2 ::= (("\"" basic_string_sub_2))
5858root_prop_1 ::= (("[" [ \n\t]* basic_string_2 root_prop_1_1 [ \n\t]* "]") | ("[" [ \n\t]* "]"))
5959root_part_0_2 ::= (([ \n\t]* "," [ \n\t]* "\"arg4\"" [ \n\t]* ":" [ \n\t]* root_prop_1)) (=([ \n\t]* "}"))
6060root_2 ::= (("{" [ \n\t]* "\"arg3\"" [ \n\t]* ":" [ \n\t]* basic_number_9 root_part_0_2 [ \n\t]* "}")) (=("</function>"))
61- basic_number_1_2 ::= ("" | ("-")) (=([1-9] [0-9]* ))
61+ basic_number_1_2 ::= ("" | ("-")) (=(basic_number_7_2 basic_number_3_2 basic_number_6_2 ))
6262basic_number_2_2 ::= (([0-9] basic_number_2_2) | ([0-9]))
6363basic_number_3_2 ::= ("" | ("." basic_number_2_2)) (=(basic_number_6_2))
6464basic_number_4_2 ::= ("" | ([+\-])) (=(basic_number_5_2))
6565basic_number_5_2 ::= (([0-9] basic_number_5_2) | ([0-9]))
6666basic_number_6_2 ::= ("" | ([eE] basic_number_4_2 basic_number_5_2))
6767root_prop_1_1 ::= ("" | ([ \n\t]* "," [ \n\t]* basic_string_2 root_prop_1_1)) (=([ \n\t]* "]"))
68- basic_number_7_2 ::= (("0") | (basic_number_1_2 [1-9] [0-9]*)) (=(basic_number_3_2 basic_number_6_2))
68+ basic_number_7_2 ::= (("0") | ([1-9] [0-9]*)) (=(basic_number_3_2 basic_number_6_2))
6969triggered_tags_group ::= (("1>" root "</function>") | ("2>" root_1 "</function>"))
7070triggered_tags_group_1 ::= ((">" root_2 "</function>"))
7171triggered_tags ::= TagDispatch(
@@ -82,7 +82,7 @@ class Schema(BaseModel):
8282basic_string_sub ::= (("\"") | ([^\0-\x1f\"\\\r\n] basic_string_sub) | ("\\" basic_escape basic_string_sub)) (=([ \n\t]* [,}\]:]))
8383basic_any ::= ((basic_number) | (basic_string) | (basic_boolean) | (basic_null) | (basic_array) | (basic_object))
8484basic_integer ::= (("0") | (basic_integer_1 [1-9] [0-9]*))
85- basic_number ::= ((basic_number_7 basic_number_3 basic_number_6))
85+ basic_number ::= ((basic_number_1 basic_number_7 basic_number_3 basic_number_6))
8686basic_string ::= (("\"" basic_string_sub))
8787basic_boolean ::= (("true") | ("false"))
8888basic_null ::= (("null"))
@@ -99,12 +99,12 @@ class Schema(BaseModel):
9999basic_number_6 ::= ("" | ([eE] basic_number_4 basic_number_5))
100100basic_array_1 ::= ("" | ([ \n\t]* "," [ \n\t]* basic_any basic_array_1))
101101basic_object_1 ::= ("" | ([ \n\t]* "," [ \n\t]* basic_string [ \n\t]* ":" [ \n\t]* basic_any basic_object_1))
102- basic_number_7 ::= (("0") | (basic_number_1 [1-9] [0-9]*))
102+ basic_number_7 ::= (("0") | ([1-9] [0-9]*))
103103basic_escape_1 ::= (([\"\\/bfnrt]) | ("u" [A-Fa-f0-9] [A-Fa-f0-9] [A-Fa-f0-9] [A-Fa-f0-9]))
104104basic_string_sub_1 ::= (("\"") | ([^\0-\x1f\"\\\r\n] basic_string_sub_1) | ("\\" basic_escape_1 basic_string_sub_1)) (=([ \n\t]* [,}\]:]))
105105basic_any_1 ::= ((basic_number_8) | (basic_string_1) | (basic_boolean_1) | (basic_null_1) | (basic_array_2) | (basic_object_2))
106106basic_integer_2 ::= (("0") | (basic_integer_1_1 [1-9] [0-9]*))
107- basic_number_8 ::= ((basic_number_7_1 basic_number_3_1 basic_number_6_1))
107+ basic_number_8 ::= ((basic_number_1_1 basic_number_7_1 basic_number_3_1 basic_number_6_1))
108108basic_string_1 ::= (("\"" basic_string_sub_1))
109109basic_boolean_1 ::= (("true") | ("false"))
110110basic_null_1 ::= (("null"))
@@ -121,12 +121,12 @@ class Schema(BaseModel):
121121basic_number_6_1 ::= ("" | ([eE] basic_number_4_1 basic_number_5_1))
122122basic_array_1_1 ::= ("" | ([ \n\t]* "," [ \n\t]* basic_any_1 basic_array_1_1))
123123basic_object_1_1 ::= ("" | ([ \n\t]* "," [ \n\t]* basic_string_1 [ \n\t]* ":" [ \n\t]* basic_any_1 basic_object_1_1))
124- basic_number_7_1 ::= (("0") | (basic_number_1_1 [1-9] [0-9]*))
124+ basic_number_7_1 ::= (("0") | ([1-9] [0-9]*))
125125basic_escape_2 ::= (([\"\\/bfnrt]) | ("u" [A-Fa-f0-9] [A-Fa-f0-9] [A-Fa-f0-9] [A-Fa-f0-9]))
126126basic_string_sub_2 ::= (("\"") | ([^\0-\x1f\"\\\r\n] basic_string_sub_2) | ("\\" basic_escape_2 basic_string_sub_2)) (=([ \n\t]* [,}\]:]))
127127basic_any_2 ::= ((basic_number_9) | (basic_string_2) | (basic_boolean_2) | (basic_null_2) | (basic_array_3) | (basic_object_3))
128128basic_integer_3 ::= (("0") | (basic_integer_1_2 [1-9] [0-9]*))
129- basic_number_9 ::= ((basic_number_7_2 basic_number_3_2 basic_number_6_2))
129+ basic_number_9 ::= ((basic_number_1_2 basic_number_7_2 basic_number_3_2 basic_number_6_2))
130130basic_string_2 ::= (("\"" basic_string_sub_2))
131131basic_boolean_2 ::= (("true") | ("false"))
132132basic_null_2 ::= (("null"))
@@ -145,7 +145,7 @@ class Schema(BaseModel):
145145basic_array_1_2 ::= ("" | ([ \n\t]* "," [ \n\t]* basic_any_2 basic_array_1_2))
146146basic_object_1_2 ::= ("" | ([ \n\t]* "," [ \n\t]* basic_string_2 [ \n\t]* ":" [ \n\t]* basic_any_2 basic_object_1_2))
147147root_prop_1_1 ::= ("" | ([ \n\t]* "," [ \n\t]* basic_string_2 root_prop_1_1))
148- basic_number_7_2 ::= (("0") | (basic_number_1_2 [1-9] [0-9]*))
148+ basic_number_7_2 ::= (("0") | ([1-9] [0-9]*))
149149triggered_tags_group ::= (("1>" root "</function>") | ("2>" root_1 "</function>"))
150150triggered_tags_group_1 ::= ((">" root_2 "</function>"))
151151triggered_tags ::= TagDispatch(
@@ -178,7 +178,6 @@ class Schema2(BaseModel):
178178 triggers = ["<function=f" , "<function=g" ]
179179
180180 grammar = xgr .Grammar .from_structural_tag (tags , triggers )
181-
182181 assert str (grammar ) == expected_grammar_test_structural_tag_before_optimization
183182
184183 accepted_inputs = [
@@ -212,7 +211,6 @@ class Schema2(BaseModel):
212211
213212 compiler = xgr .GrammarCompiler (xgr .TokenizerInfo ([]))
214213 compiled_grammar = compiler .compile_structural_tag (tags , triggers )
215-
216214 assert str (compiled_grammar .grammar ) == expected_grammar_test_structural_tag_after_optimization
217215
218216
0 commit comments