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

Merge branch '0.7.0-dev' of https://github.com/Hackerpilot/DCD into 0.7.0-dev

This commit is contained in:
Hackerpilot 2015-06-08 15:51:00 -07:00
parent 1bc33fecb3 0cf0f191bc
commit d95b78abab
5 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
containers

@ -1 +1 @@
Subproject commit d732a67e76f60fd037547c3ffe8776c6deda6bab
Subproject commit 618c1694c731c4397bc8a46983e6a991c7d97a9e

2
dsymbol

@ -1 +1 @@
Subproject commit ddf8c97753471388303d64a47bdade85cc4de003
Subproject commit 05439bb691e8130f2ff75797fa79df5146c5d729

2
libdparse

@ -1 +1 @@
Subproject commit 0dccfca0e2a132b3c862a62da1c323ccd24e622d
Subproject commit d4da4f00f361528e67fe4cc9622fd681c9004e73

18
src/server/autocomplete.d
View File

@ -445,14 +445,14 @@ ImportKind determineImportKind(T)(T tokens)
unittest
{
Token[] t;
t ~= Token(tok!"import");
t ~= Token(tok!"identifier");
t ~= Token(tok!".");
t ~= Token(tok!"identifier");
t ~= Token(tok!":");
t ~= Token(tok!"identifier");
t ~= Token(tok!",");
Token[] t = [
Token(tok!"import"),
Token(tok!"identifier"),
Token(tok!"."),
Token(tok!"identifier"),
Token(tok!":"),
Token(tok!"identifier"),
Token(tok!",")];
assert (determineImportKind(t) == ImportKind.selective);
Token[] t2;
t2 ~= Token(tok!"else");
@ -528,7 +528,7 @@ body
}
}
string resolvedLocation = ModuleCache.resolveImportLoctation(path);
string resolvedLocation = ModuleCache.resolveImportLocation(path);
if (resolvedLocation is null)
{
warning("Could not resolve location of ", path);

7
src/server/server.d
View File

@ -32,8 +32,6 @@ import std.allocator;
import std.exception : enforce;
import std.experimental.logger;
import core.memory;
import msgpack;
import dsymbol.string_interning;
@ -42,7 +40,6 @@ import messages;
import autocomplete;
import dsymbol.modulecache;
import dsymbol.symbol;
import core.memory;
import dcd_version;
/// Name of the server configuration file
@ -114,9 +111,6 @@ int main(string[] args)
sw.stop();
info(ModuleCache.symbolsAllocated, " symbols cached.");
info("Startup completed in ", sw.peek().to!("msecs", float), " milliseconds.");
import core.memory : GC;
GC.minimize();
// No relative paths
version (Posix) chdir("/");
@ -190,7 +184,6 @@ int main(string[] args)
if (request.kind & RequestKind.addImport)
{
ModuleCache.addImportPaths(request.importPaths);
GC.minimize();
}
if (request.kind & RequestKind.autocomplete)
{