aboutsummaryrefslogtreecommitdiff
path: root/lib/std
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2020-09-03 17:22:57 -0400
committerGitHub <noreply@github.com>2020-09-03 17:22:57 -0400
commitf2bbd8a548c9a707aa121c58fe8c8a97666b84f2 (patch)
tree82c2511159c52b9cd4e67daaed9c1e5948a3880e /lib/std
parentdac1cd77505ef9fa493e069549c139d74e31081f (diff)
parent6f0126e9573a6bde9cbe5b113208e0a515b2eee7 (diff)
downloadzig-f2bbd8a548c9a707aa121c58fe8c8a97666b84f2.tar.gz
zig-f2bbd8a548c9a707aa121c58fe8c8a97666b84f2.zip
Merge pull request #6242 from Vexu/stage2
Stage2: slicing and split container scope from file scope
Diffstat (limited to 'lib/std')
-rw-r--r--lib/std/zig/tokenizer.zig3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/std/zig/tokenizer.zig b/lib/std/zig/tokenizer.zig
index 47c7d23b35..86968c73b2 100644
--- a/lib/std/zig/tokenizer.zig
+++ b/lib/std/zig/tokenizer.zig
@@ -1175,6 +1175,7 @@ pub const Tokenizer = struct {
},
.num_dot_dec => switch (c) {
'.' => {
+ result.id = .IntegerLiteral;
self.index -= 1;
state = .start;
break;
@@ -1183,7 +1184,6 @@ pub const Tokenizer = struct {
state = .float_exponent_unsigned;
},
'0'...'9' => {
- result.id = .FloatLiteral;
state = .float_fraction_dec;
},
else => {
@@ -1769,6 +1769,7 @@ test "tokenizer - number literals decimal" {
testTokenize("7", &[_]Token.Id{.IntegerLiteral});
testTokenize("8", &[_]Token.Id{.IntegerLiteral});
testTokenize("9", &[_]Token.Id{.IntegerLiteral});
+ testTokenize("1..", &[_]Token.Id{ .IntegerLiteral, .Ellipsis2 });
testTokenize("0a", &[_]Token.Id{ .Invalid, .Identifier });
testTokenize("9b", &[_]Token.Id{ .Invalid, .Identifier });
testTokenize("1z", &[_]Token.Id{ .Invalid, .Identifier });