json: handle negative min / max integer bounds
This commit is contained in:
parent
c37c484029
commit
af63f4fb27
2 changed files with 28 additions and 0 deletions
|
@ -240,6 +240,20 @@ static void _generate_min_max_int(int min_value, int max_value, std::stringstrea
|
||||||
};
|
};
|
||||||
|
|
||||||
if (has_min && has_max) {
|
if (has_min && has_max) {
|
||||||
|
if (min_value < 0 && max_value < 0) {
|
||||||
|
out << "\"-\" (";
|
||||||
|
_generate_min_max_int(-max_value, -min_value, out, decimals_left, /* top_level= */ true);
|
||||||
|
out << ")";
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (min_value < 0) {
|
||||||
|
out << "\"-\" (";
|
||||||
|
_generate_min_max_int(0, -min_value, out, decimals_left, /* top_level= */ true);
|
||||||
|
out << ") | ";
|
||||||
|
min_value = 0;
|
||||||
|
}
|
||||||
|
|
||||||
auto min_s = std::to_string(min_value);
|
auto min_s = std::to_string(min_value);
|
||||||
auto max_s = std::to_string(max_value);
|
auto max_s = std::to_string(max_value);
|
||||||
auto min_digits = min_s.length();
|
auto min_digits = min_s.length();
|
||||||
|
|
|
@ -252,6 +252,20 @@ static void test_all(const std::string & lang, std::function<void(const TestCase
|
||||||
)"""
|
)"""
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test({
|
||||||
|
SUCCESS,
|
||||||
|
"min -10 max 10",
|
||||||
|
R"""({
|
||||||
|
"type": "integer",
|
||||||
|
"minimum": -10,
|
||||||
|
"maximum": 10
|
||||||
|
})""",
|
||||||
|
R"""(
|
||||||
|
root ::= ("-" ([0-9] | "10") | [0-9] | "10") space
|
||||||
|
space ::= " "?
|
||||||
|
)"""
|
||||||
|
});
|
||||||
|
|
||||||
test({
|
test({
|
||||||
FAILURE,
|
FAILURE,
|
||||||
"unknown type",
|
"unknown type",
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue