Skip to content

Commit

Permalink
Merge pull request #299 from biojppm/fix/emitjson
Browse files Browse the repository at this point in the history 
json emitter: fixes to scalars with missing quotes
  • Loading branch information
@biojppm
biojppm authored Aug 30, 2022
2 parents f020b03 + fbec340 commit e1b5768
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 6 deletions.
4 changes: 3 additions & 1 deletion changelog/0.5.0.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@
:barbar: b # was ok
:barbarbar: c # was ol
```
- Fix [#246](https://github.com/biojppm/rapidyaml/issues/246): add missing `#define` for the include guard of the amalgamated header.
- Fix [#253](https://github.com/biojppm/rapidyaml/issues/253): double-quoted emitter should encode carriage-return `\r` to preserve roundtrip equivalence:
```yaml
Tree tree;
Expand All @@ -83,6 +82,8 @@
EXPECT_EQ(tree2["s"].val(), tree["s"].val());
```
- Fix [#297](https://github.com/biojppm/rapidyaml/issues/297) ([PR#298](https://github.com/biojppm/rapidyaml/pull/298)): JSON emitter should escape control characters.
- Fix [#292](https://github.com/biojppm/rapidyaml/issues/292) ([PR#299](https://github.com/biojppm/rapidyaml/pull/299)): JSON emitter should quote version string scalars like `0.1.2`.
- Fix [#291](https://github.com/biojppm/rapidyaml/issues/291) ([PR#299](https://github.com/biojppm/rapidyaml/pull/299)): JSON emitter should quote scalars with leading zero, eg `048`.
- Fix [#274](https://github.com/biojppm/rapidyaml/issues/274) ([PR#296](https://github.com/biojppm/rapidyaml/pull/296)): Lists with unindented items and trailing empty values parse incorrectly:
```yaml
foo:
Expand All @@ -106,4 +107,5 @@
=VAL :foo
=VAL :bar
```
- Fix [#246](https://github.com/biojppm/rapidyaml/issues/246): add missing `#define` for the include guard of the amalgamated header.
- Fix [cmake#8](https://github.com/biojppm/cmake/issues/8): `SOVERSION` missing from shared libraries.
2 changes: 1 addition & 1 deletion ext/c4core
Submodule c4core updated 17 files
+4 −4 .github/workflows/emscripten.yml
+81 −26 README.md
+77 −60 bm/CMakeLists.txt
+69 −15 bm/bm_charconv.cpp
+2 −5 bm/bm_charconv.hpp
+5 −0 bm/bm_itoa_threads.cpp
+0 −6 bm/ryu.cmake
+23 −0 changelog/current.md
+1 −1 cmake
+191 −46 src/c4/charconv.hpp
+1 −1 src/c4/ext/fast_float
+69 −84 src/c4/ext/fast_float_all.h
+112 −0 src/c4/memory_util.hpp
+560 −212 src/c4/substr.hpp
+161 −56 test/test_charconv.cpp
+113 −0 test/test_memory_util.cpp
+325 −61 test/test_substr.cpp
18 changes: 15 additions & 3 deletions samples/quickstart.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1211,23 +1211,35 @@ void sample_substr()
CHECK(ryml::csubstr("-1234)asdkjh").first_real_span() == "-1234");
CHECK(ryml::csubstr("-1234gasdkjh").first_real_span() == "");
CHECK(ryml::csubstr("1.234 asdkjh").first_real_span() == "1.234");
CHECK(ryml::csubstr("1.234e5 asdkjh").first_real_span() == "1.234e5");
CHECK(ryml::csubstr("1.234e+5 asdkjh").first_real_span() == "1.234e+5");
CHECK(ryml::csubstr("1.234e-5 asdkjh").first_real_span() == "1.234e-5");
CHECK(ryml::csubstr("1.234 asdkjh").first_real_span() == "1.234");
CHECK(ryml::csubstr("1.234e5 asdkjh").first_real_span() == "1.234e5");
CHECK(ryml::csubstr("1.234e+5 asdkjh").first_real_span() == "1.234e+5");
CHECK(ryml::csubstr("1.234e-5 asdkjh").first_real_span() == "1.234e-5");
CHECK(ryml::csubstr("-1.234 asdkjh").first_real_span() == "-1.234");
CHECK(ryml::csubstr("-1.234e5 asdkjh").first_real_span() == "-1.234e5");
CHECK(ryml::csubstr("-1.234e+5 asdkjh").first_real_span() == "-1.234e+5");
CHECK(ryml::csubstr("-1.234e-5 asdkjh").first_real_span() == "-1.234e-5");
// hexadecimal real numbers
CHECK(ryml::csubstr("0x1.e8480p+19 asdkjh").first_real_span() == "0x1.e8480p+19");
CHECK(ryml::csubstr("0x1.e8480p-19 asdkjh").first_real_span() == "0x1.e8480p-19");
CHECK(ryml::csubstr("-0x1.e8480p+19 asdkjh").first_real_span() == "-0x1.e8480p+19");
CHECK(ryml::csubstr("-0x1.e8480p-19 asdkjh").first_real_span() == "-0x1.e8480p-19");
CHECK(ryml::csubstr("+0x1.e8480p+19 asdkjh").first_real_span() == "+0x1.e8480p+19");
CHECK(ryml::csubstr("+0x1.e8480p-19 asdkjh").first_real_span() == "+0x1.e8480p-19");
// binary real numbers
CHECK(ryml::csubstr("0b101.011p+19 asdkjh").first_real_span() == "0b101.011p+19");
CHECK(ryml::csubstr("0b101.011p-19 asdkjh").first_real_span() == "0b101.011p-19");
CHECK(ryml::csubstr("-0b101.011p+19 asdkjh").first_real_span() == "-0b101.011p+19");
CHECK(ryml::csubstr("-0b101.011p-19 asdkjh").first_real_span() == "-0b101.011p-19");
CHECK(ryml::csubstr("+0b101.011p+19 asdkjh").first_real_span() == "+0b101.011p+19");
CHECK(ryml::csubstr("+0b101.011p-19 asdkjh").first_real_span() == "+0b101.011p-19");
// octal real numbers
CHECK(ryml::csubstr("0o173.045p+19 asdkjh").first_real_span() == "0o173.045p+19");
CHECK(ryml::csubstr("0o173.045p-19 asdkjh").first_real_span() == "0o173.045p-19");
CHECK(ryml::csubstr("-0o173.045p+19 asdkjh").first_real_span() == "-0o173.045p+19");
CHECK(ryml::csubstr("-0o173.045p-19 asdkjh").first_real_span() == "-0o173.045p-19");
CHECK(ryml::csubstr("+0o173.045p+19 asdkjh").first_real_span() == "+0o173.045p+19");
CHECK(ryml::csubstr("+0o173.045p-19 asdkjh").first_real_span() == "+0o173.045p-19");
}
// see also is_number()

Expand Down
5 changes: 4 additions & 1 deletion src/c4/yml/emit.def.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -879,7 +879,10 @@ template<class Writer>
void Emitter<Writer>::_write_scalar_json(csubstr s, bool as_key, bool was_quoted)
{
// json only allows strings as keys
if(!as_key && !was_quoted && (s.is_number() || s == "true" || s == "null" || s == "false"))
if((!as_key)
&& (!was_quoted)
&& ((s.is_number() && !(s.len > 1 && s.str[0] == '0'))
|| s == "true" || s == "null" || s == "false"))
{
this->Writer::_do_write(s);
}
Expand Down
17 changes: 17 additions & 0 deletions test/test_json.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,23 @@ broken_value: '0.30.2'
)");
}

TEST(emit_json, issue291)
{
Tree t = parse_in_arena("{}");
t["james"] = "045";
auto s = emitrs_json<std::string>(t);
EXPECT_EQ(s, "{\"james\": \"045\"}");
}

TEST(emit_json, issue292)
{
EXPECT_FALSE(csubstr("0.1.0").is_number());
Tree t = parse_in_arena("{}");
t["james"] = "1.2.3";
auto s = emitrs_json<std::string>(t);
EXPECT_EQ(s, "{\"james\": \"1.2.3\"}");
}

TEST(emit_json, issue297)
{
char yml_buf[] = R"(
Expand Down

0 comments on commit e1b5768

Please sign in to comment.