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

Merge branch 'master' into 0.4.0-dev

This commit is contained in:
Hackerpilot 2014-09-21 19:10:37 +00:00
parent 78ad6a0af7 126452e0bb
commit b37b4b9dab
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
containers

@ -1 +1 @@
Subproject commit f7fb230db32afd1fc85b242b8112c9fab05fc839
Subproject commit 53258c939ea7f6871fba93f34c5a5512e31e9f5e

2
libdparse

@ -1 +1 @@
Subproject commit dca3498b483c8adb7671c1eb4d97186fac3483aa
Subproject commit 27f45e6490e7ef0e9a6ef604e51f68a54b10ee2d

1
makefile
View File

@ -72,6 +72,7 @@ SERVER_SRC = src/actypes.d\
containers/src/containers/hashset.d\
containers/src/containers/internal/hash.d\
containers/src/containers/internal/node.d\
containers/src/containers/internal/storage_type.d\
containers/src/containers/slist.d\
msgpack-d/src/msgpack.d

7
src/conversion/first.d
View File

@ -70,9 +70,10 @@ final class FirstPass : ASTVisitor
{
// Create a dummy symbol because we don't want unit test symbols leaking
// into the symbol they're declared in.
SemanticSymbol* s = allocateSemanticSymbol("*unittest*",
SemanticSymbol* s = allocateSemanticSymbol(internString("*unittest*"),
CompletionKind.dummy, null, 0);
s.parent = currentSymbol;
currentSymbol.addChild(s);
currentSymbol = s;
u.accept(this);
currentSymbol = s.parent;
@ -384,9 +385,9 @@ final class FirstPass : ASTVisitor
if (blockStatement.declarationsAndStatements !is null)
{
currentScope = s;
currentScope = s;
visit (blockStatement.declarationsAndStatements);
currentScope = s.parent;
currentScope = s.parent;
}
}