authorgravatar for benjamin.feng@glassdoor.comBenjamin Feng <benjamin.feng@glassdoor.com> 2019-06-12 14:00:25-05:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-07-19 17:11:58-04:00
logd4ff27180b31d7a4a5c284453b37d5301aece06d
treefc7a33896806d27a57bc8582112a1dd99e72feb1
parentaf8661405b908c0abfc191501a8ad1a59a54e86a
signature Commit is signed but in an unrecognized format.

Tokenize '&&' as AmpersandAmpersand

1 files changed, 5 insertions(+), 0 deletions(-)

std/zig/tokenizer.zig+5
...@@ -125,6 +125,7 @@ pub const Token = struct {...@@ -125,6 +125,7 @@ pub const Token = struct {
125 SlashEqual,125 SlashEqual,
126 Comma,126 Comma,
127 Ampersand,127 Ampersand,
128 AmpersandAmpersand,
128 AmpersandEqual,129 AmpersandEqual,
129 QuestionMark,130 QuestionMark,
130 AngleBracketLeft,131 AngleBracketLeft,
...@@ -484,6 +485,10 @@ pub const Tokenizer = struct {...@@ -484,6 +485,10 @@ pub const Tokenizer = struct {
484 },485 },
485486
486 State.Ampersand => switch (c) {487 State.Ampersand => switch (c) {
488 '&' => {
489 result.id = Token.Id.AmpersandAmpersand;
490 break;
491 },
487 '=' => {492 '=' => {
488 result.id = Token.Id.AmpersandEqual;493 result.id = Token.Id.AmpersandEqual;
489 self.index += 1;494 self.index += 1;