forks
/
D-Scanner
mirror of https://github.com/dlang-community/D-Scanner.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #106 from AndrejMitrovic/FixAliasLinkage 

Add linkage attribute parsing support to alias declarations.
This commit is contained in:
Hackerpilot 2014-02-12 10:57:52 -08:00
parent 1358b5ace9 a531013764
commit 54118e905f
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
stdx/d/ast.d
View File

@ -346,8 +346,9 @@ class AliasDeclaration : ASTNode
public: public:
override void accept(ASTVisitor visitor) override void accept(ASTVisitor visitor)
{ {
mixin (visitIfNotNull!(type, name, initializers)); mixin (visitIfNotNull!(linkageAttribute, type, name, initializers));
} }
/** */ LinkageAttribute linkageAttribute;
/** */ Type type; /** */ Type type;
/** */ Token name; /** */ Token name;
/** */ AliasInitializer[] initializers; /** */ AliasInitializer[] initializers;

14
stdx/d/parser.d
View File

@ -70,7 +70,7 @@ class Parser
* *
* $(GRAMMAR $(RULEDEF aliasDeclaration): * $(GRAMMAR $(RULEDEF aliasDeclaration):
* $(LITERAL 'alias') $(RULE aliasInitializer) $(LPAREN)$(LITERAL ',') $(RULE aliasInitializer)$(RPAREN)* $(LITERAL ';') * $(LITERAL 'alias') $(RULE aliasInitializer) $(LPAREN)$(LITERAL ',') $(RULE aliasInitializer)$(RPAREN)* $(LITERAL ';')
* | $(LITERAL 'alias') $(RULE type) $(LITERAL identifier) $(LITERAL ';') * | $(LITERAL 'alias') $(RULE linkageAttribute)? $(RULE type) $(LITERAL identifier) $(LITERAL ';')
* ;) * ;)
*/ */
AliasDeclaration parseAliasDeclaration() AliasDeclaration parseAliasDeclaration()
@ -78,6 +78,18 @@ class Parser
mixin(traceEnterAndExit!(__FUNCTION__)); mixin(traceEnterAndExit!(__FUNCTION__));
auto node = new AliasDeclaration; auto node = new AliasDeclaration;
if (expect(tok!"alias") is null) return null; if (expect(tok!"alias") is null) return null;
// 'alias extern(C) void function() f;' => supported in DMD and DScanner.
// 'alias f = extern(C) void function();' => not supported in both DMD and DScanner. See D Bugzilla 10471.
// 'alias extern void function() f;' => supported in DMD, not supported in DScanner since it's a storage class.
if (currentIs(tok!"extern"))
{
if (!peekIs(tok!"("))
error(`"(" expected for the linkage attribute`);
node.linkageAttribute = parseLinkageAttribute();
}
if (startsWith(tok!"identifier", tok!"=")) if (startsWith(tok!"identifier", tok!"="))
{ {
do do