authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2017-12-06 21:41:38-05:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2017-12-06 21:41:38-05:00
log37fbf01755ad8a87e9ffa5b2cd6592b523da0d8e
treee9f7a871e9d65a21ee0875e8d8d4fcd8ff418aca
parent18b8a625f55f1c9cd325ec1ffb8d6d666c440b86

awkward void union field syntax no longer needed

1 files changed, 58 insertions(+), 58 deletions(-)

src-self-hosted/main.zig+58-58
......@@ -19,46 +19,46 @@ const Token = struct {
1919 };
2020
2121 const keywords = []KeywordId {
22 KeywordId{.bytes="align", .id = Id {.Keyword_align = {}}},
23 KeywordId{.bytes="and", .id = Id {.Keyword_and = {}}},
24 KeywordId{.bytes="asm", .id = Id {.Keyword_asm = {}}},
25 KeywordId{.bytes="break", .id = Id {.Keyword_break = {}}},
26 KeywordId{.bytes="coldcc", .id = Id {.Keyword_coldcc = {}}},
27 KeywordId{.bytes="comptime", .id = Id {.Keyword_comptime = {}}},
28 KeywordId{.bytes="const", .id = Id {.Keyword_const = {}}},
29 KeywordId{.bytes="continue", .id = Id {.Keyword_continue = {}}},
30 KeywordId{.bytes="defer", .id = Id {.Keyword_defer = {}}},
31 KeywordId{.bytes="else", .id = Id {.Keyword_else = {}}},
32 KeywordId{.bytes="enum", .id = Id {.Keyword_enum = {}}},
33 KeywordId{.bytes="error", .id = Id {.Keyword_error = {}}},
34 KeywordId{.bytes="export", .id = Id {.Keyword_export = {}}},
35 KeywordId{.bytes="extern", .id = Id {.Keyword_extern = {}}},
36 KeywordId{.bytes="false", .id = Id {.Keyword_false = {}}},
37 KeywordId{.bytes="fn", .id = Id {.Keyword_fn = {}}},
38 KeywordId{.bytes="for", .id = Id {.Keyword_for = {}}},
39 KeywordId{.bytes="goto", .id = Id {.Keyword_goto = {}}},
40 KeywordId{.bytes="if", .id = Id {.Keyword_if = {}}},
41 KeywordId{.bytes="inline", .id = Id {.Keyword_inline = {}}},
42 KeywordId{.bytes="nakedcc", .id = Id {.Keyword_nakedcc = {}}},
43 KeywordId{.bytes="noalias", .id = Id {.Keyword_noalias = {}}},
44 KeywordId{.bytes="null", .id = Id {.Keyword_null = {}}},
45 KeywordId{.bytes="or", .id = Id {.Keyword_or = {}}},
46 KeywordId{.bytes="packed", .id = Id {.Keyword_packed = {}}},
47 KeywordId{.bytes="pub", .id = Id {.Keyword_pub = {}}},
48 KeywordId{.bytes="return", .id = Id {.Keyword_return = {}}},
49 KeywordId{.bytes="stdcallcc", .id = Id {.Keyword_stdcallcc = {}}},
50 KeywordId{.bytes="struct", .id = Id {.Keyword_struct = {}}},
51 KeywordId{.bytes="switch", .id = Id {.Keyword_switch = {}}},
52 KeywordId{.bytes="test", .id = Id {.Keyword_test = {}}},
53 KeywordId{.bytes="this", .id = Id {.Keyword_this = {}}},
54 KeywordId{.bytes="true", .id = Id {.Keyword_true = {}}},
55 KeywordId{.bytes="undefined", .id = Id {.Keyword_undefined = {}}},
56 KeywordId{.bytes="union", .id = Id {.Keyword_union = {}}},
57 KeywordId{.bytes="unreachable", .id = Id {.Keyword_unreachable = {}}},
58 KeywordId{.bytes="use", .id = Id {.Keyword_use = {}}},
59 KeywordId{.bytes="var", .id = Id {.Keyword_var = {}}},
60 KeywordId{.bytes="volatile", .id = Id {.Keyword_volatile = {}}},
61 KeywordId{.bytes="while", .id = Id {.Keyword_while = {}}},
22 KeywordId{.bytes="align", .id = Id.Keyword_align},
23 KeywordId{.bytes="and", .id = Id.Keyword_and},
24 KeywordId{.bytes="asm", .id = Id.Keyword_asm},
25 KeywordId{.bytes="break", .id = Id.Keyword_break},
26 KeywordId{.bytes="coldcc", .id = Id.Keyword_coldcc},
27 KeywordId{.bytes="comptime", .id = Id.Keyword_comptime},
28 KeywordId{.bytes="const", .id = Id.Keyword_const},
29 KeywordId{.bytes="continue", .id = Id.Keyword_continue},
30 KeywordId{.bytes="defer", .id = Id.Keyword_defer},
31 KeywordId{.bytes="else", .id = Id.Keyword_else},
32 KeywordId{.bytes="enum", .id = Id.Keyword_enum},
33 KeywordId{.bytes="error", .id = Id.Keyword_error},
34 KeywordId{.bytes="export", .id = Id.Keyword_export},
35 KeywordId{.bytes="extern", .id = Id.Keyword_extern},
36 KeywordId{.bytes="false", .id = Id.Keyword_false},
37 KeywordId{.bytes="fn", .id = Id.Keyword_fn},
38 KeywordId{.bytes="for", .id = Id.Keyword_for},
39 KeywordId{.bytes="goto", .id = Id.Keyword_goto},
40 KeywordId{.bytes="if", .id = Id.Keyword_if},
41 KeywordId{.bytes="inline", .id = Id.Keyword_inline},
42 KeywordId{.bytes="nakedcc", .id = Id.Keyword_nakedcc},
43 KeywordId{.bytes="noalias", .id = Id.Keyword_noalias},
44 KeywordId{.bytes="null", .id = Id.Keyword_null},
45 KeywordId{.bytes="or", .id = Id.Keyword_or},
46 KeywordId{.bytes="packed", .id = Id.Keyword_packed},
47 KeywordId{.bytes="pub", .id = Id.Keyword_pub},
48 KeywordId{.bytes="return", .id = Id.Keyword_return},
49 KeywordId{.bytes="stdcallcc", .id = Id.Keyword_stdcallcc},
50 KeywordId{.bytes="struct", .id = Id.Keyword_struct},
51 KeywordId{.bytes="switch", .id = Id.Keyword_switch},
52 KeywordId{.bytes="test", .id = Id.Keyword_test},
53 KeywordId{.bytes="this", .id = Id.Keyword_this},
54 KeywordId{.bytes="true", .id = Id.Keyword_true},
55 KeywordId{.bytes="undefined", .id = Id.Keyword_undefined},
56 KeywordId{.bytes="union", .id = Id.Keyword_union},
57 KeywordId{.bytes="unreachable", .id = Id.Keyword_unreachable},
58 KeywordId{.bytes="use", .id = Id.Keyword_use},
59 KeywordId{.bytes="var", .id = Id.Keyword_var},
60 KeywordId{.bytes="volatile", .id = Id.Keyword_volatile},
61 KeywordId{.bytes="while", .id = Id.Keyword_while},
6262 };
6363
6464 fn getKeyword(bytes: []const u8) -> ?Id {
......@@ -159,7 +159,7 @@ const Tokenizer = struct {
159159 pub fn next(self: &Tokenizer) -> Token {
160160 var state = State.Start;
161161 var result = Token {
162 .id = Token.Id { .Eof = {} },
162 .id = Token.Id.Eof,
163163 .start = self.index,
164164 .end = undefined,
165165 };
......@@ -172,7 +172,7 @@ const Tokenizer = struct {
172172 },
173173 'c' => {
174174 state = State.C;
175 result.id = Token.Id { .Identifier = {} };
175 result.id = Token.Id.Identifier;
176176 },
177177 '"' => {
178178 state = State.StringLiteral;
......@@ -180,49 +180,49 @@ const Tokenizer = struct {
180180 },
181181 'a'...'b', 'd'...'z', 'A'...'Z', '_' => {
182182 state = State.Identifier;
183 result.id = Token.Id { .Identifier = {} };
183 result.id = Token.Id.Identifier;
184184 },
185185 '@' => {
186186 state = State.Builtin;
187 result.id = Token.Id { .Builtin = {} };
187 result.id = Token.Id.Builtin;
188188 },
189189 '=' => {
190 result.id = Token.Id { .Equal = {} };
190 result.id = Token.Id.Equal;
191191 self.index += 1;
192192 break;
193193 },
194194 '(' => {
195 result.id = Token.Id { .LParen = {} };
195 result.id = Token.Id.LParen;
196196 self.index += 1;
197197 break;
198198 },
199199 ')' => {
200 result.id = Token.Id { .RParen = {} };
200 result.id = Token.Id.RParen;
201201 self.index += 1;
202202 break;
203203 },
204204 ';' => {
205 result.id = Token.Id { .Semicolon = {} };
205 result.id = Token.Id.Semicolon;
206206 self.index += 1;
207207 break;
208208 },
209209 '%' => {
210 result.id = Token.Id { .Percent = {} };
210 result.id = Token.Id.Percent;
211211 self.index += 1;
212212 break;
213213 },
214214 '{' => {
215 result.id = Token.Id { .LBrace = {} };
215 result.id = Token.Id.LBrace;
216216 self.index += 1;
217217 break;
218218 },
219219 '}' => {
220 result.id = Token.Id { .RBrace = {} };
220 result.id = Token.Id.RBrace;
221221 self.index += 1;
222222 break;
223223 },
224224 '.' => {
225 result.id = Token.Id { .Period = {} };
225 result.id = Token.Id.Period;
226226 self.index += 1;
227227 break;
228228 },
......@@ -230,7 +230,7 @@ const Tokenizer = struct {
230230 state = State.Minus;
231231 },
232232 else => {
233 result.id = Token.Id { .Invalid = {} };
233 result.id = Token.Id.Invalid;
234234 self.index += 1;
235235 break;
236236 },
......@@ -280,12 +280,12 @@ const Tokenizer = struct {
280280
281281 State.Minus => switch (c) {
282282 '>' => {
283 result.id = Token.Id { .Arrow = {} };
283 result.id = Token.Id.Arrow;
284284 self.index += 1;
285285 break;
286286 },
287287 else => {
288 result.id = Token.Id { .Minus = {} };
288 result.id = Token.Id.Minus;
289289 break;
290290 },
291291 },
......@@ -334,12 +334,12 @@ const Parser = struct {
334334 switch (next_token.id) {
335335 Token.Id.Keyword_fn => {
336336 const fn_name = self.tokenizer.next();
337 if (@TagType(Token.Id)(fn_name.id) != Token.Id.Identifier) {
337 if (fn_name.id != Token.Id.Identifier) {
338338 @panic("parse error");
339339 }
340340
341341 const lparen = self.tokenizer.next();
342 if (@TagType(Token.Id)(lparen.id) != Token.Id.LParen) {
342 if (lparen.id != Token.Id.LParen) {
343343 @panic("parse error");
344344 }
345345 },
......@@ -391,7 +391,7 @@ pub fn main2() -> %void {
391391 while (true) {
392392 const token = tokenizer.next();
393393 tokenizer.dump(token);
394 if (@TagType(Token.Id)(token.id) == Token.Id.Eof) {
394 if (token.id == Token.Id.Eof) {
395395 break;
396396 }
397397 }