fix(parser): attributes are not always propagated/populated

ljmf00 · EyalIO · ljmf00 · commit b717b20b2623 · 2022-09-16T13:57:58.000+01:00
Co-authored-by: Eyal Lotem &lt;eyal@weka.io&gt;
Signed-off-by: Luís Ferreira &lt;contact@lsferreira.net&gt;
diff --git a/src/dparse/parser.d b/src/dparse/parser.d
@@ -2179,7 +2179,7 @@ class Parser
             }
             else if (isAuto == DecType.autoFun)
             {
-                mixin(nullCheck!`node.functionDeclaration = parseFunctionDeclaration(null, true)`);
+                mixin(nullCheck!`node.functionDeclaration = parseFunctionDeclaration(null, true, node.attributes)`);
                 node.tokens = tokens[startIndex .. index];
                 return node;
             }
@@ -2412,7 +2412,7 @@ class Parser
                 goToBookmark(b2);
                 if (savedComment && comment is null)
                     comment = savedComment;
-                node.functionDeclaration = parseFunctionDeclaration(t, false);
+                node.functionDeclaration = parseFunctionDeclaration(t, false, node.attributes);
             }
             else abandonBookmark(b2);
             if (!node.variableDeclaration && !node.functionDeclaration)
@@ -3518,7 +3518,7 @@ class Parser
                     return null;
             ownArray(node.storageClasses, storageClasses);
 
-            foreach (a; node.attributes)
+            foreach (a; attributes)
             {
                 if (a.attribute == tok!"auto")
                     node.hasAuto = true;

Original file line number	Diff line number	Diff line change
`@@ -2179,7 +2179,7 @@ class Parser`
`2179`	`2179`	`}`
`2180`	`2180`	`else if (isAuto == DecType.autoFun)`
`2181`	`2181`	`{`
`2182`		- mixin(nullCheck!`node.functionDeclaration = parseFunctionDeclaration(null, true)`);
	`2182`	+ mixin(nullCheck!`node.functionDeclaration = parseFunctionDeclaration(null, true, node.attributes)`);
`2183`	`2183`	`node.tokens = tokens[startIndex .. index];`
`2184`	`2184`	`return node;`
`2185`	`2185`	`}`
`@@ -2412,7 +2412,7 @@ class Parser`
`2412`	`2412`	`goToBookmark(b2);`
`2413`	`2413`	`if (savedComment && comment is null)`
`2414`	`2414`	`comment = savedComment;`
`2415`		`- node.functionDeclaration = parseFunctionDeclaration(t, false);`
	`2415`	`+ node.functionDeclaration = parseFunctionDeclaration(t, false, node.attributes);`
`2416`	`2416`	`}`
`2417`	`2417`	`else abandonBookmark(b2);`
`2418`	`2418`	`if (!node.variableDeclaration && !node.functionDeclaration)`
`@@ -3518,7 +3518,7 @@ class Parser`
`3518`	`3518`	`return null;`
`3519`	`3519`	`ownArray(node.storageClasses, storageClasses);`
`3520`	`3520`
`3521`		`- foreach (a; node.attributes)`
	`3521`	`+ foreach (a; attributes)`
`3522`	`3522`	`{`
`3523`	`3523`	`if (a.attribute == tok!"auto")`
`3524`	`3524`	`node.hasAuto = true;`