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

Fix #59

This commit is contained in:
Hackerpilot 2013-10-28 11:28:32 -07:00
parent 4cf3e1c85a
commit 3dd657c228
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
stdx/d/ast.d
View File

@ -844,10 +844,10 @@ class ConditionalDeclaration : ASTNode
public: public:
override void accept(ASTVisitor visitor) override void accept(ASTVisitor visitor)
{ {
mixin (visitIfNotNull!(compileCondition, trueDeclaration, falseDeclaration)); mixin (visitIfNotNull!(compileCondition, trueDeclarations, falseDeclaration));
} }
/** */ CompileCondition compileCondition; /** */ CompileCondition compileCondition;
/** */ Declaration trueDeclaration; /** */ Declaration[] trueDeclarations;
/** */ Declaration falseDeclaration; /** */ Declaration falseDeclaration;
} }

27
stdx/d/parser.d
View File

@ -50,6 +50,11 @@
* License: $(LINK2 http://www.boost.org/LICENSE_1_0.txt, Boost License 1.0) * License: $(LINK2 http://www.boost.org/LICENSE_1_0.txt, Boost License 1.0)
* Authors: Brian Schott * Authors: Brian Schott
* Source: $(PHOBOSSRC std/d/_parser.d) * Source: $(PHOBOSSRC std/d/_parser.d)
* Macros:
* GRAMMAR = <pre>$0</pre>
* RULEDEF = <a name="$0"><span style="font-weight: bold;">$0</span></a>
* RULE = <a href="#$0"><span style="font-weight: bold;">$0</span></a>
* LITERAL = <span style="color: green;">$0</span>
*/ */
module stdx.d.parser; module stdx.d.parser;
@ -438,7 +443,7 @@ alias core.sys.posix.stdio.fileno fileno;
* *
* $(GRAMMAR $(RULEDEF asmInstruction): * $(GRAMMAR $(RULEDEF asmInstruction):
* $(LITERAL Identifier) * $(LITERAL Identifier)
* | $(LITERAL 'align') $(RULE IntegerLiteral) * | $(LITERAL 'align') $(LITERAL IntegerLiteral)
* | $(LITERAL 'align') $(LITERAL Identifier) * | $(LITERAL 'align') $(LITERAL Identifier)
* | $(LITERAL Identifier) $(LITERAL ':') $(RULE asmInstruction) * | $(LITERAL Identifier) $(LITERAL ':') $(RULE asmInstruction)
* | $(LITERAL Identifier) $(RULE asmExp) * | $(LITERAL Identifier) $(RULE asmExp)
@ -512,8 +517,8 @@ alias core.sys.posix.stdio.fileno fileno;
* Parses an AsmPrimaryExp * Parses an AsmPrimaryExp
* *
* $(GRAMMAR $(RULEDEF asmPrimaryExp): * $(GRAMMAR $(RULEDEF asmPrimaryExp):
* $(RULE IntegerLiteral) * $(LITERAL IntegerLiteral)
* | $(RULE FloatLiteral) * | $(LITERAL FloatLiteral)
* | $(RULE register) * | $(RULE register)
* | $(RULE identifierChain) * | $(RULE identifierChain)
* | $(LITERAL '$') * | $(LITERAL '$')
@ -1365,7 +1370,9 @@ class ClassFour(A, B) if (someTest()) : Super {}}c;
* Parses a ConditionalDeclaration * Parses a ConditionalDeclaration
* *
* $(GRAMMAR $(RULEDEF conditionalDeclaration): * $(GRAMMAR $(RULEDEF conditionalDeclaration):
* $(RULE compileCondition) ($(RULE declaration) | $(LITERAL '{') $(RULE declaration)* $(LITERAL '}')) ($(LITERAL 'else') ($(RULE declaration) | $(LITERAL '{') $(RULE declaration)* $(LITERAL '}')))? * $(RULE compileCondition) $(RULE declaration)
* | $(RULE compileCondition) $(LITERAL ':') $(RULE declaration)+
* | $(RULE compileCondition) $(RULE declaration) ($(LITERAL 'else') $(RULE declaration))?
* ;) * ;)
*/ */
ConditionalDeclaration parseConditionalDeclaration() ConditionalDeclaration parseConditionalDeclaration()
@ -1374,9 +1381,17 @@ class ClassFour(A, B) if (someTest()) : Super {}}c;
auto node = new ConditionalDeclaration; auto node = new ConditionalDeclaration;
node.compileCondition = parseCompileCondition(); node.compileCondition = parseCompileCondition();
if (currentIs(TokenType.colon))
{
advance();
while (isDeclaration())
node.trueDeclarations ~= parseDeclaration();
return node;
}
auto dec = parseDeclaration(); auto dec = parseDeclaration();
if (dec is null) return null; if (dec is null) return null;
node.trueDeclaration = dec; node.trueDeclarations ~= dec;
if(currentIs(TokenType.else_)) if(currentIs(TokenType.else_))
advance(); advance();
@ -4185,7 +4200,7 @@ q{(int a, ...)
* *
* $(GRAMMAR $(RULEDEF register): * $(GRAMMAR $(RULEDEF register):
* $(LITERAL Identifier) * $(LITERAL Identifier)
* | $(LITERAL Identifier) $(LITERAL '$(LPAREN)') $(RULE IntegerLiteral) $(LITERAL '$(RPAREN)') * | $(LITERAL Identifier) $(LITERAL '$(LPAREN)') $(LITERAL IntegerLiteral) $(LITERAL '$(RPAREN)')
* ;) * ;)
*/ */
Register parseRegister() Register parseRegister()