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

Merge pull request #594 from BBasile/issue-278 

fix #278 - Weird: UTF-16LE encoding is unsupported
merged-on-behalf-of: BBasile <BBasile@users.noreply.github.com>
This commit is contained in:
The Dlang Bot 2018-04-05 07:14:33 +02:00 committed by GitHub
parent eafae0f6c0 6e7c366e49
commit a4d84a0995
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 41 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/dscanner/utils.d
View File

@ -3,7 +3,43 @@ module dscanner.utils;
import std.array : appender, uninitializedArray;
import std.stdio : stdin, stderr, File;
import std.conv : to;
import std.file : exists;
import std.encoding : BOM, BOMSeq, EncodingException, getBOM;
import std.format : format;
import std.file : exists, read;
private void processBOM(ubyte[] sourceCode, string fname)
{
enum spec = "D-Scanner does not support %s-encoded files (%s)";
const BOMSeq bs = sourceCode.getBOM;
with(BOM) switch (bs.schema)
{
case none, utf8:
break;
default:
throw new EncodingException(spec.format(bs.schema, fname));
}
sourceCode = sourceCode[bs.sequence.length .. $];
}
unittest
{
import std.exception : assertThrown, assertNotThrown;
import std.encoding : bomTable;
import std.traits : EnumMembers;
foreach(m ; EnumMembers!BOM)
{
auto sc = bomTable[m].sequence.dup;
if (m != BOM.none && m != BOM.utf8)
{
assertThrown!(EncodingException)(processBOM(sc, ""));
}
else
{
assertNotThrown!(EncodingException)(processBOM(sc, ""));
}
}
}
ubyte[] readStdin()
{
@ -16,6 +52,7 @@ ubyte[] readStdin()
break;
sourceCode.put(b);
}
sourceCode.data.processBOM("stdin");
return sourceCode.data;
}
@ -29,10 +66,9 @@ ubyte[] readFile(string fileName)
return [];
}
File f = File(fileName);
if (f.size == 0)
return [];
ubyte[] sourceCode = uninitializedArray!(ubyte[])(to!size_t(f.size));
f.rawRead(sourceCode);
ubyte[] sourceCode;
sourceCode = cast(ubyte[]) fileName.read();
sourceCode.processBOM(fileName);
return sourceCode;
}