Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make __attribute__((__fallthrough__)); no longer parse as declaration #75

Merged
merged 2 commits into from
Feb 16, 2022
Merged

Make __attribute__((__fallthrough__)); no longer parse as declaration #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47526c2
expand to include case that still causes warning
michael-schwarz Feb 14, 2022
f3111ed
Make `__attribute__((__fallthrough__));` no longer parse as declaration
michael-schwarz Feb 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions src/frontc/cparser.mly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -936,7 +936,7 @@ for_clause:
declaration: /* ISO 6.7.*/
decl_spec_list init_declarator_list SEMICOLON
{ doDeclaration (joinLoc (snd $1) $3) (fst $1) $2 }
| decl_spec_list SEMICOLON
| decl_spec_list_no_attr_only SEMICOLON
{ doDeclaration (joinLoc (snd $1) $2) (fst $1) [] }
| static_assert_declaration { let (e, m, loc) = $1 in STATIC_ASSERT (e, m, loc) }
;
Expand Down Expand Up @@ -965,7 +965,7 @@ init_declarator: /* ISO 6.7 */
{ ($1, $3) }
;

decl_spec_list: /* ISO 6.7 */
decl_spec_list_common: /* ISO 6.7 */
/* ISO 6.7.1 */
| TYPEDEF decl_spec_list_opt { SpecTypedef :: $2, $1 }
| EXTERN decl_spec_list_opt { SpecStorage EXTERN :: $2, $1 }
Expand All @@ -980,9 +980,17 @@ decl_spec_list: /* ISO 6.7 */
| NORETURN decl_spec_list_opt { SpecNoreturn :: $2, $1 }

| cvspec decl_spec_list_opt { (fst $1) :: $2, snd $1 }
| attribute_nocv decl_spec_list_opt { SpecAttr (fst $1) :: $2, snd $1 }
/* specifier pattern variable (must be last in spec list) */
| AT_SPECIFIER LPAREN IDENT RPAREN { [ SpecPattern(fst $3) ], $1 }

decl_spec_list_no_attr_only:
| decl_spec_list_common { $1 }
| attribute_nocv decl_spec_list { SpecAttr (fst $1) :: (fst $2), snd $1 }
;

decl_spec_list:
| decl_spec_list_common { $1 }
| attribute_nocv decl_spec_list_opt { SpecAttr (fst $1) :: $2, snd $1 }
;
/* (* In most cases if we see a NAMED_TYPE we must shift it. Thus we declare
* NAMED_TYPE to have right associativity *) */
Expand Down
7 changes: 5 additions & 2 deletions test/small1/fallthrough-label.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,12 @@ int main() {

switch(a) {
case 5:
__attribute__((__fallthrough__));
a = 8;
__attribute__((__fallthrough__));
case 10:
__attribute__((__fallthrough__));
default:
a = 8;
a = 8;
}

return 0;
Expand Down