diff options
| -rw-r--r-- | expression.h | 2 | ||||
| -rw-r--r-- | parse.c | 5 | ||||
| -rw-r--r-- | validation/typedef_shadow.c | 12 |
3 files changed, 16 insertions, 3 deletions
diff --git a/expression.h b/expression.h index 5136b9b4..2e12b12c 100644 --- a/expression.h +++ b/expression.h @@ -199,7 +199,7 @@ static inline int lookup_type(struct token *token) { if (token->pos.type == TOKEN_IDENT) { struct symbol *sym = lookup_symbol(token->ident, NS_SYMBOL | NS_TYPEDEF); - return sym && sym->namespace == NS_TYPEDEF; + return sym && (sym->namespace & NS_TYPEDEF); } return 0; } @@ -1321,8 +1321,9 @@ static struct token *declaration_specifiers(struct token *token, struct decl_sta int size = 0; while (token_type(token) == TOKEN_IDENT) { - struct symbol *s = lookup_symbol(token->ident, NS_TYPEDEF); - if (!s) + struct symbol *s = lookup_symbol(token->ident, + NS_TYPEDEF | NS_SYMBOL); + if (!s || !(s->namespace & NS_TYPEDEF)) break; if (s->type != SYM_KEYWORD) { if (seen & Set_Any) diff --git a/validation/typedef_shadow.c b/validation/typedef_shadow.c new file mode 100644 index 00000000..c72cec72 --- /dev/null +++ b/validation/typedef_shadow.c @@ -0,0 +1,12 @@ +typedef int T; +static void f(int T) +{ + static T a; +} +/* + * check-name: typedef shadowing + * check-error-start: +typedef_shadow.c:4:18: error: Expected ; at end of declaration +typedef_shadow.c:4:18: error: got a + * check-error-end: + */ |