| author |  Lachlan Easton <elbeaston@gmail.com> 2019-12-17 03:01:02+11:00 |
| committer |  Andrew Kelley <andrew@ziglang.org> 2019-12-16 11:01:02-05:00 |
| log | fe0e8c87b762aba6eb5ff1fad8ad7d37404476f1 |
| tree | 47045f781e6b478b97778dc3d3a3a181f98526ad |
| parent | 0f09ff49235e77af06056d3b5cdca0098aa050c3 |
Tokenizer: Copy optional tokens prior to being set to null #3737 (#3910)
* Tokenizer: Copy optional tokens prior to being set to null #3737
* Add TODO comments, reminder to audit copying optional pattern.
2 files changed, 7 insertions(+), 2 deletions(-)
lib
std
lib/std/json.zig+1
| ... | @@ -886,6 +886,7 @@ pub const TokenStream = struct { | ... | @@ -886,6 +886,7 @@ pub const TokenStream = struct { |
| 886 | 886 | ||
| 887 | pub fn next(self: *TokenStream) Error!?Token { | 887 | pub fn next(self: *TokenStream) Error!?Token { |
| 888 | if (self.token) |token| { | 888 | if (self.token) |token| { |
| 889 | // TODO: Audit this pattern once #2915 is closed | ||
| 889 | const copy = token; | 890 | const copy = token; |
| 890 | self.token = null; | 891 | self.token = null; |
| 891 | return copy; | 892 | return copy; |
lib/std/zig/tokenizer.zig+6-2
| ... | @@ -411,8 +411,10 @@ pub const Tokenizer = struct { | ... | @@ -411,8 +411,10 @@ pub const Tokenizer = struct { |
| 411 | 411 | ||
| 412 | pub fn next(self: *Tokenizer) Token { | 412 | pub fn next(self: *Tokenizer) Token { |
| 413 | if (self.pending_invalid_token) |token| { | 413 | if (self.pending_invalid_token) |token| { |
| 414 | // TODO: Audit this pattern once #2915 is closed | ||
| 415 | const copy = token; | ||
| 414 | self.pending_invalid_token = null; | 416 | self.pending_invalid_token = null; |
| 415 | return token; | 417 | return copy; |
| 416 | } | 418 | } |
| 417 | const start_index = self.index; | 419 | const start_index = self.index; |
| 418 | var state = State.Start; | 420 | var state = State.Start; |
| ... | @@ -1265,8 +1267,10 @@ pub const Tokenizer = struct { | ... | @@ -1265,8 +1267,10 @@ pub const Tokenizer = struct { |
| 1265 | 1267 | ||
| 1266 | if (result.id == Token.Id.Eof) { | 1268 | if (result.id == Token.Id.Eof) { |
| 1267 | if (self.pending_invalid_token) |token| { | 1269 | if (self.pending_invalid_token) |token| { |
| 1270 | // TODO: Audit this pattern once #2915 is closed | ||
| 1271 | const copy = token; | ||
| 1268 | self.pending_invalid_token = null; | 1272 | self.pending_invalid_token = null; |
| 1269 | return token; | 1273 | return copy; |
| 1270 | } | 1274 | } |
| 1271 | } | 1275 | } |
| 1272 | 1276 |