diff --git a/language.zig b/language.zig index 270693b..19248e7 100644 --- a/language.zig +++ b/language.zig @@ -418,6 +418,13 @@ pub fn parse(self: *Self, tokenizer: *Tokenizer) !usize { .true, .false => { defer tokenizer.skipWhitespace(); const idx = try self.addBool(allocator, if (token.type == .true) true else false); + + if (query.len == 0) { + // root + self.index.set(root, .{ .bool = if (token.type == .true) true else false }); + return root; + } + const parent_idx = query.get(query.len - 1); switch (self.index.get(parent_idx)) { .array => |slice| { @@ -440,6 +447,14 @@ pub fn parse(self: *Self, tokenizer: *Tokenizer) !usize { .string => { defer tokenizer.skipWhitespace(); errdefer allocator.free(token.value.?.string); + + if (query.len == 0) { + // root + const idx = try self.addString(allocator, token.value.?.string); + self.index.set(root, .{ .string = @enumFromInt(idx) }); + return root; + } + const parent_idx = query.get(query.len - 1); const next = it.next() orelse return error.InvalidSyntax; @@ -468,6 +483,13 @@ pub fn parse(self: *Self, tokenizer: *Tokenizer) !usize { .number => { defer tokenizer.skipWhitespace(); + if (query.len == 0) { + // root + _ = try self.addNumber(allocator, token.value.?.number); + self.index.set(root, .{ .number = token.value.?.number }); + return root; + } + const parent_idx = query.get(query.len - 1); const idx = try self.addNumber(allocator, token.value.?.number); switch (self.index.get(parent_idx)) { @@ -498,8 +520,59 @@ pub fn parse(self: *Self, tokenizer: *Tokenizer) !usize { } } }, + .null => { + defer tokenizer.skipWhitespace(); + const idx = try self.addNull(allocator); + + if (query.len == 0) { + // root + self.index.set(root, .{ .null = {} }); + return root; + } + const parent_idx = query.get(query.len - 1); + switch (self.index.get(parent_idx)) { + .array => |slice| { + self.index.set(parent_idx, .{ .array = ArraySlice{ + .len = slice.len + 1, + .start = if (slice.len == 0) idx else slice.start, + } }); + }, + else => {}, + } + const next = it.next() orelse return error.InvalidSyntax; + token = next; + switch (next.type) { + .comma => continue :flag .comma, + .object_end, .array_end => continue :flag next.type, + else => return error.InvalidSyntax, + } + }, else => return error.InvalidSyntax, } return root; } + +test getValue { + const allocator = std.testing.allocator; + + const text = + \\{"a":"b","c":"d"} + ; + + var tokenizer: Tokenizer = try .init(allocator, text); + defer tokenizer.deinit(); + + var self = try allocator.create(Self); + self.* = Self.init; + defer allocator.destroy(self); + defer self.deinit(allocator); + + const idx: usize = try self.parse(&tokenizer); + + var root = try self.getValue(allocator, idx); + defer root.deinit(allocator); + + try std.testing.expect(root == .object); + std.debug.print("{}\n", .{root}); +} diff --git a/test.zig b/test.zig index 96f35b1..fd1dbd0 100644 --- a/test.zig +++ b/test.zig @@ -88,17 +88,17 @@ fn expectFail(comptime path: []const u8) !void { } // zig fmt: off -// test { try expectPass("/y_array_arraysWithSpaces.json"); } -//test { try expectPass("/y_array_empty.json"); } -//test { try expectPass("/y_array_empty-string.json"); } -//test { try expectPass("/y_array_ending_with_newline.json"); } -//test { try expectPass("/y_array_false.json"); } -//test { try expectPass("/y_array_heterogeneous.json"); } -//test { try expectPass("/y_array_null.json"); } -//test { try expectPass("/y_array_with_1_and_newline.json"); } -//test { try expectPass("/y_array_with_leading_space.json"); } -//test { try expectPass("/y_array_with_several_null.json"); } -//test { try expectPass("/y_array_with_trailing_space.json"); } +test { try expectPass("/y_array_arraysWithSpaces.json"); } +test { try expectPass("/y_array_empty.json"); } +test { try expectPass("/y_array_empty-string.json"); } +test { try expectPass("/y_array_ending_with_newline.json"); } +test { try expectPass("/y_array_false.json"); } +test { try expectPass("/y_array_heterogeneous.json"); } +test { try expectPass("/y_array_null.json"); } +test { try expectPass("/y_array_with_1_and_newline.json"); } +test { try expectPass("/y_array_with_leading_space.json"); } +test { try expectPass("/y_array_with_several_null.json"); } +test { try expectPass("/y_array_with_trailing_space.json"); } test { try expectPass("/y_number_0e+1.json"); } test { try expectPass("/y_number_0e1.json"); } test { try expectPass("/y_number_after_space.json"); } @@ -125,7 +125,7 @@ test { try expectPass("/y_object_basic.json"); } test { try expectPass("/y_object_empty.json"); } test { try expectPass("/y_object_empty_key.json"); } // BIG ISSUE -//test { try expectPass("/y_object_escaped_null_in_key.json"); } +// test { try expectPass("/y_object_escaped_null_in_key.json"); } test { try expectPass("/y_object_extreme_numbers.json"); } test { try expectPass("/y_object.json"); } //test { try expectPass("/y_object_long_strings.json"); } @@ -173,16 +173,16 @@ test { try expectPass("/y_object_with_newlines.json"); } //test { try expectPass("/y_string_unicode_U+2064_invisible_plus.json"); } //test { try expectPass("/y_string_unicode_U+FDD0_nonchar.json"); } //test { try expectPass("/y_string_unicode_U+FFFE_nonchar.json"); } -//test { try expectPass("/y_string_utf8.json"); } -//test { try expectPass("/y_string_with_del_character.json"); } -//test { try expectPass("/y_structure_lonely_false.json"); } -//test { try expectPass("/y_structure_lonely_int.json"); } -//test { try expectPass("/y_structure_lonely_negative_real.json"); } -//test { try expectPass("/y_structure_lonely_null.json"); } -//test { try expectPass("/y_structure_lonely_string.json"); } -//test { try expectPass("/y_structure_lonely_true.json"); } +test { try expectPass("/y_string_utf8.json"); } +test { try expectPass("/y_string_with_del_character.json"); } +test { try expectPass("/y_structure_lonely_false.json"); } +test { try expectPass("/y_structure_lonely_int.json"); } +test { try expectPass("/y_structure_lonely_negative_real.json"); } +test { try expectPass("/y_structure_lonely_null.json"); } +test { try expectPass("/y_structure_lonely_string.json"); } +test { try expectPass("/y_structure_lonely_true.json"); } //test { try expectPass("/y_structure_string_empty.json"); } -//test { try expectPass("/y_structure_trailing_newline.json"); } +test { try expectPass("/y_structure_trailing_newline.json"); } test { try expectPass("/y_structure_true_in_array.json"); } test { try expectPass("/y_structure_whitespace_array.json"); } @@ -195,7 +195,7 @@ test { try expectFail("/n_array_comma_after_close.json"); } test { try expectFail("/n_array_comma_and_number.json"); } test { try expectFail("/n_array_double_comma.json"); } test { try expectFail("/n_array_double_extra_comma.json"); } -//test { try expectFail("/n_array_extra_close.json"); } +test { try expectFail("/n_array_extra_close.json"); } test { try expectFail("/n_array_extra_comma.json"); } test { try expectFail("/n_array_incomplete_invalid_value.json"); } test { try expectFail("/n_array_incomplete.json"); } @@ -217,18 +217,16 @@ test { try expectFail("/n_array_unclosed_with_object_inside.json"); } test { try expectFail("/n_incomplete_false.json"); } test { try expectFail("/n_incomplete_null.json"); } test { try expectFail("/n_incomplete_true.json"); } -//test { try expectFail("/n_multidigit_number_then_00.json"); } +test { try expectFail("/n_multidigit_number_then_00.json"); } test { try expectFail("/n_number_0.1.2.json"); } -//test { try expectFail("/n_number_-01.json"); } +test { try expectFail("/n_number_-01.json"); } test { try expectFail("/n_number_0.3e+.json"); } test { try expectFail("/n_number_0.3e.json"); } test { try expectFail("/n_number_0_capital_E+.json"); } test { try expectFail("/n_number_0_capital_E.json"); } -//test { try expectFail("/n_number_0.e1.json"); } +test { try expectFail("/n_number_0.e1.json"); } test { try expectFail("/n_number_0e+.json"); } test { try expectFail("/n_number_0e.json"); } - - test { try expectFail("/n_number_1_000.json"); } test { try expectFail("/n_number_1.0e+.json"); } test { try expectFail("/n_number_1.0e-.json"); } @@ -237,11 +235,11 @@ test { try expectFail("/n_number_-1.0..json"); } test { try expectFail("/n_number_1eE2.json"); } test { try expectFail("/n_number_+1.json"); } test { try expectFail("/n_number_.-1.json"); } -//test { try expectFail("/n_number_2.e+3.json"); } -//test { try expectFail("/n_number_2.e-3.json"); } -//test { try expectFail("/n_number_2.e3.json"); } -//test { try expectFail("/n_number_.2e-3.json"); } -//test { try expectFail("/n_number_-2..json"); } +test { try expectFail("/n_number_2.e+3.json"); } +test { try expectFail("/n_number_2.e-3.json"); } +test { try expectFail("/n_number_2.e3.json"); } +test { try expectFail("/n_number_.2e-3.json"); } +test { try expectFail("/n_number_-2..json"); } test { try expectFail("/n_number_9.e+.json"); } test { try expectFail("/n_number_expression.json"); } test { try expectFail("/n_number_hex_1_digit.json"); } @@ -260,18 +258,17 @@ test { try expectFail("/n_number_minus_sign_with_trailing_garbage.json"); } test { try expectFail("/n_number_minus_space_1.json"); } test { try expectFail("/n_number_-NaN.json"); } test { try expectFail("/n_number_NaN.json"); } -//test { try expectFail("/n_number_neg_int_starting_with_zero.json"); } -//test { try expectFail("/n_number_neg_real_without_int_part.json"); } +test { try expectFail("/n_number_neg_int_starting_with_zero.json"); } +test { try expectFail("/n_number_neg_real_without_int_part.json"); } test { try expectFail("/n_number_neg_with_garbage_at_end.json"); } test { try expectFail("/n_number_real_garbage_after_e.json"); } test { try expectFail("/n_number_real_with_invalid_utf8_after_e.json"); } -//test { try expectFail("/n_number_real_without_fractional_part.json"); } -//test { try expectFail("/n_number_starting_with_dot.json"); } +test { try expectFail("/n_number_real_without_fractional_part.json"); } +test { try expectFail("/n_number_starting_with_dot.json"); } test { try expectFail("/n_number_U+FF11_fullwidth_digit_one.json"); } test { try expectFail("/n_number_with_alpha_char.json"); } test { try expectFail("/n_number_with_alpha.json"); } -//test { try expectFail("/n_number_with_leading_zero.json"); } - +test { try expectFail("/n_number_with_leading_zero.json"); } test { try expectFail("/n_object_bad_value.json"); } test { try expectFail("/n_object_bracket_key.json"); } test { try expectFail("/n_object_comma_instead_of_colon.json"); } @@ -290,7 +287,6 @@ test { try expectFail("/n_object_non_string_key.json"); } test { try expectFail("/n_object_repeated_null_null.json"); } test { try expectFail("/n_object_several_trailing_commas.json"); } test { try expectFail("/n_object_single_quote.json"); } -// allowed? test { try expectFail("/n_object_trailing_comma.json"); } test { try expectFail("/n_object_trailing_comment.json"); } test { try expectFail("/n_object_trailing_comment_open.json"); } @@ -373,14 +369,14 @@ test { try expectFail("/n_structure_open_open.json"); } test { try expectFail("/n_structure_trailing_#.json"); } test { try expectFail("/n_structure_U+2060_word_joined.json"); } test { try expectFail("/n_structure_uescaped_LF_before_string.json"); } -//test { try expectFail("/n_structure_unclosed_array.json"); } +test { try expectFail("/n_structure_unclosed_array.json"); } test { try expectFail("/n_structure_unclosed_array_partial_null.json"); } test { try expectFail("/n_structure_unclosed_array_unfinished_false.json"); } test { try expectFail("/n_structure_unclosed_array_unfinished_true.json"); } test { try expectFail("/n_structure_unclosed_object.json"); } //test { try expectFail("/n_structure_unicode-identifier.json"); } //test { try expectFail("/n_structure_UTF8_BOM_no_data.json"); } -//test { try expectFail("/n_structure_whitespace_formfeed.json"); } +test { try expectFail("/n_structure_whitespace_formfeed.json"); } test { try expectFail("/n_structure_whitespace_U+2060_word_joiner.json"); } // zig fmt: off