vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

json: fix negative max

Browse source
This commit is contained in:
Olivier Chafik 2024-06-08 20:33:12 +01:00
parent a786c0381b
commit 931b543607
2 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/json-schema-to-grammar.cpp
View file

@ -333,7 +333,7 @@ static void _generate_min_max_int(int min_value, int max_value, std::stringstrea
_generate_min_max_int(0, max_value, out, decimals_left, /* top_level= */ true);
} else {
out << "\"-\" (";
_generate_min_max_int(std::numeric_limits<int>::min(), -max_value, out, decimals_left, /* top_level= */ false);
_generate_min_max_int(-max_value, std::numeric_limits<int>::max(), out, decimals_left, /* top_level= */ false);
out << ")";
}
return;

12
tests/test-json-schema-to-grammar.cpp
View file

@ -180,6 +180,18 @@ static void test_all(const std::string & lang, std::function<void(const TestCase
})""",
R"""(
root ::= ("-" [0-5] | [0] | [1-9] [0-9]{0,15}) space
)"""
});
test({
SUCCESS,
"max -5",
R"""({
"type": "integer",
"maximum": -5
})""",
R"""(
root ::= ("-" ([0-4] [0-9]{1,15} | [5-9] [0-9]{0,15})) space
space ::= " "?
)"""
});