Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update some cbor data #1

Merged
merged 1 commit into from
May 13, 2020
Merged

Update some cbor data #1

merged 1 commit into from
May 13, 2020

Conversation

dota17
Copy link
Contributor

@dota17 dota17 commented May 13, 2020

@nlohmann I adjust some test data according to your log, and all test cases could pass. Please take a look.

@nlohmann
Copy link
Owner

For reference, here is the binary diff:

[0.0]
--- old/json_roundtrip/roundtrip20.json.cbor
+++ new/json_roundtrip/roundtrip20.json.cbor
@@ -1 +1 @@
-00000000: 81fb 0000 0000 0000 0000                 ..........
+00000000: 81fa 0000 0000                           ......
[-0.0]
--- old/json_roundtrip/roundtrip21.json.cbor
+++ new/json_roundtrip/roundtrip21.json.cbor
@@ -1 +1 @@
-00000000: 81fb 8000 0000 0000 0000                 ..........
+00000000: 81fa 8000 0000                           ......
[0e+1]
--- old/nst_json_testsuite/test_parsing/y_number_0e+1.json.cbor
+++ new/nst_json_testsuite/test_parsing/y_number_0e+1.json.cbor
@@ -1 +1 @@
-00000000: 81fb 0000 0000 0000 0000                 ..........
+00000000: 81fa 0000 0000                           ......
[0e1]
--- old/nst_json_testsuite/test_parsing/y_number_0e1.json.cbor
+++ new/nst_json_testsuite/test_parsing/y_number_0e1.json.cbor
@@ -1 +1 @@
-00000000: 81fb 0000 0000 0000 0000                 ..........
+00000000: 81fa 0000 0000                           ......
[123.456e-789]
--- old/nst_json_testsuite/test_parsing/y_number_double_huge_neg_exp.json.cbor
+++ new/nst_json_testsuite/test_parsing/y_number_double_huge_neg_exp.json.cbor
@@ -1 +1 @@
-00000000: 81fb 0000 0000 0000 0000                 ..........
+00000000: 81fa 0000 0000                           ......
[20e1]
--- old/nst_json_testsuite/test_parsing/y_number_int_with_exp.json.cbor
+++ new/nst_json_testsuite/test_parsing/y_number_int_with_exp.json.cbor
@@ -1 +1 @@
-00000000: 81fb 4069 0000 0000 0000                 ..@i......
+00000000: 81fa 4348 0000                           ..CH..
[1E+2]
--- old/nst_json_testsuite/test_parsing/y_number_real_capital_e_pos_exp.json.cbor
+++ new/nst_json_testsuite/test_parsing/y_number_real_capital_e_pos_exp.json.cbor
@@ -1 +1 @@
-00000000: 81fb 4059 0000 0000 0000                 ..@Y......
+00000000: 81fa 42c8 0000                           ..B...
[1e+2]
--- old/nst_json_testsuite/test_parsing/y_number_real_pos_exponent.json.cbor
+++ new/nst_json_testsuite/test_parsing/y_number_real_pos_exponent.json.cbor
@@ -1 +1 @@
-00000000: 81fb 4059 0000 0000 0000                 ..@Y......
+00000000: 81fa 42c8 0000                           ..B...
[1e+2]
--- old/nst_json_testsuite/test_parsing/y_number_real_underflow.json.cbor
+++ new/nst_json_testsuite/test_parsing/y_number_real_underflow.json.cbor
@@ -1 +1 @@
-00000000: 81fb 0000 0000 0000 0000                 ..........
+00000000: 81fa 0000 0000                           ......

@nlohmann nlohmann merged commit 01cdac2 into nlohmann:master May 13, 2020
@nlohmann
Copy link
Owner

@dota17 Merged. Can you please update nlohmann/json#2044 to use use v2.0.0 of the test data? You need to edit cmake/download_test_data.cmake, variable JSON_TEST_DATA_VERSION to 2.0.0.

@dota17
Copy link
Contributor Author

dota17 commented May 13, 2020

@dota17 Merged. Can you please update nlohmann/json#2044 to use use v2.0.0 of the test data? You need to edit cmake/download_test_data.cmake, variable JSON_TEST_DATA_VERSION to 2.0.0.

Ok, thank you, I'll do it now.

@dota17 dota17 deleted the update branch May 13, 2020 07:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants