Skip to content

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

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Dec 16, 2019
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca14081
Tokenizer: Copy optional tokens prior to being set to null #3737
LakeByTheWoods Dec 14, 2019
7ad51b0
Add TODO comments, reminder to audit copying optional pattern.
LakeByTheWoods Dec 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions lib/std/json.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 6 additions & 2 deletions lib/std/zig/tokenizer.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
}

Expand Down