mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-21 16:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tokenizer: Copy optional tokens prior to being set to null #3737 (#3910)

Browse Source 
* Tokenizer: Copy optional tokens prior to being set to null #3737

* Add TODO comments, reminder to audit copying optional pattern.
This commit is contained in:
Lachlan Easton 2019-12-17 03:01:02 +11:00 committed by Andrew Kelley
parent 0f09ff4923
commit fe0e8c87b7
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/std/json.zig
View File

@ -886,6 +886,7 @@ pub const TokenStream = struct {
pub fn next(self: *TokenStream) Error!?Token {
if (self.token) |token| {
// TODO: Audit this pattern once #2915 is closed
const copy = token;
self.token = null;
return copy;

8
lib/std/zig/tokenizer.zig
View File

@ -411,8 +411,10 @@ pub const Tokenizer = struct {
pub fn next(self: *Tokenizer) Token {
if (self.pending_invalid_token) |token| {
// TODO: Audit this pattern once #2915 is closed
const copy = token;
self.pending_invalid_token = null;
return token;
return copy;
}
const start_index = self.index;
var state = State.Start;
@ -1265,8 +1267,10 @@ pub const Tokenizer = struct {
if (result.id == Token.Id.Eof) {
if (self.pending_invalid_token) |token| {
// TODO: Audit this pattern once #2915 is closed
const copy = token;
self.pending_invalid_token = null;
return token;
return copy;
}
}