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

Fix byte order mark stripping (#740) 

Fix byte order mark stripping
merged-on-behalf-of: BBasile <BBasile@users.noreply.github.com>
This commit is contained in:
Nathan Sashihara 2019-01-01 05:13:09 -05:00 committed by The Dlang Bot
parent 3759479d9c
commit 383fcb84d8
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/dscanner/utils.d
View File

@ -7,7 +7,7 @@ import std.encoding : BOM, BOMSeq, EncodingException, getBOM;
import std.format : format; import std.format : format;
import std.file : exists, read; import std.file : exists, read;
private void processBOM(ubyte[] sourceCode, string fname) private void processBOM(ref ubyte[] sourceCode, string fname)
{ {
enum spec = "D-Scanner does not support %s-encoded files (%s)"; enum spec = "D-Scanner does not support %s-encoded files (%s)";
const BOMSeq bs = sourceCode.getBOM; const BOMSeq bs = sourceCode.getBOM;
@ -21,6 +21,13 @@ private void processBOM(ubyte[] sourceCode, string fname)
sourceCode = sourceCode[bs.sequence.length .. $]; sourceCode = sourceCode[bs.sequence.length .. $];
} }
unittest
{
ubyte[] data = [0xEF, 0xBB, 0xBF, 'h', 'i', '!'];
data.processBOM("unittest data");
assert(data[] == cast(ubyte[]) "hi!");
}
unittest unittest
{ {
import std.exception : assertThrown, assertNotThrown; import std.exception : assertThrown, assertNotThrown;
@ -52,8 +59,9 @@ ubyte[] readStdin()
break; break;
sourceCode.put(b); sourceCode.put(b);
} }
sourceCode.data.processBOM("stdin"); auto data = sourceCode.data;
return sourceCode.data; data.processBOM("stdin");
return data;
} }
ubyte[] readFile(string fileName) ubyte[] readFile(string fileName)