aboutsummaryrefslogtreecommitdiff
path: root/src/parser.cpp
diff options
context:
space:
mode:
authorgingerBill <bill@gingerbill.org>2019-01-30 14:24:14 +0000
committergingerBill <bill@gingerbill.org>2019-01-30 14:24:14 +0000
commitdee28d998ff6583dab49a57ee4b792d9e289a18f (patch)
tree159c1cde3953d7f748848fc53ad32e3b305e038c /src/parser.cpp
parent96ef6aa7f34677a8fc46f7807f2d12346c02a5bb (diff)
Allow for @indent for attributes that don't require any parameters; Add -ignore-unknown-attributes
Diffstat (limited to 'src/parser.cpp')
-rw-r--r--src/parser.cpp46
1 files changed, 27 insertions, 19 deletions
diff --git a/src/parser.cpp b/src/parser.cpp
index ee67db3be..ab5f1589c 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -3650,30 +3650,38 @@ Ast *parse_foreign_decl(AstFile *f) {
Ast *parse_attribute(AstFile *f, Token token, TokenKind open_kind, TokenKind close_kind) {
Array<Ast *> elems = {};
- Token open = expect_token(f, open_kind);
- f->expr_level++;
- if (f->curr_token.kind != close_kind) {
- elems = array_make<Ast *>(heap_allocator());
- while (f->curr_token.kind != close_kind &&
- f->curr_token.kind != Token_EOF) {
- Ast *elem = nullptr;
- elem = parse_ident(f);
- if (f->curr_token.kind == Token_Eq) {
- Token eq = expect_token(f, Token_Eq);
- Ast *value = parse_value(f);
- elem = ast_field_value(f, elem, value, eq);
- }
+ Token open = {};
+ Token close = {};
- array_add(&elems, elem);
+ if (f->curr_token.kind == Token_Ident) {
+ elems = array_make<Ast *>(heap_allocator(), 0, 1);
+ Ast *elem = parse_ident(f);
+ array_add(&elems, elem);
+ } else {
+ open = expect_token(f, open_kind);
+ f->expr_level++;
+ if (f->curr_token.kind != close_kind) {
+ elems = array_make<Ast *>(heap_allocator());
+ while (f->curr_token.kind != close_kind &&
+ f->curr_token.kind != Token_EOF) {
+ Ast *elem = nullptr;
+ elem = parse_ident(f);
+ if (f->curr_token.kind == Token_Eq) {
+ Token eq = expect_token(f, Token_Eq);
+ Ast *value = parse_value(f);
+ elem = ast_field_value(f, elem, value, eq);
+ }
- if (!allow_token(f, Token_Comma)) {
- break;
+ array_add(&elems, elem);
+
+ if (!allow_token(f, Token_Comma)) {
+ break;
+ }
}
}
+ f->expr_level--;
+ close = expect_closing(f, close_kind, str_lit("attribute"));
}
- f->expr_level--;
- Token close = expect_closing(f, close_kind, str_lit("attribute"));
-
Ast *attribute = ast_attribute(f, token, open, close, elems);
Ast *decl = parse_stmt(f);