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

#261

This commit is contained in:
Hackerpilot 2016-11-07 13:18:12 -08:00
parent 5da2a71a67
commit 7961bfc15f
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libdparse

@ -1 +1 @@
Subproject commit 6f98e085edfdabe571fd57164370d3f27f452c52 Subproject commit 1e24b41392c1363fc52a3d079debde965771be3e

5
makefile
View File

@ -1,7 +1,6 @@
SRC := $(shell find src -name "*.d") \ SRC := $(shell find src -name "*.d") \
$(shell find libdparse/src -name "*.d") \ $(shell find libdparse/src -name "*.d")
$(shell find libdparse/experimental_allocator/src -name "*.d") INCLUDE_PATHS := -Ilibdparse/src -Isrc
INCLUDE_PATHS := -Ilibdparse/src -Isrc -Ilibdparse/experimental_allocator/src
DMD_COMMON_FLAGS := -dip25 -w $(INCLUDE_PATHS) DMD_COMMON_FLAGS := -dip25 -w $(INCLUDE_PATHS)
DMD_DEBUG_FLAGS := -g $(DMD_COMMON_FLAGS) DMD_DEBUG_FLAGS := -g $(DMD_COMMON_FLAGS)
DMD_FLAGS := -O -inline $(DMD_COMMON_FLAGS) DMD_FLAGS := -O -inline $(DMD_COMMON_FLAGS)

3
src/dfmt/tokens.d
View File

@ -36,6 +36,7 @@ int tokenLength(ref const Token t) pure @safe @nogc
{ {
import std.algorithm : countUntil; import std.algorithm : countUntil;
int c;
switch (t.type) switch (t.type)
{ {
case tok!"doubleLiteral": case tok!"doubleLiteral":
@ -55,7 +56,7 @@ int tokenLength(ref const Token t) pure @safe @nogc
case tok!"wstringLiteral": case tok!"wstringLiteral":
case tok!"dstringLiteral": case tok!"dstringLiteral":
// TODO: Unicode line breaks and old-Mac line endings // TODO: Unicode line breaks and old-Mac line endings
auto c = cast(int) t.text.countUntil('\n'); c = cast(int) t.text.countUntil('\n');
if (c == -1) if (c == -1)
return cast(int) t.text.length; return cast(int) t.text.length;
else else