Ekdohibs/zig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

self-hosted: implement addr of align parsing

Browse Source
This commit is contained in:
Josh Wolfe 2017-12-12 19:26:33 -07:00
parent 24c2703dfa
commit 0003cc8105
1 changed files with 57 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src-self-hosted/parser.zig
View File

@ -81,6 +81,7 @@ pub const Parser = struct {
MultiplyExpression: DestPtr, MultiplyExpression: DestPtr,
BraceSuffixExpression: DestPtr, BraceSuffixExpression: DestPtr,
PrefixOpExpression: DestPtr, PrefixOpExpression: DestPtr,
AddrOfModifiers: &ast.NodeAddrOfExpr,
SuffixOpExpression: DestPtr, SuffixOpExpression: DestPtr,
PrimaryExpression: DestPtr, PrimaryExpression: DestPtr,
TypeExpr: DestPtr, TypeExpr: DestPtr,
@ -350,30 +351,51 @@ pub const Parser = struct {
State.PrefixOpExpression => |dest_ptr| { State.PrefixOpExpression => |dest_ptr| {
const first_token = self.getNextToken(); const first_token = self.getNextToken();
if (first_token.id == Token.Id.Ampersand) { switch (first_token.id) {
Token.Id.Ampersand => {
const addr_of_expr = %return self.createAttachAddrOfExpr(dest_ptr, first_token); const addr_of_expr = %return self.createAttachAddrOfExpr(dest_ptr, first_token);
stack.append(State { .AddrOfModifiers = addr_of_expr }) %% unreachable;
continue;
},
else => {
self.putBackToken(first_token);
stack.append(State { .SuffixOpExpression = dest_ptr }) %% unreachable;
continue;
},
}
},
State.AddrOfModifiers => |addr_of_expr| {
var token = self.getNextToken(); var token = self.getNextToken();
if (token.id == Token.Id.Keyword_align) { switch (token.id) {
@panic("TODO align"); Token.Id.Keyword_align => {
} stack.append(State { .AddrOfModifiers = addr_of_expr }) %% unreachable;
if (token.id == Token.Id.Keyword_const) { if (addr_of_expr.align_expr != null) return self.parseError(token, "multiple align qualifiers");
_ = %return self.eatToken(Token.Id.LParen);
%return stack.append(State { .ExpectToken = Token.Id.RParen });
%return stack.append(State { .Expression = DestPtr{.NullableField = &addr_of_expr.align_expr} });
continue;
},
Token.Id.Keyword_const => {
if (addr_of_expr.const_token != null) return self.parseError(token, "duplicate qualifier: const");
addr_of_expr.const_token = token; addr_of_expr.const_token = token;
token = self.getNextToken(); stack.append(State { .AddrOfModifiers = addr_of_expr }) %% unreachable;
} continue;
if (token.id == Token.Id.Keyword_volatile) { },
Token.Id.Keyword_volatile => {
if (addr_of_expr.volatile_token != null) return self.parseError(token, "duplicate qualifier: volatile");
addr_of_expr.volatile_token = token; addr_of_expr.volatile_token = token;
token = self.getNextToken(); stack.append(State { .AddrOfModifiers = addr_of_expr }) %% unreachable;
} continue;
},
else => {
self.putBackToken(token); self.putBackToken(token);
stack.append(State { stack.append(State {
.PrefixOpExpression = DestPtr { .Field = &addr_of_expr.op_expr}, .PrefixOpExpression = DestPtr { .Field = &addr_of_expr.op_expr},
}) %% unreachable; }) %% unreachable;
continue; continue;
},
} }
self.putBackToken(first_token);
stack.append(State { .SuffixOpExpression = dest_ptr }) %% unreachable;
continue;
}, },
State.SuffixOpExpression => |dest_ptr| { State.SuffixOpExpression => |dest_ptr| {
@ -1189,4 +1211,16 @@ test "zig fmt" {
\\} \\}
\\ \\
); );
testCanonical(
\\extern fn f1(s: &align(&u8) u8) -> c_int;
\\
);
testCanonical(
\\extern fn f1(s: &&align(1) &const &volatile u8) -> c_int;
\\extern fn f2(s: &align(1) const &align(1) volatile &const volatile u8) -> c_int;
\\extern fn f3(s: &align(1) const volatile u8) -> c_int;
\\
);
} }