Parse deprecated enumerators

tim-dlang · tim-dlang · commit 1b09e2365c5f · 2025-01-19T15:38:59.000+01:00
diff --git a/src/cppconv/dwriter.d b/src/cppconv/dwriter.d
@@ -3479,7 +3479,7 @@ void parseTreeToDCode(T)(ref CodeWriter code, DWriterData data, T tree, immutabl
         skipToken(code, data, tree.childs[0]);
         code.write(name);
 
-        foreach (c; tree.childs[1 .. $])
+        foreach (c; tree.childs[2 .. $])
         {
             parseTreeToDCode(code, data, c, condition, currentScope);
         }
diff --git a/src/cppconv/grammarcpp.ebnf b/src/cppconv/grammarcpp.ebnf
@@ -763,7 +763,7 @@ EnumeratorList @array
     | EnumeratorList "," Enumerator
     ;
 Enumerator
-    = Identifier EnumeratorInitializer?
+    = Identifier AttributeSpecifierSeq EnumeratorInitializer?
     ;
 EnumeratorInitializer
     = "=" ConstantExpression
diff --git a/tests/single/test372.cpp b/tests/single/test372.cpp
@@ -0,0 +1,5 @@
+enum E
+{
+    a __attribute__ ((__deprecated__("text"))) = 1,
+    b = 3
+};
diff --git a/tests/single/test372.d b/tests/single/test372.d
@@ -0,0 +1,11 @@
+module test372;
+
+import config;
+import cppconvhelpers;
+
+enum E
+{
+    a /+ __attribute__ ((__deprecated__("text"))) +/ = 1,
+    b = 3
+}
+

Original file line number	Diff line number	Diff line change
`@@ -3479,7 +3479,7 @@ void parseTreeToDCode(T)(ref CodeWriter code, DWriterData data, T tree, immutabl`
`3479`	`3479`	`skipToken(code, data, tree.childs[0]);`
`3480`	`3480`	`code.write(name);`
`3481`	`3481`
`3482`		`- foreach (c; tree.childs[1 .. $])`
	`3482`	`+ foreach (c; tree.childs[2 .. $])`
`3483`	`3483`	`{`
`3484`	`3484`	`parseTreeToDCode(code, data, c, condition, currentScope);`
`3485`	`3485`	`}`
Original file line number	Diff line number	Diff line change
`@@ -763,7 +763,7 @@ EnumeratorList @array`
`763`	`763`	`\| EnumeratorList "," Enumerator`
`764`	`764`	`;`
`765`	`765`	`Enumerator`
`766`		`- = Identifier EnumeratorInitializer?`
	`766`	`+ = Identifier AttributeSpecifierSeq EnumeratorInitializer?`
`767`	`767`	`;`
`768`	`768`	`EnumeratorInitializer`
`769`	`769`	`= "=" ConstantExpression`
-Original file line number
+Diff line change
 +enum E
 +{
 +    a __attribute__ ((__deprecated__("text"))) = 1,
 +    b = 3
 +};