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 branch 'master' of https://github.com/Hackerpilot/Dscanner into HEAD

This commit is contained in:
Hackerpilot 2014-04-29 15:46:22 -07:00
parent bf2531b188 07ccc4d55c
commit 9722183249
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
astprinter.d
View File

@ -479,7 +479,7 @@ class XMLPrinter : ASTVisitor
override void visit(const ForStatement forStatement) override void visit(const ForStatement forStatement)
{ {
output.writeln("<forStatement>"); output.writeln("<forStatement>");
if (forStatement.declarationOrStatement !is null) if (forStatement.initialization !is null)
{ {
output.writeln("<initialization>"); output.writeln("<initialization>");
visit(forStatement.initialization); visit(forStatement.initialization);
@ -497,7 +497,8 @@ class XMLPrinter : ASTVisitor
visit(forStatement.increment); visit(forStatement.increment);
output.writeln("</increment>"); output.writeln("</increment>");
} }
visit(forStatement.declarationOrStatement); if (forStatement.declarationOrStatement !is null)
visit(forStatement.declarationOrStatement);
output.writeln("</forStatement>"); output.writeln("</forStatement>");
} }
@ -780,7 +781,7 @@ class XMLPrinter : ASTVisitor
output.writeln("</key>"); output.writeln("</key>");
output.writeln("<value>"); output.writeln("<value>");
visit(keyValuePair.value); visit(keyValuePair.value);
output.writeln("<value>"); output.writeln("</value>");
output.writeln("</keyValuePair>"); output.writeln("</keyValuePair>");
} }

2
build.sh
View File

@ -12,7 +12,7 @@ dmd\
analysis/*.d\ analysis/*.d\
-version=DIP61\ -version=DIP61\
-ofdscanner\ -ofdscanner\
-m64 -g\ -g\
-O -release -O -release
#gdc\ #gdc\

5
std/d/parser.d
View File

@ -325,7 +325,7 @@ alias core.sys.posix.stdio.fileno fileno;
* Parses an ArrayLiteral * Parses an ArrayLiteral
* *
* $(GRAMMAR $(RULEDEF arrayLiteral): * $(GRAMMAR $(RULEDEF arrayLiteral):
* $(LITERAL '[') ($(RULE assignExpression) ($(LITERAL ',') $(RULE assignExpression))*)? $(LITERAL ']') * $(LITERAL '[') $(RULE argumentList)? $(LITERAL ']')
* ;) * ;)
*/ */
ArrayLiteral parseArrayLiteral() ArrayLiteral parseArrayLiteral()
@ -6263,8 +6263,7 @@ protected:
auto b = setBookmark(); auto b = setBookmark();
scope(exit) goToBookmark(b); scope(exit) goToBookmark(b);
advance(); advance();
Expression e = parseExpression(); return !currentIs(tok!"]") && parseExpression() !is null && currentIs(tok!":");
return e !is null && currentIs(tok!":");
} }
bool hasMagicDelimiter(alias L, alias T)() bool hasMagicDelimiter(alias L, alias T)()