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

Merge pull request #29 from soarqin/dmd2067_fix

Browse source 
Fixed compilation for dmd 2.067
This commit is contained in:
Ferdinand Majerech 2015-06-03 20:33:39 +02:00
parent 6d706dd3dc bfd8654816
commit 96f64eb221
6 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/dyaml/composer.d
View file

@ -55,13 +55,13 @@ final class Composer
///We need one appender for each nesting level that involves ///We need one appender for each nesting level that involves
///a pair array, as the inner levels are processed as a ///a pair array, as the inner levels are processed as a
///part of the outer levels. Used as a stack. ///part of the outer levels. Used as a stack.
Appender!(Node.Pair[], Node.Pair)[] pairAppenders_; Appender!(Node.Pair[])[] pairAppenders_;
///Used to reduce allocations when creating node arrays. ///Used to reduce allocations when creating node arrays.
/// ///
///We need one appender for each nesting level that involves ///We need one appender for each nesting level that involves
///a node array, as the inner levels are processed as a ///a node array, as the inner levels are processed as a
///part of the outer levels. Used as a stack. ///part of the outer levels. Used as a stack.
Appender!(Node[], Node)[] nodeAppenders_; Appender!(Node[])[] nodeAppenders_;
public: public:
/** /**

4
source/dyaml/constructor.d
View file

@ -347,7 +347,7 @@ final class Constructor
* ctor = Constructor function. * ctor = Constructor function.
*/ */
auto addConstructor(T)(const Tag tag, T function(ref Node) ctor) auto addConstructor(T)(const Tag tag, T function(ref Node) ctor)
@safe pure nothrow @safe nothrow
{ {
assert((tag in fromScalar_) is null && assert((tag in fromScalar_) is null &&
(tag in fromSequence_) is null && (tag in fromSequence_) is null &&
@ -859,7 +859,7 @@ struct MyStruct
{ {
int x, y, z; int x, y, z;
const int opCmp(ref const MyStruct s) const pure @safe nothrow int opCmp(ref const MyStruct s) const pure @safe nothrow
{ {
if(x != s.x){return x - s.x;} if(x != s.x){return x - s.x;}
if(y != s.y){return y - s.y;} if(y != s.y){return y - s.y;}

2
source/dyaml/fastcharsearch.d
View file

@ -70,7 +70,7 @@ string searchCode(dstring chars, uint tableSize)() @safe pure //nothrow
{ {
code ~= code ~=
q{ q{
static immutable ubyte table_[%s] = [ static immutable ubyte[%s] table_ = [
%s]; %s];
}.format(tableSize, table[].map!(c => c ? q{true} : q{false}).join(q{, })); }.format(tableSize, table[].map!(c => c ? q{true} : q{false}).join(q{, }));
} }

4
source/dyaml/node.d
View file

@ -1826,7 +1826,7 @@ package:
// //
// Params: pairs = Appender managing the array of pairs to merge into. // Params: pairs = Appender managing the array of pairs to merge into.
// toMerge = Pair to merge. // toMerge = Pair to merge.
void merge(ref Appender!(Node.Pair[], Node.Pair) pairs, ref Node.Pair toMerge) @trusted void merge(ref Appender!(Node.Pair[]) pairs, ref Node.Pair toMerge) @trusted
{ {
foreach(ref pair; pairs.data) foreach(ref pair; pairs.data)
{ {
@ -1842,7 +1842,7 @@ void merge(ref Appender!(Node.Pair[], Node.Pair) pairs, ref Node.Pair toMerge) @
// //
// Params: pairs = Appender managing the array of pairs to merge into. // Params: pairs = Appender managing the array of pairs to merge into.
// toMerge = Pairs to merge. // toMerge = Pairs to merge.
void merge(ref Appender!(Node.Pair[], Node.Pair) pairs, Node.Pair[] toMerge) @trusted void merge(ref Appender!(Node.Pair[]) pairs, Node.Pair[] toMerge) @trusted
{ {
bool eq(ref Node.Pair a, ref Node.Pair b){return a.key == b.key;} bool eq(ref Node.Pair a, ref Node.Pair b){return a.key == b.key;}

1
source/dyaml/nogcutil.d
View file

@ -12,6 +12,7 @@ module dyaml.nogcutil;
import std.traits; import std.traits;
import std.typecons; import std.typecons;
import std.typetuple;
import std.range; import std.range;

2
source/dyaml/representer.d
View file

@ -602,7 +602,7 @@ struct MyStruct
{ {
int x, y, z; int x, y, z;
const int opCmp(ref const MyStruct s) const pure @safe nothrow int opCmp(ref const MyStruct s) const pure @safe nothrow
{ {
if(x != s.x){return x - s.x;} if(x != s.x){return x - s.x;}
if(y != s.y){return y - s.y;} if(y != s.y){return y - s.y;}