C++ front-end: enum attributes and multiple attributes

tautschnig · tautschnig · commit 5fa2df79c428 · 2025-02-09T19:59:57.000+01:00
Clang's standard library includes enum member attributes and uses of
`__attribute__((...)) __attribute__((...))` rather than combining
multiple attributes via a comma between them.
diff --git a/src/cpp/parse.cpp b/src/cpp/parse.cpp
@@ -2458,7 +2458,7 @@ bool Parser::rGCCAttribute(typet &t)
 
 bool Parser::optAttribute(typet &t)
 {
-  if(lex.LookAhead(0) == TOK_GCC_ATTRIBUTE)
+  while(lex.LookAhead(0) == TOK_GCC_ATTRIBUTE)
   {
     lex.get_token();
 
@@ -4627,6 +4627,10 @@ bool Parser::rEnumBody(irept &body)
     set_location(n, tk);
     n.set(ID_name, tk.data.get(ID_C_base_name));
 
+    typet discarded_attribute;
+    if(!optAttribute(discarded_attribute))
+      return false;
+
     if(lex.LookAhead(0, tk2)=='=') // set the constant
     {
       lex.get_token(tk2); // read the '='

Original file line number	Diff line number	Diff line change
`@@ -2458,7 +2458,7 @@ bool Parser::rGCCAttribute(typet &t)`
`2458`	`2458`
`2459`	`2459`	`bool Parser::optAttribute(typet &t)`
`2460`	`2460`	`{`
`2461`		`- if(lex.LookAhead(0) == TOK_GCC_ATTRIBUTE)`
	`2461`	`+ while(lex.LookAhead(0) == TOK_GCC_ATTRIBUTE)`
`2462`	`2462`	`{`
`2463`	`2463`	`lex.get_token();`
`2464`	`2464`
`@@ -4627,6 +4627,10 @@ bool Parser::rEnumBody(irept &body)`
`4627`	`4627`	`set_location(n, tk);`
`4628`	`4628`	`n.set(ID_name, tk.data.get(ID_C_base_name));`
`4629`	`4629`
	`4630`	`+ typet discarded_attribute;`
	`4631`	`+ if(!optAttribute(discarded_attribute))`
	`4632`	`+ return false;`
	`4633`	`+`
`4630`	`4634`	`if(lex.LookAhead(0, tk2)=='=') // set the constant`
`4631`	`4635`	`{`
`4632`	`4636`	`lex.get_token(tk2); // read the '='`