mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-01-02 03:25:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

std: json.unescapeString doesn't need to take an allocator

Browse Source
This commit is contained in:
daurnimator 2019-12-31 00:51:54 +11:00
parent 04a2a4a7cb
commit ef3a01a367
No known key found for this signature in database
GPG Key ID: 45B429A8F9D9D22A
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/std/json.zig
View File

@ -1379,10 +1379,15 @@ pub const Parser = struct {
// TODO: We don't strictly have to copy values which do not contain any escape
// characters if flagged with the option.
const slice = s.slice(input, i);
return switch (s.escapes) {
.None => Value{ .String = try mem.dupe(allocator, u8, slice) },
.Some => |some_escapes| Value{ .String = try unescapeStringAlloc(allocator, some_escapes, slice) },
};
switch (s.escapes) {
.None => return Value{ .String = try mem.dupe(allocator, u8, slice) },
.Some => |some_escapes| {
const output = try allocator.alloc(u8, s.decodedLength());
errdefer allocator.free(output);
try unescapeString(output, slice);
return Value{ .String = output };
},
}
}
fn parseNumber(p: *Parser, n: std.meta.TagPayloadType(Token, Token.Number), input: []const u8, i: usize) !Value {
@ -1396,12 +1401,7 @@ pub const Parser = struct {
// Unescape a JSON string
// Only to be used on strings already validated by the parser
// (note the unreachable statements and lack of bounds checking)
fn unescapeStringAlloc(alloc: *Allocator, escapes: std.meta.TagPayloadType(StringEscapes, StringEscapes.Some), input: []const u8) ![]u8 {
const result_size = input.len +% @bitCast(usize, escapes.size_diff);
const output = try alloc.alloc(u8, result_size);
errdefer alloc.free(output);
fn unescapeString(output: []u8, input: []const u8) !void {
var inIndex: usize = 0;
var outIndex: usize = 0;
@ -1455,9 +1455,7 @@ fn unescapeStringAlloc(alloc: *Allocator, escapes: std.meta.TagPayloadType(Strin
}
}
}
assert(outIndex == result_size);
return output;
assert(outIndex == output.len);
}
test "json.parser.dynamic" {