LLM inference in C/C++
C++ ggml
common/json-schema-to-grammar : align spacing rules with parsers (#24835)
Aldehir Rojasc57607016a1e
diff --git a/common/json-schema-to-grammar.cpp b/common/json-schema-to-grammar.cppindex e2c4d6ce22..b18607cd65 100644--- a/common/json-schema-to-grammar.cpp+++ b/common/json-schema-to-grammar.cpp@@ -233,27 +233,27 @@ struct BuiltinRule {};static std::unordered_map<std::string, BuiltinRule> PRIMITIVE_RULES = {- {"boolean", {"(\"true\" | \"false\") space", {}}},+ {"boolean", {"(\"true\" | \"false\")", {}}},{"decimal-part", {"[0-9]{1,16}", {}}},{"integral-part", {"[0] | [1-9] [0-9]{0,15}", {}}},- {"number", {"(\"-\"? integral-part) (\".\" decimal-part)? ([eE] [-+]? integral-part)? space", {"integral-part", "decimal-part"}}},- {"integer", {"(\"-\"? integral-part) space", {"integral-part"}}},+ {"number", {"(\"-\"? integral-part) (\".\" decimal-part)? ([eE] [-+]? integral-part)?", {"integral-part", "decimal-part"}}},+ {"integer", {"(\"-\"? integral-part)", {"integral-part"}}},{"value", {"object | array | string | number | boolean | null", {"object", "array", "string", "number", "boolean", "null"}}},- {"object", {"\"{\" space ( string \":\" space value (\",\" space string \":\" space value)* )? \"}\" space", {"string", "value"}}},- {"array", {"\"[\" space ( value (\",\" space value)* )? \"]\" space", {"value"}}},- {"uuid", {"\"\\\"\" [0-9a-fA-F]{8} \"-\" [0-9a-fA-F]{4} \"-\" [0-9a-fA-F]{4} \"-\" [0-9a-fA-F]{4} \"-\" [0-9a-fA-F]{12} \"\\\"\" space", {}}},+ {"object", {"\"{\" space ( string \":\" space value (\",\" space string \":\" space value)* )? space \"}\"", {"string", "value"}}},+ {"array", {"\"[\" space ( value (\",\" space value)* )? space \"]\"", {"value"}}},+ {"uuid", {"\"\\\"\" [0-9a-fA-F]{8} \"-\" [0-9a-fA-F]{4} \"-\" [0-9a-fA-F]{4} \"-\" [0-9a-fA-F]{4} \"-\" [0-9a-fA-F]{12} \"\\\"\"", {}}},{"char", {"[^\"\\\\\\x7F\\x00-\\x1F] | [\\\\] ([\"\\\\bfnrt] | \"u\" [0-9a-fA-F]{4})", {}}},- {"string", {"\"\\\"\" char* \"\\\"\" space", {"char"}}},- {"null", {"\"null\" space", {}}},+ {"string", {"\"\\\"\" char* \"\\\"\"", {"char"}}},+ {"null", {"\"null\"", {}}},};static std::unordered_map<std::string, BuiltinRule> STRING_FORMAT_RULES = {{"date", {"[0-9]{4} \"-\" ( \"0\" [1-9] | \"1\" [0-2] ) \"-\" ( \"0\" [1-9] | [1-2] [0-9] | \"3\" [0-1] )", {}}},{"time", {"([01] [0-9] | \"2\" [0-3]) \":\" [0-5] [0-9] \":\" [0-5] [0-9] ( \".\" [0-9]{3} )? ( \"Z\" | ( \"+\" | \"-\" ) ( [01] [0-9] | \"2\" [0-3] ) \":\" [0-5] [0-9] )", {}}},{"date-time", {"date \"T\" time", {"date", "time"}}},- {"date-string", {"\"\\\"\" date \"\\\"\" space", {"date"}}},- {"time-string", {"\"\\\"\" time \"\\\"\" space", {"time"}}},- {"date-time-string", {"\"\\\"\" date-time \"\\\"\" space", {"date-time"}}}+ {"date-string", {"\"\\\"\" date \"\\\"\"", {"date"}}},+ {"time-string", {"\"\\\"\" time \"\\\"\"", {"time"}}},+ {"date-time-string", {"\"\\\"\" date-time \"\\\"\"", {"date-time"}}}};static bool is_reserved_name(const std::string & name) {@@ -551,16 +551,16 @@ private:}return join_seq();};- return _add_rule(name, "\"\\\"\" (" + to_rule(transform()) + ") \"\\\"\" space");+ return _add_rule(name, "\"\\\"\" (" + to_rule(transform()) + ") \"\\\"\"");}/*Returns a rule that matches a JSON string that is none of the provided stringsnot_strings({"a"})- -> ["] ( [a] char+ | [^"a] char* )? ["] space+ -> ["] ( [a] char+ | [^"a] char* )? ["]not_strings({"and", "also"})- -> ["] ( [a] ([l] ([s] ([o] char+ | [^"o] char*) | [^"s] char*) | [n] ([d] char+ | [^"d] char*) | [^"ln] char*) | [^"a] char* )? ["] space+ -> ["] ( [a] ([l] ([s] ([o] char+ | [^"o] char*) | [^"s] char*) | [n] ([d] char+ | [^"d] char*) | [^"ln] char*) | [^"a] char* )? ["]*/std::string _not_strings(const std::vector<std::string> & strings) {@@ -619,7 +619,7 @@ private:if (!trie.is_end_of_string) {out << "?";}- out << " [\"] space";+ out << " [\"]";return out.str();}@@ -725,7 +725,7 @@ private:rule += " )?";}- rule += " \"}\" space";+ rule += " space \"}\"";return rule;}@@ -858,14 +858,14 @@ public:return _add_rule(rule_name, _generate_union_rule(name, schema_types));}if (schema.contains("const")) {- return _add_rule(rule_name, _generate_constant_rule(schema["const"]) + " space");+ return _add_rule(rule_name, _generate_constant_rule(schema["const"]));}if (schema.contains("enum")) {std::vector<std::string> enum_values;for (const auto & v : schema["enum"]) {enum_values.push_back(_generate_constant_rule(v));}- return _add_rule(rule_name, "(" + string_join(enum_values, " | ") + ") space");+ return _add_rule(rule_name, "(" + string_join(enum_values, " | ") + ")");}if ((schema_type.is_null() || schema_type == "object")&& (schema.contains("properties") ||@@ -933,7 +933,7 @@ public:}}if (!enum_intersection.empty()) {- return _add_rule(rule_name, "(" + string_join(enum_intersection, " | ") + ") space");+ return _add_rule(rule_name, "(" + string_join(enum_intersection, " | ") + ")");}}return _add_rule(rule_name, _build_object_rule(properties, required, hybrid_name, json()));@@ -948,7 +948,7 @@ public:}rule += visit(items[i], name + (name.empty() ? "" : "-") + "tuple-" + std::to_string(i));}- rule += " \"]\" space";+ rule += " space \"]\"";return _add_rule(rule_name, rule);}std::string item_rule_name = visit(items, name + (name.empty() ? "" : "-") + "item");@@ -956,7 +956,7 @@ public:json max_items_json = schema.contains("maxItems") ? schema["maxItems"] : json();int max_items = max_items_json.is_number_integer() ? max_items_json.get<int>() : std::numeric_limits<int>::max();- return _add_rule(rule_name, "\"[\" space " + build_repetition(item_rule_name, min_items, max_items, "\",\" space") + " \"]\" space");+ return _add_rule(rule_name, "\"[\" space " + build_repetition(item_rule_name, min_items, max_items, "\",\" space") + " space \"]\"");}if ((schema_type.is_null() || schema_type == "string") && schema.contains("pattern")) {return _visit_pattern(schema["pattern"], rule_name);@@ -972,7 +972,7 @@ public:std::string char_rule = _add_primitive("char", PRIMITIVE_RULES.at("char"));int min_len = schema.contains("minLength") ? schema["minLength"].get<int>() : 0;int max_len = schema.contains("maxLength") ? schema["maxLength"].get<int>() : std::numeric_limits<int>::max();- return _add_rule(rule_name, "\"\\\"\" " + build_repetition(char_rule, min_len, max_len) + " \"\\\"\" space");+ return _add_rule(rule_name, "\"\\\"\" " + build_repetition(char_rule, min_len, max_len) + " \"\\\"\"");}if (schema_type == "integer" && (schema.contains("minimum") || schema.contains("exclusiveMinimum") || schema.contains("maximum") || schema.contains("exclusiveMaximum"))) {int64_t min_value = std::numeric_limits<int64_t>::min();@@ -990,7 +990,7 @@ public:std::stringstream out;out << "(";build_min_max_int(min_value, max_value, out);- out << ") space";+ out << ")";return _add_rule(rule_name, out.str());}if (schema.empty() || schema_type == "object") {diff --git a/common/peg-parser.cpp b/common/peg-parser.cppindex d4b491a80e..ff0d24d43f 100644--- a/common/peg-parser.cpp+++ b/common/peg-parser.cpp@@ -1342,7 +1342,7 @@ common_peg_parser common_peg_parser_builder::json_object() {common_peg_parser common_peg_parser_builder::json_array() {return rule("json-array", [this]() {auto ws = space();- auto elements = sequence({json(), zero_or_more(sequence({literal(","), ws, json()}))});+ auto elements = sequence({json(), zero_or_more(sequence({ws, literal(","), ws, json()}))});return sequence({literal("["),ws,diff --git a/examples/json_schema_to_grammar.py b/examples/json_schema_to_grammar.pyindex 077fcfacac..83abd259da 100755--- a/examples/json_schema_to_grammar.py+++ b/examples/json_schema_to_grammar.py@@ -198,18 +198,18 @@ class BuiltinRule:SPACE_RULE = '| " " | "\\n"{1,2} [ \\t]{0,20}'PRIMITIVE_RULES = {- 'boolean' : BuiltinRule('("true" | "false") space', []),+ 'boolean' : BuiltinRule('("true" | "false")', []),'decimal-part' : BuiltinRule('[0-9]{1,16}', []),'integral-part': BuiltinRule('[0] | [1-9] [0-9]{0,15}', []),- 'number' : BuiltinRule('("-"? integral-part) ("." decimal-part)? ([eE] [-+]? integral-part)? space', ['integral-part', 'decimal-part']),- 'integer' : BuiltinRule('("-"? integral-part) space', ['integral-part']),+ 'number' : BuiltinRule('("-"? integral-part) ("." decimal-part)? ([eE] [-+]? integral-part)?', ['integral-part', 'decimal-part']),+ 'integer' : BuiltinRule('("-"? integral-part)', ['integral-part']),'value' : BuiltinRule('object | array | string | number | boolean | null', ['object', 'array', 'string', 'number', 'boolean', 'null']),- 'object' : BuiltinRule('"{" space ( string ":" space value ("," space string ":" space value)* )? "}" space', ['string', 'value']),- 'array' : BuiltinRule('"[" space ( value ("," space value)* )? "]" space', ['value']),- 'uuid' : BuiltinRule(r'"\"" [0-9a-fA-F]{8} "-" [0-9a-fA-F]{4} "-" [0-9a-fA-F]{4} "-" [0-9a-fA-F]{4} "-" [0-9a-fA-F]{12} "\"" space', []),+ 'object' : BuiltinRule('"{" space ( string ":" space value ("," space string ":" space value)* )? space "}"', ['string', 'value']),+ 'array' : BuiltinRule('"[" space ( value ("," space value)* )? space "]"', ['value']),+ 'uuid' : BuiltinRule(r'"\"" [0-9a-fA-F]{8} "-" [0-9a-fA-F]{4} "-" [0-9a-fA-F]{4} "-" [0-9a-fA-F]{4} "-" [0-9a-fA-F]{12} "\""', []),'char' : BuiltinRule(r'[^"\\\x7F\x00-\x1F] | [\\] (["\\bfnrt] | "u" [0-9a-fA-F]{4})', []),- 'string' : BuiltinRule(r'"\"" char* "\"" space', ['char']),- 'null' : BuiltinRule('"null" space', []),+ 'string' : BuiltinRule(r'"\"" char* "\""', ['char']),+ 'null' : BuiltinRule('"null"', []),}# TODO: support "uri", "email" string formats@@ -217,9 +217,9 @@ STRING_FORMAT_RULES = {'date' : BuiltinRule('[0-9]{4} "-" ( "0" [1-9] | "1" [0-2] ) "-" ( \"0\" [1-9] | [1-2] [0-9] | "3" [0-1] )', []),'time' : BuiltinRule('([01] [0-9] | "2" [0-3]) ":" [0-5] [0-9] ":" [0-5] [0-9] ( "." [0-9]{3} )? ( "Z" | ( "+" | "-" ) ( [01] [0-9] | "2" [0-3] ) ":" [0-5] [0-9] )', []),'date-time' : BuiltinRule('date "T" time', ['date', 'time']),- 'date-string' : BuiltinRule('"\\"" date "\\"" space', ['date']),- 'time-string' : BuiltinRule('"\\"" time "\\"" space', ['time']),- 'date-time-string': BuiltinRule('"\\"" date-time "\\"" space', ['date-time']),+ 'date-string' : BuiltinRule('"\\"" date "\\""', ['date']),+ 'time-string' : BuiltinRule('"\\"" time "\\""', ['time']),+ 'date-time-string': BuiltinRule('"\\"" date-time "\\""', ['date-time']),}DOTALL = '[\\U00000000-\\U0010FFFF]'@@ -319,7 +319,7 @@ class SchemaConverter:out.append(f'[^"{"".join(rejects)}] {char_rule}*')visit(trie)- out.append(f' ){"" if trie.is_end_of_string else "?"} ["] space')+ out.append(f' ){"" if trie.is_end_of_string else "?"} ["]')return ''.join(out)def _add_rule(self, name, rule):@@ -549,7 +549,7 @@ class SchemaConverter:return self._add_rule(name,to_rule(transform()) if self._raw_pattern \- else "\"\\\"\" (" + to_rule(transform()) + ") \"\\\"\" space")+ else "\"\\\"\" (" + to_rule(transform()) + ") \"\\\"\"")def _resolve_ref(self, ref):@@ -580,10 +580,10 @@ class SchemaConverter:return self._add_rule(rule_name, self._generate_union_rule(name, [{**schema, 'type': t} for t in schema_type]))elif 'const' in schema:- return self._add_rule(rule_name, self._generate_constant_rule(schema['const']) + ' space')+ return self._add_rule(rule_name, self._generate_constant_rule(schema['const']))elif 'enum' in schema:- rule = '(' + ' | '.join((self._generate_constant_rule(v) for v in schema['enum'])) + ') space'+ rule = '(' + ' | '.join((self._generate_constant_rule(v) for v in schema['enum'])) + ')'return self._add_rule(rule_name, rule)elif schema_type in (None, 'object') and \@@ -624,7 +624,7 @@ class SchemaConverter:enum_intersection &= sif enum_intersection:- rule = '(' + ' | '.join((self._generate_constant_rule(v) for v in sorted(enum_intersection))) + ') space'+ rule = '(' + ' | '.join((self._generate_constant_rule(v) for v in sorted(enum_intersection))) + ')'return self._add_rule(rule_name, rule)return self._add_rule(rule_name, self._build_object_rule(properties, required, hybrid_name, additional_properties=None))@@ -638,12 +638,12 @@ class SchemaConverter:' "," space '.join(self.visit(item, f'{name}{"-" if name else ""}tuple-{i}')for i, item in enumerate(items)) +- ' "]" space')+ ' space "]"')else:item_rule_name = self.visit(items, f'{name}{"-" if name else ""}item')min_items = schema.get("minItems", 0)max_items = schema.get("maxItems")- return self._add_rule(rule_name, '"[" space ' + _build_repetition(item_rule_name, min_items, max_items, separator_rule='"," space') + ' "]" space')+ return self._add_rule(rule_name, '"[" space ' + _build_repetition(item_rule_name, min_items, max_items, separator_rule='"," space') + ' space "]"')elif schema_type in (None, 'string') and 'pattern' in schema:return self._visit_pattern(schema['pattern'], rule_name)@@ -663,7 +663,7 @@ class SchemaConverter:min_len = schema.get('minLength', 0)max_len = schema.get('maxLength')- return self._add_rule(rule_name, r'"\"" ' + _build_repetition(char_rule, min_len, max_len) + r' "\"" space')+ return self._add_rule(rule_name, r'"\"" ' + _build_repetition(char_rule, min_len, max_len) + r' "\""')elif schema_type in (None, 'integer') and \('minimum' in schema or 'exclusiveMinimum' in schema or 'maximum' in schema or 'exclusiveMaximum' in schema):@@ -680,7 +680,7 @@ class SchemaConverter:out = ["("]_generate_min_max_int(min_value, max_value, out)- out.append(") space")+ out.append(")")return self._add_rule(rule_name, ''.join(out))elif (schema_type == 'object') or (len(schema) == 0):@@ -765,7 +765,7 @@ class SchemaConverter:rule += ' )'rule += ' )?'- rule += ' "}" space'+ rule += ' space "}"'return rulediff --git a/tests/test-chat.cpp b/tests/test-chat.cppindex 902a4c135a..30aa35e137 100644--- a/tests/test-chat.cpp+++ b/tests/test-chat.cpp@@ -5022,14 +5022,14 @@ static void test_template_output_peg_parsers(bool detailed_debug) {tst.test("Hello, world!\nWhat's up?").tools({ special_function_tool }).expect(message_assist).expect_reconstruction().run();tst.test(- "```json\n\"42\" \n```")+ "```json\n\"42\"\n```").reasoning_format(COMMON_REASONING_FORMAT_AUTO).json_schema(const_schema).expect_content(R"("42")").run();tst.test(- "\"42\" \n")+ "\"42\"\n").reasoning_format(COMMON_REASONING_FORMAT_AUTO).json_schema(const_schema).expect_content(R"("42")")diff --git a/tests/test-json-schema-to-grammar.cpp b/tests/test-json-schema-to-grammar.cppindex b4362852c3..f095274cd1 100755--- a/tests/test-json-schema-to-grammar.cpp+++ b/tests/test-json-schema-to-grammar.cpp@@ -92,7 +92,7 @@ static void test_all(const std::string & lang, std::function<void(const TestCase"minimum": 0})""",R"""(- root ::= ([0] | [1-9] [0-9]{0,15}) space+ root ::= ([0] | [1-9] [0-9]{0,15})space ::= | " " | "\n"{1,2} [ \t]{0,20})"""});@@ -105,7 +105,7 @@ static void test_all(const std::string & lang, std::function<void(const TestCase"minimum": 1})""",R"""(- root ::= ([1-9] [0-9]{0,15}) space+ root ::= ([1-9] [0-9]{0,15})space ::= | " " | "\n"{1,2} [ \t]{0,20})"""});@@ -118,7 +118,7 @@ static void test_all(const std::string & lang, std::function<void(const TestCase"minimum": 3})""",R"""(- root ::= ([1-2] [0-9]{1,15} | [3-9] [0-9]{0,15}) space+ root ::= ([1-2] [0-9]{1,15} | [3-9] [0-9]{0,15})space ::= | " " | "\n"{1,2} [ \t]{0,20})"""});@@ -131,7 +131,7 @@ static void test_all(const std::string & lang, std::function<void(const TestCase"minimum": 9})""",R"""(- root ::= ([1-8] [0-9]{1,15} | [9] [0-9]{0,15}) space+ root ::= ([1-8] [0-9]{1,15} | [9] [0-9]{0,15})space ::= | " " | "\n"{1,2} [ \t]{0,20})"""});@@ -144,7 +144,7 @@ static void test_all(const std::string & lang, std::function<void(const TestCase"minimum": 10})""",R"""(- root ::= ([1] ([0-9]{1,15}) | [2-9] [0-9]{1,15}) space+ root ::= ([1] ([0-9]{1,15}) | [2-9] [0-9]{1,15})space ::= | " " | "\n"{1,2} [ \t]{0,20})"""});@@ -157,7 +157,7 @@ static void test_all(const std::string & lang, std::function<void(const TestCase"minimum": 25})""",R"""(- root ::= ([1] [0-9]{2,15} | [2] ([0-4] [0-9]{1,14} | [5-9] [0-9]{0,14}) | [3-9] [0-9]{1,15}) space+ root ::= ([1] [0-9]{2,15} | [2] ([0-4] [0-9]{1,14} | [5-9] [0-9]{0,14}) | [3-9] [0-9]{1,15})space ::= | " " | "\n"{1,2} [ \t]{0,20})"""});@@ -170,7 +170,7 @@ static void test_all(const std::string & lang, std::function<void(const TestCase"maximum": 30})""",R"""(- root ::= ("-" [1-9] [0-9]{0,15} | [0-9] | ([1-2] [0-9] | [3] "0")) space+ root ::= ("-" [1-9] [0-9]{0,15} | [0-9] | ([1-2] [0-9] | [3] "0"))space ::= | " " | "\n"{1,2} [ \t]{0,20})"""});@@ -183,7 +183,7 @@ static void test_all(const std::string & lang, std::function<void(const TestCase"minimum": -5})""",R"""(- root ::= ("-" ([0-5]) | [0] | [1-9] [0-9]{0,15}) space+ root ::= ("-" ([0-5]) | [0] | [1-9] [0-9]{0,15})space ::= | " " | "\n"{1,2} [ \t]{0,20})"""});@@ -196,7 +196,7 @@ static void test_all(const std::string & lang, std::function<void(const TestCase"minimum": -123})""",R"""(- root ::= ("-" ([0-9] | ([1-8] [0-9] | [9] [0-9]) | "1" ([0-1] [0-9] | [2] [0-3])) | [0] | [1-9] [0-9]{0,15}) space+ root ::= ("-" ([0-9] | ([1-8] [0-9] | [9] [0-9]) | "1" ([0-1] [0-9] | [2] [0-3])) | [0] | [1-9] [0-9]{0,15})space ::= | " " | "\n"{1,2} [ \t]{0,20})"""});@@ -209,7 +209,7 @@ static void test_all(const std::string & lang, std::function<void(const TestCase"maximum": -5})""",R"""(- root ::= ("-" ([0-4] [0-9]{1,15} | [5-9] [0-9]{0,15})) space+ root ::= ("-" ([0-4] [0-9]{1,15} | [5-9] [0-9]{0,15}))space ::= | " " | "\n"{1,2} [ \t]{0,20})"""});@@ -222,7 +222,7 @@ static void test_all(const std::string & lang, std::function<void(const TestCase"maximum": 1})""",R"""(- root ::= ("-" [1-9] [0-9]{0,15} | [0-1]) space+ root ::= ("-" [1-9] [0-9]{0,15} | [0-1])space ::= | " " | "\n"{1,2} [ \t]{0,20})"""});@@ -235,7 +235,7 @@ static void test_all(const std::string & lang, std::function<void(const TestCase"maximum": 100})""",R"""(- root ::= ("-" [1-9] [0-9]{0,15} | [0-9] | ([1-8] [0-9] | [9] [0-9]) | "100") space+ root ::= ("-" [1-9] [0-9]{0,15} | [0-9] | ([1-8] [0-9] | [9] [0-9]) | "100")space ::= | " " | "\n"{1,2} [ \t]{0,20})"""});@@ -249,7 +249,7 @@ static void test_all(const std::string & lang, std::function<void(const TestCase"maximum": 23})""",R"""(- root ::= ([0-9] | ([1] [0-9] | [2] [0-3])) space+ root ::= ([0-9] | ([1] [0-9] | [2] [0-3]))space ::= | " " | "\n"{1,2} [ \t]{0,20})"""});@@ -263,7 +263,7 @@ static void test_all(const std::string & lang, std::function<void(const TestCase"maximum": 300})""",R"""(- root ::= (([1] ([5-9]) | [2-9] [0-9]) | ([1-2] [0-9]{2} | [3] "00")) space+ root ::= (([1] ([5-9]) | [2-9] [0-9]) | ([1-2] [0-9]{2} | [3] "00"))space ::= | " " | "\n"{1,2} [ \t]{0,20})"""});@@ -277,7 +277,7 @@ static void test_all(const std::string & lang, std::function<void(const TestCase"maximum": 30})""",R"""(- root ::= ([5-9] | ([1-2] [0-9] | [3] "0")) space+ root ::= ([5-9] | ([1-2] [0-9] | [3] "0"))space ::= | " " | "\n"{1,2} [ \t]{0,20})"""});@@ -291,7 +291,7 @@ static void test_all(const std::string & lang, std::function<void(const TestCase"maximum": 42})""",R"""(- root ::= ("-" ([0-9] | ([1-8] [0-9] | [9] [0-9]) | "1" ([0-1] [0-9] | [2] [0-3])) | [0-9] | ([1-3] [0-9] | [4] [0-2])) space+ root ::= ("-" ([0-9] | ([1-8] [0-9] | [9] [0-9]) | "1" ([0-1] [0-9] | [2] [0-3])) | [0-9] | ([1-3] [0-9] | [4] [0-2]))space ::= | " " | "\n"{1,2} [ \t]{0,20})"""});@@ -305,7 +305,7 @@ static void test_all(const std::string & lang, std::function<void(const TestCase"maximum": 10})""",R"""(- root ::= ("-" ([0-9] | "10") | [0-9] | "10") space+ root ::= ("-" ([0-9] | "10") | [0-9] | "10")space ::= | " " | "\n"{1,2} [ \t]{0,20})"""});@@ -333,17 +333,17 @@ static void test_all(const std::string & lang, std::function<void(const TestCase"empty schema (object)","{}",R"""(- array ::= "[" space ( value ("," space value)* )? "]" space- boolean ::= ("true" | "false") space+ array ::= "[" space ( value ("," space value)* )? space "]"+ boolean ::= ("true" | "false")char ::= [^"\\\x7F\x00-\x1F] | [\\] (["\\bfnrt] | "u" [0-9a-fA-F]{4})decimal-part ::= [0-9]{1,16}integral-part ::= [0] | [1-9] [0-9]{0,15}- null ::= "null" space- number ::= ("-"? integral-part) ("." decimal-part)? ([eE] [-+]? integral-part)? space- object ::= "{" space ( string ":" space value ("," space string ":" space value)* )? "}" space+ null ::= "null"+ number ::= ("-"? integral-part) ("." decimal-part)? ([eE] [-+]? integral-part)?+ object ::= "{" space ( string ":" space value ("," space string ":" space value)* )? space "}"root ::= objectspace ::= | " " | "\n"{1,2} [ \t]{0,20}- string ::= "\"" char* "\"" space+ string ::= "\"" char* "\""value ::= object | array | string | number | boolean | null)"""});@@ -361,17 +361,17 @@ static void test_all(const std::string & lang, std::function<void(const TestCase})""",R"""(date ::= [0-9]{4} "-" ( "0" [1-9] | "1" [0-2] ) "-" ( "0" [1-9] | [1-2] [0-9] | "3" [0-1] )- date-string ::= "\"" date "\"" space+ date-string ::= "\"" date "\""date-time ::= date "T" time- date-time-string ::= "\"" date-time "\"" space- root ::= "[" space tuple-0 "," space uuid "," space tuple-2 "," space tuple-3 "]" space+ date-time-string ::= "\"" date-time "\""+ root ::= "[" space tuple-0 "," space uuid "," space tuple-2 "," space tuple-3 space "]"space ::= | " " | "\n"{1,2} [ \t]{0,20}time ::= ([01] [0-9] | "2" [0-3]) ":" [0-5] [0-9] ":" [0-5] [0-9] ( "." [0-9]{3} )? ( "Z" | ( "+" | "-" ) ( [01] [0-9] | "2" [0-3] ) ":" [0-5] [0-9] )- time-string ::= "\"" time "\"" space+ time-string ::= "\"" time "\""tuple-0 ::= date-stringtuple-2 ::= time-stringtuple-3 ::= date-time-string- uuid ::= "\"" [0-9a-fA-F]{8} "-" [0-9a-fA-F]{4} "-" [0-9a-fA-F]{4} "-" [0-9a-fA-F]{4} "-" [0-9a-fA-F]{12} "\"" space+ uuid ::= "\"" [0-9a-fA-F]{8} "-" [0-9a-fA-F]{4} "-" [0-9a-fA-F]{4} "-" [0-9a-fA-F]{4} "-" [0-9a-fA-F]{12} "\"")"""});@@ -383,7 +383,7 @@ static void test_all(const std::string & lang, std::function<void(const TestCase})""",R"""(char ::= [^"\\\x7F\x00-\x1F] | [\\] (["\\bfnrt] | "u" [0-9a-fA-F]{4})- root ::= "\"" char* "\"" space+ root ::= "\"" char* "\""space ::= | " " | "\n"{1,2} [ \t]{0,20})"""});@@ -397,7 +397,7 @@ static void test_all(const std::string & lang, std::function<void(const TestCase})""",R"""(char ::= [^"\\\x7F\x00-\x1F] | [\\] (["\\bfnrt] | "u" [0-9a-fA-F]{4})- root ::= "\"" char+ "\"" space+ root ::= "\"" char+ "\""space ::= | " " | "\n"{1,2} [ \t]{0,20})"""});@@ -411,7 +411,7 @@ static void test_all(const std::string & lang, std::function<void(const TestCase})""",R"""(char ::= [^"\\\x7F\x00-\x1F] | [\\] (["\\bfnrt] | "u" [0-9a-fA-F]{4})- root ::= "\"" char{3,} "\"" space+ root ::= "\"" char{3,} "\""space ::= | " " | "\n"{1,2} [ \t]{0,20})"""});@@ -425,7 +425,7 @@ static void test_all(const std::string & lang, std::function<void(const TestCase})""",R"""(char ::= [^"\\\x7F\x00-\x1F] | [\\] (["\\bfnrt] | "u" [0-9a-fA-F]{4})- root ::= "\"" char{0,3} "\"" space+ root ::= "\"" char{0,3} "\""space ::= | " " | "\n"{1,2} [ \t]{0,20})"""});@@ -440,7 +440,7 @@ static void test_all(const std::string & lang, std::function<void(const TestCase})""",R"""(char ::= [^"\\\x7F\x00-\x1F] | [\\] (["\\bfnrt] | "u" [0-9a-fA-F]{4})- root ::= "\"" char{1,4} "\"" space+ root ::= "\"" char{1,4} "\""space ::= | " " | "\n"{1,2} [ \t]{0,20})"""});@@ -452,7 +452,7 @@ static void test_all(const std::string & lang, std::function<void(const TestCase"type": "boolean"})""",R"""(- root ::= ("true" | "false") space+ root ::= ("true" | "false")space ::= | " " | "\n"{1,2} [ \t]{0,20})"""});@@ -465,7 +465,7 @@ static void test_all(const std::string & lang, std::function<void(const TestCase})""",R"""(integral-part ::= [0] | [1-9] [0-9]{0,15}- root ::= ("-"? integral-part) space+ root ::= ("-"? integral-part)space ::= | " " | "\n"{1,2} [ \t]{0,20})"""});@@ -477,7 +477,7 @@ static void test_all(const std::string & lang, std::function<void(const TestCase"const": "foo"})""",R"""(- root ::= "\"foo\"" space+ root ::= "\"foo\""space ::= | " " | "\n"{1,2} [ \t]{0,20})"""});@@ -489,7 +489,7 @@ static void test_all(const std::string & lang, std::function<void(const TestCase"const": 123})""",R"""(- root ::= "123" space+ root ::= "123"space ::= | " " | "\n"{1,2} [ \t]{0,20})"""});@@ -501,7 +501,7 @@ static void test_all(const std::string & lang, std::function<void(const TestCase"enum": ["red", "amber", "green", null, 42, ["foo"]]})""",R"""(- root ::= ("\"red\"" | "\"amber\"" | "\"green\"" | "null" | "42" | "[\"foo\"]") space+ root ::= ("\"red\"" | "\"amber\"" | "\"green\"" | "null" | "42" | "[\"foo\"]")space ::= | " " | "\n"{1,2} [ \t]{0,20})"""});@@ -515,9 +515,9 @@ static void test_all(const std::string & lang, std::function<void(const TestCase})""",R"""(char ::= [^"\\\x7F\x00-\x1F] | [\\] (["\\bfnrt] | "u" [0-9a-fA-F]{4})- root ::= "[" space (string ("," space string)*)? "]" space+ root ::= "[" space (string ("," space string)*)? space "]"space ::= | " " | "\n"{1,2} [ \t]{0,20}- string ::= "\"" char* "\"" space+ string ::= "\"" char* "\"")"""});@@ -529,12 +529,12 @@ static void test_all(const std::string & lang, std::function<void(const TestCase"prefixItems": { "type": "string" }})""",R"""(- alternative-0 ::= "[" space (string ("," space string)*)? "]" space+ alternative-0 ::= "[" space (string ("," space string)*)? space "]"char ::= [^"\\\x7F\x00-\x1F] | [\\] (["\\bfnrt] | "u" [0-9a-fA-F]{4})- null ::= "null" space+ null ::= "null"root ::= alternative-0 | nullspace ::= | " " | "\n"{1,2} [ \t]{0,20}- string ::= "\"" char* "\"" space+ string ::= "\"" char* "\"")"""});@@ -546,9 +546,9 @@ static void test_all(const std::string & lang, std::function<void(const TestCase})""",R"""(char ::= [^"\\\x7F\x00-\x1F] | [\\] (["\\bfnrt] | "u" [0-9a-fA-F]{4})- root ::= "[" space string "]" space+ root ::= "[" space string space "]"space ::= | " " | "\n"{1,2} [ \t]{0,20}- string ::= "\"" char* "\"" space+ string ::= "\"" char* "\"")"""});@@ -562,10 +562,10 @@ static void test_all(const std::string & lang, std::function<void(const TestCasechar ::= [^"\\\x7F\x00-\x1F] | [\\] (["\\bfnrt] | "u" [0-9a-fA-F]{4})decimal-part ::= [0-9]{1,16}integral-part ::= [0] | [1-9] [0-9]{0,15}- number ::= ("-"? integral-part) ("." decimal-part)? ([eE] [-+]? integral-part)? space- root ::= "[" space string "," space number "]" space+ number ::= ("-"? integral-part) ("." decimal-part)? ([eE] [-+]? integral-part)?+ root ::= "[" space string "," space number space "]"space ::= | " " | "\n"{1,2} [ \t]{0,20}- string ::= "\"" char* "\"" space+ string ::= "\"" char* "\"")"""});@@ -577,18 +577,18 @@ static void test_all(const std::string & lang, std::function<void(const TestCase"items": {}})""",R"""(- array ::= "[" space ( value ("," space value)* )? "]" space- boolean ::= ("true" | "false") space+ array ::= "[" space ( value ("," space value)* )? space "]"+ boolean ::= ("true" | "false")char ::= [^"\\\x7F\x00-\x1F] | [\\] (["\\bfnrt] | "u" [0-9a-fA-F]{4})decimal-part ::= [0-9]{1,16}integral-part ::= [0] | [1-9] [0-9]{0,15}item ::= object- null ::= "null" space- number ::= ("-"? integral-part) ("." decimal-part)? ([eE] [-+]? integral-part)? space- object ::= "{" space ( string ":" space value ("," space string ":" space value)* )? "}" space- root ::= "[" space (item ("," space item)*)? "]" space+ null ::= "null"+ number ::= ("-"? integral-part) ("." decimal-part)? ([eE] [-+]? integral-part)?+ object ::= "{" space ( string ":" space value ("," space string ":" space value)* )? space "}"+ root ::= "[" space (item ("," space item)*)? space "]"space ::= | " " | "\n"{1,2} [ \t]{0,20}- string ::= "\"" char* "\"" space+ string ::= "\"" char* "\""value ::= object | array | string | number | boolean | null)"""});@@ -602,18 +602,18 @@ static void test_all(const std::string & lang, std::function<void(const TestCase"prefixItems": { "type": "string" }})""",R"""(- array ::= "[" space ( value ("," space value)* )? "]" space- boolean ::= ("true" | "false") space+ array ::= "[" space ( value ("," space value)* )? space "]"+ boolean ::= ("true" | "false")char ::= [^"\\\x7F\x00-\x1F] | [\\] (["\\bfnrt] | "u" [0-9a-fA-F]{4})decimal-part ::= [0-9]{1,16}integral-part ::= [0] | [1-9] [0-9]{0,15}item ::= object- null ::= "null" space- number ::= ("-"? integral-part) ("." decimal-part)? ([eE] [-+]? integral-part)? space- object ::= "{" space ( string ":" space value ("," space string ":" space value)* )? "}" space- root ::= "[" space (item ("," space item)*)? "]" space+ null ::= "null"+ number ::= ("-"? integral-part) ("." decimal-part)? ([eE] [-+]? integral-part)?+ object ::= "{" space ( string ":" space value ("," space string ":" space value)* )? space "}"+ root ::= "[" space (item ("," space item)*)? space "]"space ::= | " " | "\n"{1,2} [ \t]{0,20}- string ::= "\"" char* "\"" space+ string ::= "\"" char* "\""value ::= object | array | string | number | boolean | null)"""});@@ -627,7 +627,7 @@ static void test_all(const std::string & lang, std::function<void(const TestCaseR"""(decimal-part ::= [0-9]{1,16}integral-part ::= [0] | [1-9] [0-9]{0,15}- root ::= ("-"? integral-part) ("." decimal-part)? ([eE] [-+]? integral-part)? space+ root ::= ("-"? integral-part) ("." decimal-part)? ([eE] [-+]? integral-part)?space ::= | " " | "\n"{1,2} [ \t]{0,20})"""});@@ -642,8 +642,8 @@ static void test_all(const std::string & lang, std::function<void(const TestCase"minItems": 2})""",R"""(- boolean ::= ("true" | "false") space- root ::= "[" space boolean ("," space boolean)+ "]" space+ boolean ::= ("true" | "false")+ root ::= "[" space boolean ("," space boolean)+ space "]"space ::= | " " | "\n"{1,2} [ \t]{0,20})"""});@@ -658,8 +658,8 @@ static void test_all(const std::string & lang, std::function<void(const TestCase"maxItems": 0})""",R"""(- boolean ::= ("true" | "false") space- root ::= "[" space "]" space+ boolean ::= ("true" | "false")+ root ::= "[" space space "]"space ::= | " " | "\n"{1,2} [ \t]{0,20})"""});@@ -674,8 +674,8 @@ static void test_all(const std::string & lang, std::function<void(const TestCase"maxItems": 1})""",R"""(- boolean ::= ("true" | "false") space- root ::= "[" space boolean? "]" space+ boolean ::= ("true" | "false")+ root ::= "[" space boolean? space "]"space ::= | " " | "\n"{1,2} [ \t]{0,20})"""});@@ -690,8 +690,8 @@ static void test_all(const std::string & lang, std::function<void(const TestCase"maxItems": 2})""",R"""(- boolean ::= ("true" | "false") space- root ::= "[" space (boolean ("," space boolean)?)? "]" space+ boolean ::= ("true" | "false")+ root ::= "[" space (boolean ("," space boolean)?)? space "]"space ::= | " " | "\n"{1,2} [ \t]{0,20})"""});@@ -708,11 +708,11 @@ static void test_all(const std::string & lang, std::function<void(const TestCase})""",R"""(decimal-part ::= [0-9]{1,16}- integer ::= ("-"? integral-part) space+ integer ::= ("-"? integral-part)integral-part ::= [0] | [1-9] [0-9]{0,15}item ::= number | integer- number ::= ("-"? integral-part) ("." decimal-part)? ([eE] [-+]? integral-part)? space- root ::= "[" space item ("," space item){2,4} "]" space+ number ::= ("-"? integral-part) ("." decimal-part)? ([eE] [-+]? integral-part)?+ root ::= "[" space item ("," space item){2,4} space "]"space ::= | " " | "\n"{1,2} [ \t]{0,20})"""});@@ -730,8 +730,8 @@ static void test_all(const std::string & lang, std::function<void(const TestCase"maxItems": 5})""",R"""(- item ::= ("-" ([0-9] | "1" [0-2]) | [0-9] | ([1-8] [0-9] | [9] [0-9]) | ([1] [0-9]{2} | [2] "0" [0-7])) space- root ::= "[" space item ("," space item){2,4} "]" space+ item ::= ("-" ([0-9] | "1" [0-2]) | [0-9] | ([1-8] [0-9] | [9] [0-9]) | ([1] [0-9]{2} | [2] "0" [0-7]))+ root ::= "[" space item ("," space item){2,4} space "]"space ::= | " " | "\n"{1,2} [ \t]{0,20})"""});@@ -749,8 +749,8 @@ static void test_all(const std::string & lang, std::function<void(const TestCase"maxItems": 5})""",R"""(- item ::= (([1] ([2-9]) | [2-9] [0-9]) | ([1] [0-9]{2} | [2] "0" [0-7])) space- root ::= "[" space item ("," space item){2,4} "]" space+ item ::= (([1] ([2-9]) | [2-9] [0-9]) | ([1] [0-9]{2} | [2] "0" [0-7]))+ root ::= "[" space item ("," space item){2,4} space "]"space ::= | " " | "\n"{1,2} [ \t]{0,20})"""});@@ -763,7 +763,7 @@ static void test_all(const std::string & lang, std::function<void(const TestCase"pattern": "^abc?d*efg+(hij)?kl$"})""",R"""(- root ::= "\"" ("ab" "c"? "d"* "ef" "g"+ ("hij")? "kl") "\"" space+ root ::= "\"" ("ab" "c"? "d"* "ef" "g"+ ("hij")? "kl") "\""space ::= | " " | "\n"{1,2} [ \t]{0,20})"""});@@ -776,7 +776,7 @@ static void test_all(const std::string & lang, std::function<void(const TestCase"pattern": "^\\[\\]\\{\\}\\(\\)\\|\\+\\*\\?$"})""",R"""(- root ::= "\"" ("[]{}()|+*?") "\"" space+ root ::= "\"" ("[]{}()|+*?") "\""space ::= | " " | "\n"{1,2} [ \t]{0,20})"""});@@ -789,7 +789,7 @@ static void test_all(const std::string & lang, std::function<void(const TestCase"pattern": "^\"$"})""",R"""(- root ::= "\"" ("\"") "\"" space+ root ::= "\"" ("\"") "\""space ::= | " " | "\n"{1,2} [ \t]{0,20})"""});@@ -802,7 +802,7 @@ static void test_all(const std::string & lang, std::function<void(const TestCase"pattern": "^A|B|C|D$"})""",R"""(- root ::= "\"" ("A" | "B" | "C" | "D") "\"" space+ root ::= "\"" ("A" | "B" | "C" | "D") "\""space ::= | " " | "\n"{1,2} [ \t]{0,20})"""});@@ -816,7 +816,7 @@ static void test_all(const std::string & lang, std::function<void(const TestCase})""",R"""(dot ::= [^\x0A\x0D]- root ::= "\"" (("(" root-1{1,3} ")")? root-1{3,3} "-" root-1{4,4} " " "a"{3,5} "nd" dot dot dot) "\"" space+ root ::= "\"" (("(" root-1{1,3} ")")? root-1{3,3} "-" root-1{4,4} " " "a"{3,5} "nd" dot dot dot) "\""root-1 ::= [0-9]space ::= | " " | "\n"{1,2} [ \t]{0,20})"""@@ -845,9 +845,9 @@ static void test_all(const std::string & lang, std::function<void(const TestCaseb-kv ::= "\"b\"" space ":" space stringc-kv ::= "\"c\"" space ":" space stringchar ::= [^"\\\x7F\x00-\x1F] | [\\] (["\\bfnrt] | "u" [0-9a-fA-F]{4})- root ::= "{" space b-kv "," space c-kv "," space a-kv "}" space+ root ::= "{" space b-kv "," space c-kv "," space a-kv space "}"space ::= | " " | "\n"{1,2} [ \t]{0,20}- string ::= "\"" char* "\"" space+ string ::= "\"" char* "\"")"""});@@ -865,9 +865,9 @@ static void test_all(const std::string & lang, std::function<void(const TestCaseR"""(a-kv ::= "\"a\"" space ":" space stringchar ::= [^"\\\x7F\x00-\x1F] | [\\] (["\\bfnrt] | "u" [0-9a-fA-F]{4})- root ::= "{" space (a-kv )? "}" space+ root ::= "{" space (a-kv )? space "}"space ::= | " " | "\n"{1,2} [ \t]{0,20}- string ::= "\"" char* "\"" space+ string ::= "\"" char* "\"")"""});@@ -889,9 +889,9 @@ static void test_all(const std::string & lang, std::function<void(const TestCaseb-rest ::= ( "," space c-kv )?c-kv ::= "\"c\"" space ":" space stringchar ::= [^"\\\x7F\x00-\x1F] | [\\] (["\\bfnrt] | "u" [0-9a-fA-F]{4})- root ::= "{" space (a-kv a-rest | b-kv b-rest | c-kv )? "}" space+ root ::= "{" space (a-kv a-rest | b-kv b-rest | c-kv )? space "}"space ::= | " " | "\n"{1,2} [ \t]{0,20}- string ::= "\"" char* "\"" space+ string ::= "\"" char* "\"")"""});@@ -915,9 +915,9 @@ static void test_all(const std::string & lang, std::function<void(const TestCasechar ::= [^"\\\x7F\x00-\x1F] | [\\] (["\\bfnrt] | "u" [0-9a-fA-F]{4})d-kv ::= "\"d\"" space ":" space stringd-rest ::= ( "," space c-kv )?- root ::= "{" space b-kv "," space a-kv ( "," space ( d-kv d-rest | c-kv ) )? "}" space+ root ::= "{" space b-kv "," space a-kv ( "," space ( d-kv d-rest | c-kv ) )? space "}"space ::= | " " | "\n"{1,2} [ \t]{0,20}- string ::= "\"" char* "\"" space+ string ::= "\"" char* "\"")"""});@@ -930,14 +930,14 @@ static void test_all(const std::string & lang, std::function<void(const TestCase})""",R"""(additional-kv ::= string ":" space additional-value- additional-value ::= "[" space (number ("," space number)*)? "]" space+ additional-value ::= "[" space (number ("," space number)*)? space "]"char ::= [^"\\\x7F\x00-\x1F] | [\\] (["\\bfnrt] | "u" [0-9a-fA-F]{4})decimal-part ::= [0-9]{1,16}integral-part ::= [0] | [1-9] [0-9]{0,15}- number ::= ("-"? integral-part) ("." decimal-part)? ([eE] [-+]? integral-part)? space- root ::= "{" space (additional-kv ( "," space additional-kv )* )? "}" space+ number ::= ("-"? integral-part) ("." decimal-part)? ([eE] [-+]? integral-part)?+ root ::= "{" space (additional-kv ( "," space additional-kv )* )? space "}"space ::= | " " | "\n"{1,2} [ \t]{0,20}- string ::= "\"" char* "\"" space+ string ::= "\"" char* "\"")"""});@@ -949,17 +949,17 @@ static void test_all(const std::string & lang, std::function<void(const TestCase"additionalProperties": true})""",R"""(- array ::= "[" space ( value ("," space value)* )? "]" space- boolean ::= ("true" | "false") space+ array ::= "[" space ( value ("," space value)* )? space "]"+ boolean ::= ("true" | "false")char ::= [^"\\\x7F\x00-\x1F] | [\\] (["\\bfnrt] | "u" [0-9a-fA-F]{4})decimal-part ::= [0-9]{1,16}integral-part ::= [0] | [1-9] [0-9]{0,15}- null ::= "null" space- number ::= ("-"? integral-part) ("." decimal-part)? ([eE] [-+]? integral-part)? space- object ::= "{" space ( string ":" space value ("," space string ":" space value)* )? "}" space+ null ::= "null"+ number ::= ("-"? integral-part) ("." decimal-part)? ([eE] [-+]? integral-part)?+ object ::= "{" space ( string ":" space value ("," space string ":" space value)* )? space "}"root ::= objectspace ::= | " " | "\n"{1,2} [ \t]{0,20}- string ::= "\"" char* "\"" space+ string ::= "\"" char* "\""value ::= object | array | string | number | boolean | null)"""});@@ -971,17 +971,17 @@ static void test_all(const std::string & lang, std::function<void(const TestCase"type": "object"})""",R"""(- array ::= "[" space ( value ("," space value)* )? "]" space- boolean ::= ("true" | "false") space+ array ::= "[" space ( value ("," space value)* )? space "]"+ boolean ::= ("true" | "false")char ::= [^"\\\x7F\x00-\x1F] | [\\] (["\\bfnrt] | "u" [0-9a-fA-F]{4})decimal-part ::= [0-9]{1,16}integral-part ::= [0] | [1-9] [0-9]{0,15}- null ::= "null" space- number ::= ("-"? integral-part) ("." decimal-part)? ([eE] [-+]? integral-part)? space- object ::= "{" space ( string ":" space value ("," space string ":" space value)* )? "}" space+ null ::= "null"+ number ::= ("-"? integral-part) ("." decimal-part)? ([eE] [-+]? integral-part)?+ object ::= "{" space ( string ":" space value ("," space string ":" space value)* )? space "}"root ::= objectspace ::= | " " | "\n"{1,2} [ \t]{0,20}- string ::= "\"" char* "\"" space+ string ::= "\"" char* "\""value ::= object | array | string | number | boolean | null)"""});@@ -994,7 +994,7 @@ static void test_all(const std::string & lang, std::function<void(const TestCase"additionalProperties": false})""",R"""(- root ::= "{" space "}" space+ root ::= "{" space space "}"space ::= | " " | "\n"{1,2} [ \t]{0,20})"""});@@ -1012,15 +1012,15 @@ static void test_all(const std::string & lang, std::function<void(const TestCase})""",R"""(a-kv ::= "\"a\"" space ":" space number- additional-k ::= ["] ( [a] char+ | [^"a] char* )? ["] space+ additional-k ::= ["] ( [a] char+ | [^"a] char* )? ["]additional-kv ::= additional-k ":" space stringchar ::= [^"\\\x7F\x00-\x1F] | [\\] (["\\bfnrt] | "u" [0-9a-fA-F]{4})decimal-part ::= [0-9]{1,16}integral-part ::= [0] | [1-9] [0-9]{0,15}- number ::= ("-"? integral-part) ("." decimal-part)? ([eE] [-+]? integral-part)? space- root ::= "{" space a-kv ( "," space ( additional-kv ( "," space additional-kv )* ) )? "}" space+ number ::= ("-"? integral-part) ("." decimal-part)? ([eE] [-+]? integral-part)?+ root ::= "{" space a-kv ( "," space ( additional-kv ( "," space additional-kv )* ) )? space "}"space ::= | " " | "\n"{1,2} [ \t]{0,20}- string ::= "\"" char* "\"" space+ string ::= "\"" char* "\"")"""});@@ -1037,13 +1037,13 @@ static void test_all(const std::string & lang, std::function<void(const TestCaseR"""(a-kv ::= "\"a\"" space ":" space numbera-rest ::= ( "," space additional-kv )*- additional-k ::= ["] ( [a] char+ | [^"a] char* )? ["] space+ additional-k ::= ["] ( [a] char+ | [^"a] char* )? ["]additional-kv ::= additional-k ":" space numberchar ::= [^"\\\x7F\x00-\x1F] | [\\] (["\\bfnrt] | "u" [0-9a-fA-F]{4})decimal-part ::= [0-9]{1,16}integral-part ::= [0] | [1-9] [0-9]{0,15}- number ::= ("-"? integral-part) ("." decimal-part)? ([eE] [-+]? integral-part)? space- root ::= "{" space (a-kv a-rest | additional-kv ( "," space additional-kv )* )? "}" space+ number ::= ("-"? integral-part) ("." decimal-part)? ([eE] [-+]? integral-part)?+ root ::= "{" space (a-kv a-rest | additional-kv ( "," space additional-kv )* )? space "}"space ::= | " " | "\n"{1,2} [ \t]{0,20})"""});@@ -1061,7 +1061,7 @@ static void test_all(const std::string & lang, std::function<void(const TestCase"additionalProperties": {"type": "number"}})""",R"""(- additional-k ::= ["] ( [a] ([l] ([s] ([o] char+ | [^"o] char*) | [^"s] char*) | [n] ([d] char+ | [^"d] char*) | [^"ln] char*) | [^"a] char* )? ["] space+ additional-k ::= ["] ( [a] ([l] ([s] ([o] char+ | [^"o] char*) | [^"s] char*) | [n] ([d] char+ | [^"d] char*) | [^"ln] char*) | [^"a] char* )? ["]additional-kv ::= additional-k ":" space numberalso-kv ::= "\"also\"" space ":" space numberalso-rest ::= ( "," space additional-kv )*@@ -1069,8 +1069,8 @@ static void test_all(const std::string & lang, std::function<void(const TestCasechar ::= [^"\\\x7F\x00-\x1F] | [\\] (["\\bfnrt] | "u" [0-9a-fA-F]{4})decimal-part ::= [0-9]{1,16}integral-part ::= [0] | [1-9] [0-9]{0,15}- number ::= ("-"? integral-part) ("." decimal-part)? ([eE] [-+]? integral-part)? space- root ::= "{" space and-kv ( "," space ( also-kv also-rest | additional-kv ( "," space additional-kv )* ) )? "}" space+ number ::= ("-"? integral-part) ("." decimal-part)? ([eE] [-+]? integral-part)?+ root ::= "{" space and-kv ( "," space ( also-kv also-rest | additional-kv ( "," space additional-kv )* ) )? space "}"space ::= | " " | "\n"{1,2} [ \t]{0,20})"""});@@ -1090,13 +1090,13 @@ static void test_all(const std::string & lang, std::function<void(const TestCase-rest ::= ( "," space a-kv )? a-resta-kv ::= "\"a\"" space ":" space integera-rest ::= ( "," space additional-kv )*- additional-k ::= ["] ( [a] char+ | [^"a] char* ) ["] space+ additional-k ::= ["] ( [a] char+ | [^"a] char* ) ["]additional-kv ::= additional-k ":" space integerchar ::= [^"\\\x7F\x00-\x1F] | [\\] (["\\bfnrt] | "u" [0-9a-fA-F]{4})- integer ::= ("-"? integral-part) space+ integer ::= ("-"? integral-part)integral-part ::= [0] | [1-9] [0-9]{0,15}- root ::= ("-"? integral-part) space- root0 ::= "{" space (-kv -rest | a-kv a-rest | additional-kv ( "," space additional-kv )* )? "}" space+ root ::= ("-"? integral-part)+ root0 ::= "{" space (-kv -rest | a-kv a-rest | additional-kv ( "," space additional-kv )* )? space "}"space ::= | " " | "\n"{1,2} [ \t]{0,20})"""});@@ -1116,12 +1116,12 @@ static void test_all(const std::string & lang, std::function<void(const TestCasea-rest ::= ( "," space aa-kv )? aa-restaa-kv ::= "\"aa\"" space ":" space integeraa-rest ::= ( "," space additional-kv )*- additional-k ::= ["] ( [a] ([a] char+ | [^"a] char*) | [^"a] char* )? ["] space+ additional-k ::= ["] ( [a] ([a] char+ | [^"a] char*) | [^"a] char* )? ["]additional-kv ::= additional-k ":" space integerchar ::= [^"\\\x7F\x00-\x1F] | [\\] (["\\bfnrt] | "u" [0-9a-fA-F]{4})- integer ::= ("-"? integral-part) space+ integer ::= ("-"? integral-part)integral-part ::= [0] | [1-9] [0-9]{0,15}- root ::= "{" space (a-kv a-rest | aa-kv aa-rest | additional-kv ( "," space additional-kv )* )? "}" space+ root ::= "{" space (a-kv a-rest | aa-kv aa-rest | additional-kv ( "," space additional-kv )* )? space "}"space ::= | " " | "\n"{1,2} [ \t]{0,20})"""});@@ -1141,12 +1141,12 @@ static void test_all(const std::string & lang, std::function<void(const TestCaseab-rest ::= ( "," space ac-kv )? ac-restac-kv ::= "\"ac\"" space ":" space integerac-rest ::= ( "," space additional-kv )*- additional-k ::= ["] ( [a] ([b] char+ | [c] char+ | [^"bc] char*) | [^"a] char* )? ["] space+ additional-k ::= ["] ( [a] ([b] char+ | [c] char+ | [^"bc] char*) | [^"a] char* )? ["]additional-kv ::= additional-k ":" space integerchar ::= [^"\\\x7F\x00-\x1F] | [\\] (["\\bfnrt] | "u" [0-9a-fA-F]{4})- integer ::= ("-"? integral-part) space+ integer ::= ("-"? integral-part)integral-part ::= [0] | [1-9] [0-9]{0,15}- root ::= "{" space (ab-kv ab-rest | ac-kv ac-rest | additional-kv ( "," space additional-kv )* )? "}" space+ root ::= "{" space (ab-kv ab-rest | ac-kv ac-rest | additional-kv ( "," space additional-kv )* )? space "}"space ::= | " " | "\n"{1,2} [ \t]{0,20})"""});@@ -1173,11 +1173,11 @@ static void test_all(const std::string & lang, std::function<void(const TestCase})""",R"""(char ::= [^"\\\x7F\x00-\x1F] | [\\] (["\\bfnrt] | "u" [0-9a-fA-F]{4})- ref-definitions-foo ::= "{" space ref-definitions-foo-a-kv "}" space+ ref-definitions-foo ::= "{" space ref-definitions-foo-a-kv space "}"ref-definitions-foo-a-kv ::= "\"a\"" space ":" space stringroot ::= ref-definitions-foospace ::= | " " | "\n"{1,2} [ \t]{0,20}- string ::= "\"" char* "\"" space+ string ::= "\"" char* "\"")"""});@@ -1204,10 +1204,10 @@ static void test_all(const std::string & lang, std::function<void(const TestCasealternative-1 ::= ref-definitions-bardecimal-part ::= [0-9]{1,16}integral-part ::= [0] | [1-9] [0-9]{0,15}- number ::= ("-"? integral-part) ("." decimal-part)? ([eE] [-+]? integral-part)? space- ref-definitions-bar ::= "{" space (ref-definitions-bar-b-kv )? "}" space+ number ::= ("-"? integral-part) ("." decimal-part)? ([eE] [-+]? integral-part)?+ ref-definitions-bar ::= "{" space (ref-definitions-bar-b-kv )? space "}"ref-definitions-bar-b-kv ::= "\"b\"" space ":" space number- ref-definitions-foo ::= "{" space (ref-definitions-foo-a-kv )? "}" space+ ref-definitions-foo ::= "{" space (ref-definitions-foo-a-kv )? space "}"ref-definitions-foo-a-kv ::= "\"a\"" space ":" space numberroot ::= alternative-0 | alternative-1space ::= | " " | "\n"{1,2} [ \t]{0,20}@@ -1241,14 +1241,14 @@ static void test_all(const std::string & lang, std::function<void(const TestCaseb ::= b-0 | booleanb-0 ::= stringb-kv ::= "\"b\"" space ":" space b- boolean ::= ("true" | "false") space+ boolean ::= ("true" | "false")char ::= [^"\\\x7F\x00-\x1F] | [\\] (["\\bfnrt] | "u" [0-9a-fA-F]{4})decimal-part ::= [0-9]{1,16}integral-part ::= [0] | [1-9] [0-9]{0,15}- number ::= ("-"? integral-part) ("." decimal-part)? ([eE] [-+]? integral-part)? space- root ::= "{" space (a-kv a-rest | b-kv )? "}" space+ number ::= ("-"? integral-part) ("." decimal-part)? ([eE] [-+]? integral-part)?+ root ::= "{" space (a-kv a-rest | b-kv )? space "}"space ::= | " " | "\n"{1,2} [ \t]{0,20}- string ::= "\"" char* "\"" space+ string ::= "\"" char* "\"")"""});@@ -1290,8 +1290,8 @@ static void test_all(const std::string & lang, std::function<void(const TestCased-rest ::= ( "," space c-kv )?decimal-part ::= [0-9]{1,16}integral-part ::= [0] | [1-9] [0-9]{0,15}- number ::= ("-"? integral-part) ("." decimal-part)? ([eE] [-+]? integral-part)? space- root ::= "{" space a-kv "," space b-kv ( "," space ( d-kv d-rest | c-kv ) )? "}" space+ number ::= ("-"? integral-part) ("." decimal-part)? ([eE] [-+]? integral-part)?+ root ::= "{" space a-kv "," space b-kv ( "," space ( d-kv d-rest | c-kv ) )? space "}"space ::= | " " | "\n"{1,2} [ \t]{0,20})"""});@@ -1311,7 +1311,7 @@ static void test_all(const std::string & lang, std::function<void(const TestCase}})""",R"""(- root ::= ("\"a\"" | "\"b\"") space+ root ::= ("\"a\"" | "\"b\"")space ::= | " " | "\n"{1,2} [ \t]{0,20})"""});@@ -1336,7 +1336,7 @@ static void test_all(const std::string & lang, std::function<void(const TestCase}})""",R"""(- root ::= ("\"b\"" | "\"c\"") space+ root ::= ("\"b\"" | "\"c\"")space ::= | " " | "\n"{1,2} [ \t]{0,20})"""});@@ -1378,13 +1378,13 @@ static void test_all(const std::string & lang, std::function<void(const TestCaseR"""(decimal-part ::= [0-9]{1,16}integral-part ::= [0] | [1-9] [0-9]{0,15}- number ::= ("-"? integral-part) ("." decimal-part)? ([eE] [-+]? integral-part)? space- number- ::= "{" space number-number-kv "}" space+ number ::= ("-"? integral-part) ("." decimal-part)? ([eE] [-+]? integral-part)?+ number- ::= "{" space number-number-kv space "}"number-kv ::= "\"number\"" space ":" space number-- number-number ::= "{" space number-number-root-kv "}" space+ number-number ::= "{" space number-number-root-kv space "}"number-number-kv ::= "\"number\"" space ":" space number-numbernumber-number-root-kv ::= "\"root\"" space ":" space number- root ::= "{" space number-kv "}" space+ root ::= "{" space number-kv space "}"space ::= | " " | "\n"{1,2} [ \t]{0,20})"""});@@ -1394,17 +1394,17 @@ static void test_all(const std::string & lang, std::function<void(const TestCase"description only (no type) treated as unconstrained",R"""({"description": "The 0-based index of the last line to be retrieved (inclusive). If None, read until the end of the file."})""",R"""(- array ::= "[" space ( value ("," space value)* )? "]" space- boolean ::= ("true" | "false") space+ array ::= "[" space ( value ("," space value)* )? space "]"+ boolean ::= ("true" | "false")char ::= [^"\\\x7F\x00-\x1F] | [\\] (["\\bfnrt] | "u" [0-9a-fA-F]{4})decimal-part ::= [0-9]{1,16}integral-part ::= [0] | [1-9] [0-9]{0,15}- null ::= "null" space- number ::= ("-"? integral-part) ("." decimal-part)? ([eE] [-+]? integral-part)? space- object ::= "{" space ( string ":" space value ("," space string ":" space value)* )? "}" space+ null ::= "null"+ number ::= ("-"? integral-part) ("." decimal-part)? ([eE] [-+]? integral-part)?+ object ::= "{" space ( string ":" space value ("," space string ":" space value)* )? space "}"root ::= valuespace ::= | " " | "\n"{1,2} [ \t]{0,20}- string ::= "\"" char* "\"" space+ string ::= "\"" char* "\""value ::= object | array | string | number | boolean | null)"""});@@ -1428,9 +1428,9 @@ static void test_all(const std::string & lang, std::function<void(const TestCase"type": "object"})""",R"""(- code ::= "\" \\r \\n \\\" \\\\ \"" space+ code ::= "\" \\r \\n \\\" \\\\ \""code-kv ::= "\"code\"" space ":" space code- root ::= "{" space code-kv "}" space+ root ::= "{" space code-kv space "}"space ::= | " " | "\n"{1,2} [ \t]{0,20})"""});@@ -1547,7 +1547,7 @@ int main() {"pattern": "^(?:foo|bar)baz$"})""",R"""(- root ::= "\"" (("foo" | "bar") "baz") "\"" space+ root ::= "\"" (("foo" | "bar") "baz") "\""space ::= | " " | "\n"{1,2} [ \t]{0,20})""",});@@ -1560,7 +1560,7 @@ int main() {"pattern": "^(?:(?:ab)+c)?d$"})""",R"""(- root ::= "\"" ((("ab")+ "c")? "d") "\"" space+ root ::= "\"" ((("ab")+ "c")? "d") "\""space ::= | " " | "\n"{1,2} [ \t]{0,20})""",});