From 28138351f4a5be0dab8d5ad572ac26b1a53cbdb0 Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Thu, 25 Apr 2024 00:38:27 +0100 Subject: [PATCH 1/2] Apply suggestions from code review Co-authored-by: Clint Herron --- common/json-schema-to-grammar.cpp | 2 +- examples/json_schema_to_grammar.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/json-schema-to-grammar.cpp b/common/json-schema-to-grammar.cpp index 93d2e9ea2..cadcd018f 100644 --- a/common/json-schema-to-grammar.cpp +++ b/common/json-schema-to-grammar.cpp @@ -50,7 +50,7 @@ struct BuiltinRule { std::unordered_map PRIMITIVE_RULES = { {"boolean", {"(\"true\" | \"false\") space", {}}}, {"decimal-part", {"[0-9]{1,16}", {}}}, - {"integral-part", {"[0] | [1-9] [0-9]{1,15}", {}}}, + {"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"}}}, {"value", {"object | array | string | number | boolean | null", {"object", "array", "string", "number", "boolean", "null"}}}, diff --git a/examples/json_schema_to_grammar.py b/examples/json_schema_to_grammar.py index 31b3e3a24..7d889c3fe 100755 --- a/examples/json_schema_to_grammar.py +++ b/examples/json_schema_to_grammar.py @@ -36,7 +36,7 @@ SPACE_RULE = '" "?' PRIMITIVE_RULES = { 'boolean' : BuiltinRule('("true" | "false") space', []), 'decimal-part' : BuiltinRule('[0-9]{1,16}', []), - 'integral-part': BuiltinRule('[0] | [1-9] [0-9]{1,15}', []), + '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']), 'value' : BuiltinRule('object | array | string | number | boolean | null', ['object', 'array', 'string', 'number', 'boolean', 'null']), From 46fe6483abe64881e0162cc46e7bf6e96c4f6078 Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Thu, 25 Apr 2024 00:40:02 +0100 Subject: [PATCH 2/2] Update examples/server/public/json-schema-to-grammar.mjs Co-authored-by: Clint Herron --- examples/server/public/json-schema-to-grammar.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/server/public/json-schema-to-grammar.mjs b/examples/server/public/json-schema-to-grammar.mjs index 758b4c3d6..cef11eab8 100644 --- a/examples/server/public/json-schema-to-grammar.mjs +++ b/examples/server/public/json-schema-to-grammar.mjs @@ -34,7 +34,7 @@ class BuiltinRule { const PRIMITIVE_RULES = { boolean : new BuiltinRule('("true" | "false") space', []), 'decimal-part' : new BuiltinRule('[0-9]{1,16}', []), - 'integral-part': new BuiltinRule('[0] | [1-9] [0-9]{1,15}', []), + 'integral-part': new BuiltinRule('[0] | [1-9] [0-9]{0,15}', []), number : new BuiltinRule('("-"? integral-part) ("." decimal-part)? ([eE] [-+]? integral-part)? space', ['integral-part', 'decimal-part']), integer : new BuiltinRule('("-"? integral-part) space', ['integral-part']), value : new BuiltinRule('object | array | string | number | boolean | null', ['object', 'array', 'string', 'number', 'boolean', 'null']),