Commit 74fd7107e85e19412c4b5d2c55d230844f22f372 | zig

author	Lewis Gaul <Lewis@scphillips.com> 2021-04-04 09:16:59+01:00
committer	GitHub <noreply@github.com> 2021-04-04 10:16:59+02:00
log	74fd7107e85e19412c4b5d2c55d230844f22f372
tree	17b0b5e32e04006df60a88a095a04741cdace67e
parent	6fc822a9481c0d2c8b37f26f41be603dd77ab5a4
signature	Signed by PGP key 4AEE18F83AFDEB23

Switch std.json to use an ordered hashmap

2 files changed, 43 insertions(+), 27 deletions(-)

lib
- std
  - json.zig
  - json
    test.zig

lib/std/json.zig+2-2

...	@@ -1234,7 +1234,7 @@ test "json.validate" {	...	@@ -1234,7 +1234,7 @@ test "json.validate" {
1234	const Allocator = std.mem.Allocator;	1234	const Allocator = std.mem.Allocator;
1235	const ArenaAllocator = std.heap.ArenaAllocator;	1235	const ArenaAllocator = std.heap.ArenaAllocator;
1236	const ArrayList = std.ArrayList;	1236	const ArrayList = std.ArrayList;
1237	const StringHashMap = std.StringHashMap;	1237	const StringArrayHashMap = std.StringArrayHashMap;
1238		1238
1239	pub const ValueTree = struct {	1239	pub const ValueTree = struct {
1240	arena: ArenaAllocator,	1240	arena: ArenaAllocator,
...	@@ -1245,7 +1245,7 @@ pub const ValueTree = struct {	...	@@ -1245,7 +1245,7 @@ pub const ValueTree = struct {
1245	}	1245	}
1246	};	1246	};
1247		1247
1248	pub const ObjectMap = StringHashMap(Value);	1248	pub const ObjectMap = StringArrayHashMap(Value);
1249	pub const Array = ArrayList(Value);	1249	pub const Array = ArrayList(Value);
1250		1250
1251	/// Represents a JSON value	1251	/// Represents a JSON value

lib/std/json/test.zig+41-25

 @@ -52,12 +52,28 @@ fn anyStreamingErrNonStreaming(comptime s: []const u8) void {
     testing.expect(false);
 }
+fn roundTrip(s: []const u8) !void {
+    testing.expect(json.validate(s));
+    var p = json.Parser.init(testing.allocator, false);
+    defer p.deinit();
+    var tree = try p.parse(s);
+    defer tree.deinit();
+    var buf: [256]u8 = undefined;
+    var fbs = std.io.fixedBufferStream(&buf);
+    try tree.root.jsonStringify(.{}, fbs.writer());
+    testing.expectEqualStrings(s, fbs.getWritten());
+}
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 //
 // Additional tests not part of test JSONTestSuite.
 test "y_trailing_comma_after_empty" {
-    ok(
+    try roundTrip(
         \\{"1":[],"2":{},"3":"4"}
     );
 }
 @@ -71,25 +87,25 @@ test "y_array_arraysWithSpaces" {
 }
 test "y_array_empty" {
-    ok(
+    try roundTrip(
         \\[]
     );
 }
 test "y_array_empty-string" {
-    ok(
+    try roundTrip(
         \\[""]
     );
 }
 test "y_array_ending_with_newline" {
-    ok(
+    try roundTrip(
         \\["a"]
     );
 }
 test "y_array_false" {
-    ok(
+    try roundTrip(
         \\[false]
     );
 }
 @@ -101,7 +117,7 @@ test "y_array_heterogeneous" {
 }
 test "y_array_null" {
-    ok(
+    try roundTrip(
         \\[null]
     );
 }
 @@ -120,7 +136,7 @@ test "y_array_with_leading_space" {
 }
 test "y_array_with_several_null" {
-    ok(
+    try roundTrip(
         \\[1,null,null,null,2]
     );
 }
 @@ -172,13 +188,13 @@ test "y_number_minus_zero" {
 }
 test "y_number_negative_int" {
-    ok(
+    try roundTrip(
         \\[-123]
     );
 }
 test "y_number_negative_one" {
-    ok(
+    try roundTrip(
         \\[-1]
     );
 }
 @@ -232,7 +248,7 @@ test "y_number_real_pos_exponent" {
 }
 test "y_number_simple_int" {
-    ok(
+    try roundTrip(
         \\[123]
     );
 }
 @@ -244,7 +260,7 @@ test "y_number_simple_real" {
 }
 test "y_object_basic" {
-    ok(
+    try roundTrip(
         \\{"asd":"sdf"}
     );
 }
 @@ -262,13 +278,13 @@ test "y_object_duplicated_key" {
 }
 test "y_object_empty" {
-    ok(
+    try roundTrip(
         \\{}
     );
 }
 test "y_object_empty_key" {
-    ok(
+    try roundTrip(
         \\{"":0}
     );
 }
 @@ -298,7 +314,7 @@ test "y_object_long_strings" {
 }
 test "y_object_simple" {
-    ok(
+    try roundTrip(
         \\{"a":[]}
     );
 }
 @@ -348,7 +364,7 @@ test "y_string_backslash_and_u_escaped_zero" {
 }
 test "y_string_backslash_doublequotes" {
-    ok(
+    try roundTrip(
         \\["\""]
     );
 }
 @@ -366,7 +382,7 @@ test "y_string_double_escape_a" {
 }
 test "y_string_double_escape_n" {
-    ok(
+    try roundTrip(
         \\["\\n"]
     );
 }
 @@ -450,7 +466,7 @@ test "y_string_simple_ascii" {
 }
 test "y_string_space" {
-    ok(
+    try roundTrip(
         \\" "
     );
 }
 @@ -568,13 +584,13 @@ test "y_string_with_del_character" {
 }
 test "y_structure_lonely_false" {
-    ok(
+    try roundTrip(
         \\false
     );
 }
 test "y_structure_lonely_int" {
-    ok(
+    try roundTrip(
         \\42
     );
 }
 @@ -586,37 +602,37 @@ test "y_structure_lonely_negative_real" {
 }
 test "y_structure_lonely_null" {
-    ok(
+    try roundTrip(
         \\null
     );
 }
 test "y_structure_lonely_string" {
-    ok(
+    try roundTrip(
         \\"asd"
     );
 }
 test "y_structure_lonely_true" {
-    ok(
+    try roundTrip(
         \\true
     );
 }
 test "y_structure_string_empty" {
-    ok(
+    try roundTrip(
         \\""
     );
 }
 test "y_structure_trailing_newline" {
-    ok(
+    try roundTrip(
         \\["a"]
     );
 }
 test "y_structure_true_in_array" {
-    ok(
+    try roundTrip(
         \\[true]
     );
 }