Commit aa09e7b63995639084d25329954b1972a72ad12d | zig

author	Jimmi Holst Christensen <jhc@dismail.de> 2018-04-10 15:01:21+02:00
committer	Jimmi Holst Christensen <jhc@dismail.de> 2018-04-10 15:01:21+02:00
log	aa09e7b63995639084d25329954b1972a72ad12d
tree	ec7b6e78cc7deac1d185f97fb83861356a79f019
parent	3b80e665074cd56d9e24fb8ae0fb9d86e8cd841a

2 files changed, 10 insertions(+), 3 deletions(-)

std/zig/parser.zig+8

...	...	@@ -5041,3 +5041,11 @@ test "zig fmt: use" {
5041	5041	\\
5042	5042	);
5043	5043	}
	5044
	5045	test "zig fmt: string identifier" {
	5046	try testCanonical(
	5047	\\const @"a b" = @"c d".@"e f";
	5048	\\fn @"g h"() void {}
	5049	\\
	5050	);
	5051	}

std/zig/tokenizer.zig+2-3

...	...	@@ -78,7 +78,6 @@ pub const Token = struct {
78	78	StringLiteral: StrLitKind,
79	79	MultilineStringLiteralLine: StrLitKind,
80	80	CharLiteral,
81		StringIdentifier,
82	81	Eof,
83	82	Builtin,
84	83	Bang,
...	...	@@ -434,7 +433,7 @@ pub const Tokenizer = struct {
434	433
435	434	State.SawAtSign => switch (c) {
436	435	'"' => {
437		result.id = Token.Id.StringIdentifier;
	436	result.id = Token.Id.Identifier;
438	437	state = State.StringLiteral;
439	438	},
440	439	else => {
...	...	@@ -1136,7 +1135,7 @@ test "tokenizer - string identifier and builtin fns" {
1136	1135	,
1137	1136	[]Token.Id{
1138	1137	Token.Id.Keyword_const,
1139		Token.Id.StringIdentifier,
	1138	Token.Id.Identifier,
1140	1139	Token.Id.Equal,
1141	1140	Token.Id.Builtin,
1142	1141	Token.Id.LParen,