debian-packages/dyaml
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #100 from Herringway/remove-redundant-bom

Browse source 
remove redundant BOM definitions
This commit is contained in:
Sebastian Wilzbach 2018-04-08 11:30:40 +02:00 committed by GitHub
parent 85b6d077cc 8074792fb3
commit dc29868f7d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
source/dyaml/emitter.d
View file

@ -15,6 +15,7 @@ import std.array;
import std.ascii; import std.ascii;
import std.container; import std.container;
import std.conv; import std.conv;
import std.encoding;
import std.exception; import std.exception;
import std.format; import std.format;
import std.range; import std.range;
@ -1166,14 +1167,14 @@ struct Emitter
case Encoding.UTF_8: case Encoding.UTF_8:
break; break;
case Encoding.UTF_16: case Encoding.UTF_16:
bom = std.system.endian == Endian.littleEndian bom = std.system.endian == Endian.littleEndian
? ByteOrderMarks[BOM.UTF16LE] ? bomTable[BOM.utf16le].sequence
: ByteOrderMarks[BOM.UTF16BE]; : bomTable[BOM.utf16be].sequence;
break; break;
case Encoding.UTF_32: case Encoding.UTF_32:
bom = std.system.endian == Endian.littleEndian bom = std.system.endian == Endian.littleEndian
? ByteOrderMarks[BOM.UTF32LE] ? bomTable[BOM.utf32le].sequence
: ByteOrderMarks[BOM.UTF32BE]; : bomTable[BOM.utf32be].sequence;
break; break;
} }

14
source/dyaml/reader.d
View file

@ -990,9 +990,9 @@ void testEndian(R)()
void testPeekPrefixForward(R)() void testPeekPrefixForward(R)()
{ {
import dyaml.stream; import std.encoding;
writeln(typeid(R).toString() ~ ": peek/prefix/forward unittest"); writeln(typeid(R).toString() ~ ": peek/prefix/forward unittest");
ubyte[] data = ByteOrderMarks[BOM.UTF8] ~ cast(ubyte[])"data"; ubyte[] data = bomTable[BOM.utf8].sequence ~ cast(ubyte[])"data";
auto reader = new R(data); auto reader = new R(data);
assert(reader.peek() == 'd'); assert(reader.peek() == 'd');
assert(reader.peek(1) == 'a'); assert(reader.peek(1) == 'a');
@ -1008,12 +1008,12 @@ void testPeekPrefixForward(R)()
void testUTF(R)() void testUTF(R)()
{ {
import dyaml.stream; import std.encoding;
writeln(typeid(R).toString() ~ ": UTF formats unittest"); writeln(typeid(R).toString() ~ ": UTF formats unittest");
dchar[] data = cast(dchar[])"data"; dchar[] data = cast(dchar[])"data";
void utf_test(T)(T[] data, BOM bom) void utf_test(T)(T[] data, BOM bom)
{ {
ubyte[] bytes = ByteOrderMarks[bom] ~ ubyte[] bytes = bomTable[bom].sequence ~
(cast(ubyte[])data)[0 .. data.length * T.sizeof]; (cast(ubyte[])data)[0 .. data.length * T.sizeof];
auto reader = new R(bytes); auto reader = new R(bytes);
assert(reader.peek() == 'd'); assert(reader.peek() == 'd');
@ -1021,9 +1021,9 @@ void testUTF(R)()
assert(reader.peek(2) == 't'); assert(reader.peek(2) == 't');
assert(reader.peek(3) == 'a'); assert(reader.peek(3) == 'a');
} }
utf_test!char(to!(char[])(data), BOM.UTF8); utf_test!char(to!(char[])(data), BOM.utf8);
utf_test!wchar(to!(wchar[])(data), endian == Endian.bigEndian ? BOM.UTF16BE : BOM.UTF16LE); utf_test!wchar(to!(wchar[])(data), endian == Endian.bigEndian ? BOM.utf16be : BOM.utf16le);
utf_test(data, endian == Endian.bigEndian ? BOM.UTF32BE : BOM.UTF32LE); utf_test(data, endian == Endian.bigEndian ? BOM.utf32be : BOM.utf32le);
} }
void test1Byte(R)() void test1Byte(R)()

28
source/dyaml/stream.d
View file

@ -1,33 +1,5 @@
module dyaml.stream; module dyaml.stream;
enum BOM
{
UTF8, /// UTF-8
UTF16LE, /// UTF-16 Little Endian
UTF16BE, /// UTF-16 Big Endian
UTF32LE, /// UTF-32 Little Endian
UTF32BE, /// UTF-32 Big Endian
}
import std.system;
private enum int NBOMS = 5;
immutable Endian[NBOMS] BOMEndian =
[
std.system.endian,
Endian.littleEndian, Endian.bigEndian,
Endian.littleEndian, Endian.bigEndian
];
immutable ubyte[][NBOMS] ByteOrderMarks =
[
[0xEF, 0xBB, 0xBF],
[0xFF, 0xFE],
[0xFE, 0xFF],
[0xFF, 0xFE, 0x00, 0x00],
[0x00, 0x00, 0xFE, 0xFF]
];
interface YStream interface YStream
{ {
void writeExact(const void* buffer, size_t size); void writeExact(const void* buffer, size_t size);