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

Allocator update

This commit is contained in:
Hackerpilot 2015-06-13 20:23:13 -07:00
parent e721059a2f
commit 8d39155555
6 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
containers

@ -1 +1 @@
Subproject commit 1633c5de6c6fa7ba325c5a13927bb288ef244cbc Subproject commit f9f971dac9125cf52d2489dd296c8ef159d2a173

2
dsymbol

@ -1 +1 @@
Subproject commit 40fe6a3c87ef8f4cdda25d1420f2325cd4c82471 Subproject commit 6ebfb4e1fd45588a46f50ac49eac9acfd177d09e

2
libdparse

@ -1 +1 @@
Subproject commit dbe351d00648cabc1c53fbc31358796102ca4d35 Subproject commit 7ba0b01fe1f2808db1a6fe67af4f31bdb3ab3980

19
makefile
View File

@ -63,8 +63,12 @@ SERVER_SRC := \
libdparse/src/std/d/lexer.d\ libdparse/src/std/d/lexer.d\
libdparse/src/std/d/parser.d\ libdparse/src/std/d/parser.d\
libdparse/src/std/lexer.d\ libdparse/src/std/lexer.d\
libdparse/src/std/allocator.d\
libdparse/src/std/d/formatter.d\ libdparse/src/std/d/formatter.d\
containers/src/std/experimental/allocator/mallocator.d\
containers/src/std/experimental/allocator/package.d\
containers/src/std/experimental/allocator/common.d\
containers/src/std/experimental/allocator/gc_allocator.d\
containers/src/std/experimental/allocator/typed.d\
containers/src/memory/allocators.d\ containers/src/memory/allocators.d\
containers/src/memory/appender.d\ containers/src/memory/appender.d\
containers/src/containers/dynamicarray.d\ containers/src/containers/dynamicarray.d\
@ -96,7 +100,8 @@ DEBUG_SERVER_FLAGS := -Icontainers/src\
-wi\ -wi\
-g\ -g\
-ofbin/dcd-server\ -ofbin/dcd-server\
-J. -J.\
-debug
GDC_SERVER_FLAGS := -Icontainers/src\ GDC_SERVER_FLAGS := -Icontainers/src\
-Imsgpack-d/src\ -Imsgpack-d/src\
@ -116,27 +121,27 @@ LDC_SERVER_FLAGS := -Icontainers/src\
dmdclient: githash dmdclient: githash
mkdir -p bin mkdir -p bin
rm -f containers/src/std/allocator.d rm -f libdparse/src/std/allocator.d
${DMD} ${CLIENT_SRC} ${DMD_CLIENT_FLAGS} ${DMD} ${CLIENT_SRC} ${DMD_CLIENT_FLAGS}
dmdserver: githash dmdserver: githash
mkdir -p bin mkdir -p bin
rm -f containers/src/std/allocator.d rm -f libdparse/src/std/allocator.d
${DMD} ${SERVER_SRC} ${DMD_SERVER_FLAGS} ${DMD} ${SERVER_SRC} ${DMD_SERVER_FLAGS}
debugserver: githash debugserver: githash
mkdir -p bin mkdir -p bin
rm -f containers/src/std/allocator.d rm -f libdparse/src/std/allocator.d
${DMD} ${SERVER_SRC} ${DEBUG_SERVER_FLAGS} ${DMD} ${SERVER_SRC} ${DEBUG_SERVER_FLAGS}
gdcclient: githash gdcclient: githash
mkdir -p bin mkdir -p bin
rm -f containers/src/std/allocator.d rm -f libdparse/src/std/allocator.d
${GDC} ${CLIENT_SRC} ${GDC_CLIENT_FLAGS} ${GDC} ${CLIENT_SRC} ${GDC_CLIENT_FLAGS}
gdcserver: githash gdcserver: githash
mkdir -p bin mkdir -p bin
rm -f containers/src/std/allocator.d rm -f libdparse/src/std/allocator.d
${GDC} ${SERVER_SRC} ${GDC_SERVER_FLAGS} ${GDC} ${SERVER_SRC} ${GDC_SERVER_FLAGS}
ldcclient: githash ldcclient: githash

4
src/server/autocomplete.d
View File

@ -19,7 +19,7 @@
module server.autocomplete; module server.autocomplete;
import std.algorithm; import std.algorithm;
import std.allocator; import std.experimental.allocator;
import std.array; import std.array;
import std.conv; import std.conv;
import std.experimental.logger; import std.experimental.logger;
@ -329,7 +329,7 @@ auto getTokensBeforeCursor(const(ubyte[]) sourceCode, size_t cursorPosition,
* the request's source code, cursor position, and completion type. * the request's source code, cursor position, and completion type.
*/ */
DSymbol*[] getSymbolsForCompletion(const AutocompleteRequest request, DSymbol*[] getSymbolsForCompletion(const AutocompleteRequest request,
const CompletionType type, CAllocator allocator, StringCache* cache) const CompletionType type, IAllocator allocator, StringCache* cache)
{ {
const(Token)[] tokenArray; const(Token)[] tokenArray;
auto beforeTokens = getTokensBeforeCursor(request.sourceCode, auto beforeTokens = getTokensBeforeCursor(request.sourceCode,

2
src/server/server.d
View File

@ -28,7 +28,7 @@ import std.array;
import std.process; import std.process;
import std.datetime; import std.datetime;
import std.conv; import std.conv;
import std.allocator; import std.experimental.allocator;
import std.exception : enforce; import std.exception : enforce;
import std.experimental.logger; import std.experimental.logger;