Refactor allSatisfy, anySatisfy, staticIndexOf

In tanya.algorithm.iteration.take & retro preserve const/inout for `empty`/`front`/etc.

.gitignore

@@ -9,8 +9,8 @@ dub.selections.json
 
 __test__*__
 __test__*__.core
-/tanya-test-*
+tanya-*test-*
-/dub_platform_probe-*
+/dub_platform_probe[_-]*
 
 /docs/
 /docs.json

.travis.yml

@@ -7,31 +7,63 @@ os:
 language: d
 
 d:
-  - dmd-2.082.0
+- dmd-2.085.0
 - dmd-2.081.2
 
 env:
+  global:
+  - LATEST=2.085.0
+
   matrix:
   - ARCH=x86_64
   - ARCH=x86
 
+matrix:
+  include:
+  - name: D-Scanner
+    d: dmd-$LATEST
+    env: DSCANNER=0.7.0
+    os: linux
+  - name: DDoc
+    d: dmd-$LATEST
+    env: DDOC=true
+    os: linux
+
 addons:
   apt:
     packages:
     - gcc-multilib
 
 before_script:
-  - if [ "`$DC --version | head -n 1 | grep 'v2.082.0'`" ]; then
+- if [ "`$DC --version | head -n 1 | grep v$LATEST`" ] &&
+     [ -z "$DSCANNER$DDOC" ]; then
     export UNITTEST="unittest-cov";
   fi
 
 script:
-  - dub test -b ${UNITTEST:-unittest} --arch=$ARCH --compiler=$DC
+- set -e;
-  - if [ "$UNITTEST" ] && [ "$ARCH" = "x86_64" ] && [ "$TRAVIS_OS_NAME" = "linux" ];
+  if [ -n "$DDOC" ]; then
-    then
+    dub build :meta -b ddox --compiler=$DC;
-      dub fetch dscanner --version=0.5.10;
+    dub build :sys -b ddox --compiler=$DC;
-      dub run dscanner -- --styleCheck ./source/;
+    dub build :os -b ddox --compiler=$DC;
+    dub build :encoding -b ddox --compiler=$DC;
+    dub build :middle -b ddox --compiler=$DC;
+    dub build :test -b ddox --compiler=$DC;
+    dub build -b ddox --compiler=$DC;
+  elif [ -z "$DSCANNER" ]; then
+    dub test :meta -b ${UNITTEST:-unittest} --arch=$ARCH --compiler=$DC;
+    dub test :sys -b ${UNITTEST:-unittest} --arch=$ARCH --compiler=$DC;
+    dub test :os -b ${UNITTEST:-unittest} --arch=$ARCH --compiler=$DC;
+    dub test :encoding -b ${UNITTEST:-unittest} --arch=$ARCH --compiler=$DC;
+    dub test :middle -b ${UNITTEST:-unittest} --arch=$ARCH --compiler=$DC;
+    dub test :test -b ${UNITTEST:-unittest} --arch=$ARCH --compiler=$DC;
+    dub test -b ${UNITTEST:-unittest} --arch=$ARCH --compiler=$DC;
+  else
+    dub fetch dscanner --version=$DSCANNER;
+
+    FILES=$(find */tanya -type f);
+    dub run dscanner -- --styleCheck $FILES;
   fi
 
 after_success:
-  - test "$UNITTEST" && bash <(curl -s https://codecov.io/bash)
+- test "$UNITTEST" && bash <(curl -s https://codecov.io/bash) || true

README.md

@@ -25,12 +25,12 @@ Tanya consists of the following packages and (top-level) modules:
 
 * `algorithm`: Collection of generic algorithms.
 * `async`: Event loop (epoll, kqueue and IOCP).
+* `bitmanip`: Bit manipulation.
 * `container`: Queue, Array, Singly and doubly linked lists, Buffers, UTF-8
 string, Set, Hash table.
 * `conv`: This module provides functions for converting between different
 types.
 * `encoding`: This package provides tools to work with text encodings.
-* `exception`: Common exceptions and errors.
 * `format`: Formatting and conversion functions.
 * `functional`: Functions that manipulate other functions and their argument
 lists.
@@ -173,9 +173,9 @@ parameter is used)
 ### Supported compilers
 
 | DMD               | GCC             |
-|:-------:|:------:|
+|:-----------------:|:---------------:|
-| 2.082.0 | gdc-8  |
+| 2.081.2 — 2.085.0 | gdc-8 (2.081.2) |
-| 2.081.2 | gdc-7  |
+|                   | gdc-7 (2.081.2) |
 
 ### Release management
 

appveyor.yml

@@ -4,10 +4,10 @@ os: Visual Studio 2015
 environment:
   matrix:
     - DC: dmd
-      DVersion: 2.082.0
+      DVersion: 2.085.0
       arch: x64
     - DC: dmd
-      DVersion: 2.082.0
+      DVersion: 2.085.0
       arch: x86
     - DC: dmd
       DVersion: 2.081.2
@@ -51,4 +51,10 @@ test_script:
   - echo %PATH%
   - 'dub --version'
   - '%DC% --version'
+  - dub test :meta -b unittest --arch=%Darch% --compiler=%DC%
+  - dub test :sys -b unittest --arch=%Darch% --compiler=%DC%
+  - dub test :os -b unittest --arch=%Darch% --compiler=%DC%
+  - dub test :encoding -b unittest --arch=%Darch% --compiler=%DC%
+  - dub test :middle -b unittest --arch=%Darch% --compiler=%DC%
+  - dub test :test -b unittest --arch=%Darch% --compiler=%DC%
   - dub test -b unittest --arch=%Darch% --compiler=%DC%

arch/build.ninja

@@ -6,9 +6,9 @@ rule archive
 
 build abs.o: gas x64/linux/math/abs.S
 build log.o: gas x64/linux/math/log.S
-build cmp.o: gas x64/linux/memory/cmp.S
+build equal.o: gas x64/linux/memory/equal.S
 build fill.o: gas x64/linux/memory/fill.S
 build copy.o: gas x64/linux/memory/copy.S
 build syscall.o: gas x64/linux/syscall.S
 
-build tanya.a: archive syscall.o copy.o fill.o cmp.o log.o abs.o
+build tanya.a: archive syscall.o copy.o fill.o equal.o log.o abs.o

arch/x64/linux/memory/equal.S

@@ -1,20 +1,19 @@
 	.text
 
 /*
- * cmpMemory.
+ * equalMemory.
  *
  * rdi - r1 length
  * rsi - r1 data.
  * rdx - r2 length.
  * rcx - r2 data.
  */
-	.globl _D5tanya6memory2op9cmpMemoryFNaNbNixAvxQdZi
+	.globl _D5tanya6memory2op11equalMemoryFNaNbNixAvxQdZb
-	.type _D5tanya6memory2op9cmpMemoryFNaNbNixAvxQdZi, @function
+	.type _D5tanya6memory2op11equalMemoryFNaNbNixAvxQdZb, @function
-_D5tanya6memory2op9cmpMemoryFNaNbNixAvxQdZi:
+_D5tanya6memory2op11equalMemoryFNaNbNixAvxQdZb:
 		// Compare the lengths
 		cmp %rdx, %rdi
-		jl  less
+		jne not_equal
-		jg  greater
 
 		mov %rcx, %rdi
 
@@ -26,8 +25,7 @@ _D5tanya6memory2op9cmpMemoryFNaNbNixAvxQdZi:
 
 	naligned:
 		cmpsb
-		jl less
+		jne not_equal
-		jg greater
 
 		dec %rdx
 		test $0x07, %edi
@@ -38,8 +36,7 @@ _D5tanya6memory2op9cmpMemoryFNaNbNixAvxQdZi:
 		shr $0x03, %rcx
 
 		repe cmpsq
-		jl less
+		jne not_equal
-		jg greater
 
 		and $0x07, %edx
 		jz equal
@@ -49,19 +46,14 @@ _D5tanya6memory2op9cmpMemoryFNaNbNixAvxQdZi:
 		cmp $0x0, %rcx
 
 		repe cmpsb
-		jl less
+		jne not_equal
-		jg greater
 
 	equal:
+		mov $0x01, %rax // Return 1
+		jmp end
+
+	not_equal:
 		xor %rax, %rax // Return 0
-		jmp end
-
-	greater:
-		mov $0x01, %rax
-		jmp end
-
-	less:
-		mov $-0x01, %rax
 
 	end:
 		ret

dub.json

@@ -9,10 +9,28 @@
 
 	"targetType": "library",
 
+	"dependencies": {
+		"tanya:meta": "*",
+		"tanya:sys": "*",
+		"tanya:os": "*",
+		"tanya:encoding": "*",
+		"tanya:middle": "*",
+		"tanya:test": "*"
+	},
+
 	"dependencies-linux": {
 		"mir-linux-kernel": "~>1.0.0"
 	},
 
+	"subPackages": [
+		"./meta",
+		"./sys",
+		"./os",
+		"./encoding",
+		"./middle",
+		"./test"
+	],
+
 	"configurations": [
 		{
 			"name": "library",
@@ -31,6 +49,34 @@
 			"preBuildCommands": ["ninja -C arch"],
 			"lflags": ["arch/tanya.a"],
 			"versions": ["TanyaNative"]
+		},
+		{
+			"name": "unittest",
+			"versions": ["TanyaPhobos"],
+			"dflags": ["-dip25"],
+			"importPaths": [
+				"./source",
+				"./tests"
+			],
+			"sourcePaths": [
+				"./source",
+				"./tests"
+			]
+		},
+		{
+			"name": "unittest-native",
+			"platforms": ["linux-x86_64-gdc"],
+			"preBuildCommands": ["ninja -C arch"],
+			"lflags": ["arch/tanya.a"],
+			"versions": ["TanyaNative"],
+			"importPaths": [
+				"./source",
+				"./tests"
+			],
+			"sourcePaths": [
+				"./source",
+				"./tests"
+			]
 		}
 	],
 

encoding/dub.json

@@ -0,0 +1,16 @@
+{
+	"name": "encoding",
+	"description": "This package provides tools to work with text encodings",
+	"targetType": "library",
+
+	"dependencies": {
+		"tanya:meta": "*"
+	},
+
+	"sourcePaths": [
+		"."
+	],
+	"importPaths": [
+		"."
+	]
+}

encoding/tanya/encoding/ascii.d

@@ -8,11 +8,11 @@
  * ASCII is $(B A)merican $(B S)tandard $(B C)ode for $(B I)nformation
  * $(B I)nterchange.
  *
- * Copyright: Eugene Wissner 2017-2018.
+ * Copyright: Eugene Wissner 2017-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/encoding/ascii.d,
+ * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/encoding/tanya/encoding/ascii.d,
  *                 tanya/encoding/ascii.d)
  */
 module tanya.encoding.ascii;

encoding/tanya/encoding/package.d

@@ -5,11 +5,11 @@
 /**
  * This package provides tools to work with text encodings.
  *
- * Copyright: Eugene Wissner 2017-2018.
+ * Copyright: Eugene Wissner 2017-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/encoding/package.d,
+ * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/encoding/tanya/encoding/package.d,
  *                 tanya/encoding/package.d)
  */
 module tanya.encoding;

meta/dub.json

@@ -0,0 +1,12 @@
+{
+	"name": "meta",
+	"description": "Template metaprogramming",
+	"targetType": "library",
+
+	"sourcePaths": [
+		"."
+	],
+	"importPaths": [
+		"."
+	]
+}

meta/tanya/meta/metafunction.d

@@ -9,11 +9,11 @@
  * It contains different algorithms for iterating, searching and modifying
  * template arguments.
  *
- * Copyright: Eugene Wissner 2017-2018.
+ * Copyright: Eugene Wissner 2017-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/meta/metafunction.d,
+ * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/meta/tanya/meta/metafunction.d,
  *                 tanya/meta/metafunction.d)
  */
 module tanya.meta.metafunction;
@@ -238,18 +238,6 @@ struct Pack(Args...)
     alias Seq this;
 }
 
-deprecated("Use Pack instead")
-struct Tuple(Args...)
-{
-    /// Elements in this tuple as $(D_PSYMBOL AliasSeq).
-    alias Seq = Args;
-
-    /// The length of the tuple.
-    enum size_t length = Args.length;
-
-    alias Seq this;
-}
-
 ///
 @nogc nothrow pure @safe unittest
 {
@@ -810,22 +798,7 @@ alias AliasSeq(Args...) = Args;
  * Returns: $(D_KEYWORD true) if all the items of $(D_PARAM L) satisfy
  *          $(D_PARAM F), $(D_KEYWORD false) otherwise.
  */
-template allSatisfy(alias F, L...)
+enum bool allSatisfy(alias F, L...) = Filter!(templateNot!F, L).length == 0;
-if (__traits(isTemplate, F))
-{
-    static if (L.length == 0)
-    {
-        enum bool allSatisfy = true;
-    }
-    else static if (F!(L[0]))
-    {
-        enum bool allSatisfy = allSatisfy!(F, L[1 .. $]);
-    }
-    else
-    {
-        enum bool allSatisfy = false;
-    }
-}
 
 ///
 @nogc nothrow pure @safe unittest
@@ -848,22 +821,7 @@ if (__traits(isTemplate, F))
  * Returns: $(D_KEYWORD true) if any of the items of $(D_PARAM L) satisfy
  *          $(D_PARAM F), $(D_KEYWORD false) otherwise.
  */
-template anySatisfy(alias F, L...)
+enum bool anySatisfy(alias F, L...) = Filter!(F, L).length != 0;
-if (__traits(isTemplate, F))
-{
-    static if (L.length == 0)
-    {
-        enum bool anySatisfy = false;
-    }
-    else static if (F!(L[0]))
-    {
-        enum bool anySatisfy = true;
-    }
-    else
-    {
-        enum bool anySatisfy = anySatisfy!(F, L[1 .. $]);
-    }
-}
 
 ///
 @nogc nothrow pure @safe unittest
@@ -873,21 +831,18 @@ if (__traits(isTemplate, F))
     static assert(!anySatisfy!(isSigned, uint, ushort, ulong));
 }
 
-private template indexOf(ptrdiff_t i, Args...)
+private template indexOf(Args...)
-if (Args.length > 0)
 {
-    static if (Args.length == 1)
+    static foreach (i, Arg; Args[1 .. $])
     {
-        enum ptrdiff_t indexOf = -1;
+        static if (!is(typeof(indexOf) == ptrdiff_t) && isEqual!(Args[0], Arg))
-    }
-    else static if (isEqual!(Args[0 .. 2]))
         {
             enum ptrdiff_t indexOf = i;
         }
-    else
+    }
+    static if (!is(typeof(indexOf) == ptrdiff_t))
     {
-        enum ptrdiff_t indexOf = indexOf!(i + 1,
+        enum ptrdiff_t indexOf = -1;
-                                          AliasSeq!(Args[0], Args[2 .. $]));
     }
 }
 
@@ -903,13 +858,13 @@ if (Args.length > 0)
  */
 template staticIndexOf(T, L...)
 {
-    enum ptrdiff_t staticIndexOf = indexOf!(0, AliasSeq!(T, L));
+    enum ptrdiff_t staticIndexOf = indexOf!(T, L);
 }
 
 /// ditto
 template staticIndexOf(alias T, L...)
 {
-    enum ptrdiff_t staticIndexOf = indexOf!(0, AliasSeq!(T, L));
+    enum ptrdiff_t staticIndexOf = indexOf!(T, L);
 }
 
 ///
@@ -932,16 +887,10 @@ template staticIndexOf(alias T, L...)
  * Returns: $(D_KEYWORD true) if $(D_PARAM T) can be found in $(D_PARAM L),
  *          $(D_KEYWORD false) otherwise.
  */
-template canFind(T, L...)
+enum bool canFind(T, L...) = staticIndexOf!(T, L) != -1;
-{
-    enum bool canFind = indexOf!(0, AliasSeq!(T, L)) != -1;
-}
 
 /// ditto
-template canFind(alias T, L...)
+enum bool canFind(alias T, L...) = staticIndexOf!(T, L) != -1;
-{
-    enum bool canFind = indexOf!(0, AliasSeq!(T, L)) != -1;
-}
 
 ///
 @nogc nothrow pure @safe unittest
@@ -1141,30 +1090,6 @@ if (__traits(isTemplate, cmp))
     static assert(!isSorted!(cmp, long, byte, ubyte, short, uint));
 }
 
-@nogc nothrow pure @safe unittest
-{
-    enum cmp(int x, int y) = x - y;
-    static assert(isSorted!(cmp));
-    static assert(isSorted!(cmp, 1));
-    static assert(isSorted!(cmp, 1, 2, 2));
-    static assert(isSorted!(cmp, 1, 2, 2, 4));
-    static assert(isSorted!(cmp, 1, 2, 2, 4, 8));
-    static assert(!isSorted!(cmp, 32, 2, 2, 4, 8));
-    static assert(isSorted!(cmp, 32, 32));
-}
-
-@nogc nothrow pure @safe unittest
-{
-    enum cmp(int x, int y) = x < y;
-    static assert(isSorted!(cmp));
-    static assert(isSorted!(cmp, 1));
-    static assert(isSorted!(cmp, 1, 2, 2));
-    static assert(isSorted!(cmp, 1, 2, 2, 4));
-    static assert(isSorted!(cmp, 1, 2, 2, 4, 8));
-    static assert(!isSorted!(cmp, 32, 2, 2, 4, 8));
-    static assert(isSorted!(cmp, 32, 32));
-}
-
 /**
  * Params:
  *  T    = A template.
@@ -1653,6 +1578,7 @@ template EraseAll(alias T, L...)
  *          $(D_PARAM pred).
  */
 template Filter(alias pred, L...)
+if (__traits(isTemplate, pred))
 {
     static if (L.length == 0)
     {
@@ -1813,3 +1739,62 @@ if (T.length == 2)
     static assert(is(Select!(true, int, float) == int));
     static assert(is(Select!(false, int, float) == float));
 }
+
+/**
+ * Attaches a numeric index to each element from $(D_PARAM Args).
+ *
+ * $(D_PSYMBOL EnumerateFrom) returns a sequence of tuples ($(D_PSYMBOL Pack)s)
+ * consisting of the index of each element and the element itself.
+ *
+ * Params:
+ *  start = Enumeration initial value.
+ *  Args  = Enumerated sequence.
+ *
+ * See_Also: $(D_PSYMBOL Enumerate).
+ */
+template EnumerateFrom(size_t start, Args...)
+{
+    static if (Args.length == 0)
+    {
+        alias EnumerateFrom = AliasSeq!();
+    }
+    else
+    {
+        alias EnumerateFrom = AliasSeq!(Pack!(start, Args[0]), EnumerateFrom!(start + 1, Args[1 .. $]));
+    }
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    static assert(EnumerateFrom!(0, int, uint, bool).length == 3);
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    alias Expected = AliasSeq!(Pack!(cast(size_t) 0, int),
+                               Pack!(cast(size_t) 1, uint));
+    static assert(is(EnumerateFrom!(0, int, uint) == Expected));
+}
+
+/**
+ * Attaches a numeric index to each element from $(D_PARAM Args).
+ *
+ * $(D_PSYMBOL EnumerateFrom) returns a sequence of tuples ($(D_PSYMBOL Pack)s)
+ * consisting of the index of each element and the element itself.
+ *
+ * Params:
+ *  Args  = Enumerated sequence.
+ *
+ * See_Also: $(D_PSYMBOL EnumerateFrom).
+ */
+alias Enumerate(Args...) = EnumerateFrom!(0, Args);
+
+///
+@nogc nothrow pure @safe unittest
+{
+    alias Expected = AliasSeq!(Pack!(cast(size_t) 0, int),
+                               Pack!(cast(size_t) 1, uint));
+    static assert(is(Enumerate!(int, uint) == Expected));
+}

meta/tanya/meta/package.d

@@ -9,11 +9,11 @@
  * to transform from one type to another. It has also different algorithms for
  * iterating, searching and modifying template arguments.
  *
- * Copyright: Eugene Wissner 2017-2018.
+ * Copyright: Eugene Wissner 2017-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/meta/package.d,
+ * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/meta/tanya/meta/package.d,
  *                 tanya/meta/package.d)
  */
 module tanya.meta;

meta/tanya/meta/trait.d

@@ -8,11 +8,11 @@
  * Templates in this module are used to obtain type information at compile
  * time.
  *
- * Copyright: Eugene Wissner 2017-2018.
+ * Copyright: Eugene Wissner 2017-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/meta/trait.d,
+ * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/meta/tanya/meta/trait.d,
  *                 tanya/meta/trait.d)
  */
 module tanya.meta.trait;
@@ -549,19 +549,6 @@ template isPointer(T)
     static assert(!isPointer!bool);
 }
 
-// typeof(null) is not a pointer.
-@nogc nothrow pure @safe unittest
-{
-    static assert(!isPointer!(typeof(null)));
-    static assert(!isPointer!(const shared typeof(null)));
-
-    enum typeOfNull : typeof(null)
-    {
-        null_ = null,
-    }
-    static assert(!isPointer!typeOfNull);
-}
-
 /**
  * Determines whether $(D_PARAM T) is an array type (dynamic or static, but
  * not an associative one).
@@ -1478,21 +1465,9 @@ if (F.length == 1)
     static assert(!isCallable!I);
 }
 
-@nogc nothrow pure @safe unittest
-{
-    static struct S
-    {
-        @property int opCall()
-        {
-            return 0;
-        }
-    }
-    S s;
-    static assert(isCallable!S);
-    static assert(isCallable!s);
-}
-
 /**
+ * Determines whether $(D_PARAM T) defines a symbol $(D_PARAM member).
+ *
  * Params:
  *  T      = Aggregate type.
  *  member = Symbol name.
@@ -1601,7 +1576,7 @@ if (is(T == class) || is(T == struct) || is(T == union))
 }
 
 ///
-pure nothrow @safe unittest
+@nogc pure nothrow @safe unittest
 {
     static struct S
     {
@@ -1674,63 +1649,6 @@ if (isCallable!F)
     static assert(is(FunctionTypeOf!(() {}) == function));
 }
 
-@nogc nothrow pure @safe unittest
-{
-    static assert(is(FunctionTypeOf!(void delegate()) == function));
-
-    static void staticFunc()
-    {
-    }
-    auto functionPointer = &staticFunc;
-    static assert(is(FunctionTypeOf!staticFunc == function));
-    static assert(is(FunctionTypeOf!functionPointer == function));
-
-    void func()
-    {
-    }
-    auto dg = &func;
-    static assert(is(FunctionTypeOf!func == function));
-    static assert(is(FunctionTypeOf!dg == function));
-
-    interface I
-    {
-        @property int prop();
-    }
-    static assert(is(FunctionTypeOf!(I.prop) == function));
-
-    static struct S
-    {
-        void opCall()
-        {
-        }
-    }
-    class C
-    {
-        static void opCall()
-        {
-        }
-    }
-    S s;
-
-    static assert(is(FunctionTypeOf!s == function));
-    static assert(is(FunctionTypeOf!C == function));
-    static assert(is(FunctionTypeOf!S == function));
-}
-
-@nogc nothrow pure @safe unittest
-{
-    static struct S2
-    {
-        @property int opCall()
-        {
-            return 0;
-        }
-    }
-    S2 s2;
-    static assert(is(FunctionTypeOf!S2 == function));
-    static assert(is(FunctionTypeOf!s2 == function));
-}
-
 /**
  * Determines the return type of the callable $(D_PARAM F).
  *
@@ -2339,6 +2257,61 @@ if (isCallable!F)
     static assert((functionAttributes!func1 & FunctionAttribute.return_) == 0);
 }
 
+/**
+ * Determines whether a function has attribute.
+ *
+ * This template should get at least two arguments: the function itself and the
+ * attributes it should be tested for. If more than one attribute is given,
+ * $(D_PSYMBOL hasFunctionAttributes) evaluates to $(D_KEYWORD true) if all of
+ * them are present. The attributes should be $(D_PSYMBOL FunctionAttribute)
+ * members.
+ *
+ * Params:
+ *  Args = The function and attributes.
+ *
+ * Returns:
+ *
+ * See_Also: $(D_PSYMBOL FunctionAttribute).
+ */
+template hasFunctionAttributes(Args...)
+if (Args.length > 1
+ && is(typeof(Args[1]) == FunctionAttribute)
+ && isCallable!(Args[0])
+ && allSameType!(Map!(TypeOf, Args[1 .. $])))
+{
+    enum uint pred(Args_...) = Args_[0] | Args_[1];
+
+    template Reduce(Args_...)
+    {
+        static if (Args_.length == 1)
+        {
+            enum uint Reduce = Args_[0];
+        }
+        else
+        {
+            enum uint Reduce = Reduce!(pred!(Args_[0], Args_[1]), Args_[2 .. $]);
+        }
+    }
+    enum uint field = Reduce!(0, Args[1 .. $]);
+    enum hasFunctionAttributes = (functionAttributes!(Args[0]) & field) == field;
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    static struct Range
+    {
+        @property auto front() inout
+        {
+            return 8;
+        }
+    }
+    static assert(hasFunctionAttributes!(Range.init.front, FunctionAttribute.inout_));
+    static assert(!hasFunctionAttributes!(Range.init.front, FunctionAttribute.const_));
+    static assert(!hasFunctionAttributes!(Range.init.front,
+                  FunctionAttribute.inout_, FunctionAttribute.const_));
+}
+
 /**
  * Returns a tuple with default values of the parameters to $(D_PARAM F).
  *
@@ -2550,44 +2523,6 @@ template hasElaborateAssign(T)
     }
 }
 
-@nogc nothrow pure @safe unittest
-{
-    static assert(!hasElaborateAssign!int);
-
-    static struct S1
-    {
-        void opAssign(S1)
-        {
-        }
-    }
-    static struct S2
-    {
-        void opAssign(int)
-        {
-        }
-    }
-    static struct S3
-    {
-        S1 s;
-        alias s this;
-    }
-    static assert(hasElaborateAssign!S1);
-    static assert(!hasElaborateAssign!(const S1));
-    static assert(hasElaborateAssign!(S1[1]));
-    static assert(!hasElaborateAssign!(S1[0]));
-    static assert(!hasElaborateAssign!S2);
-    static assert(hasElaborateAssign!S3);
-
-    static struct S4
-    {
-        void opAssign(S4)
-        {
-        }
-        @disable this(this);
-    }
-    static assert(hasElaborateAssign!S4);
-}
-
 /**
  * Returns all members of $(D_KEYWORD enum) $(D_PARAM T).
  *
@@ -2613,14 +2548,23 @@ if (is(T == enum))
         }
         else
         {
-            alias getEnumMembers = AliasSeq!(__traits(getMember, T, Args[0]), getEnumMembers!(Args[1 .. $]));
+            alias getEnumMembers = AliasSeq!(__traits(getMember, T, Args[0]),
+                                             getEnumMembers!(Args[1 .. $]));
         }
     }
-    alias EnumMembers = getEnumMembers!(__traits(allMembers, T));
+    private alias allMembers = AliasSeq!(__traits(allMembers, T));
+    static if (allMembers.length == 1)
+    {
+        alias EnumMembers = AliasSeq!(__traits(getMember, T, allMembers));
+    }
+    else
+    {
+        alias EnumMembers = getEnumMembers!allMembers;
+    }
 }
 
 ///
-pure nothrow @nogc @safe unittest
+@nogc nothrow pure @safe unittest
 {
     enum E : int
     {
@@ -2628,7 +2572,7 @@ pure nothrow @nogc @safe unittest
         two,
         three,
     }
-    static assert([E.one, E.two, E.three] == [ EnumMembers!E ]);
+    static assert([EnumMembers!E] == [E.one, E.two, E.three]);
 }
 
 /**
@@ -2671,6 +2615,58 @@ if (is(T == class))
     static assert(classInstanceAlignment!C2 == S.alignof);
 }
 
+/**
+ * Returns the size in bytes of the state that needs to be allocated to hold an
+ * object of type $(D_PARAM T).
+ *
+ * There is a difference between the `.sizeof`-property and
+ * $(D_PSYMBOL stateSize) if $(D_PARAM T) is a class or an interface.
+ * `T.sizeof` is constant on the given architecture then and is the same as
+ * `size_t.sizeof` and `ptrdiff_t.sizeof`. This is because classes and
+ * interfaces are reference types and `.sizeof` returns the size of the
+ * reference which is the same as the size of a pointer. $(D_PSYMBOL stateSize)
+ * returns the size of the instance itself.
+ *
+ * The size of a dynamic array is `size_t.sizeof * 2` since a dynamic array
+ * stores its length and a data pointer. The size of the static arrays is
+ * calculated differently since they are value types. It is the array length
+ * multiplied by the element size.
+ *
+ * `stateSize!void` is `1` since $(D_KEYWORD void) is mostly used as a synonym
+ * for $(D_KEYWORD byte)/$(D_KEYWORD ubyte) in `void*`.
+ *
+ * Params:
+ *  T = Object type.
+ *
+ * Returns: Size of an instance of type $(D_PARAM T).
+ */
+template stateSize(T)
+{
+    static if (isPolymorphicType!T)
+    {
+        enum size_t stateSize = __traits(classInstanceSize, T);
+    }
+    else
+    {
+        enum size_t stateSize = T.sizeof;
+    }
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    static assert(stateSize!int == 4);
+    static assert(stateSize!bool == 1);
+    static assert(stateSize!(int[]) == (size_t.sizeof * 2));
+    static assert(stateSize!(short[3]) == 6);
+
+    static struct Empty
+    {
+    }
+    static assert(stateSize!Empty == 1);
+    static assert(stateSize!void == 1);
+}
+
 /**
  * Tests whether $(D_INLINECODE pred(T)) can be used as condition in an
  * $(D_KEYWORD if)-statement or a ternary operator.
@@ -2835,6 +2831,46 @@ template hasUDA(alias symbol, alias attr)
     static assert(!hasUDA!(a, Attr2));
 }
 
+/**
+ * If $(D_PARAM T) is a type, constructs its default value, otherwise
+ * $(D_PSYMBOL evalUDA) aliases itself to $(D_PARAM T).
+ *
+ * This template is useful when working with UDAs with default parameters,
+ * i.e. if an attribute can be given as `@Attr` or `@Attr("param")`,
+ * $(D_PSYMBOL evalUDA) makes `@Attr()` from `@Attr`, but returns
+ * `@Attr("param")` as is.
+ *
+ * $(D_PARAM T) (or its type if it isn't a type already) should have a default
+ * constructor.
+ *
+ * Params:
+ *  T = User Defined Attribute.
+ */
+alias evalUDA(alias T) = T;
+
+/// ditto
+alias evalUDA(T) = Alias!(T());
+
+///
+@nogc nothrow pure @safe unittest
+{
+    static struct Length
+    {
+        size_t length = 8;
+    }
+    @Length @Length(0) int i;
+    alias uda = AliasSeq!(__traits(getAttributes, i));
+
+    alias attr1 = evalUDA!(uda[0]);
+    alias attr2 = evalUDA!(uda[1]);
+
+    static assert(is(typeof(attr1) == Length));
+    static assert(is(typeof(attr2) == Length));
+
+    static assert(attr1.length == 8);
+    static assert(attr2.length == 0);
+}
+
 /**
  * Tests whether $(D_PARAM T) is an inner class, i.e. a class nested inside
  * another class.
@@ -2883,14 +2919,6 @@ template isInnerClass(T)
     static assert(!isInnerClass!(O.Fake));
 }
 
-@nogc nothrow pure @safe unittest
-{
-    class RefCountedStore(T)
-    {
-    }
-    static assert(!isInnerClass!(RefCountedStore!int));
-}
-
 /**
  * Returns the types of all members of $(D_PARAM T).
  *
@@ -3018,28 +3046,3 @@ enum bool isOrderingComparable(T) = ifTestable!(T, a => a > a);
 {
     static assert(isOrderingComparable!int);
 }
-
-@nogc nothrow pure @safe unittest
-{
-    static struct DisabledOpEquals
-    {
-        @disable bool opEquals(typeof(this)) @nogc nothrow pure @safe;
-
-        int opCmp(typeof(this)) @nogc nothrow pure @safe
-        {
-            return 0;
-        }
-    }
-    static assert(!isEqualityComparable!DisabledOpEquals);
-    static assert(isOrderingComparable!DisabledOpEquals);
-
-    static struct OpEquals
-    {
-        bool opEquals(typeof(this)) @nogc nothrow pure @safe
-        {
-            return true;
-        }
-    }
-    static assert(isEqualityComparable!OpEquals);
-    static assert(!isOrderingComparable!OpEquals);
-}

meta/tanya/meta/transform.d

@@ -9,11 +9,11 @@
  * types. They take some type as argument and return a different type after
  * perfoming the specified transformation.
  *
- * Copyright: Eugene Wissner 2017-2018.
+ * Copyright: Eugene Wissner 2017-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/meta/transform.d,
+ * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/meta/tanya/meta/transform.d,
  *                 tanya/meta/transform.d)
  */
 module tanya.meta.transform;
@@ -855,53 +855,6 @@ if (allSatisfy!(isType, Args))
     static assert(is(CommonType!(const A, Object) == const Object));
 }
 
-@nogc nothrow pure @safe unittest
-{
-    static assert(is(CommonType!(void*, int*) == void*));
-    static assert(is(CommonType!(void*, const(int)*) == const(void)*));
-    static assert(is(CommonType!(void*, const(void)*) == const(void)*));
-    static assert(is(CommonType!(int*, void*) == void*));
-    static assert(is(CommonType!(const(int)*, void*) == const(void)*));
-    static assert(is(CommonType!(const(void)*, void*) == const(void)*));
-
-    static assert(is(CommonType!() == void));
-    static assert(is(CommonType!(int*, const(int)*) == const(int)*));
-    static assert(is(CommonType!(int**, const(int)**) == const(int*)*));
-
-    static assert(is(CommonType!(float, double) == double));
-    static assert(is(CommonType!(float, int) == void));
-
-    static assert(is(CommonType!(bool, const bool) == bool));
-    static assert(is(CommonType!(int, bool) == void));
-    static assert(is(CommonType!(int, void) == void));
-    static assert(is(CommonType!(Object, void*) == void));
-
-    class A
-    {
-    }
-    static assert(is(CommonType!(A, Object) == Object));
-    static assert(is(CommonType!(const(A)*, Object*) == const(Object)*));
-    static assert(is(CommonType!(A, typeof(null)) == A));
-
-    class B : A
-    {
-    }
-    class C : A
-    {
-    }
-    static assert(is(CommonType!(B, C) == A));
-
-    static struct S
-    {
-        int opCast(T : int)()
-        {
-            return 1;
-        }
-    }
-    static assert(is(CommonType!(S, int) == void));
-    static assert(is(CommonType!(const S, S) == const S));
-}
-
 /**
  * Finds the type with the smallest size in the $(D_PARAM Args) list. If
  * several types have the same type, the leftmost is returned.

middle/dub.json

@@ -0,0 +1,22 @@
+{
+	"name": "middle",
+	"description": "Runtime, middle-level utilities",
+	"targetType": "library",
+
+	"dependencies": {
+		"tanya:meta": "*",
+		"tanya:os": "*",
+		"tanya:sys": "*"
+	},
+
+	"dependencies-linux": {
+		"mir-linux-kernel": "~>1.0.0"
+	},
+
+	"sourcePaths": [
+		"."
+	],
+	"importPaths": [
+		"."
+	]
+}

middle/tanya/memory/allocator.d

@@ -3,23 +3,85 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
- * Dynamic memory management.
+ * This module contains the interface for implementing custom allocators.
  *
- * Copyright: Eugene Wissner 2016-2018.
+ * Allocators are classes encapsulating memory allocation strategy. This allows
+ * to decouple memory management from the algorithms and the data. 
+ *
+ * Copyright: Eugene Wissner 2016-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/memory/package.d,
+ * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/middle/tanya/memory/allocator.d,
- *                 tanya/memory/package.d)
+ *                 tanya/memory/allocator.d)
  */
-module tanya.memory;
+module tanya.memory.allocator;
 
-import std.algorithm.mutation : uninitializedFill;
+import tanya.memory.lifetime;
-import tanya.conv;
-import tanya.exception;
-public import tanya.memory.allocator;
 import tanya.meta.trait;
-import tanya.range.primitive;
+
+/**
+ * Abstract class implementing a basic allocator.
+ */
+interface Allocator
+{
+    /**
+     * Returns: Alignment offered.
+     */
+    @property uint alignment() const shared pure nothrow @safe @nogc;
+
+    /**
+     * Allocates $(D_PARAM size) bytes of memory.
+     *
+     * Params:
+     *  size = Amount of memory to allocate.
+     *
+     * Returns: Pointer to the new allocated memory.
+     */
+    void[] allocate(size_t size) shared pure nothrow @nogc;
+
+    /**
+     * Deallocates a memory block.
+     *
+     * Params:
+     *  p = A pointer to the memory block to be freed.
+     *
+     * Returns: Whether the deallocation was successful.
+     */
+    bool deallocate(void[] p) shared pure nothrow @nogc;
+
+    /**
+     * Increases or decreases the size of a memory block.
+     *
+     * Params:
+     *  p    = A pointer to the memory block.
+     *  size = Size of the reallocated block.
+     *
+     * Returns: Pointer to the allocated memory.
+     */
+    bool reallocate(ref void[] p, size_t size) shared pure nothrow @nogc;
+
+    /**
+     * Reallocates a memory block in place if possible or returns
+     * $(D_KEYWORD false). This function cannot be used to allocate or
+     * deallocate memory, so if $(D_PARAM p) is $(D_KEYWORD null) or
+     * $(D_PARAM size) is `0`, it should return $(D_KEYWORD false).
+     *
+     * Params:
+     *  p    = A pointer to the memory block.
+     *  size = Size of the reallocated block.
+     *
+     * Returns: $(D_KEYWORD true) if successful, $(D_KEYWORD false) otherwise.
+     */
+    bool reallocateInPlace(ref void[] p, size_t size)
+    shared pure nothrow @nogc;
+}
+
+package template GetPureInstance(T : Allocator)
+{
+    alias GetPureInstance = shared(T) function()
+                            pure nothrow @nogc;
+}
 
 /**
  * The mixin generates common methods for classes and structs using
@@ -39,11 +101,7 @@ mixin template DefaultAllocator()
      * Precondition: $(D_INLINECODE allocator_ !is null)
      */
     this(shared Allocator allocator) @nogc nothrow pure @safe
-    in
+    in (allocator !is null)
-    {
-        assert(allocator !is null);
-    }
-    do
     {
         this.allocator_ = allocator;
     }
@@ -57,11 +115,7 @@ mixin template DefaultAllocator()
      * Postcondition: $(D_INLINECODE allocator !is null)
      */
     @property shared(Allocator) allocator() @nogc nothrow pure @safe
-    out (allocator)
+    out (allocator; allocator !is null)
-    {
-        assert(allocator !is null);
-    }
-    do
     {
         if (allocator_ is null)
         {
@@ -72,11 +126,7 @@ mixin template DefaultAllocator()
 
     /// ditto
     @property shared(Allocator) allocator() const @nogc nothrow pure @trusted
-    out (allocator)
+    out (allocator; allocator !is null)
-    {
-        assert(allocator !is null);
-    }
-    do
     {
         if (allocator_ is null)
         {
@@ -86,10 +136,6 @@ mixin template DefaultAllocator()
     }
 }
 
-// From druntime
-extern (C)
-private void _d_monitordelete(Object h, bool det) @nogc nothrow pure;
-
 shared Allocator allocator;
 
 private shared(Allocator) getAllocatorInstance() @nogc nothrow
@@ -98,12 +144,12 @@ private shared(Allocator) getAllocatorInstance() @nogc nothrow
     {
         version (TanyaNative)
         {
-            import tanya.memory.mmappool;
+            import tanya.memory.mmappool : MmapPool;
             defaultAllocator = MmapPool.instance;
         }
         else
         {
-            import tanya.memory.mallocator;
+            import tanya.memory.mallocator : Mallocator;
             defaultAllocator = Mallocator.instance;
         }
     }
@@ -116,11 +162,7 @@ private shared(Allocator) getAllocatorInstance() @nogc nothrow
  * Postcondition: $(D_INLINECODE allocator !is null).
  */
 @property shared(Allocator) defaultAllocator() @nogc nothrow pure @trusted
-out (allocator)
+out (allocator; allocator !is null)
-{
-    assert(allocator !is null);
-}
-do
 {
     return (cast(GetPureInstance!Allocator) &getAllocatorInstance)();
 }
@@ -134,67 +176,11 @@ do
  * Precondition: $(D_INLINECODE allocator !is null).
  */
 @property void defaultAllocator(shared(Allocator) allocator) @nogc nothrow @safe
-in
+in (allocator !is null)
-{
-    assert(allocator !is null);
-}
-do
 {
     .allocator = allocator;
 }
 
-/**
- * Returns the size in bytes of the state that needs to be allocated to hold an
- * object of type $(D_PARAM T).
- *
- * There is a difference between the `.sizeof`-property and
- * $(D_PSYMBOL stateSize) if $(D_PARAM T) is a class or an interface.
- * `T.sizeof` is constant on the given architecture then and is the same as
- * `size_t.sizeof` and `ptrdiff_t.sizeof`. This is because classes and
- * interfaces are reference types and `.sizeof` returns the size of the
- * reference which is the same as the size of a pointer. $(D_PSYMBOL stateSize)
- * returns the size of the instance itself.
- *
- * The size of a dynamic array is `size_t.sizeof * 2` since a dynamic array
- * stores its length and a data pointer. The size of the static arrays is
- * calculated differently since they are value types. It is the array length
- * multiplied by the element size.
- *
- * `stateSize!void` is `1` since $(D_KEYWORD void) is mostly used as a synonym
- * for $(D_KEYWORD byte)/$(D_KEYWORD ubyte) in `void*`.
- *
- * Params:
- *  T = Object type.
- *
- * Returns: Size of an instance of type $(D_PARAM T).
- */
-template stateSize(T)
-{
-    static if (isPolymorphicType!T)
-    {
-        enum size_t stateSize = __traits(classInstanceSize, T);
-    }
-    else
-    {
-        enum size_t stateSize = T.sizeof;
-    }
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    static assert(stateSize!int == 4);
-    static assert(stateSize!bool == 1);
-    static assert(stateSize!(int[]) == (size_t.sizeof * 2));
-    static assert(stateSize!(short[3]) == 6);
-
-    static struct Empty
-    {
-    }
-    static assert(stateSize!Empty == 1);
-    static assert(stateSize!void == 1);
-}
-
 /**
  * Params:
  *  size      = Raw size.
@@ -208,70 +194,173 @@ pure nothrow @safe @nogc
     return (size - 1) / alignment * alignment + alignment;
 }
 
-/*
+/**
- * Internal function used to create, resize or destroy a dynamic array. It
+ * Error thrown if memory allocation fails.
- * may throw $(D_PSYMBOL OutOfMemoryError). The new
+ */
- * allocated part of the array isn't initialized. This function can be trusted
+final class OutOfMemoryError : Error
- * only in the data structures that can ensure that the array is
+{
- * allocated/rellocated/deallocated with the same allocator.
+    /**
+     * Constructs new error.
      *
      * Params:
- *  T         = Element type of the array being created.
+     *  msg  = The message for the exception.
- *  allocator = The allocator used for getting memory.
+     *  file = The file where the exception occurred.
- *  array     = A reference to the array being changed.
+     *  line = The line number where the exception occurred.
- *  length    = New array length.
+     *  next = The previous exception in the chain of exceptions, if any.
- *
- * Returns: $(D_PARAM array).
      */
-package(tanya) T[] resize(T)(shared Allocator allocator,
+    this(string msg = "Out of memory",
-                             auto ref T[] array,
+         string file = __FILE__,
-                             const size_t length) @trusted
+         size_t line = __LINE__,
+         Throwable next = null) @nogc nothrow pure @safe
     {
-    if (length == 0)
+        super(msg, file, line, next);
+    }
+
+    /// ditto
+    this(string msg,
+         Throwable next,
+         string file = __FILE__,
+         size_t line = __LINE__) @nogc nothrow pure @safe
     {
-        if (allocator.deallocate(array))
+        super(msg, file, line, next);
+    }
+}
+
+/**
+ * Destroys and deallocates $(D_PARAM p) of type $(D_PARAM T).
+ * It is assumed the respective entities had been allocated with the same
+ * allocator.
+ *
+ * Params:
+ *  T         = Type of $(D_PARAM p).
+ *  allocator = Allocator the $(D_PARAM p) was allocated with.
+ *  p         = Object or array to be destroyed.
+ */
+void dispose(T)(shared Allocator allocator, auto ref T p)
 {
-            return null;
+    () @trusted { allocator.deallocate(finalize(p)); }();
+    p = null;
+}
+
+/**
+ * Constructs a new class instance of type $(D_PARAM T) using $(D_PARAM args)
+ * as the parameter list for the constructor of $(D_PARAM T).
+ *
+ * Params:
+ *  T         = Class type.
+ *  A         = Types of the arguments to the constructor of $(D_PARAM T).
+ *  allocator = Allocator.
+ *  args      = Constructor arguments of $(D_PARAM T).
+ *
+ * Returns: Newly created $(D_PSYMBOL T).
+ *
+ * Precondition: $(D_INLINECODE allocator !is null)
+ */
+T make(T, A...)(shared Allocator allocator, auto ref A args)
+if (is(T == class))
+in (allocator !is null)
+{
+    auto mem = (() @trusted => allocator.allocate(stateSize!T))();
+    if (mem is null)
+    {
+        onOutOfMemoryError();
+    }
+    scope (failure)
+    {
+        () @trusted { allocator.deallocate(mem); }();
+    }
+
+    return emplace!T(mem[0 .. stateSize!T], args);
+}
+
+/**
+ * Constructs a value object of type $(D_PARAM T) using $(D_PARAM args)
+ * as the parameter list for the constructor of $(D_PARAM T) and returns a
+ * pointer to the new object.
+ *
+ * Params:
+ *  T         = Object type.
+ *  A         = Types of the arguments to the constructor of $(D_PARAM T).
+ *  allocator = Allocator.
+ *  args      = Constructor arguments of $(D_PARAM T).
+ *
+ * Returns: Pointer to the created object.
+ *
+ * Precondition: $(D_INLINECODE allocator !is null)
+ */
+T* make(T, A...)(shared Allocator allocator, auto ref A args)
+if (!isPolymorphicType!T && !isAssociativeArray!T && !isArray!T)
+in (allocator !is null)
+{
+    auto mem = (() @trusted => allocator.allocate(stateSize!T))();
+    if (mem is null)
+    {
+        onOutOfMemoryError();
+    }
+    scope (failure)
+    {
+        () @trusted { allocator.deallocate(mem); }();
+    }
+    return emplace!T(mem[0 .. stateSize!T], args);
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    int* i = defaultAllocator.make!int(5);
+    assert(*i == 5);
+    defaultAllocator.dispose(i);
+}
+
+/**
+ * Constructs a new array with $(D_PARAM n) elements.
+ *
+ * Params:
+ *  T         = Array type.
+ *  E         = Array element type.
+ *  allocator = Allocator.
+ *  n         = Array size.
+ *
+ * Returns: Newly created array.
+ *
+ * Precondition: $(D_INLINECODE allocator !is null
+ *                           && n <= size_t.max / E.sizeof)
+ */
+T make(T : E[], E)(shared Allocator allocator, size_t n)
+in (allocator !is null)
+in (n <= size_t.max / E.sizeof)
+{
+    auto ret = allocator.resize!E(null, n);
+
+    static if (hasElaborateDestructor!E)
+    {
+        for (auto range = ret; range.length != 0; range = range[1 .. $])
+        {
+            emplace!E(cast(void[]) range[0 .. 1], E.init);
+        }
     }
     else
     {
-            onOutOfMemoryError();
+        ret[] = E.init;
-        }
     }
 
-    void[] buf = array;
+    return ret;
-    if (!allocator.reallocate(buf, length * T.sizeof))
-    {
-        onOutOfMemoryError();
-    }
-    // Casting from void[] is unsafe, but we know we cast to the original type.
-    array = cast(T[]) buf;
-
-    return array;
 }
 
+///
 @nogc nothrow pure @safe unittest
 {
-    int[] p;
+    int[] i = defaultAllocator.make!(int[])(2);
-
+    assert(i.length == 2);
-    p = defaultAllocator.resize(p, 20);
+    assert(i[0] == int.init && i[1] == int.init);
-    assert(p.length == 20);
+    defaultAllocator.dispose(i);
-
-    p = defaultAllocator.resize(p, 30);
-    assert(p.length == 30);
-
-    p = defaultAllocator.resize(p, 10);
-    assert(p.length == 10);
-
-    p = defaultAllocator.resize(p, 0);
-    assert(p is null);
 }
 
 /*
  * Destroys the object.
  * Returns the memory should be freed.
  */
-package(tanya) void[] finalize(T)(ref T* p)
+package void[] finalize(T)(ref T* p)
 {
     if (p is null)
     {
@@ -284,7 +373,7 @@ package(tanya) void[] finalize(T)(ref T* p)
     return (cast(void*) p)[0 .. T.sizeof];
 }
 
-package(tanya) void[] finalize(T)(ref T p)
+package void[] finalize(T)(ref T p)
 if (isPolymorphicType!T)
 {
     if (p is null)
@@ -339,176 +428,70 @@ if (isPolymorphicType!T)
     return support;
 }
 
-package(tanya) void[] finalize(T)(ref T[] p)
+package void[] finalize(T)(ref T[] p)
 {
-    static if (hasElaborateDestructor!(typeof(p[0])))
+    destroyAllImpl!(T[], T)(p);
-    {
-        foreach (ref e; p)
-        {
-            destroy(e);
-        }
-    }
     return p;
 }
 
 /**
- * Destroys and deallocates $(D_PARAM p) of type $(D_PARAM T).
+ * Allocates $(D_PSYMBOL OutOfMemoryError) in a static storage and throws it.
- * It is assumed the respective entities had been allocated with the same
- * allocator.
  *
  * Params:
- *  T         = Type of $(D_PARAM p).
+ *  msg = Custom error message.
- *  allocator = Allocator the $(D_PARAM p) was allocated with.
+ *
- *  p         = Object or array to be destroyed.
+ * Throws: $(D_PSYMBOL OutOfMemoryError).
  */
-void dispose(T)(shared Allocator allocator, auto ref T p)
+void onOutOfMemoryError(string msg = "Out of memory")
+@nogc nothrow pure @trusted
 {
-    () @trusted { allocator.deallocate(finalize(p)); }();
+    static ubyte[stateSize!OutOfMemoryError] memory;
-    p = null;
+    alias PureType = OutOfMemoryError function(string) @nogc nothrow pure;
+    throw (cast(PureType) () => emplace!OutOfMemoryError(memory))(msg);
 }
 
-@nogc nothrow pure @system unittest
+// From druntime
-{
+extern (C)
-    static struct S
+private void _d_monitordelete(Object h, bool det) @nogc nothrow pure;
-    {
-        ~this() @nogc nothrow pure @safe
-        {
-        }
-    }
-    auto p = cast(S[]) defaultAllocator.allocate(S.sizeof);
 
-    defaultAllocator.dispose(p);
+/*
-}
+ * Internal function used to create, resize or destroy a dynamic array. It
-
+ * may throw $(D_PSYMBOL OutOfMemoryError). The new
-// Works with interfaces.
+ * allocated part of the array isn't initialized. This function can be trusted
-@nogc nothrow pure @safe unittest
+ * only in the data structures that can ensure that the array is
-{
+ * allocated/rellocated/deallocated with the same allocator.
-    interface I
-    {
-    }
-    class C : I
-    {
-    }
-    auto c = defaultAllocator.make!C();
-    I i = c;
-
-    defaultAllocator.dispose(i);
-    defaultAllocator.dispose(i);
-}
-
-/**
- * Constructs a new class instance of type $(D_PARAM T) using $(D_PARAM args)
- * as the parameter list for the constructor of $(D_PARAM T).
  *
  * Params:
- *  T         = Class type.
+ *  T         = Element type of the array being created.
- *  A         = Types of the arguments to the constructor of $(D_PARAM T).
+ *  allocator = The allocator used for getting memory.
- *  allocator = Allocator.
+ *  array     = A reference to the array being changed.
- *  args      = Constructor arguments of $(D_PARAM T).
+ *  length    = New array length.
  *
- * Returns: Newly created $(D_PSYMBOL T).
+ * Returns: $(D_PARAM array).
- *
- * Precondition: $(D_INLINECODE allocator !is null)
  */
-T make(T, A...)(shared Allocator allocator, auto ref A args)
+package(tanya) T[] resize(T)(shared Allocator allocator,
-if (is(T == class))
+                             auto ref T[] array,
-in
+                             const size_t length) @trusted
 {
-    assert(allocator !is null);
+    if (length == 0)
+    {
+        if (allocator.deallocate(array))
+        {
+            return null;
         }
-do
+        else
-{
-    auto mem = (() @trusted => allocator.allocate(stateSize!T))();
-    if (mem is null)
         {
             onOutOfMemoryError();
         }
-    scope (failure)
-    {
-        () @trusted { allocator.deallocate(mem); }();
     }
 
-    return emplace!T(mem[0 .. stateSize!T], args);
+    void[] buf = array;
-}
+    if (!allocator.reallocate(buf, length * T.sizeof))
-
-/**
- * Constructs a value object of type $(D_PARAM T) using $(D_PARAM args)
- * as the parameter list for the constructor of $(D_PARAM T) and returns a
- * pointer to the new object.
- *
- * Params:
- *  T         = Object type.
- *  A         = Types of the arguments to the constructor of $(D_PARAM T).
- *  allocator = Allocator.
- *  args      = Constructor arguments of $(D_PARAM T).
- *
- * Returns: Pointer to the created object.
- *
- * Precondition: $(D_INLINECODE allocator !is null)
- */
-T* make(T, A...)(shared Allocator allocator, auto ref A args)
-if (!is(T == interface)
- && !is(T == class)
- && !isAssociativeArray!T
- && !isArray!T)
-in
-{
-    assert(allocator !is null);
-}
-do
-{
-    auto mem = (() @trusted => allocator.allocate(stateSize!T))();
-    if (mem is null)
     {
         onOutOfMemoryError();
     }
-    scope (failure)
+    // Casting from void[] is unsafe, but we know we cast to the original type.
-    {
+    array = cast(T[]) buf;
-        () @trusted { allocator.deallocate(mem); }();
-    }
-    return emplace!T(mem[0 .. stateSize!T], args);
-}
 
-///
+    return array;
-@nogc nothrow pure @safe unittest
-{
-    int* i = defaultAllocator.make!int(5);
-    assert(*i == 5);
-    defaultAllocator.dispose(i);
-}
-
-/**
- * Constructs a new array with $(D_PARAM n) elements.
- *
- * Params:
- *  T         = Array type.
- *  allocator = Allocator.
- *  n         = Array size.
- *
- * Returns: Newly created array.
- *
- * Precondition: $(D_INLINECODE allocator !is null
- *                           && n <= size_t.max / ElementType!T.sizeof)
- */
-T make(T)(shared Allocator allocator, const size_t n)
-if (isArray!T)
-in
-{
-    assert(allocator !is null);
-    assert(n <= size_t.max / ElementType!T.sizeof);
-}
-do
-{
-    auto ret = allocator.resize!(ElementType!T)(null, n);
-    ret.uninitializedFill(ElementType!T.init);
-    return ret;
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    int[] i = defaultAllocator.make!(int[])(2);
-    assert(i.length == 2);
-    assert(i[0] == int.init && i[1] == int.init);
-    defaultAllocator.dispose(i);
 }

middle/tanya/memory/lifetime.d

@@ -0,0 +1,508 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/**
+ * Lifetime management functions, types and related exceptions.
+ *
+ * Copyright: Eugene Wissner 2019.
+ * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
+ *                  Mozilla Public License, v. 2.0).
+ * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
+ * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/middle/tanya/memory/lifetime.d,
+ *                 tanya/memory/lifetime.d)
+ */
+module tanya.memory.lifetime;
+
+import tanya.memory.allocator;
+import tanya.meta.metafunction;
+import tanya.meta.trait;
+
+package(tanya) void destroyAllImpl(R, E)(R p)
+{
+    static if (hasElaborateDestructor!E)
+    {
+        foreach (ref e; p)
+        {
+            destroy(e);
+        }
+    }
+}
+
+/**
+ * Constructs a new object of type $(D_PARAM T) in $(D_PARAM memory) with the
+ * given arguments.
+ *
+ * If $(D_PARAM T) is a $(D_KEYWORD class), emplace returns a class reference
+ * of type $(D_PARAM T), otherwise a pointer to the constructed object is
+ * returned.
+ *
+ * If $(D_PARAM T) is a nested class inside another class, $(D_PARAM outer)
+ * should be an instance of the outer class.
+ *
+ * $(D_PARAM args) are arguments for the constructor of $(D_PARAM T). If
+ * $(D_PARAM T) isn't an aggregate type and doesn't have a constructor,
+ * $(D_PARAM memory) can be initialized to `args[0]` if `Args.length == 1`,
+ * `Args[0]` should be implicitly convertible to $(D_PARAM T) then.
+ *
+ * Params:
+ *  T     = Constructed type.
+ *  U     = Type of the outer class if $(D_PARAM T) is a nested class.
+ *  Args  = Types of the constructor arguments if $(D_PARAM T) has a constructor
+ *          or the type of the initial value.
+ *  outer = Outer class instance if $(D_PARAM T) is a nested class.
+ *  args  = Constructor arguments if $(D_PARAM T) has a constructor or the
+ *          initial value.
+ *
+ * Returns: New instance of type $(D_PARAM T) constructed in $(D_PARAM memory).
+ *
+ * Precondition: `memory.length == stateSize!T`.
+ * Postcondition: $(D_PARAM memory) and the result point to the same memory.
+ */
+T emplace(T, U, Args...)(void[] memory, U outer, auto ref Args args)
+if (!isAbstractClass!T && isInnerClass!T && is(typeof(T.outer) == U))
+in (memory.length >= stateSize!T)
+out (result; memory.ptr is (() @trusted => cast(void*) result)())
+{
+    import tanya.memory.op : copy;
+
+    copy(typeid(T).initializer, memory);
+
+    auto result = (() @trusted => cast(T) memory.ptr)();
+    result.outer = outer;
+
+    static if (is(typeof(result.__ctor(args))))
+    {
+        result.__ctor(args);
+    }
+
+    return result;
+}
+
+/// ditto
+T emplace(T, Args...)(void[] memory, auto ref Args args)
+if (is(T == class) && !isAbstractClass!T && !isInnerClass!T)
+in (memory.length == stateSize!T)
+out (result; memory.ptr is (() @trusted => cast(void*) result)())
+{
+    import tanya.memory.op : copy;
+
+    copy(typeid(T).initializer, memory);
+
+    auto result = (() @trusted => cast(T) memory.ptr)();
+    static if (is(typeof(result.__ctor(args))))
+    {
+        result.__ctor(args);
+    }
+    return result;
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    class C
+    {
+        int i = 5;
+        class Inner
+        {
+            int i;
+
+            this(int param) pure nothrow @safe @nogc
+            {
+                this.i = param;
+            }
+        }
+    }
+    ubyte[stateSize!C] memory1;
+    ubyte[stateSize!(C.Inner)] memory2;
+
+    auto c = emplace!C(memory1);
+    assert(c.i == 5);
+
+    auto inner = emplace!(C.Inner)(memory2, c, 8);
+    assert(c.i == 5);
+    assert(inner.i == 8);
+    assert(inner.outer is c);
+}
+
+/// ditto
+T* emplace(T, Args...)(void[] memory, auto ref Args args)
+if (!isAggregateType!T && (Args.length <= 1))
+in (memory.length >= T.sizeof)
+out (result; memory.ptr is result)
+{
+    auto result = (() @trusted => cast(T*) memory.ptr)();
+    static if (Args.length == 1)
+    {
+        *result = T(args[0]);
+    }
+    else
+    {
+        *result = T.init;
+    }
+    return result;
+}
+
+private void initializeOne(T)(ref void[] memory, ref T* result) @trusted
+{
+    import tanya.memory.op : copy, fill;
+
+    static if (!hasElaborateAssign!T && isAssignable!T)
+    {
+        *result = T.init;
+    }
+    else static if (__VERSION__ >= 2083 // __traits(isZeroInit) available.
+        && __traits(isZeroInit, T))
+    {
+        memory.ptr[0 .. T.sizeof].fill!0;
+    }
+    else
+    {
+        static immutable T init = T.init;
+        copy((&init)[0 .. 1], memory);
+    }
+}
+
+/// ditto
+T* emplace(T, Args...)(void[] memory, auto ref Args args)
+if (!isPolymorphicType!T && isAggregateType!T)
+in (memory.length >= T.sizeof)
+out (result; memory.ptr is result)
+{
+    auto result = (() @trusted => cast(T*) memory.ptr)();
+
+    static if (Args.length == 0)
+    {
+        static assert(is(typeof({ static T t; })),
+                      "Default constructor is disabled");
+        initializeOne(memory, result);
+    }
+    else static if (is(typeof(result.__ctor(args))))
+    {
+        initializeOne(memory, result);
+        result.__ctor(args);
+    }
+    else static if (Args.length == 1 && is(typeof({ T t = args[0]; })))
+    {
+        import tanya.memory.op : copy;
+
+        ((ref arg) @trusted =>
+            copy((cast(void*) &arg)[0 .. T.sizeof], memory))(args[0]);
+        static if (hasElaborateCopyConstructor!T)
+        {
+            result.__postblit();
+        }
+    }
+    else static if (is(typeof({ T t = T(args); })))
+    {
+        auto init = T(args);
+        (() @trusted => moveEmplace(init, *result))();
+    }
+    else
+    {
+        static assert(false,
+                      "Unable to construct value with the given arguments");
+    }
+    return result;
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    ubyte[4] memory;
+
+    auto i = emplace!int(memory);
+    static assert(is(typeof(i) == int*));
+    assert(*i == 0);
+
+    i = emplace!int(memory, 5);
+    assert(*i == 5);
+
+    static struct S
+    {
+        int i;
+        @disable this();
+        @disable this(this);
+        this(int i) @nogc nothrow pure @safe
+        {
+            this.i = i;
+        }
+    }
+    auto s = emplace!S(memory, 8);
+    static assert(is(typeof(s) == S*));
+    assert(s.i == 8);
+}
+
+private void deinitialize(bool zero, T)(ref T value)
+{
+    static if (is(T == U[S], U, size_t S))
+    {
+        foreach (ref e; value)
+        {
+            deinitialize!zero(e);
+        }
+    }
+    else
+    {
+        import tanya.memory.op : copy, fill;
+
+        static if (isNested!T)
+        {
+            // Don't override the context pointer.
+            enum size_t size = T.sizeof - (void*).sizeof;
+        }
+        else
+        {
+            enum size_t size = T.sizeof;
+        }
+        static if (zero)
+        {
+            fill!0((cast(void*) &value)[0 .. size]);
+        }
+        else
+        {
+            copy(typeid(T).initializer()[0 .. size], (&value)[0 .. 1]);
+        }
+    }
+}
+
+/**
+ * Moves $(D_PARAM source) into $(D_PARAM target) assuming that
+ * $(D_PARAM target) isn't initialized.
+ *
+ * Moving the $(D_PARAM source) copies it into the $(D_PARAM target) and places
+ * the $(D_PARAM source) into a valid but unspecified state, which means that
+ * after moving $(D_PARAM source) can be destroyed or assigned a new value, but
+ * accessing it yields an unspecified value. No postblits or destructors are
+ * called. If the $(D_PARAM target) should be destroyed before, use
+ * $(D_PSYMBOL move).
+ *
+ * $(D_PARAM source) and $(D_PARAM target) must be different objects.
+ *
+ * Params:
+ *  T      = Object type.
+ *  source = Source object.
+ *  target = Target object.
+ *
+ * See_Also: $(D_PSYMBOL move),
+ *           $(D_PSYMBOL hasElaborateCopyConstructor),
+ *           $(D_PSYMBOL hasElaborateDestructor).
+ *
+ * Precondition: `&source !is &target`.
+ */
+void moveEmplace(T)(ref T source, ref T target) @system
+in (&source !is &target, "Source and target must be different")
+{
+    static if (is(T == struct) || isStaticArray!T)
+    {
+        import tanya.memory.op : copy;
+
+        copy((&source)[0 .. 1], (&target)[0 .. 1]);
+
+        static if (hasElaborateCopyConstructor!T || hasElaborateDestructor!T)
+        {
+            static if (__VERSION__ >= 2083) // __traits(isZeroInit) available.
+            {
+                deinitialize!(__traits(isZeroInit, T))(source);
+            }
+            else
+            {
+                if (typeid(T).initializer().ptr is null)
+                {
+                    deinitialize!true(source);
+                }
+                else
+                {
+                    deinitialize!false(source);
+                }
+            }
+        }
+    }
+    else
+    {
+        target = source;
+    }
+}
+
+///
+@nogc nothrow pure @system unittest
+{
+    static struct S
+    {
+        int member = 5;
+
+        this(this) @nogc nothrow pure @safe
+        {
+            assert(false);
+        }
+    }
+    S source, target = void;
+    moveEmplace(source, target);
+    assert(target.member == 5);
+
+    int x1 = 5, x2;
+    moveEmplace(x1, x2);
+    assert(x2 == 5);
+}
+
+/**
+ * Moves $(D_PARAM source) into $(D_PARAM target) assuming that
+ * $(D_PARAM target) isn't initialized.
+ *
+ * Moving the $(D_PARAM source) copies it into the $(D_PARAM target) and places
+ * the $(D_PARAM source) into a valid but unspecified state, which means that
+ * after moving $(D_PARAM source) can be destroyed or assigned a new value, but
+ * accessing it yields an unspecified value. $(D_PARAM target) is destroyed before
+ * the new value is assigned. If $(D_PARAM target) isn't initialized and
+ * therefore shouldn't be destroyed, $(D_PSYMBOL moveEmplace) can be used.
+ *
+ * If $(D_PARAM target) isn't specified, $(D_PSYMBOL move) returns the source
+ * as rvalue without calling its copy constructor or destructor.
+ *
+ * $(D_PARAM source) and $(D_PARAM target) are the same object,
+ * $(D_PSYMBOL move) does nothing.
+ *
+ * Params:
+ *  T      = Object type.
+ *  source = Source object.
+ *  target = Target object.
+ *
+ * See_Also: $(D_PSYMBOL moveEmplace).
+ */
+void move(T)(ref T source, ref T target)
+{
+    if ((() @trusted => &source is &target)())
+    {
+        return;
+    }
+    static if (hasElaborateDestructor!T)
+    {
+        target.__xdtor();
+    }
+    (() @trusted => moveEmplace(source, target))();
+}
+
+/// ditto
+T move(T)(ref T source) @trusted
+{
+    static if (hasElaborateCopyConstructor!T || hasElaborateDestructor!T)
+    {
+        T target = void;
+        moveEmplace(source, target);
+        return target;
+    }
+    else
+    {
+        return source;
+    }
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    static struct S
+    {
+        int member = 5;
+
+        this(this) @nogc nothrow pure @safe
+        {
+            assert(false);
+        }
+    }
+    S source, target = void;
+    move(source, target);
+    assert(target.member == 5);
+    assert(move(target).member == 5);
+
+    int x1 = 5, x2;
+    move(x1, x2);
+    assert(x2 == 5);
+    assert(move(x2) == 5);
+}
+
+/**
+ * Exchanges the values of $(D_PARAM a) and $(D_PARAM b).
+ *
+ * $(D_PSYMBOL swap) moves the contents of $(D_PARAM a) and $(D_PARAM b)
+ * without calling its postblits or destructors.
+ *
+ * Params:
+ *  a = The first object.
+ *  b = The second object.
+ */
+void swap(T)(ref T a, ref T b) @trusted
+{
+    T tmp = void;
+    moveEmplace(a, tmp);
+    moveEmplace(b, a);
+    moveEmplace(tmp, b);
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    int a = 3, b = 5;
+    swap(a, b);
+    assert(a == 5);
+    assert(b == 3);
+}
+
+/**
+ * Forwards its argument list preserving $(D_KEYWORD ref) and $(D_KEYWORD out)
+ * storage classes.
+ *
+ * $(D_PSYMBOL forward) accepts a list of variables or literals. It returns an
+ * argument list of the same length that can be for example passed to a
+ * function accepting the arguments of this type.
+ *
+ * Params:
+ *  args = Argument list.
+ *
+ * Returns: $(D_PARAM args) with their original storage classes.
+ */
+template forward(args...)
+{
+    static if (args.length == 0)
+    {
+        alias forward = AliasSeq!();
+    }
+    else static if (__traits(isRef, args[0]) || __traits(isOut, args[0]))
+    {
+        static if (args.length == 1)
+        {
+            alias forward = args[0];
+        }
+        else
+        {
+            alias forward = AliasSeq!(args[0], forward!(args[1 .. $]));
+        }
+    }
+    else
+    {
+        @property auto forwardOne()
+        {
+            return move(args[0]);
+        }
+        static if (args.length == 1)
+        {
+            alias forward = forwardOne;
+        }
+        else
+        {
+            alias forward = AliasSeq!(forwardOne, forward!(args[1 .. $]));
+        }
+    }
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    static assert(is(typeof((int i) { int v = forward!i; })));
+    static assert(is(typeof((ref int i) { int v = forward!i; })));
+    static assert(is(typeof({
+        void f(int i, ref int j, out int k)
+        {
+            f(forward!(i, j, k));
+        }
+    })));
+}

middle/tanya/memory/mallocator.d

@@ -3,13 +3,14 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
- * Allocator based on $(D_PSYMBOL malloc), $(D_PSYMBOL realloc) and $(D_PSYMBOL free).
+ * Allocator based on $(D_PSYMBOL malloc), $(D_PSYMBOL realloc) and
+ * $(D_PSYMBOL free).
  *
- * Copyright: Eugene Wissner 2017-2018.
+ * Copyright: Eugene Wissner 2017-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/memory/mallocator.d,
+ * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/middle/tanya/memory/mallocator.d,
  *                 tanya/memory/mallocator.d)
  */
 module tanya.memory.mallocator;
@@ -171,16 +172,6 @@ final class Mallocator : Allocator
         assert(p is null);
     }
 
-    // Fails with false
-    @nogc nothrow pure @system unittest
-    {
-        void[] p = Mallocator.instance.allocate(20);
-        void[] oldP = p;
-        assert(!Mallocator.instance.reallocate(p, size_t.max - Mallocator.psize * 2));
-        assert(oldP is p);
-        Mallocator.instance.deallocate(p);
-    }
-
     /**
      * Returns: The alignment offered.
      */
@@ -189,11 +180,6 @@ final class Mallocator : Allocator
         return (void*).alignof;
     }
 
-    private nothrow @nogc unittest
-    {
-        assert(Mallocator.instance.alignment == (void*).alignof);
-    }
-
     static private shared(Mallocator) instantiate() @nogc nothrow @system
     {
         if (instance_ is null)

middle/tanya/memory/mmappool.d

@@ -5,11 +5,11 @@
 /*
  * Native allocator.
  *
- * Copyright: Eugene Wissner 2016-2018.
+ * Copyright: Eugene Wissner 2016-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/memory/mmappool.d,
+ * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/middle/tanya/memory/mmappool.d,
  *                 tanya/memory/mmappool.d)
  */
 module tanya.memory.mmappool;
@@ -17,7 +17,6 @@ module tanya.memory.mmappool;
 version (TanyaNative):
 
 import mir.linux._asm.unistd;
-import tanya.algorithm.comparison;
 import tanya.memory.allocator;
 import tanya.memory.op;
 import tanya.os.error;
@@ -115,33 +114,6 @@ final class MmapPool : Allocator
         return data is null ? null : data[0 .. size];
     }
 
-    @nogc nothrow pure @system unittest
-    {
-        auto p = MmapPool.instance.allocate(20);
-        assert(p);
-        MmapPool.instance.deallocate(p);
-
-        p = MmapPool.instance.allocate(0);
-        assert(p.length == 0);
-    }
-
-    @nogc nothrow pure @system unittest
-    {
-        // allocate() check.
-        size_t tooMuchMemory = size_t.max
-                             - MmapPool.alignment_
-                             - BlockEntry.sizeof * 2
-                             - RegionEntry.sizeof
-                             - pageSize;
-        assert(MmapPool.instance.allocate(tooMuchMemory) is null);
-
-        assert(MmapPool.instance.allocate(size_t.max) is null);
-
-        // initializeRegion() check.
-        tooMuchMemory = size_t.max - MmapPool.alignment_;
-        assert(MmapPool.instance.allocate(tooMuchMemory) is null);
-    }
-
     /*
      * Search for a block large enough to keep $(D_PARAM size) and split it
      * into two blocks if the block is too large.
@@ -258,13 +230,6 @@ final class MmapPool : Allocator
         return true;
     }
 
-    @nogc nothrow pure @system unittest
-    {
-        auto p = MmapPool.instance.allocate(20);
-
-        assert(MmapPool.instance.deallocate(p));
-    }
-
     /*
      * Reallocates a memory block in place if possible or returns
      * $(D_KEYWORD false). This function cannot be used to allocate or
@@ -341,30 +306,6 @@ final class MmapPool : Allocator
         return true;
     }
 
-    @nogc nothrow pure @system unittest
-    {
-        void[] p;
-        assert(!MmapPool.instance.reallocateInPlace(p, 5));
-        assert(p is null);
-
-        p = MmapPool.instance.allocate(1);
-        auto orig = p.ptr;
-
-        assert(MmapPool.instance.reallocateInPlace(p, 2));
-        assert(p.length == 2);
-        assert(p.ptr == orig);
-
-        assert(MmapPool.instance.reallocateInPlace(p, 4));
-        assert(p.length == 4);
-        assert(p.ptr == orig);
-
-        assert(MmapPool.instance.reallocateInPlace(p, 2));
-        assert(p.length == 2);
-        assert(p.ptr == orig);
-
-        MmapPool.instance.deallocate(p);
-    }
-
     /*
      * Increases or decreases the size of a memory block.
      *
@@ -399,7 +340,7 @@ final class MmapPool : Allocator
         }
         if (p !is null)
         {
-            copy(p[0 .. min(p.length, size)], reallocP);
+            copy(p[0 .. p.length < size ? p.length : size], reallocP);
             deallocate(p);
         }
         p = reallocP;
@@ -407,34 +348,6 @@ final class MmapPool : Allocator
         return true;
     }
 
-    @nogc nothrow pure @system unittest
-    {
-        void[] p;
-        MmapPool.instance.reallocate(p, 10 * int.sizeof);
-        (cast(int[]) p)[7] = 123;
-
-        assert(p.length == 40);
-
-        MmapPool.instance.reallocate(p, 8 * int.sizeof);
-
-        assert(p.length == 32);
-        assert((cast(int[]) p)[7] == 123);
-
-        MmapPool.instance.reallocate(p, 20 * int.sizeof);
-        (cast(int[]) p)[15] = 8;
-
-        assert(p.length == 80);
-        assert((cast(int[]) p)[15] == 8);
-        assert((cast(int[]) p)[7] == 123);
-
-        MmapPool.instance.reallocate(p, 8 * int.sizeof);
-
-        assert(p.length == 32);
-        assert((cast(int[]) p)[7] == 123);
-
-        MmapPool.instance.deallocate(p);
-    }
-
     static private shared(MmapPool) instantiate() @nogc nothrow @system
     {
         if (instance_ is null)
@@ -464,11 +377,6 @@ final class MmapPool : Allocator
         return (cast(GetPureInstance!MmapPool) &instantiate)();
     }
 
-    @nogc nothrow pure @system unittest
-    {
-        assert(instance is instance);
-    }
-
     /*
      * Initializes a region for one element.
      *
@@ -566,11 +474,6 @@ final class MmapPool : Allocator
         return alignment_;
     }
 
-    @nogc nothrow pure @system unittest
-    {
-        assert(MmapPool.instance.alignment == MmapPool.alignment_);
-    }
-
     private enum uint alignment_ = 8;
 
     private shared static MmapPool instance_;
@@ -599,60 +502,19 @@ final class MmapPool : Allocator
     private alias Block = shared BlockEntry*;
 }
 
-// A lot of allocations/deallocations, but it is the minimum caused a
-// segmentation fault because MmapPool reallocateInPlace moves a block wrong.
 @nogc nothrow pure @system unittest
 {
-    auto a = MmapPool.instance.allocate(16);
+    // allocate() check.
-    auto d = MmapPool.instance.allocate(16);
+    size_t tooMuchMemory = size_t.max
-    auto b = MmapPool.instance.allocate(16);
+                         - MmapPool.alignment_
-    auto e = MmapPool.instance.allocate(16);
+                         - BlockEntry.sizeof * 2
-    auto c = MmapPool.instance.allocate(16);
+                         - RegionEntry.sizeof
-    auto f = MmapPool.instance.allocate(16);
+                         - pageSize;
+    assert(MmapPool.instance.allocate(tooMuchMemory) is null);
 
-    MmapPool.instance.deallocate(a);
+    assert(MmapPool.instance.allocate(size_t.max) is null);
-    MmapPool.instance.deallocate(b);
-    MmapPool.instance.deallocate(c);
 
-    a = MmapPool.instance.allocate(50);
+    // initializeRegion() check.
-    MmapPool.instance.reallocateInPlace(a, 64);
+    tooMuchMemory = size_t.max - MmapPool.alignment_;
-    MmapPool.instance.deallocate(a);
+    assert(MmapPool.instance.allocate(tooMuchMemory) is null);
-
-    a = MmapPool.instance.allocate(1);
-    auto tmp1 = MmapPool.instance.allocate(1);
-    auto h1 = MmapPool.instance.allocate(1);
-    auto tmp2 = cast(ubyte[]) MmapPool.instance.allocate(1);
-
-    auto h2 = MmapPool.instance.allocate(2);
-    tmp1 = MmapPool.instance.allocate(1);
-    MmapPool.instance.deallocate(h2);
-    MmapPool.instance.deallocate(h1);
-
-    h2 = MmapPool.instance.allocate(2);
-    h1 = MmapPool.instance.allocate(1);
-    MmapPool.instance.deallocate(h2);
-
-    auto rep = cast(void[]) tmp2;
-    MmapPool.instance.reallocate(rep, tmp1.length);
-    tmp2 = cast(ubyte[]) rep;
-
-    MmapPool.instance.reallocate(tmp1, 9);
-
-    rep = cast(void[]) tmp2;
-    MmapPool.instance.reallocate(rep, tmp1.length);
-    tmp2 = cast(ubyte[]) rep;
-    MmapPool.instance.reallocate(tmp1, 17);
-
-    tmp2[$ - 1] = 0;
-
-    MmapPool.instance.deallocate(tmp1);
-
-    b = MmapPool.instance.allocate(16);
-
-    MmapPool.instance.deallocate(h1);
-    MmapPool.instance.deallocate(a);
-    MmapPool.instance.deallocate(b);
-    MmapPool.instance.deallocate(d);
-    MmapPool.instance.deallocate(e);
-    MmapPool.instance.deallocate(f);
 }

middle/tanya/memory/op.d

@@ -5,11 +5,11 @@
 /**
  * Set of operations on memory blocks.
  *
- * Copyright: Eugene Wissner 2017-2018.
+ * Copyright: Eugene Wissner 2017-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/memory/op.d,
+ * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/middle/tanya/memory/op.d,
  *                 tanya/memory/op.d)
  */
 module tanya.memory.op;
@@ -24,7 +24,7 @@ version (TanyaNative)
     extern private void moveMemory(const void[], void[])
     pure nothrow @system @nogc;
 
-    extern private int cmpMemory(const void[], const void[])
+    extern private bool equalMemory(const void[], const void[])
     pure nothrow @system @nogc;
 }
 else
@@ -32,21 +32,6 @@ else
     import core.stdc.string;
 }
 
-version (TanyaNative)
-{
-    @nogc nothrow pure @system unittest
-    {
-        ubyte[2] buffer = 1;
-        fillMemory(buffer[1 .. $], 0);
-        assert(buffer[0] == 1 && buffer[1] == 0);
-    }
-
-    @nogc nothrow pure @safe unittest
-    {
-        assert(cmp(null, null) == 0);
-    }
-}
-
 private enum alignMask = size_t.sizeof - 1;
 
 /**
@@ -67,13 +52,9 @@ private enum alignMask = size_t.sizeof - 1;
  * Precondition: $(D_INLINECODE source.length <= target.length).
  */
 void copy(const void[] source, void[] target) @nogc nothrow pure @trusted
-in
+in (source.length <= target.length)
-{
+in (source.length == 0 || source.ptr !is null)
-    assert(source.length <= target.length);
+in (target.length == 0 || target.ptr !is null)
-    assert(source.length == 0 || source.ptr !is null);
-    assert(target.length == 0 || target.ptr !is null);
-}
-do
 {
     version (TanyaNative)
     {
@@ -91,27 +72,7 @@ do
     ubyte[9] source = [1, 2, 3, 4, 5, 6, 7, 8, 9];
     ubyte[9] target;
     source.copy(target);
-    assert(cmp(source, target) == 0);
+    assert(equal(source, target));
-}
-
-@nogc nothrow pure @safe unittest
-{
-    {
-        ubyte[0] source, target;
-        source.copy(target);
-    }
-    {
-        ubyte[1] source = [1];
-        ubyte[1] target;
-        source.copy(target);
-        assert(target[0] == 1);
-    }
-    {
-        ubyte[8] source = [1, 2, 3, 4, 5, 6, 7, 8];
-        ubyte[8] target;
-        source.copy(target);
-        assert(cmp(source, target) == 0);
-    }
 }
 
 /*
@@ -137,11 +98,7 @@ private template filledBytes(ubyte Byte, ubyte I = 0)
  *  memory = Memory block.
  */
 void fill(ubyte c = 0)(void[] memory) @trusted
-in
+in (memory.length == 0 || memory.ptr !is null)
-{
-    assert(memory.length == 0 || memory.ptr !is null);
-}
-do
 {
     version (TanyaNative)
     {
@@ -187,13 +144,9 @@ do
  * Precondition: $(D_INLINECODE source.length <= target.length).
  */
 void copyBackward(const void[] source, void[] target) @nogc nothrow pure @trusted
-in
+in (source.length <= target.length)
-{
+in (source.length == 0 || source.ptr !is null)
-    assert(source.length <= target.length);
+in (target.length == 0 || target.ptr !is null)
-    assert(source.length == 0 || source.ptr !is null);
-    assert(target.length == 0 || target.ptr !is null);
-}
-do
 {
     version (TanyaNative)
     {
@@ -212,85 +165,7 @@ do
     ubyte[6] expected = [ 'a', 'a', 'a', 'a', 'b', 'b' ];
 
     copyBackward(mem[0 .. 4], mem[2 .. $]);
-    assert(cmp(expected, mem) == 0);
+    assert(equal(expected, mem));
-}
-
-@nogc nothrow pure @safe unittest
-{
-    ubyte[9] r1 = [ 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i' ];
-    ubyte[9] r2;
-
-    copyBackward(r1, r2);
-    assert(cmp(r1, r2) == 0);
-}
-
-/**
- * Compares two memory areas $(D_PARAM r1) and $(D_PARAM r2).
- *
- * $(D_PSYMBOL cmp) returns a positive integer if
- * $(D_INLINECODE r1.length > r2.length) or the first `n` compared bytes of
- * $(D_PARAM r1) found to be greater than the first `n` bytes of $(D_PARAM r2),
- *
- * $(D_PSYMBOL cmp) returns a negative integer if
- * $(D_INLINECODE r2.length > r1.length) or the first `n` compared bytes of
- * $(D_PARAM r1) found to be less than the first `n` bytes of $(D_PARAM r2),
- *
- * `0` is returned otherwise.
- *
- * Returns: Positive integer if $(D_INLINECODE r1 > r2),
- *          negative integer if $(D_INLINECODE r2 > r1),
- *          `0` if $(D_INLINECODE r1 == r2).
- */
-int cmp(const void[] r1, const void[] r2) @nogc nothrow pure @trusted
-in
-{
-    assert(r1.length == 0 || r1.ptr !is null);
-    assert(r2.length == 0 || r2.ptr !is null);
-}
-do
-{
-    version (TanyaNative)
-    {
-        return cmpMemory(r1, r2);
-    }
-    else
-    {
-        if (r1.length > r2.length)
-        {
-            return 1;
-        }
-        return r1.length < r2.length ? -1 : memcmp(r1.ptr, r2.ptr, r1.length);
-    }
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    ubyte[4] r1 = [ 'a', 'b', 'c', 'd' ];
-    ubyte[3] r2 = [ 'c', 'a', 'b' ];
-
-    assert(cmp(r1[0 .. 3], r2[]) < 0);
-    assert(cmp(r2[], r1[0 .. 3]) > 0);
-
-    assert(cmp(r1, r2) > 0);
-    assert(cmp(r2, r1) < 0);
-}
-
-@nogc nothrow pure @safe unittest
-{
-    ubyte[16] r1 = [
-        'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h',
-        'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p',
-    ];
-    ubyte[16] r2 = [
-        'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h',
-        'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p',
-    ];
-
-    assert(cmp(r1, r2) == 0);
-    assert(cmp(r1[1 .. $], r2[1 .. $]) == 0);
-    assert(cmp(r1[0 .. $ - 1], r2[0 .. $ - 1]) == 0);
-    assert(cmp(r1[0 .. 8], r2[0 .. 8]) == 0);
 }
 
 /**
@@ -307,11 +182,7 @@ do
  */
 inout(void[]) find(return inout void[] haystack, ubyte needle)
 @nogc nothrow pure @trusted
-in
+in (haystack.length == 0 || haystack.ptr !is null)
-{
-    assert(haystack.length == 0 || haystack.ptr !is null);
-}
-do
 {
     auto length = haystack.length;
     const size_t needleWord = size_t.max * needle;
@@ -362,13 +233,13 @@ do
 {
     const ubyte[9] haystack = ['a', 'b', 'c', 'd', 'e', 'f', 'b', 'g', 'h'];
 
-    assert(cmp(find(haystack, 'a'), haystack[]) == 0);
+    assert(equal(find(haystack, 'a'), haystack[]));
-    assert(cmp(find(haystack, 'b'), haystack[1 .. $]) == 0);
+    assert(equal(find(haystack, 'b'), haystack[1 .. $]));
-    assert(cmp(find(haystack, 'c'), haystack[2 .. $]) == 0);
+    assert(equal(find(haystack, 'c'), haystack[2 .. $]));
-    assert(cmp(find(haystack, 'd'), haystack[3 .. $]) == 0);
+    assert(equal(find(haystack, 'd'), haystack[3 .. $]));
-    assert(cmp(find(haystack, 'e'), haystack[4 .. $]) == 0);
+    assert(equal(find(haystack, 'e'), haystack[4 .. $]));
-    assert(cmp(find(haystack, 'f'), haystack[5 .. $]) == 0);
+    assert(equal(find(haystack, 'f'), haystack[5 .. $]));
-    assert(cmp(find(haystack, 'h'), haystack[8 .. $]) == 0);
+    assert(equal(find(haystack, 'h'), haystack[8 .. $]));
     assert(find(haystack, 'i').length == 0);
 
     assert(find(null, 'a').length == 0);
@@ -389,11 +260,7 @@ do
  */
 inout(char[]) findNullTerminated(return inout char[] haystack)
 @nogc nothrow pure @trusted
-in
+in (haystack.length == 0 || haystack.ptr !is null)
-{
-    assert(haystack.length == 0 || haystack.ptr !is null);
-}
-do
 {
     auto length = haystack.length;
     enum size_t highBits = filledBytes!(0x01, 0);
@@ -441,10 +308,44 @@ do
 ///
 @nogc nothrow pure @safe unittest
 {
-    assert(cmp(findNullTerminated("abcdef\0gh"), "abcdef") == 0);
+    assert(equal(findNullTerminated("abcdef\0gh"), "abcdef"));
-    assert(cmp(findNullTerminated("\0garbage"), "") == 0);
+    assert(equal(findNullTerminated("\0garbage"), ""));
-    assert(cmp(findNullTerminated("\0"), "") == 0);
+    assert(equal(findNullTerminated("\0"), ""));
-    assert(cmp(findNullTerminated("cstring\0"), "cstring") == 0);
+    assert(equal(findNullTerminated("cstring\0"), "cstring"));
     assert(findNullTerminated(null) is null);
     assert(findNullTerminated("abcdef") is null);
 }
+
+/**
+ * Compares two memory areas $(D_PARAM r1) and $(D_PARAM r2) for equality.
+ *
+ * Params:
+ *  r1 = First memory block.
+ *  r2 = Second memory block.
+ *
+ * Returns: $(D_KEYWORD true) if $(D_PARAM r1) and $(D_PARAM r2) are equal,
+ *          $(D_KEYWORD false) otherwise.
+ */
+bool equal(const void[] r1, const void[] r2) @nogc nothrow pure @trusted
+in (r1.length == 0 || r1.ptr !is null)
+in (r2.length == 0 || r2.ptr !is null)
+{
+    version (TanyaNative)
+    {
+        return equalMemory(r1, r2);
+    }
+    else
+    {
+        return r1.length == r2.length
+            && memcmp(r1.ptr, r2.ptr, r1.length) == 0;
+    }
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    assert(equal("asdf", "asdf"));
+    assert(!equal("asd", "asdf"));
+    assert(!equal("asdf", "asd"));
+    assert(!equal("asdf", "qwer"));
+}

middle/tanya/memory/package.d

@@ -0,0 +1,20 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/**
+ * Dynamic memory management.
+ *
+ * Copyright: Eugene Wissner 2016-2019.
+ * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
+ *                  Mozilla Public License, v. 2.0).
+ * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
+ * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/middle/tanya/memory/package.d,
+ *                 tanya/memory/package.d)
+ */
+module tanya.memory;
+
+public import tanya.memory.allocator;
+public import tanya.memory.lifetime;
+deprecated("Use tanya.meta.trait.stateSize instead")
+public import tanya.meta.trait : stateSize;

middle/tanya/memory/smartref.d

@@ -14,26 +14,22 @@
  *  $(LI Unique ownership)
  * )
  *
- * Copyright: Eugene Wissner 2016-2018.
+ * Copyright: Eugene Wissner 2016-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/memory/smartref.d,
+ * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/middle/tanya/memory/smartref.d,
  *                 tanya/memory/smartref.d)
  */
 module tanya.memory.smartref;
 
-import tanya.algorithm.comparison;
+import tanya.memory.allocator;
-import tanya.algorithm.mutation;
+import tanya.memory.lifetime;
-import tanya.conv;
-import tanya.exception;
-import tanya.memory;
 import tanya.meta.trait;
-import tanya.range.primitive;
 
 private template Payload(T)
 {
-    static if (isPolymorphicType!T || isArray!T)
+    static if (isPolymorphicType!T || isDynamicArray!T)
     {
         alias Payload = T;
     }
@@ -50,11 +46,7 @@ private final class RefCountedStore(T)
 
     size_t opUnary(string op)()
     if (op == "--" || op == "++")
-    in
+    in (this.counter > 0)
-    {
-        assert(this.counter > 0);
-    }
-    do
     {
         mixin("return " ~ op ~ "counter;");
     }
@@ -135,11 +127,7 @@ struct RefCounted(T)
 
     /// ditto
     this(shared Allocator allocator)
-    in
+    in (allocator !is null)
-    {
-        assert(allocator !is null);
-    }
-    do
     {
         this.allocator_ = allocator;
     }
@@ -243,11 +231,7 @@ struct RefCounted(T)
      * Precondition: $(D_INLINECODE cound > 0).
      */
     inout(Payload!T) get() inout
-    in
+    in (count > 0, "Attempted to access an uninitialized reference")
-    {
-        assert(count > 0, "Attempted to access an uninitialized reference");
-    }
-    do
     {
         return this.storage.payload;
     }
@@ -305,174 +289,14 @@ struct RefCounted(T)
     auto val = rc.get();
 
     *val = 8;
-    assert(*rc.storage.payload == 8);
+    assert(*rc.get == 8);
 
     val = null;
-    assert(rc.storage.payload !is null);
+    assert(rc.get !is null);
-    assert(*rc.storage.payload == 8);
+    assert(*rc.get == 8);
 
     *rc = 9;
-    assert(*rc.storage.payload == 9);
+    assert(*rc.get == 9);
-}
-
-@nogc @system unittest
-{
-    auto rc = defaultAllocator.refCounted!int(5);
-    rc = defaultAllocator.make!int(7);
-    assert(*rc == 7);
-}
-
-@nogc @system unittest
-{
-    RefCounted!int rc;
-    assert(!rc.isInitialized);
-    rc = null;
-    assert(!rc.isInitialized);
-}
-
-@nogc @system unittest
-{
-    auto rc = defaultAllocator.refCounted!int(5);
-
-    void func(RefCounted!int param) @nogc
-    {
-        assert(param.count == 2);
-        param = defaultAllocator.make!int(7);
-        assert(param.count == 1);
-        assert(*param == 7);
-    }
-    func(rc);
-    assert(rc.count == 1);
-    assert(*rc == 5);
-}
-
-@nogc @system unittest
-{
-    RefCounted!int rc;
-
-    void func(RefCounted!int param) @nogc
-    {
-        assert(param.count == 0);
-        param = defaultAllocator.make!int(7);
-        assert(param.count == 1);
-        assert(*param == 7);
-    }
-    func(rc);
-    assert(rc.count == 0);
-}
-
-@nogc @system unittest
-{
-    RefCounted!int rc1, rc2;
-    static assert(is(typeof(rc1 = rc2)));
-}
-
-version (unittest)
-{
-    private class A
-    {
-        uint *destroyed;
-
-        this(ref uint destroyed) @nogc
-        {
-            this.destroyed = &destroyed;
-        }
-
-        ~this() @nogc
-        {
-            ++(*destroyed);
-        }
-    }
-
-    private struct B
-    {
-        int prop;
-        @disable this();
-        this(int param1) @nogc
-        {
-            prop = param1;
-        }
-    }
-}
-
-@nogc @system unittest
-{
-    uint destroyed;
-    auto a = defaultAllocator.make!A(destroyed);
-
-    assert(destroyed == 0);
-    {
-        auto rc = RefCounted!A(a, defaultAllocator);
-        assert(rc.count == 1);
-
-        void func(RefCounted!A rc) @nogc @system
-        {
-            assert(rc.count == 2);
-        }
-        func(rc);
-
-        assert(rc.count == 1);
-    }
-    assert(destroyed == 1);
-
-    RefCounted!int rc;
-    assert(rc.count == 0);
-    rc = defaultAllocator.make!int(8);
-    assert(rc.count == 1);
-}
-
-@nogc @system unittest
-{
-    auto rc = RefCounted!int(defaultAllocator);
-    assert(!rc.isInitialized);
-    assert(rc.allocator is defaultAllocator);
-}
-
-@nogc @system unittest
-{
-    auto rc = defaultAllocator.refCounted!int(5);
-    assert(rc.count == 1);
-
-    void func(RefCounted!int rc) @nogc
-    {
-        assert(rc.count == 2);
-        rc = null;
-        assert(!rc.isInitialized);
-        assert(rc.count == 0);
-    }
-
-    assert(rc.count == 1);
-    func(rc);
-    assert(rc.count == 1);
-
-    rc = null;
-    assert(!rc.isInitialized);
-    assert(rc.count == 0);
-}
-
-@nogc @system unittest
-{
-    auto rc = defaultAllocator.refCounted!int(5);
-    assert(*rc == 5);
-
-    void func(RefCounted!int rc) @nogc
-    {
-        assert(rc.count == 2);
-        rc = defaultAllocator.refCounted!int(4);
-        assert(*rc == 4);
-        assert(rc.count == 1);
-    }
-    func(rc);
-    assert(*rc == 5);
-}
-
-@nogc nothrow pure @safe unittest
-{
-    static assert(is(typeof(RefCounted!int.storage.payload) == int*));
-    static assert(is(typeof(RefCounted!A.storage.payload) == A));
-
-    static assert(is(RefCounted!B));
-    static assert(is(RefCounted!A));
 }
 
 /**
@@ -497,11 +321,7 @@ version (unittest)
 RefCounted!T refCounted(T, A...)(shared Allocator allocator, auto ref A args)
 if (!is(T == interface) && !isAbstractClass!T
  && !isAssociativeArray!T && !isArray!T)
-in
+in (allocator !is null)
-{
-    assert(allocator !is null);
-}
-do
 {
     auto rc = typeof(return)(allocator);
 
@@ -530,23 +350,19 @@ do
  *
  * Params:
  *  T         = Array type.
+ *  E         = Array element type.
  *  size      = Array size.
  *  allocator = Allocator.
  *
  * Returns: Newly created $(D_PSYMBOL RefCounted!T).
  *
  * Precondition: $(D_INLINECODE allocator !is null
- *                           && size <= size_t.max / ElementType!T.sizeof)
+ *                           && size <= size_t.max / E.sizeof)
  */
-RefCounted!T refCounted(T)(shared Allocator allocator, const size_t size)
+RefCounted!T refCounted(T : E[], E)(shared Allocator allocator, size_t size)
 @trusted
-if (isArray!T)
+in (allocator !is null)
-in
+in (size <= size_t.max / E.sizeof)
-{
-    assert(allocator !is null);
-    assert(size <= size_t.max / ElementType!T.sizeof);
-}
-do
 {
     return RefCounted!T(allocator.make!T(size), allocator);
 }
@@ -573,59 +389,6 @@ do
     assert(rc.count == 1);
 }
 
-@nogc @system unittest
-{
-    struct E
-    {
-    }
-    auto b = defaultAllocator.refCounted!B(15);
-    static assert(is(typeof(b.storage.payload) == B*));
-    static assert(is(typeof(b.prop) == int));
-    static assert(!is(typeof(defaultAllocator.refCounted!B())));
-
-    static assert(is(typeof(defaultAllocator.refCounted!E())));
-    static assert(!is(typeof(defaultAllocator.refCounted!E(5))));
-    {
-        auto rc = defaultAllocator.refCounted!B(3);
-        assert(rc.get().prop == 3);
-    }
-    {
-        auto rc = defaultAllocator.refCounted!E();
-        assert(rc.count);
-    }
-}
-
-@nogc @system unittest
-{
-    auto rc = defaultAllocator.refCounted!(int[])(5);
-    assert(rc.length == 5);
-}
-
-@nogc @system unittest
-{
-    auto p1 = defaultAllocator.make!int(5);
-    auto p2 = p1;
-    auto rc = RefCounted!int(p1, defaultAllocator);
-    assert(rc.get() is p2);
-}
-
-@nogc @system unittest
-{
-    static bool destroyed;
-
-    static struct F
-    {
-        ~this() @nogc nothrow @safe
-        {
-            destroyed = true;
-        }
-    }
-    {
-        auto rc = defaultAllocator.refCounted!F();
-    }
-    assert(destroyed);
-}
-
 /**
  * $(D_PSYMBOL Unique) stores an object that gets destroyed at the end of its scope.
  *
@@ -660,11 +423,7 @@ struct Unique(T)
 
     /// ditto
     this(shared Allocator allocator)
-    in
+    in (allocator !is null)
-    {
-        assert(allocator !is null);
-    }
-    do
     {
         this.allocator_ = allocator;
     }
@@ -845,11 +604,7 @@ struct Unique(T)
 Unique!T unique(T, A...)(shared Allocator allocator, auto ref A args)
 if (!is(T == interface) && !isAbstractClass!T
  && !isAssociativeArray!T && !isArray!T)
-in
+in (allocator !is null)
-{
-    assert(allocator !is null);
-}
-do
 {
     auto payload = allocator.make!(T, A)(args);
     return Unique!T(payload, allocator);
@@ -861,63 +616,20 @@ do
  *
  * Params:
  *  T         = Array type.
+ *  E         = Array element type.
  *  size      = Array size.
  *  allocator = Allocator.
  *
  * Returns: Newly created $(D_PSYMBOL Unique!T).
  *
  * Precondition: $(D_INLINECODE allocator !is null
- *                           && size <= size_t.max / ElementType!T.sizeof)
+ *                           && size <= size_t.max / E.sizeof)
  */
-Unique!T unique(T)(shared Allocator allocator, const size_t size)
+Unique!T unique(T : E[], E)(shared Allocator allocator, size_t size)
 @trusted
-if (isArray!T)
+in (allocator !is null)
-in
+in (size <= size_t.max / E.sizeof)
 {
-    assert(allocator !is null);
+    auto payload = allocator.resize!E(null, size);
-    assert(size <= size_t.max / ElementType!T.sizeof);
-}
-do
-{
-    auto payload = allocator.resize!(ElementType!T)(null, size);
     return Unique!T(payload, allocator);
 }
-
-@nogc nothrow pure @safe unittest
-{
-    static assert(is(typeof(defaultAllocator.unique!B(5))));
-    static assert(is(typeof(defaultAllocator.unique!(int[])(5))));
-}
-
-@nogc nothrow pure @system unittest
-{
-    auto s = defaultAllocator.unique!int(5);
-    assert(*s == 5);
-
-    s = null;
-    assert(s is null);
-}
-
-@nogc nothrow pure @system unittest
-{
-    auto s = defaultAllocator.unique!int(5);
-    assert(*s == 5);
-
-    s = defaultAllocator.unique!int(4);
-    assert(*s == 4);
-}
-
-@nogc nothrow pure @system unittest
-{
-    auto p1 = defaultAllocator.make!int(5);
-    auto p2 = p1;
-
-    auto rc = Unique!int(p1, defaultAllocator);
-    assert(rc.get() is p2);
-}
-
-@nogc nothrow pure @system unittest
-{
-    auto rc = Unique!int(defaultAllocator);
-    assert(rc.allocator is defaultAllocator);
-}

os/dub.json

@@ -0,0 +1,16 @@
+{
+	"name": "os",
+	"description": "Platform-independent interfaces to operating system functionality",
+	"targetType": "library",
+
+	"dependencies": {
+		"tanya:meta": "*"
+	},
+
+	"sourcePaths": [
+		"."
+	],
+	"importPaths": [
+		"."
+	]
+}

os/tanya/os/error.d

@@ -5,11 +5,11 @@
 /**
  * This module provides a portable way of using operating system error codes.
  *
- * Copyright: Eugene Wissner 2017-2018.
+ * Copyright: Eugene Wissner 2017-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/os/error.d,
+ * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/os/tanya/os/error.d,
  *                 tanya/os/error.d)
  */
 module tanya.os.error;
@@ -407,12 +407,6 @@ struct ErrorCode
         assert(ec.toString() == "An invalid pointer address detected");
     }
 
-    @nogc nothrow pure @safe unittest
-    {
-        ErrorCode ec = cast(ErrorCode.ErrorNo) -1;
-        assert(ec.toString() is null);
-    }
-
     private ErrorNo value_ = ErrorNo.success;
 
     alias ErrorNo this;

os/tanya/os/package.d

@@ -6,11 +6,11 @@
  * This package provides platform-independent interfaces to operating system
  * functionality.
  *
- * Copyright: Eugene Wissner 2017-2018.
+ * Copyright: Eugene Wissner 2017-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/os/package.d,
+ * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/os/tanya/os/package.d,
  *                 tanya/os/package.d)
  */
 module tanya.os;

source/tanya/algorithm/comparison.d

@@ -5,7 +5,7 @@
 /**
  * Algorithms for comparing values.
  *
- * Copyright: Eugene Wissner 2018.
+ * Copyright: Eugene Wissner 2018-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@@ -15,8 +15,8 @@
 module tanya.algorithm.comparison;
 
 import tanya.algorithm.mutation;
-import tanya.math : isNaN;
+import tanya.math;
-import tanya.memory.op;
+static import tanya.memory.op;
 import tanya.meta.metafunction;
 import tanya.meta.trait;
 import tanya.meta.transform;
@@ -99,22 +99,6 @@ if (Args.length >= 2
     return minMax!((ref a, ref b) => a < b)(args);
 }
 
-@nogc nothrow pure @safe unittest
-{
-    static assert(!is(typeof(min(1, 1UL))));
-}
-
-@nogc nothrow pure @safe unittest
-{
-    assert(min(5, 3) == 3);
-    assert(min(4, 4) == 4);
-    assert(min(5.2, 3.0) == 3.0);
-
-    assert(min(5.2, double.nan) == 5.2);
-    assert(min(double.nan, 3.0) == 3.0);
-    assert(isNaN(min(double.nan, double.nan)));
-}
-
 /// ditto
 Range min(Range)(Range range)
 if (isForwardRange!Range && isOrderingComparable!(ElementType!Range))
@@ -150,11 +134,6 @@ if (isForwardRange!Range && isOrderingComparable!(ElementType!Range))
     assert(minElement.length == 3);
 }
 
-@nogc nothrow pure @safe unittest
-{
-    assert(min(cast(ubyte[]) []).empty);
-}
-
 /**
  * Finds the largest element in the argument list or a range.
  *
@@ -192,22 +171,6 @@ if (Args.length >= 2
     return minMax!((ref a, ref b) => a > b)(args);
 }
 
-@nogc nothrow pure @safe unittest
-{
-    static assert(!is(typeof(max(1, 1UL))));
-}
-
-@nogc nothrow pure @safe unittest
-{
-    assert(max(5, 3) == 5);
-    assert(max(4, 4) == 4);
-    assert(max(5.2, 3.0) == 5.2);
-
-    assert(max(5.2, double.nan) == 5.2);
-    assert(max(double.nan, 3.0) == 3.0);
-    assert(isNaN(max(double.nan, double.nan)));
-}
-
 /// ditto
 Range max(Range)(Range range)
 if (isForwardRange!Range && isOrderingComparable!(ElementType!Range))
@@ -243,41 +206,13 @@ if (isForwardRange!Range && isOrderingComparable!(ElementType!Range))
     assert(maxElement.length == 3);
 }
 
-@nogc nothrow pure @safe unittest
-{
-    assert(max(cast(ubyte[]) []).empty);
-}
-
-// min/max compare const and mutable structs.
-@nogc nothrow pure @safe unittest
-{
-    static struct S
-    {
-        int s;
-
-        int opCmp(typeof(this) that) const @nogc nothrow pure @safe
-        {
-            return this.s - that.s;
-        }
-    }
-    {
-        const s1 = S(1);
-        assert(min(s1, S(2)).s == 1);
-        assert(max(s1, S(2)).s == 2);
-    }
-    {
-        auto s2 = S(2), s3 = S(3);
-        assert(min(s2, s3).s == 2);
-        assert(max(s2, s3).s == 3);
-    }
-}
-
 /**
  * Compares element-wise two ranges for equality.
  *
  * If the ranges have different lengths, they aren't equal.
  *
  * Params:
+ *  pred = Predicate used to compare individual element pairs.
  *  R1   = First range type.
  *  R2   = Second range type.
  *  r1   = First range.
@@ -286,14 +221,16 @@ if (isForwardRange!Range && isOrderingComparable!(ElementType!Range))
  * Returns: $(D_KEYWORD true) if both ranges are equal, $(D_KEYWORD false)
  *          otherwise.
  */
-bool equal(R1, R2)(R1 r1, R2 r2)
+bool equal(alias pred = (auto ref a, auto ref b) => a == b, R1, R2)
-if (allSatisfy!(isInputRange, R1, R2) && is(typeof(r1.front == r2.front)))
+          (R1 r1, R2 r2)
+if (allSatisfy!(isInputRange, R1, R2)
+ && is(typeof(pred(r1.front, r2.front)) == bool))
 {
     static if (isDynamicArray!R1
             && is(R1 == R2)
             && __traits(isPOD, ElementType!R1))
     {
-        return cmp(r1, r2) == 0;
+        return tanya.memory.op.equal(r1, r2);
     }
     else
     {
@@ -306,7 +243,7 @@ if (allSatisfy!(isInputRange, R1, R2) && is(typeof(r1.front == r2.front)))
         }
         for (; !r1.empty && !r2.empty; r1.popFront(), r2.popFront())
         {
-            if (r1.front != r2.front)
+            if (!pred(r1.front, r2.front))
             {
                 return false;
             }
@@ -331,3 +268,107 @@ if (allSatisfy!(isInputRange, R1, R2) && is(typeof(r1.front == r2.front)))
     int[3] range2 = [1, 2, 3];
     assert(!equal(range1[], range2[]));
 }
+
+/**
+ * Compares element-wise two ranges for ordering.
+ *
+ * $(D_PSYMBOL compare) returns a negative value if $(D_PARAM r1) is less than
+ * $(D_PARAM r2), a positive value if $(D_PARAM r2) is less than $(D_PARAM r1),
+ * or `0` if $(D_PARAM r1) and $(D_PARAM r2) equal.
+ *
+ * $(D_PSYMBOL compare) iterates both ranges in lockstep. Whichever of them
+ * contains an element that is greater than the respective element at the same
+ * position in the other range is the greater one of the two.
+ *
+ * If one of the ranges becomes empty when iterating, but all elements equal so
+ * far, the range with more elements is the greater one.
+ *
+ * If $(D_PARAM pred) is given, it is used for comparison. $(D_PARAM pred) is
+ * called as $(D_INLINECODE pred(r1.front, r2.front)) and
+ * $(D_INLINECODE pred(r2.front, r1.front)) to perform three-way comparison.
+ * $(D_PARAM pred) should return a $(D_KEYWORD bool).
+ *
+ * If $(D_PARAM pred) is not given, but the element type of $(D_PARAM R1)
+ * defines `opCmp()` for the element type of $(D_PARAM R2), `opCmp()` is used.
+ *
+ * Otherwise the comparison is perfomed using the basic comparison operators.
+ *
+ * Params:
+ *  pred = Predicate used for comparison.
+ *  R1   = First range type.
+ *  R2   = Second range type.
+ *  r1   = First range.
+ *  r2   = Second range.
+ *
+ * Returns: A negative value if $(D_PARAM r1) is less than $(D_PARAM r2), a
+ *          positive value if $D(_PARAM r2) is less than $(D_PARAM r1), `0`
+ *          otherwise.
+ */
+int compare(alias pred, R1, R2)(R1 r1, R2 r2)
+if (allSatisfy!(isInputRange, R1, R2)
+ && is(typeof(pred(r1.front, r2.front)) == bool)
+ && is(typeof(pred(r2.front, r1.front)) == bool))
+{
+    alias predImpl = (ref r1, ref r2) {
+        return pred(r2.front, r1.front) - pred(r1.front, r2.front);
+    };
+    return compareImpl!(predImpl, R1, R2)(r1, r2);
+}
+
+/// ditto
+int compare(R1, R2)(R1 r1, R2 r2)
+if (allSatisfy!(isInputRange, R1, R2)
+ && is(typeof(r1.front < r2.front || r2.front < r1.front)))
+{
+    static if (is(typeof(r1.front.opCmp(r2.front)) == int))
+    {
+        alias pred = (ref r1, ref r2) => r1.front.opCmp(r2.front);
+    }
+    else
+    {
+        alias pred = (ref r1, ref r2) {
+            return (r2.front < r1.front) - (r1.front < r2.front);
+        };
+    }
+    return compareImpl!(pred, R1, R2)(r1, r2);
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    assert(compare("abc", "abc") == 0);
+    assert(compare("abcd", "abc") > 0);
+    assert(compare("ab", "abc") < 0);
+    assert(compare("abc", "abcd") < 0);
+    assert(compare("abc", "ab") > 0);
+    assert(compare("aec", "abc") > 0);
+    assert(compare("aac", "abc") < 0);
+    assert(compare("abc", "aec") < 0);
+    assert(compare("abc", "aab") > 0);
+    assert(compare("aacd", "abc") < 0);
+    assert(compare("abc", "aacd") > 0);
+
+    assert(compare!((a, b) => a > b)("aec", "abc") < 0);
+    assert(compare!((a, b) => a > b)("aac", "abc") > 0);
+}
+
+private int compareImpl(alias pred, R1, R2)(ref R1 r1, ref R2 r2)
+{
+    for (; !r1.empty || !r2.empty; r1.popFront(), r2.popFront())
+    {
+        if (r1.empty)
+        {
+            return -1;
+        }
+        else if (r2.empty)
+        {
+            return 1;
+        }
+        const comparison = pred(r1, r2);
+        if (comparison != 0)
+        {
+            return comparison;
+        }
+    }
+    return 0;
+}

source/tanya/algorithm/iteration.d

@@ -3,15 +3,15 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
- * Range adapters.
+ * Iteration algorithms.
  *
- * A range adapter wraps another range and modifies the way, how the original
+ * These algorithms wrap other ranges and modify the way, how the original
  * range is iterated, or the order in which its elements are accessed.
  *
- * All adapters are lazy algorithms, they request the next element of the
+ * All algorithms in this module are lazy, they request the next element of the
- * adapted range on demand.
+ * original range on demand.
  *
- * Copyright: Eugene Wissner 2018.
+ * Copyright: Eugene Wissner 2018-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@@ -21,10 +21,57 @@
 module tanya.algorithm.iteration;
 
 import tanya.algorithm.comparison;
-import tanya.algorithm.mutation;
+import tanya.memory.lifetime;
+import tanya.meta.trait;
+import tanya.meta.transform;
 import tanya.range;
+import tanya.typecons;
 
-private mixin template Take(R, bool exactly)
+// These predicates are used to help preserve `const` and `inout` for
+// ranges built on other ranges.
+
+private enum hasInoutFront(T) = is(typeof((inout ref T a) => a.front));
+private enum hasInoutBack(T) = is(typeof((inout ref T a) => a.back));
+private enum hasInoutIndex(T) = is(typeof((inout ref T a, size_t i) => a[i]));
+
+private enum hasConstEmpty(T) = is(typeof(((const T* a) => (*a).empty)(null)) : bool);
+private enum hasConstLength(T) = is(typeof(((const T* a) => (*a).length)(null)) : size_t);
+private enum hasConstSave(T) = is(typeof(((const T* a) => (*a).save())(null)) : T);
+private enum hasConstSlice(T) = is(typeof(((const T* a) => (*a)[0 .. $])(null)) : T);
+
+unittest
+{
+    // Test the definitions.
+    static assert(hasInoutFront!string);
+    static assert(hasInoutBack!string);
+    static assert(hasInoutIndex!string);
+    static assert(hasConstEmpty!string);
+    static assert(hasConstLength!string);
+    static assert(hasConstSave!string);
+    static assert(hasConstSlice!string);
+
+    // Test that Take propagates const/inout correctly.
+    alias TakeString = Take!(string, false);
+    static assert(hasInoutFront!TakeString);
+    static assert(hasInoutBack!TakeString);
+    static assert(hasInoutIndex!TakeString);
+    static assert(hasConstEmpty!TakeString);
+    static assert(hasConstLength!TakeString);
+    static assert(hasConstSave!TakeString);
+    static assert(hasConstSlice!TakeString);
+
+    // Test that Retro propagates const/inout correctly.
+    alias RetroString = Retro!string;
+    static assert(hasInoutFront!RetroString);
+    static assert(hasInoutBack!RetroString);
+    static assert(hasInoutIndex!RetroString);
+    static assert(hasConstEmpty!RetroString);
+    static assert(hasConstLength!RetroString);
+    static assert(hasConstSave!RetroString);
+    static assert(hasConstSlice!RetroString);
+}
+
+private struct Take(R, bool exactly)
 {
     private R source;
     size_t length_;
@@ -44,62 +91,49 @@ private mixin template Take(R, bool exactly)
         }
     }
 
-    @property auto ref front()
+    mixin(`@property auto ref front() ` ~ (hasInoutFront!R ? `inout ` : ``) ~
-    in
+    `in (!empty)
-    {
-        assert(!empty);
-    }
-    do
     {
         return this.source.front;
-    }
+    }`);
 
     void popFront()
-    in
+    in (!empty)
-    {
-        assert(!empty);
-    }
-    do
     {
         this.source.popFront();
         --this.length_;
     }
 
-    @property bool empty()
+    mixin(`@property bool empty() ` ~ (exactly || isInfinite!R || hasConstEmpty!R ? `const ` : ``) ~
-    {
+    `{
         static if (exactly || isInfinite!R)
         {
             return length == 0;
         }
         else
         {
-            return length == 0 || this.source.empty;
+            return this.length_ == 0 || this.source.empty;
-        }
         }
+    }`);
 
-    @property size_t length()
+    static if (exactly || hasLength!R)
+    {
+        @property size_t length() const
         {
             return this.length_;
         }
+    }
 
     static if (hasAssignableElements!R)
     {
         @property void front(ref ElementType!R value)
-        in
+        in (!empty)
-        {
-            assert(!empty);
-        }
-        do
         {
             this.source.front = value;
         }
 
         @property void front(ElementType!R value)
-        in
+        in (!empty)
-        {
-            assert(!empty);
-        }
-        do
         {
             this.source.front = move(value);
         }
@@ -107,86 +141,72 @@ private mixin template Take(R, bool exactly)
 
     static if (isForwardRange!R)
     {
-        typeof(this) save()
+        mixin(`typeof(this) save() ` ~ (hasConstSave!R ? `const ` : ``) ~
-        {
+        `{
             return typeof(this)(this.source.save(), length);
-        }
+        }`);
     }
     static if (isRandomAccessRange!R)
     {
-        @property auto ref back()
+        mixin(`@property auto ref back() ` ~ (hasInoutBack!R ? `inout ` : ``) ~
-        in
+        `in (!empty)
-        {
-            assert(!empty);
-        }
-        do
         {
             return this.source[this.length - 1];
-        }
+        }`);
 
         void popBack()
-        in
+        in (!empty)
-        {
-            assert(!empty);
-        }
-        do
         {
             --this.length_;
         }
 
-        auto ref opIndex(size_t i)
+        mixin(`auto ref opIndex(size_t i) ` ~ (hasInoutIndex!R ? `inout ` : ``) ~
-        in
+        `in (i < length)
-        {
-            assert(i < length);
-        }
-        do
         {
             return this.source[i];
-        }
+        }`);
 
         static if (hasAssignableElements!R)
         {
             @property void back(ref ElementType!R value)
-            in
+            in (!empty)
-            {
-                assert(!empty);
-            }
-            do
             {
                 this.source[length - 1] = value;
             }
 
             @property void back(ElementType!R value)
-            in
+            in (!empty)
-            {
-                assert(!empty);
-            }
-            do
             {
                 this.source[length - 1] = move(value);
             }
 
             void opIndexAssign(ref ElementType!R value, size_t i)
-            in
+            in (i < length)
-            {
-                assert(i < length);
-            }
-            do
             {
                 this.source[i] = value;
             }
 
             void opIndexAssign(ElementType!R value, size_t i)
-            in
+            in (i < length)
-            {
-                assert(i < length);
-            }
-            do
             {
                 this.source[i] = move(value);
             }
         }
     }
+
+    static if (!exactly && hasSlicing!R)
+    {
+        static if (is(typeof(length))) alias opDollar = length;
+
+        mixin(`auto opSlice(size_t i, size_t j) ` ~ (hasConstSlice!R ? `const ` : ``) ~
+        `in (i <= j)
+        in (j <= length)
+        {
+            return typeof(this)(this.source[i .. j], length);
+        }`);
+    }
+
+    version (unittest) static assert(isInputRange!Take);
 }
 
 /**
@@ -212,26 +232,35 @@ private mixin template Take(R, bool exactly)
 auto take(R)(R range, size_t n)
 if (isInputRange!R)
 {
-    static struct Take
+    static if (hasSlicing!R && hasLength!R)
     {
-        mixin .Take!(R, false);
+        if (range.length <= n)
-
+            return range;
-        static if (hasSlicing!R)
+        else
+            return range[0 .. n];
+    }
+    // Special case: take(take(...), n)
+    else static if (is(Range == Take!(RRange, exact), RRange, bool exact))
     {
-            auto opSlice(size_t i, size_t j)
+        if (n > range.length_)
-            in
+            n = range.length_;
+        static if (exact)
+            // `take(takeExactly(r, n0), n)` is rewritten `takeExactly(r, min(n0, n))`.
+            return Take!(RRange, true)(range.source, n);
+        else
+            // `take(take(r, n0), n)` is rewritten `take(r, min(n0, n))`.
+            return Take!(RRange, false)(range.source, n);
+    }
+    else static if (isInfinite!R)
     {
-                assert(i <= j);
+        // If the range is infinite then `take` is the same as `takeExactly`.
-                assert(j <= length);
+        return Take!(R, true)(range, n);
     }
-            do
+    else
     {
-                return typeof(this)(this.source[i .. j], length);
+        return Take!(R, false)(range, n);
     }
 }
-    }
-    return Take(range, n);
-}
 
 ///
 @nogc nothrow pure @safe unittest
@@ -315,13 +344,15 @@ if (isInputRange!R)
     {
         return range[0 .. n];
     }
+    // Special case: takeExactly(take(range, ...), n) is takeExactly(range, n)
+    else static if (is(Range == Take!(RRange, exact), RRange, bool exact))
+    {
+        assert(n <= range.length_);
+        return Take!(RRange, true)(range.source, n);
+    }
     else
     {
-        static struct TakeExactly
+        return Take!(R, true)(range, n);
-        {
-            mixin Take!(R, true);
-        }
-        return TakeExactly(range, n);
     }
 }
 
@@ -382,28 +413,317 @@ if (isInputRange!R)
     assert(t.empty);
 }
 
-// Takes minimum length if the range length > n
+// Reverse-access-order range returned by `retro`.
+private struct Retro(Range)
+{
+    Range source;
+
+    @disable this();
+
+    private this(Range source)
+    {
+        this.source = source;
+    }
+
+    mixin(`Retro save() ` ~ (hasConstSave!Range ? `const ` : ``) ~
+    `{
+        return Retro(source.save());
+    }`);
+
+    mixin(`@property auto ref front() ` ~ (hasInoutBack!Range ? `inout ` : ``) ~
+    `in (!empty)
+    {
+        return this.source.back;
+    }`);
+
+    void popFront()
+    in (!empty)
+    {
+        this.source.popBack();
+    }
+
+    mixin(`@property auto ref back() ` ~ (hasInoutFront!Range ? `inout ` : ``) ~
+    `in (!empty)
+    {
+        return this.source.front;
+    }`);
+
+    void popBack()
+    in (!empty)
+    {
+        this.source.popFront();
+    }
+
+    mixin(`@property bool empty() ` ~ (hasConstEmpty!Range ? `const ` : ``) ~
+    `{
+        return this.source.empty;
+    }`);
+
+    static if (hasLength!Range)
+    {
+        mixin(`@property size_t length() ` ~ (hasConstLength!Range ? `const ` : ``) ~
+        `{
+            return this.source.length;
+        }`);
+    }
+
+    static if (isRandomAccessRange!Range && hasLength!Range)
+    {
+        mixin(`auto ref opIndex(size_t i) ` ~ (hasInoutIndex!Range ? `inout ` : ``) ~
+        `in (i < length)
+        {
+            return this.source[$ - ++i];
+        }`);
+    }
+
+    static if (hasLength!Range && hasSlicing!Range)
+    {
+        alias opDollar = length;
+
+        mixin(`auto opSlice(size_t i, size_t j) ` ~ (hasConstSlice!Range ? `const ` : ``) ~
+        `in (i <= j)
+        in (j <= length)
+        {
+            return typeof(this)(this.source[$-j .. $-i]);
+        }`);
+    }
+
+    static if (hasAssignableElements!Range)
+    {
+        @property void front(ref ElementType!Range value)
+        in (!empty)
+        {
+            this.source.back = value;
+        }
+
+        @property void front(ElementType!Range value)
+        in (!empty)
+        {
+            this.source.back = move(value);
+        }
+
+        @property void back(ref ElementType!Range value)
+        in (!empty)
+        {
+            this.source.front = value;
+        }
+
+        @property void back(ElementType!Range value)
+        in (!empty)
+        {
+            this.source.front = move(value);
+        }
+
+        static if (isRandomAccessRange!Range && hasLength!Range)
+        {
+            void opIndexAssign(ref ElementType!Range value, size_t i)
+            in (i < length)
+            {
+                this.source[$ - ++i] = value;
+            }
+
+            void opIndexAssign(ElementType!Range value, size_t i)
+            in (i < length)
+            {
+                this.source[$ - ++i] = move(value);
+            }
+        }
+    }
+
+    version (unittest) static assert(isBidirectionalRange!Retro);
+}
+
+/**
+ * Iterates a bidirectional range backwards.
+ *
+ * If $(D_PARAM Range) is a random-access range as well, the resulting range
+ * is a random-access range too.
+ *
+ * Params:
+ *  Range = Bidirectional range type.
+ *  range = Bidirectional range.
+ *
+ * Returns: Bidirectional range with the elements order reversed.
+ */
+auto retro(Range)(return Range range)
+if (isBidirectionalRange!Range)
+{
+    // Special case: retro(retro(range)) is range
+    static if (is(Range == Retro!RRange, RRange))
+        return range.source;
+    else
+        return Retro!Range(range);
+}
+
+///
 @nogc nothrow pure @safe unittest
 {
-    auto range = take(cast(int[]) null, 8);
+    import tanya.algorithm.comparison : equal;
-    assert(range.length == 0);
+
+    const int[3] given = [1, 2, 3];
+    const int[3] expected = [3, 2, 1];
+
+    auto actual = retro(given[]);
+
+    assert(actual.length == expected.length);
+    assert(!actual.empty);
+    assert(equal(actual, expected[]));
 }
 
+private struct SingletonByValue(E)
+{
+    private Option!E element;
+
+    @disable this();
+
+    private this(U)(ref U element)
+    if (is(U == E))
+    {
+        this.element = move(element);
+    }
+
+    private this(U)(ref U element)
+    if (is(Unqual!U == Option!(Unqual!E)) || is(Unqual!U == Option!(const E)))
+    {
+        if (!element.isNothing)
+        {
+            this.element = element.get;
+        }
+    }
+
+    @property ref inout(E) front() inout
+    in (!empty)
+    {
+        return this.element.get;
+    }
+
+    alias back = front;
+
+    void popFront()
+    in (!empty)
+    {
+        this.element.reset();
+    }
+
+    alias popBack = popFront;
+
+    @property bool empty() const
+    {
+        return this.element.isNothing;
+    }
+
+    @property size_t length() const
+    {
+        return !this.element.isNothing;
+    }
+
+    auto save()
+    {
+        return SingletonByValue!E(this.element);
+    }
+
+    auto save() const
+    {
+        return SingletonByValue!(const E)(this.element);
+    }
+
+    ref inout(E) opIndex(size_t i) inout
+    in (!empty)
+    in (i == 0)
+    {
+        return this.element.get;
+    }
+}
+
+private struct SingletonByRef(E)
+{
+    private E* element;
+
+    @disable this();
+
+    private this(return ref E element) @trusted
+    {
+        this.element = &element;
+    }
+
+    @property ref inout(E) front() inout return
+    in (!empty)
+    {
+        return *this.element;
+    }
+
+    alias back = front;
+
+    void popFront()
+    in (!empty)
+    {
+        this.element = null;
+    }
+
+    alias popBack = popFront;
+
+    @property bool empty() const
+    {
+        return this.element is null;
+    }
+
+    @property size_t length() const
+    {
+        return this.element !is null;
+    }
+
+    auto save() return
+    {
+        return typeof(this)(*this.element);
+    }
+
+    auto save() const return
+    {
+        return SingletonByRef!(const E)(*this.element);
+    }
+
+    ref inout(E) opIndex(size_t i) inout return
+    in (!empty)
+    in (i == 0)
+    {
+        return *this.element;
+    }
+}
+
+/**
+ * Creates a bidirectional and random-access range with the single element
+ * $(D_PARAM element).
+ *
+ * If $(D_PARAM element) is passed by value the resulting range stores it
+ * internally. If $(D_PARAM element) is passed by reference, the resulting
+ * range keeps only a pointer to the element.
+ *
+ * Params:
+ *  E       = Element type.
+ *  element = Element.
+ *
+ * Returns: A range with one element.
+ */
+auto singleton(E)(return E element)
+if (isMutable!E)
+{
+    return SingletonByValue!E(element);
+}
+
+/// ditto
+auto singleton(E)(return ref E element)
+{
+    return SingletonByRef!E(element);
+}
+
+///
 @nogc nothrow pure @safe unittest
 {
-    const int[9] range = [1, 2, 3, 4, 5, 6, 7, 8, 9];
+    auto singleChar = singleton('a');
-    {
-        auto slice = take(range[], 8)[1 .. 3];
 
-        assert(slice.length == 2);
+    assert(singleChar.length == 1);
-        assert(slice.front == 2);
+    assert(singleChar.front == 'a');
-        assert(slice.back == 3);
-    }
-    {
-        auto slice = takeExactly(range[], 8)[1 .. 3];
 
-        assert(slice.length == 2);
+    singleChar.popFront();
-        assert(slice.front == 2);
+    assert(singleChar.empty);
-        assert(slice.back == 3);
-    }
 }

source/tanya/algorithm/mutation.d

@@ -5,7 +5,7 @@
 /**
  * Algorithms that modify its arguments.
  *
- * Copyright: Eugene Wissner 2017-2018.
+ * Copyright: Eugene Wissner 2017-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@@ -14,268 +14,20 @@
  */
 module tanya.algorithm.mutation;
 
+static import tanya.memory.lifetime;
 static import tanya.memory.op;
 import tanya.meta.trait;
 import tanya.meta.transform;
 import tanya.range;
 
-private void deinitialize(bool zero, T)(ref T value)
+deprecated("Use tanya.memory.lifetime.swap instead")
-{
+alias swap = tanya.memory.lifetime.swap;
-    static if (is(T == U[S], U, size_t S))
-    {
-        foreach (ref e; value)
-        {
-            deinitialize!zero(e);
-        }
-    }
-    else
-    {
-        static if (isNested!T)
-        {
-            // Don't override the context pointer.
-            enum size_t size = T.sizeof - (void*).sizeof;
-        }
-        else
-        {
-            enum size_t size = T.sizeof;
-        }
-        static if (zero)
-        {
-            tanya.memory.op.fill!0((cast(void*) &value)[0 .. size]);
-        }
-        else
-        {
-            tanya.memory.op.copy(typeid(T).initializer()[0 .. size],
-                                 (&value)[0 .. 1]);
-        }
-    }
-}
 
-/**
+deprecated("Use tanya.memory.lifetime.moveEmplace instead")
- * Moves $(D_PARAM source) into $(D_PARAM target) assuming that
+alias moveEmplace = tanya.memory.lifetime.moveEmplace;
- * $(D_PARAM target) isn't initialized.
- *
- * Moving the $(D_PARAM source) copies it into the $(D_PARAM target) and places
- * the $(D_PARAM source) into a valid but unspecified state, which means that
- * after moving $(D_PARAM source) can be destroyed or assigned a new value, but
- * accessing it yields an unspecified value. No postblits or destructors are
- * called. If the $(D_PARAM target) should be destroyed before, use
- * $(D_PSYMBOL move).
- *
- * $(D_PARAM source) and $(D_PARAM target) must be different objects.
- *
- * Params:
- *  T      = Object type.
- *  source = Source object.
- *  target = Target object.
- *
- * See_Also: $(D_PSYMBOL move),
- *           $(D_PSYMBOL hasElaborateCopyConstructor),
- *           $(D_PSYMBOL hasElaborateDestructor).
- *
- * Precondition: `&source !is &target`.
- */
-void moveEmplace(T)(ref T source, ref T target) @system
-in
-{
-    assert(&source !is &target, "Source and target must be different");
-}
-do
-{
-    static if (is(T == struct) || isStaticArray!T)
-    {
-        tanya.memory.op.copy((&source)[0 .. 1], (&target)[0 .. 1]);
 
-        static if (hasElaborateCopyConstructor!T || hasElaborateDestructor!T)
+deprecated("Use tanya.memory.lifetime.move instead")
-        {
+alias move = tanya.memory.lifetime.move;
-            if (typeid(T).initializer().ptr is null)
-            {
-                deinitialize!true(source);
-            }
-            else
-            {
-                deinitialize!false(source);
-            }
-        }
-    }
-    else
-    {
-        target = source;
-    }
-}
-
-///
-@nogc nothrow pure @system unittest
-{
-    static struct S
-    {
-        int member = 5;
-
-        this(this) @nogc nothrow pure @safe
-        {
-            assert(false);
-        }
-    }
-    S source, target = void;
-    moveEmplace(source, target);
-    assert(target.member == 5);
-
-    int x1 = 5, x2;
-    moveEmplace(x1, x2);
-    assert(x2 == 5);
-}
-
-// Is pure.
-@nogc nothrow pure @system unittest
-{
-    struct S
-    {
-        this(this)
-        {
-        }
-    }
-    S source, target = void;
-    static assert(is(typeof({ moveEmplace(source, target); })));
-}
-
-// Moves nested.
-@nogc nothrow pure @system unittest
-{
-    struct Nested
-    {
-        void method() @nogc nothrow pure @safe
-        {
-        }
-    }
-    Nested source, target = void;
-    moveEmplace(source, target);
-    assert(source == target);
-}
-
-// Emplaces static arrays.
-@nogc nothrow pure @system unittest
-{
-    static struct S
-    {
-        size_t member;
-        this(size_t i) @nogc nothrow pure @safe
-        {
-            this.member = i;
-        }
-        ~this() @nogc nothrow pure @safe
-        {
-        }
-    }
-    S[2] source = [ S(5), S(5) ], target = void;
-    moveEmplace(source, target);
-    assert(source[0].member == 0);
-    assert(target[0].member == 5);
-    assert(source[1].member == 0);
-    assert(target[1].member == 5);
-}
-
-/**
- * Moves $(D_PARAM source) into $(D_PARAM target) assuming that
- * $(D_PARAM target) isn't initialized.
- *
- * Moving the $(D_PARAM source) copies it into the $(D_PARAM target) and places
- * the $(D_PARAM source) into a valid but unspecified state, which means that
- * after moving $(D_PARAM source) can be destroyed or assigned a new value, but
- * accessing it yields an unspecified value. $(D_PARAM target) is destroyed before
- * the new value is assigned. If $(D_PARAM target) isn't initialized and
- * therefore shouldn't be destroyed, $(D_PSYMBOL moveEmplace) can be used.
- *
- * If $(D_PARAM target) isn't specified, $(D_PSYMBOL move) returns the source
- * as rvalue without calling its copy constructor or destructor.
- *
- * $(D_PARAM source) and $(D_PARAM target) are the same object,
- * $(D_PSYMBOL move) does nothing.
- *
- * Params:
- *  T      = Object type.
- *  source = Source object.
- *  target = Target object.
- *
- * See_Also: $(D_PSYMBOL moveEmplace).
- */
-void move(T)(ref T source, ref T target)
-{
-    if ((() @trusted => &source is &target)())
-    {
-        return;
-    }
-    static if (hasElaborateDestructor!T)
-    {
-        target.__xdtor();
-    }
-    (() @trusted => moveEmplace(source, target))();
-}
-
-/// ditto
-T move(T)(ref T source) @trusted
-{
-    T target = void;
-    moveEmplace(source, target);
-    return target;
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    static struct S
-    {
-        int member = 5;
-
-        this(this) @nogc nothrow pure @safe
-        {
-            assert(false);
-        }
-    }
-    S source, target = void;
-    move(source, target);
-    assert(target.member == 5);
-    assert(move(target).member == 5);
-
-    int x1 = 5, x2;
-    move(x1, x2);
-    assert(x2 == 5);
-    assert(move(x2) == 5);
-}
-
-// Moves if source is target.
-@nogc nothrow pure @safe unittest
-{
-    int x = 5;
-    move(x, x);
-    assert(x == 5);
-}
-
-/**
- * Exchanges the values of $(D_PARAM a) and $(D_PARAM b).
- *
- * $(D_PSYMBOL swap) moves the contents of $(D_PARAM a) and $(D_PARAM b)
- * without calling its postblits or destructors.
- *
- * Params:
- *  a = The first object.
- *  b = The second object.
- */
-void swap(T)(ref T a, ref T b) @trusted
-{
-    T tmp = void;
-    moveEmplace(a, tmp);
-    moveEmplace(b, a);
-    moveEmplace(tmp, b);
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    int a = 3, b = 5;
-    swap(a, b);
-    assert(a == 5);
-    assert(b == 3);
-}
 
 /**
  * Copies the $(D_PARAM source) range into the $(D_PARAM target) range.
@@ -293,7 +45,7 @@ void swap(T)(ref T a, ref T b) @trusted
  *               $(D_PARAM source) elements.
  */
 Target copy(Source, Target)(Source source, Target target)
-if (isInputRange!Source && isOutputRange!(Target, Source))
+if (isInputRange!Source && isOutputRange!(Target, ElementType!Source))
 in
 {
     static if (hasLength!Source && hasLength!Target)
@@ -343,48 +95,212 @@ do
     assert(equal(source[], target[]));
 }
 
-// Returns advanced target
+/**
-@nogc nothrow pure @safe unittest
+ * Fills $(D_PARAM range) with $(D_PARAM value).
+ *
+ * Params:
+ *  Range = Input range type.
+ *  Value = Filler type.
+ *  range = Input range.
+ *  value = Filler.
+ */
+void fill(Range, Value)(Range range, auto ref Value value)
+if (isInputRange!Range && isAssignable!(ElementType!Range, Value))
 {
-    int[5] input = [1, 2, 3, 4, 5];
+    static if (!isDynamicArray!Range && is(typeof(range[] = value)))
-    assert(copy(input[3 .. 5], input[]).front == 3);
+    {
+        range[] = value;
+    }
+    else
+    {
+        for (; !range.empty; range.popFront())
+        {
+            range.front = value;
+        }
+    }
 }
 
-// Copies overlapping arrays
+///
 @nogc nothrow pure @safe unittest
 {
     import tanya.algorithm.comparison : equal;
 
-    int[6] actual = [1, 2, 3, 4, 5, 6];
+    int[6] actual;
-    const int[6] expected = [1, 2, 1, 2, 3, 4];
+    const int[6] expected = [1, 1, 1, 1, 1, 1];
 
-    copy(actual[0 .. 4], actual[2 .. 6]);
+    fill(actual[], 1);
     assert(equal(actual[], expected[]));
 }
 
-@nogc nothrow pure @safe unittest
+/**
+ * Fills $(D_PARAM range) with $(D_PARAM value) assuming the elements of the
+ * $(D_PARAM range) aren't initialized.
+ *
+ * Params:
+ *  Range = Input range type.
+ *  Value = Initializer type.
+ *  range = Input range.
+ *  value = Initializer.
+ */
+void uninitializedFill(Range, Value)(Range range, auto ref Value value)
+if (isInputRange!Range && hasLvalueElements!Range
+ && isAssignable!(ElementType!Range, Value))
 {
-    static assert(is(typeof(copy((ubyte[]).init, (ushort[]).init))));
+    static if (hasElaborateDestructor!(ElementType!Range))
-    static assert(!is(typeof(copy((ushort[]).init, (ubyte[]).init))));
+    {
+        for (; !range.empty; range.popFront())
+        {
+            ElementType!Range* p = &range.front;
+            tanya.memory.lifetime.emplace!(ElementType!Range)(cast(void[]) (p[0 .. 1]), value);
+        }
+    }
+    else
+    {
+        fill(range, value);
+    }
 }
 
+///
 @nogc nothrow pure @safe unittest
 {
-    static struct OutPutRange
+    import tanya.algorithm.comparison : equal;
-    {
-        int value;
-        void put(int value) @nogc nothrow pure @safe
-        in
-        {
-            assert(this.value == 0);
-        }
-        do
-        {
-            this.value = value;
-        }
-    }
-    int[1] source = [5];
-    OutPutRange target;
 
-    assert(copy(source[], target).value == 5);
+    int[6] actual = void;
+    const int[6] expected = [1, 1, 1, 1, 1, 1];
+
+    uninitializedFill(actual[], 1);
+    assert(equal(actual[], expected[]));
+}
+
+/**
+ * Initializes all elements of the $(D_PARAM range) assuming that they are
+ * uninitialized.
+ *
+ * Params:
+ *  Range = Input range type
+ *  range = Input range.
+ */
+void initializeAll(Range)(Range range) @trusted
+if (isInputRange!Range && hasLvalueElements!Range)
+{
+    import tanya.memory.op : copy, fill;
+    alias T = ElementType!Range;
+
+    static if (__VERSION__ >= 2083
+            && isDynamicArray!Range
+            && __traits(isZeroInit, T))
+    {
+        fill!0(range);
+    }
+    else
+    {
+        static immutable init = T.init;
+        for (; !range.empty; range.popFront())
+        {
+            copy((&init)[0 .. 1], (&range.front)[0 .. 1]);
+        }
+    }
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    import tanya.algorithm.comparison : equal;
+
+    int[2] actual = void;
+    const int[2] expected = [0, 0];
+
+    initializeAll(actual[]);
+    assert(equal(actual[], expected[]));
+}
+
+/**
+ * Destroys all elements in the $(D_PARAM range).
+ *
+ * This function has effect only if the element type of $(D_PARAM Range) has
+ * an elaborate destructor, i.e. it is a $(D_PSYMBOL struct) with an explicit
+ * or generated by the compiler destructor.
+ *
+ * Params:
+ *  Range = Input range type.
+ *  range = Input range.
+ */
+void destroyAll(Range)(Range range)
+if (isInputRange!Range && hasLvalueElements!Range)
+{
+    tanya.memory.lifetime.destroyAllImpl!(Range, ElementType!Range)(range);
+}
+
+///
+@nogc nothrow pure @trusted unittest
+{
+    static struct WithDtor
+    {
+        private size_t* counter;
+        ~this() @nogc nothrow pure
+        {
+            if (this.counter !is null)
+            {
+                ++(*this.counter);
+            }
+        }
+    }
+
+    size_t counter;
+    WithDtor[2] withDtor = [WithDtor(&counter), WithDtor(&counter)];
+
+    destroyAll(withDtor[]);
+
+    assert(counter == 2);
+}
+
+/**
+ * Rotates the elements of a union of two ranges.
+ *
+ * Performs a left rotation on the given ranges, as if it would be a signle
+ * range, so that [`front.front`, `back.front`$(RPAREN) is a valid range, that
+ * is $(D_PARAM back) would continue $(D_PARAM front).
+ *
+ * The elements are moved so, that the first element of $(D_PARAM back) becomes
+ * the first element of $(D_PARAM front) without changing the relative order of
+ * their elements.
+ *
+ * Params:
+ *  Range = Range type.
+ *  front = Left half.
+ *  back  = Right half.
+ */
+void rotate(Range)(Range front, Range back)
+if (isForwardRange!Range && hasSwappableElements!Range)
+{
+    auto next = back.save();
+
+    while (!front.empty && !next.empty && !sameHead(front, next))
+    {
+        tanya.memory.lifetime.swap(front.front, next.front);
+        front.popFront();
+        next.popFront();
+
+        if (next.empty)
+        {
+            next = back.save();
+        }
+        else if (front.empty)
+        {
+            front = back.save();
+            back = next.save();
+        }
+    }
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    import tanya.algorithm.comparison : equal;
+
+    const int[7] expected = [1, 2, 3, 4, 5, 6, 7];
+    int[7] actual = [5, 6, 3, 4, 1, 2, 7];
+
+    rotate(actual[0 .. 2], actual[4 .. 6]);
+    assert(equal(actual[], expected[]));
 }

source/tanya/algorithm/package.d

@@ -5,7 +5,7 @@
 /**
  * Collection of generic algorithms.
  *
- * Copyright: Eugene Wissner 2017-2018.
+ * Copyright: Eugene Wissner 2017-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@@ -17,3 +17,4 @@ module tanya.algorithm;
 public import tanya.algorithm.comparison;
 public import tanya.algorithm.iteration;
 public import tanya.algorithm.mutation;
+public import tanya.algorithm.searching;

source/tanya/algorithm/searching.d

@@ -0,0 +1,53 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/**
+ * Searching algorithms.
+ *
+ * Copyright: Eugene Wissner 2018-2019.
+ * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
+ *                  Mozilla Public License, v. 2.0).
+ * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
+ * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/algorithm/searching.d,
+ *                 tanya/algorithm/searching.d)
+ */
+module tanya.algorithm.searching;
+
+import tanya.range;
+
+/**
+ * Counts the elements in an input range.
+ *
+ * If $(D_PARAM R) has length, $(D_PSYMBOL count) returns it, otherwise it
+ * iterates over the range and counts the elements.
+ *
+ * Params:
+ *  R     = Input range type.
+ *  range = Input range.
+ *
+ * Returns: $(D_PARAM range) length.
+ */
+size_t count(R)(R range)
+if (isInputRange!R)
+{
+    static if (hasLength!R)
+    {
+        return range.length;
+    }
+    else
+    {
+        size_t counter;
+        for (; !range.empty; range.popFront(), ++counter)
+        {
+        }
+        return counter;
+    }
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    int[3] array;
+    assert(count(array) == 3);
+}

source/tanya/async/event/epoll.d

@@ -5,7 +5,7 @@
 /**
  * Event loop implementation for Linux.
  *
- * Copyright: Eugene Wissner 2016-2018.
+ * Copyright: Eugene Wissner 2016-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@@ -30,7 +30,7 @@ import tanya.async.protocol;
 import tanya.async.transport;
 import tanya.async.watcher;
 import tanya.container.array;
-import tanya.memory;
+import tanya.memory.allocator;
 import tanya.network.socket;
 
 extern (C) nothrow @nogc

source/tanya/async/event/iocp.d

@@ -5,7 +5,7 @@
 /**
  * Event loop implementation for Windows.
  *
- * Copyright: Eugene Wissner 2016-2018.
+ * Copyright: Eugene Wissner 2016-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@@ -26,7 +26,7 @@ import tanya.async.protocol;
 import tanya.async.transport;
 import tanya.async.watcher;
 import tanya.container.buffer;
-import tanya.memory;
+import tanya.memory.allocator;
 import tanya.network.socket;
 import tanya.sys.windows.winbase;
 
@@ -67,11 +67,7 @@ final class StreamTransport : SocketWatcher, DuplexTransport, SocketTransport
      * Postcondition: $(D_INLINECODE socket !is null)
      */
     override @property OverlappedConnectedSocket socket() pure nothrow @safe @nogc
-    out (socket)
+    out (socket; socket !is null)
-    {
-        assert(socket !is null);
-    }
-    do
     {
         return cast(OverlappedConnectedSocket) socket_;
     }
@@ -124,11 +120,7 @@ final class StreamTransport : SocketWatcher, DuplexTransport, SocketTransport
      * Precondition: $(D_INLINECODE protocol !is null)
      */
     @property void protocol(Protocol protocol) pure nothrow @safe @nogc
-    in
+    in (protocol !is null)
-    {
-        assert(protocol !is null);
-    }
-    do
     {
         protocol_ = protocol;
     }
@@ -264,11 +256,7 @@ final class IOCPLoop : Loop
 
     private void kill(StreamTransport transport,
                       SocketException exception = null) @nogc
-    in
+    in (transport !is null)
-    {
-        assert(transport !is null);
-    }
-    do
     {
         transport.socket.shutdown();
         defaultAllocator.dispose(transport.socket);
@@ -318,7 +306,9 @@ final class IOCPLoop : Loop
 
                 connection.incoming.insertBack(transport);
 
-                reify(transport, EventMask(Event.none), EventMask(Event.read, Event.write));
+                reify(transport,
+                      EventMask(Event.none),
+                      EventMask(Event.read | Event.write));
 
                 pendings.insertBack(connection);
                 listener.beginAccept(overlapped);

source/tanya/async/event/kqueue.d

@@ -5,7 +5,7 @@
 /*
  * Event loop implementation for *BSD.
  *
- * Copyright: Eugene Wissner 2016-2018.
+ * Copyright: Eugene Wissner 2016-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@@ -58,7 +58,7 @@ import tanya.async.loop;
 import tanya.async.transport;
 import tanya.async.watcher;
 import tanya.container.array;
-import tanya.memory;
+import tanya.memory.allocator;
 import tanya.network.socket;
 
 void EV_SET(kevent_t* kevp, typeof(kevent_t.tupleof) args) pure nothrow @nogc

source/tanya/async/event/selector.d

@@ -5,7 +5,7 @@
 /*
  * This module contains base implementations for reactor event loops.
  *
- * Copyright: Eugene Wissner 2016-2018.
+ * Copyright: Eugene Wissner 2016-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@@ -25,7 +25,7 @@ import tanya.async.transport;
 import tanya.async.watcher;
 import tanya.container.array;
 import tanya.container.buffer;
-import tanya.memory;
+import tanya.memory.allocator;
 import tanya.network.socket;
 
 /**
@@ -75,22 +75,14 @@ package class StreamTransport : SocketWatcher, DuplexTransport, SocketTransport
      * Postcondition: $(D_INLINECODE socket !is null)
      */
     override @property ConnectedSocket socket() pure nothrow @safe @nogc
-    out (socket)
+    out (socket; socket !is null)
-    {
-        assert(socket !is null);
-    }
-    do
     {
         return cast(ConnectedSocket) socket_;
     }
 
     private @property void socket(ConnectedSocket socket)
     pure nothrow @safe @nogc
-    in
+    in (socket !is null)
-    {
-        assert(socket !is null);
-    }
-    do
     {
         socket_ = socket;
     }
@@ -114,11 +106,7 @@ package class StreamTransport : SocketWatcher, DuplexTransport, SocketTransport
      * Precondition: $(D_INLINECODE protocol !is null)
      */
     @property void protocol(Protocol protocol) pure nothrow @safe @nogc
-    in
+    in (protocol !is null)
-    {
-        assert(protocol !is null);
-    }
-    do
     {
         protocol_ = protocol;
     }
@@ -140,7 +128,7 @@ package class StreamTransport : SocketWatcher, DuplexTransport, SocketTransport
     {
         closing = true;
         loop.reify(this,
-                   EventMask(Event.read, Event.write),
+                   EventMask(Event.read | Event.write),
                    EventMask(Event.write));
     }
 
@@ -257,11 +245,7 @@ abstract class SelectorLoop : Loop
      */
     protected void kill(StreamTransport transport,
                         SocketException exception = null) @nogc
-    in
+    in (transport !is null)
-    {
-        assert(transport !is null);
-    }
-    do
     {
         transport.socket.shutdown();
         defaultAllocator.dispose(transport.socket);
@@ -283,11 +267,7 @@ abstract class SelectorLoop : Loop
      */
     protected bool feed(StreamTransport transport,
                         SocketException exception = null) @nogc
-    in
+    in (transport !is null)
-    {
-        assert(transport !is null);
-    }
-    do
     {
         while (transport.input.length && transport.writeReady)
         {
@@ -350,11 +330,7 @@ abstract class SelectorLoop : Loop
      *  connection = Connection watcher ready to accept.
      */
     package void acceptConnections(ConnectionWatcher connection) @nogc
-    in
+    in (connection !is null)
-    {
-        assert(connection !is null);
-    }
-    do
     {
         while (true)
         {
@@ -393,7 +369,9 @@ abstract class SelectorLoop : Loop
                 transport.socket = client;
             }
 
-            reify(transport, EventMask(Event.none), EventMask(Event.read, Event.write));
+            reify(transport,
+                  EventMask(Event.none),
+                  EventMask(Event.read | Event.write));
             connection.incoming.insertBack(transport);
         }
 

source/tanya/async/iocp.d

@@ -7,7 +7,7 @@
  *
  * Note: Available only on Windows.
  *
- * Copyright: Eugene Wissner 2016-2018.
+ * Copyright: Eugene Wissner 2016-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)

source/tanya/async/loop.d

@@ -62,7 +62,7 @@
  * }
  * ---
  *
- * Copyright: Eugene Wissner 2016-2018.
+ * Copyright: Eugene Wissner 2016-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@@ -72,12 +72,12 @@
 module tanya.async.loop;
 
 import core.time;
-import std.typecons;
 import tanya.async.transport;
 import tanya.async.watcher;
+import tanya.bitmanip;
 import tanya.container.buffer;
 import tanya.container.list;
-import tanya.memory;
+import tanya.memory.allocator;
 import tanya.network.socket;
 
 version (DisableBackends)
@@ -116,30 +116,6 @@ else version (DragonFlyBSD)
 {
     version = Kqueue;
 }
-version (unittest)
-{
-    final class TestLoop : Loop
-    {
-        override protected bool reify(SocketWatcher watcher,
-                                      EventMask oldEvents,
-                                      EventMask events) @nogc
-        {
-            return true;
-        }
-
-        override protected void poll() @nogc
-        {
-            assert(!this.done);
-            unloop();
-        }
-
-        override protected @property uint maxEvents()
-        const pure nothrow @safe @nogc
-        {
-            return 64U;
-        }
-    }
-}
 
 /**
  * Events.
@@ -160,7 +136,7 @@ alias EventMask = BitFlags!Event;
  */
 abstract class Loop
 {
-    private bool done = true;
+    protected bool done = true;
 
     /// Pending watchers.
     protected DList!Watcher pendings;
@@ -175,14 +151,6 @@ abstract class Loop
         return 128U;
     }
 
-    @nogc @system unittest
-    {
-        auto loop = defaultAllocator.make!TestLoop;
-        assert(loop.maxEvents == 64);
-
-        defaultAllocator.dispose(loop);
-    }
-
     /**
      * Initializes the loop.
      */
@@ -228,31 +196,6 @@ abstract class Loop
         this.done = true;
     }
 
-    @nogc @system unittest
-    {
-        auto loop = defaultAllocator.make!TestLoop;
-        assert(loop.done);
-
-        loop.run();
-        assert(loop.done);
-
-        defaultAllocator.dispose(loop);
-    }
-
-    @nogc @system unittest
-    {
-        auto loop = defaultAllocator.make!TestLoop;
-        auto watcher = defaultAllocator.make!DummyWatcher;
-        loop.pendings.insertBack(watcher);
-
-        assert(!watcher.invoked);
-        loop.run();
-        assert(watcher.invoked);
-
-        defaultAllocator.dispose(loop);
-        defaultAllocator.dispose(watcher);
-    }
-
     /**
      * Start watching.
      *
@@ -319,27 +262,12 @@ abstract class Loop
      *              $(D_PSYMBOL maxBlockTime).
      */
     protected @property void blockTime(in Duration blockTime) @safe pure nothrow @nogc
-    in
+    in (blockTime <= 1.dur!"hours", "Too long to wait.")
-    {
+    in (!blockTime.isNegative)
-        assert(blockTime <= 1.dur!"hours", "Too long to wait.");
-        assert(!blockTime.isNegative);
-    }
-    do
     {
         blockTime_ = blockTime;
     }
 
-    @nogc @system unittest
-    {
-        auto loop = defaultAllocator.make!TestLoop;
-        assert(loop.blockTime == 1.dur!"minutes");
-
-        loop.blockTime = 2.dur!"minutes";
-        assert(loop.blockTime == 2.dur!"minutes");
-
-        defaultAllocator.dispose(loop);
-    }
-
     /**
      * Does the actual polling.
      */
@@ -408,26 +336,9 @@ class BadLoopException : Exception
  *  loop = The event loop.
  */
 @property void defaultLoop(Loop loop) @nogc
-in
+in (loop !is null)
-{
-    assert(loop !is null);
-}
-do
 {
     defaultLoop_ = loop;
 }
 
 private Loop defaultLoop_;
-
-@nogc @system unittest
-{
-    auto oldLoop = defaultLoop_;
-    auto loop = defaultAllocator.make!TestLoop;
-
-    defaultLoop = loop;
-    assert(defaultLoop_ is loop);
-    assert(defaultLoop is loop);
-
-    defaultLoop_ = oldLoop;
-    defaultAllocator.dispose(loop);
-}

source/tanya/async/package.d

@@ -5,7 +5,7 @@
 /**
  * This package provides asynchronous capabilities.
  *
- * Copyright: Eugene Wissner 2016-2018.
+ * Copyright: Eugene Wissner 2016-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)

source/tanya/async/protocol.d

@@ -9,7 +9,7 @@
  * When an event from the network arrives, a protocol method gets
  * called and can respond to the event.
  *
- * Copyright: Eugene Wissner 2016-2018.
+ * Copyright: Eugene Wissner 2016-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)

source/tanya/async/transport.d

@@ -6,7 +6,7 @@
  * This module contains transports which are responsible for data dilvery
  * between two parties of an asynchronous communication.
  *
- * Copyright: Eugene Wissner 2016-2018.
+ * Copyright: Eugene Wissner 2016-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@@ -57,10 +57,7 @@ interface DuplexTransport : ReadTransport, WriteTransport
      * Postcondition: $(D_INLINECODE protocol !is null)
      */
     @property Protocol protocol() pure nothrow @safe @nogc
-    out (protocol)
+    out (protocol; protocol !is null);
-    {
-        assert(protocol !is null);
-    }
 
     /**
      * Switches the protocol.
@@ -73,10 +70,7 @@ interface DuplexTransport : ReadTransport, WriteTransport
      * Precondition: $(D_INLINECODE protocol !is null)
      */
     @property void protocol(Protocol protocol) pure nothrow @safe @nogc
-    in
+    in (protocol !is null);
-    {
-        assert(protocol !is null);
-    }
 
 
     /**

source/tanya/async/watcher.d

@@ -5,7 +5,7 @@
 /**
  * Watchers register user's interest in some event.
  *
- * Copyright: Eugene Wissner 2016-2018.
+ * Copyright: Eugene Wissner 2016-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@@ -19,7 +19,7 @@ import tanya.async.protocol;
 import tanya.async.transport;
 import tanya.container.buffer;
 import tanya.container.list;
-import tanya.memory;
+import tanya.memory.allocator;
 import tanya.network.socket;
 
 /**
@@ -37,19 +37,6 @@ abstract class Watcher
     void invoke() @nogc;
 }
 
-version (unittest)
-{
-    final class DummyWatcher : Watcher
-    {
-        bool invoked;
-
-        override void invoke() @nogc
-        {
-            this.invoked = true;
-        }
-    }
-}
-
 /**
  * Socket watcher.
  */
@@ -65,11 +52,7 @@ abstract class SocketWatcher : Watcher
      * Precondition: $(D_INLINECODE socket !is null)
      */
     this(Socket socket) pure nothrow @safe @nogc
-    in
+    in (socket !is null)
-    {
-        assert(socket !is null);
-    }
-    do
     {
         socket_ = socket;
     }
@@ -115,11 +98,7 @@ class ConnectionWatcher : SocketWatcher
      * Invokes new connection callback.
      */
     override void invoke() @nogc
-    in
+    in (protocolFactory !is null, "Protocol isn't set.")
-    {
-        assert(protocolFactory !is null, "Protocol isn't set.");
-    }
-    do
     {
         for (; !this.incoming.empty; this.incoming.removeFront())
         {

source/tanya/bitmanip.d

@@ -0,0 +1,318 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/**
+ * Bit manipulation.
+ *
+ * Copyright: Eugene Wissner 2018-2019.
+ * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
+ *                  Mozilla Public License, v. 2.0).
+ * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
+ * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/bitmanip.d,
+ *                 tanya/bitmanip.d)
+ */
+module tanya.bitmanip;
+
+import tanya.meta.metafunction;
+import tanya.meta.trait;
+import tanya.meta.transform;
+
+/**
+ * Determines whether $(D_PARAM E) is a $(D_KEYWORD enum), whose members can be
+ * used as bit flags.
+ *
+ * This is the case if all members of $(D_PARAM E) are integral numbers that
+ * are either 0 or positive integral powers of 2.
+ *
+ * Params:
+ *  E = Some $(D_KEYWORD enum).
+ *
+ * Returns: $(D_KEYWORD true) if $(D_PARAM E) contains only bit flags,
+ *          $(D_KEYWORD false) otherwise.
+ */
+template isBitFlagEnum(E)
+{
+    enum bool isValid(OriginalType!E x) = x == 0
+                                       || (x > 0 && ((x & (x - 1)) == 0));
+    static if (isIntegral!E)
+    {
+        enum bool isBitFlagEnum = allSatisfy!(isValid, EnumMembers!E);
+    }
+    else
+    {
+        enum bool isBitFlagEnum = false;
+    }
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    enum Valid
+    {
+        none = 0,
+        one = 1 << 0,
+        two = 1 << 1,
+    }
+    static assert(isBitFlagEnum!Valid);
+
+    enum Invalid
+    {
+        one,
+        two,
+        three,
+        four,
+    }
+    static assert(!isBitFlagEnum!Invalid);
+
+    enum Negative
+    {
+        one = -1,
+        two = -2,
+    }
+    static assert(!isBitFlagEnum!Negative);
+}
+
+/**
+ * Validates that $(D_PARAM field) contains only bits from $(D_PARAM E).
+ *
+ * Params:
+ *  E     = Some $(D_KEYWORD enum).
+ *  field = Bit field.
+ *
+ * Returns: $(D_KEYWORD true) if $(D_PARAM field) is valid, $(D_KEYWORD false)
+ *          otherwise.
+ */
+bool containsBitFlags(E)(E field)
+if (isBitFlagEnum!E)
+{
+    OriginalType!E fillField()
+    {
+        typeof(return) full;
+        static foreach (member; EnumMembers!E)
+        {
+            full |= member;
+        }
+        return full;
+    }
+    enum OriginalType!E full = fillField();
+    return (field & ~full) == OriginalType!E.init;
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    enum E
+    {
+        one,
+        two,
+        three,
+    }
+    assert(containsBitFlags(E.one | E.two));
+    assert(!containsBitFlags(cast(E) 0x8));
+}
+
+/**
+ * Allows to use $(D_KEYWORD enum) values as a set of bit flags.
+ *
+ * $(D_PSYMBOL BitFlags) behaves the same as a bit field of type $(D_PARAM E),
+ * but does additional cheks to ensure that the bit field contains only valid
+ * values, this is only values from $(D_PARAM E).
+ *
+ * Params:
+ *  E = Some $(D_KEYWORD enum).
+ */
+struct BitFlags(E)
+if (isBitFlagEnum!E)
+{
+    private OriginalType!E field;
+
+    /**
+     * Constructs $(D_PSYMBOL BitFlags) from $(D_PARAM field).
+     *
+     * Params:
+     *  field = Bits to be set.
+     */
+    this(E field)
+    {
+        this.field = field;
+    }
+
+    /**
+     * Converts $(D_PSYMBOL BitFlags) to a boolean.
+     *
+     * It is $(D_KEYWORD true) if any bit is set, $(D_KEYWORD false) otherwise.
+     *
+     * Returns: $(D_KEYWORD true) if this $(D_PSYMBOL BitFlags) contains any
+     *          set bits, $(D_KEYWORD false) otherwise.
+     */
+    bool opCast(T : bool)()
+    {
+        return this.field != 0;
+    }
+
+    /**
+     * Converts to the original type of $(D_PARAM E) ($(D_KEYWORD int) by
+     * default).
+     *
+     * Returns: $(D_KEYWORD this) as $(D_INLINECODE OriginalType!T).
+     */
+    OriginalType!E opCast(T : OriginalType!E)() const
+    {
+        return this.field;
+    }
+
+    /**
+     * Tests (&), sets (|) or toggles (^) bits.
+     *
+     * Params:
+     *  op   = Operation.
+     *  that = 0 or more bit flags.
+     *
+     * Returns: New $(D_PSYMBOL BitFlags) object.
+     */
+    BitFlags opBinary(string op)(E that) const
+    if (op == "&" || op == "|" || op == "^")
+    {
+        BitFlags result = this;
+        mixin("return result " ~ op ~ "= that;");
+    }
+
+    /// ditto
+    BitFlags opBinary(string op)(BitFlags that) const
+    if (op == "&" || op == "|" || op == "^")
+    {
+        BitFlags result = this;
+        mixin("return result " ~ op ~ "= that;");
+    }
+
+    /// ditto
+    BitFlags opBinaryRight(string op)(E that) const
+    if (op == "&" || op == "|" || op == "^")
+    {
+        BitFlags result = this;
+        mixin("return result " ~ op ~ "= that;");
+    }
+
+    /**
+     * Tests (&), sets (|) or toggles (^) bits.
+     *
+     * Params:
+     *  op   = Operation.
+     *  that = 0 or more bit flags.
+     *
+     * Returns: $(D_KEYWORD this).
+     */
+    ref BitFlags opOpAssign(string op)(E that)
+    if (op == "&" || op == "|" || op == "^")
+    {
+        mixin("this.field " ~ op ~ "= that;");
+        return this;
+    }
+
+    /// ditto
+    ref BitFlags opOpAssign(string op)(BitFlags that)
+    if (op == "&" || op == "|" || op == "^")
+    {
+        mixin("this.field " ~ op ~ "= that.field;");
+        return this;
+    }
+
+    /**
+     * Inverts all bit flags.
+     *
+     * Returns: New $(D_PSYMBOL BitFlags) object with all bits inverted.
+     */
+    BitFlags opUnary(string op : "~")() const
+    {
+        BitFlags result;
+        result.field  = ~this.field;
+        return result;
+    }
+
+    /**
+     * Assigns a bit field.
+     *
+     * Params:
+     *  that = Bit field of type $(D_PARAM E).
+     *
+     * Returns: $(D_KEYWORD this).
+     */
+    ref BitFlags opAssign(E that)
+    {
+        this.field = that;
+        return this;
+    }
+
+    /**
+     * Compares this $(D_PSYMBOL BitFlags) object to another bit field.
+     *
+     * Params:
+     *  that = $(D_PSYMBOL BitFlags) object or a bit field of type
+     *         $(D_PARAM E).
+     *
+     * Returns: $(D_KEYWORD true) if $(D_KEYWORD this) and $(D_PARAM that)
+     *          contain the same bits ,$(D_KEYWORD false) otherwise.
+     */
+    bool opEquals(E that) const
+    {
+        return this.field == that;
+    }
+
+    /// ditto
+    bool opEquals(BitFlags that) const
+    {
+        return this.field == that.field;
+    }
+
+    /**
+     * Generates a hash value of this object.
+     *
+     * Returns: Hash value.
+     */
+    size_t toHash() const
+    {
+        return cast(size_t) this.field;
+    }
+}
+
+/**
+ * Creates a $(D_PSYMBOL BitFlags) object initialized with $(D_PARAM field).
+ *
+ * Params:
+ *  E     = Some $(D_KEYWORD enum).
+ *  field = Bits to be set.
+ */
+BitFlags!E bitFlags(E)(E field)
+if (isBitFlagEnum!E)
+{
+    return BitFlags!E(field);
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    enum E
+    {
+        one = 1 << 0,
+        two = 1 << 1,
+        three = 1 << 2,
+    }
+    // Construct with E.one and E.two set
+    auto flags = bitFlags(E.one | E.two);
+
+    // Test wheter E.one is set
+    assert(flags & E.one);
+
+    // Toggle E.one
+    flags ^= E.one;
+    assert(!(flags & E.one));
+
+    // Set E.three
+    flags |= E.three;
+    assert(flags & E.three);
+
+    // Clear E.three
+    flags &= ~E.three;
+    assert(!(flags & E.three));
+}

source/tanya/container/array.d

@@ -5,7 +5,7 @@
 /**
  * Single-dimensioned array.
  *
- * Copyright: Eugene Wissner 2016-2018.
+ * Copyright: Eugene Wissner 2016-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@@ -15,19 +15,13 @@
 module tanya.container.array;
 
 import core.checkedint;
-import std.algorithm.mutation : bringToFront,
-                                copy,
-                                fill,
-                                initializeAll,
-                                uninitializedFill;
-import std.meta;
 import tanya.algorithm.comparison;
 import tanya.algorithm.mutation;
-import tanya.exception;
+import tanya.memory.allocator;
-import tanya.memory;
+import tanya.memory.lifetime;
 import tanya.meta.trait;
 import tanya.meta.transform;
-import tanya.range.primitive;
+import tanya.range;
 
 /**
  * Random-access range for the $(D_PSYMBOL Array).
@@ -41,22 +35,15 @@ struct Range(A)
     private E* begin, end;
     private A* container;
 
-    invariant
+    invariant (this.begin <= this.end);
-    {
+    invariant (this.container !is null);
-        assert(this.begin <= this.end);
+    invariant (this.begin >= this.container.data);
-        assert(this.container !is null);
+    invariant (this.end <= this.container.data + this.container.length);
-        assert(this.begin >= this.container.data);
-        assert(this.end <= this.container.data + this.container.length);
-    }
 
     private this(ref A container, E* begin, E* end) @trusted
-    in
+    in (begin <= end)
-    {
+    in (begin >= container.data)
-        assert(begin <= end);
+    in (end <= container.data + container.length)
-        assert(begin >= container.data);
-        assert(end <= container.data + container.length);
-    }
-    do
     {
         this.container = &container;
         this.begin = begin;
@@ -83,51 +70,31 @@ struct Range(A)
     alias opDollar = length;
 
     @property ref inout(E) front() inout
-    in
+    in (!empty)
-    {
-        assert(!empty);
-    }
-    do
     {
         return *this.begin;
     }
 
     @property ref inout(E) back() inout @trusted
-    in
+    in (!empty)
-    {
-        assert(!empty);
-    }
-    do
     {
         return *(this.end - 1);
     }
 
     void popFront() @trusted
-    in
+    in (!empty)
-    {
-        assert(!empty);
-    }
-    do
     {
         ++this.begin;
     }
 
     void popBack() @trusted
-    in
+    in (!empty)
-    {
-        assert(!empty);
-    }
-    do
     {
         --this.end;
     }
 
     ref inout(E) opIndex(size_t i) inout @trusted
-    in
+    in (i < length)
-    {
-        assert(i < length);
-    }
-    do
     {
         return *(this.begin + i);
     }
@@ -143,23 +110,15 @@ struct Range(A)
     }
 
     Range opSlice(size_t i, size_t j) @trusted
-    in
+    in (i <= j)
-    {
+    in (j <= length)
-        assert(i <= j);
-        assert(j <= length);
-    }
-    do
     {
         return typeof(return)(*this.container, this.begin + i, this.begin + j);
     }
 
     A.ConstRange opSlice(size_t i, size_t j) const @trusted
-    in
+    in (i <= j)
-    {
+    in (j <= length)
-        assert(i <= j);
-        assert(j <= length);
-    }
-    do
     {
         return typeof(return)(*this.container, this.begin + i, this.begin + j);
     }
@@ -188,11 +147,8 @@ struct Array(T)
     private T* data;
     private size_t capacity_;
 
-    invariant
+    invariant (this.length_ <= this.capacity_);
-    {
+    invariant (this.capacity_ == 0 || this.data !is null);
-        assert(this.length_ <= this.capacity_);
-        assert(this.capacity_ == 0 || this.data !is null);
-    }
 
     /**
      * Creates a new $(D_PSYMBOL Array) with the elements from a static array.
@@ -299,7 +255,9 @@ struct Array(T)
      *  init      = Initial value to fill the array with.
      *  allocator = Allocator.
      */
-    this(size_t len, T init, shared Allocator allocator = defaultAllocator)
+    this()(size_t len,
+           auto ref T init,
+           shared Allocator allocator = defaultAllocator)
     {
         this(allocator);
         reserve(len);
@@ -316,11 +274,7 @@ struct Array(T)
 
     /// ditto
     this(shared Allocator allocator)
-    in
+    in (allocator !is null)
-    {
-        assert(allocator !is null);
-    }
-    do
     {
         allocator_ = allocator;
     }
@@ -354,9 +308,8 @@ struct Array(T)
         (() @trusted => allocator.deallocate(slice(capacity)))();
     }
 
-    /**
+    static if (isCopyable!T)
-     * Copies the array.
+    {
-     */
         this(this)
         {
             auto buf = slice(this.length);
@@ -364,6 +317,11 @@ struct Array(T)
             this.data = null;
             insertBack(buf);
         }
+    }
+    else
+    {
+        @disable this(this);
+    }
 
     /**
      * Removes all elements.
@@ -419,28 +377,20 @@ struct Array(T)
      */
     @property void length(size_t len) @trusted
     {
-        if (len == length)
+        if (len > length)
-        {
-            return;
-        }
-        else if (len > length)
         {
             reserve(len);
             initializeAll(this.data[length_ .. len]);
         }
         else
         {
-            static if (hasElaborateDestructor!T)
+            destroyAll(this.data[len .. this.length_]);
+        }
+        if (len != length)
         {
-                const T* end = this.data + length_ - 1;
-                for (T* e = this.data + len; e != end; ++e)
-                {
-                    destroy(*e);
-                }
-            }
-        }
             length_ = len;
         }
+    }
 
     ///
     @nogc nothrow pure @safe unittest
@@ -575,11 +525,7 @@ struct Array(T)
      * Precondition: $(D_INLINECODE !empty).
      */
     void removeBack()
-    in
+    in (!empty)
-    {
-        assert(!empty);
-    }
-    do
     {
         length = length - 1;
     }
@@ -597,11 +543,7 @@ struct Array(T)
      * Returns: The number of elements removed
      */
     size_t removeBack(size_t howMany)
-    out (removed)
+    out (removed; removed <= howMany)
-    {
-        assert(removed <= howMany);
-    }
-    do
     {
         const toRemove = min(howMany, length);
 
@@ -622,11 +564,7 @@ struct Array(T)
     }
 
     private inout(T)[] slice(size_t length) inout @trusted
-    in
+    in (length <= capacity)
-    {
-        assert(length <= capacity);
-    }
-    do
     {
         return this.data[0 .. length];
     }
@@ -648,13 +586,9 @@ struct Array(T)
      * Precondition: $(D_PARAM r) refers to a region of $(D_KEYWORD this).
      */
     Range remove(Range r)
-    in
+    in (r.container is &this)
-    {
+    in (r.begin >= this.data)
-        assert(r.container is &this);
+    in (r.end <= end)
-        assert(r.begin >= this.data);
-        assert(r.end <= end);
-    }
-    do
     {
         auto target = r.begin;
         auto source = r.end;
@@ -809,30 +743,23 @@ struct Array(T)
     if (!isInfinite!R
      && isInputRange!R
      && isImplicitlyConvertible!(ElementType!R, T))
-    in
+    in (r.container is &this)
+    in (r.begin >= this.data)
+    in (r.end <= this.data + length)
     {
-        assert(r.container is &this);
+        const oldLength = length;
-        assert(r.begin >= this.data);
+        const after = r.end - this.data;
-        assert(r.end <= this.data + length);
-    }
-    do
-    {
-        const oldLen = length;
-        const offset = r.end - this.data;
         const inserted = insertBack(el);
-        bringToFront(this.data[offset .. oldLen], this.data[oldLen .. length]);
+
+        rotate(this.data[after .. oldLength], this.data[oldLength .. length]);
         return inserted;
     }
 
     /// ditto
     size_t insertAfter(size_t R)(Range r, T[R] el)
-    in
+    in (r.container is &this)
-    {
+    in (r.begin >= this.data)
-        assert(r.container is &this);
+    in (r.end <= this.data + length)
-        assert(r.begin >= this.data);
-        assert(r.end <= this.data + length);
-    }
-    do
     {
         return insertAfter!(T[])(r, el[]);
     }
@@ -840,13 +767,9 @@ struct Array(T)
     /// ditto
     size_t insertAfter(R)(Range r, auto ref R el)
     if (isImplicitlyConvertible!(R, T))
-    in
+    in (r.container is &this)
-    {
+    in (r.begin >= this.data)
-        assert(r.container is &this);
+    in (r.end <= this.data + length)
-        assert(r.begin >= this.data);
-        assert(r.end <= this.data + length);
-    }
-    do
     {
         const oldLen = length;
         const offset = r.end - this.data;
@@ -859,7 +782,7 @@ struct Array(T)
         {
             moveBack(el);
         }
-        bringToFront(this.data[offset .. oldLen], this.data[oldLen .. length]);
+        rotate(this.data[offset .. oldLen], this.data[oldLen .. length]);
 
         return 1;
     }
@@ -869,26 +792,18 @@ struct Array(T)
     if (!isInfinite!R
      && isInputRange!R
      && isImplicitlyConvertible!(ElementType!R, T))
-    in
+    in (r.container is &this)
-    {
+    in (r.begin >= this.data)
-        assert(r.container is &this);
+    in (r.end <= this.data + length)
-        assert(r.begin >= this.data);
-        assert(r.end <= this.data + length);
-    }
-    do
     {
         return insertAfter(Range(this, this.data, r.begin), el);
     }
 
     /// ditto
     size_t insertBefore(size_t R)(Range r, T[R] el)
-    in
+    in (r.container is &this)
-    {
+    in (r.begin >= this.data)
-        assert(r.container is &this);
+    in (r.end <= this.data + length)
-        assert(r.begin >= this.data);
-        assert(r.end <= this.data + length);
-    }
-    do
     {
         return insertBefore!(T[])(r, el[]);
     }
@@ -896,13 +811,9 @@ struct Array(T)
     /// ditto
     size_t insertBefore(R)(Range r, auto ref R el)
     if (isImplicitlyConvertible!(R, T))
-    in
+    in (r.container is &this)
-    {
+    in (r.begin >= this.data)
-        assert(r.container is &this);
+    in (r.end <= this.data + length)
-        assert(r.begin >= this.data);
-        assert(r.end <= this.data + length);
-    }
-    do
     {
         const oldLen = length;
         const offset = r.begin - this.data;
@@ -915,7 +826,7 @@ struct Array(T)
         {
             moveBack(el);
         }
-        bringToFront(this.data[offset .. oldLen], this.data[oldLen .. length]);
+        rotate(this.data[offset .. oldLen], this.data[oldLen .. length]);
 
         return 1;
     }
@@ -1006,7 +917,7 @@ struct Array(T)
      */
     ref T opIndexAssign(E : T)(auto ref E value, size_t pos)
     {
-        return opIndex(pos) = value;
+        return opIndex(pos) = forward!value;
     }
 
     /// ditto
@@ -1040,7 +951,7 @@ struct Array(T)
     }
 
     /// ditto
-    Range opIndexAssign(Range value)
+    Range opIndexAssign()(Range value)
     {
         return opSliceAssign(value, 0, length);
     }
@@ -1070,11 +981,7 @@ struct Array(T)
      * Precondition: $(D_INLINECODE length > pos).
      */
     ref inout(T) opIndex(size_t pos) inout @trusted
-    in
+    in (length > pos)
-    {
-        assert(length > pos);
-    }
-    do
     {
         return *(this.data + pos);
     }
@@ -1175,11 +1082,7 @@ struct Array(T)
      * Precondition: $(D_INLINECODE !empty).
      */
     @property ref inout(T) front() inout
-    in
+    in (!empty)
-    {
-        assert(!empty);
-    }
-    do
     {
         return *this.data;
     }
@@ -1202,11 +1105,7 @@ struct Array(T)
      * Precondition: $(D_INLINECODE !empty).
      */
     @property ref inout(T) back() inout @trusted
-    in
+    in (!empty)
-    {
-        assert(!empty);
-    }
-    do
     {
         return *(this.data + length - 1);
     }
@@ -1234,24 +1133,16 @@ struct Array(T)
      * Precondition: $(D_INLINECODE i <= j && j <= length).
      */
     Range opSlice(size_t i, size_t j) @trusted
-    in
+    in (i <= j)
-    {
+    in (j <= length)
-        assert(i <= j);
-        assert(j <= length);
-    }
-    do
     {
         return typeof(return)(this, this.data + i, this.data + j);
     }
 
     /// ditto
     ConstRange opSlice(size_t i, size_t j) const @trusted
-    in
+    in (i <= j)
-    {
+    in (j <= length)
-        assert(i <= j);
-        assert(j <= length);
-    }
-    do
     {
         return typeof(return)(this, this.data + i, this.data + j);
     }
@@ -1308,12 +1199,8 @@ struct Array(T)
      */
     Range opSliceAssign(size_t R)(T[R] value, size_t i, size_t j)
     @trusted
-    in
+    in (i <= j)
-    {
+    in (j <= length)
-        assert(i <= j);
-        assert(j <= length);
-    }
-    do
     {
         copy(value[], this.data[i .. j]);
         return opSlice(i, j);
@@ -1322,26 +1209,18 @@ struct Array(T)
     /// ditto
     Range opSliceAssign(R : T)(auto ref R value, size_t i, size_t j)
     @trusted
-    in
+    in (i <= j)
-    {
+    in (j <= length)
-        assert(i <= j);
-        assert(j <= length);
-    }
-    do
     {
         fill(this.data[i .. j], value);
         return opSlice(i, j);
     }
 
     /// ditto
-    Range opSliceAssign(Range value, size_t i, size_t j) @trusted
+    Range opSliceAssign()(Range value, size_t i, size_t j) @trusted
-    in
+    in (i <= j)
-    {
+    in (j <= length)
-        assert(i <= j);
+    in (j - i == value.length)
-        assert(j <= length);
-        assert(j - i == value.length);
-    }
-    do
     {
         copy(value, this.data[i .. j]);
         return opSlice(i, j);
@@ -1498,197 +1377,3 @@ struct Array(T)
     assert(r.front == 7);
     assert(r.front == v.front);
 }
-
-@nogc nothrow pure @safe unittest
-{
-    const v1 = Array!int();
-    const Array!int v2;
-    const v3 = Array!int([1, 5, 8]);
-    static assert(is(PointerTarget!(typeof(v3.data)) == const(int)));
-}
-
-@nogc nothrow pure @safe unittest
-{
-    // Test that const arrays return usable ranges.
-    auto v = const Array!int([1, 2, 4]);
-    auto r1 = v[];
-
-    assert(r1.back == 4);
-    r1.popBack();
-    assert(r1.back == 2);
-    r1.popBack();
-    assert(r1.back == 1);
-    r1.popBack();
-    assert(r1.length == 0);
-
-    static assert(!is(typeof(r1[0] = 5)));
-    static assert(!is(typeof(v[0] = 5)));
-
-    const r2 = r1[];
-    static assert(is(typeof(r2[])));
-}
-
-@nogc nothrow pure @safe unittest
-{
-    Array!int v1;
-    const Array!int v2;
-
-    auto r1 = v1[];
-    auto r2 = v1[];
-
-    assert(r1.length == 0);
-    assert(r2.empty);
-    assert(r1 == r2);
-
-    v1.insertBack([1, 2, 4]);
-    assert(v1[] == v1);
-    assert(v2[] == v2);
-    assert(v2[] != v1);
-    assert(v1[] != v2);
-    assert(v1[].equal(v1[]));
-    assert(v2[].equal(v2[]));
-    assert(!v1[].equal(v2[]));
-}
-
-@nogc nothrow pure @safe unittest
-{
-    struct MutableEqualsStruct
-    {
-        int opEquals(typeof(this) that) @nogc nothrow pure @safe
-        {
-            return true;
-        }
-    }
-    struct ConstEqualsStruct
-    {
-        int opEquals(const typeof(this) that) const @nogc nothrow pure @safe
-        {
-            return true;
-        }
-    }
-    auto v1 = Array!ConstEqualsStruct();
-    auto v2 = Array!ConstEqualsStruct();
-    assert(v1 == v2);
-    assert(v1[] == v2);
-    assert(v1 == v2[]);
-    assert(v1[].equal(v2[]));
-
-    auto v3 = const Array!ConstEqualsStruct();
-    auto v4 = const Array!ConstEqualsStruct();
-    assert(v3 == v4);
-    assert(v3[] == v4);
-    assert(v3 == v4[]);
-    assert(v3[].equal(v4[]));
-
-    auto v7 = Array!MutableEqualsStruct(1, MutableEqualsStruct());
-    auto v8 = Array!MutableEqualsStruct(1, MutableEqualsStruct());
-    assert(v7 == v8);
-    assert(v7[] == v8);
-    assert(v7 == v8[]);
-    assert(v7[].equal(v8[]));
-}
-
-@nogc nothrow pure @safe unittest
-{
-    struct SWithDtor
-    {
-        ~this() @nogc nothrow pure @safe
-        {
-        }
-    }
-    auto v = Array!SWithDtor(); // Destructor can destroy empty arrays.
-}
-
-@nogc nothrow pure @safe unittest
-{
-    class A
-    {
-    }
-    A a1, a2;
-    auto v1 = Array!A([a1, a2]);
-
-    // Issue 232: https://issues.caraus.io/issues/232.
-    static assert(is(Array!(A*)));
-}
-
-@nogc nothrow pure @safe unittest
-{
-    auto v = Array!int([5, 15, 8]);
-    {
-        size_t i;
-
-        foreach (e; v)
-        {
-            assert(i != 0 || e == 5);
-            assert(i != 1 || e == 15);
-            assert(i != 2 || e == 8);
-            ++i;
-        }
-        assert(i == 3);
-    }
-    {
-        size_t i = 3;
-
-        foreach_reverse (e; v)
-        {
-            --i;
-            assert(i != 2 || e == 8);
-            assert(i != 1 || e == 15);
-            assert(i != 0 || e == 5);
-        }
-        assert(i == 0);
-    }
-}
-
-// const constructor tests
-@nogc nothrow pure @safe unittest
-{
-    auto v1 = const Array!int([1, 2, 3]);
-    auto v2 = Array!int(v1);
-    assert(v1.data !is v2.data);
-    assert(v1 == v2);
-
-    auto v3 = const Array!int(Array!int([1, 2, 3]));
-    assert(v1 == v3);
-    assert(v3.length == 3);
-    assert(v3.capacity == 3);
-}
-
-@nogc nothrow pure @safe unittest
-{
-    auto v1 = Array!int(defaultAllocator);
-}
-
-@nogc nothrow pure @safe unittest
-{
-    Array!int v;
-    auto r = v[];
-    assert(r.length == 0);
-    assert(r.empty);
-}
-
-@nogc nothrow pure @safe unittest
-{
-    auto v1 = const Array!int([5, 15, 8]);
-    Array!int v2;
-    v2 = v1[0 .. 2];
-    assert(equal(v1[0 .. 2], v2[]));
-}
-
-// Move assignment
-@nogc nothrow pure @safe unittest
-{
-    Array!int v1;
-    v1 = Array!int([5, 15, 8]);
-}
-
-// Postblit is safe
-@nogc nothrow pure @safe unittest
-{
-    auto array = Array!int(3);
-    void func(Array!int arg)
-    {
-        assert(arg.capacity == 3);
-    }
-    func(array);
-}

source/tanya/container/buffer.d

@@ -5,7 +5,7 @@
 /**
  * This module contains buffers designed for C-style input/output APIs.
  *
- * Copyright: Eugene Wissner 2016-2018.
+ * Copyright: Eugene Wissner 2016-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@@ -14,7 +14,7 @@
  */
 module tanya.container.buffer;
 
-import tanya.memory;
+import tanya.memory.allocator;
 import tanya.meta.trait;
 
 version (unittest)
@@ -22,11 +22,7 @@ version (unittest)
     private int fillBuffer(ubyte[] buffer,
                            int start = 0,
                            int end = 10) @nogc pure nothrow
-    in
+    in (start < end)
-    {
-        assert(start < end);
-    }
-    do
     {
         auto numberRead = end - start;
         for (ubyte i; i < numberRead; ++i)
@@ -71,12 +67,9 @@ if (isScalarType!T)
     /// Size by which the buffer will grow.
     private size_t blockSize = 8192;
 
-    invariant
+    invariant (this.length_ <= this.buffer_.length);
-    {
+    invariant (this.blockSize > 0);
-        assert(this.length_ <= this.buffer_.length);
+    invariant (this.minAvailable > 0);
-        assert(this.blockSize > 0);
-        assert(this.minAvailable > 0);
-    }
 
     /**
      * Creates a new read buffer.
@@ -101,11 +94,7 @@ if (isScalarType!T)
 
     /// ditto
     this(shared Allocator allocator)
-    in
+    in (allocator_ is null)
-    {
-        assert(allocator_ is null);
-    }
-    do
     {
         allocator_ = allocator;
     }
@@ -293,11 +282,6 @@ if (isScalarType!T)
     mixin DefaultAllocator;
 }
 
-@nogc nothrow pure @safe unittest
-{
-    static assert(is(ReadBuffer!int));
-}
-
 /**
  * Circular, self-expanding buffer with overflow support. Can be used with
  * functions returning the number of the transferred bytes.
@@ -328,12 +312,9 @@ if (isScalarType!T)
     /// The position of the free area in the buffer.
     private size_t position;
 
-    invariant
+    invariant (this.blockSize > 0);
-    {
-        assert(this.blockSize > 0);
     // Position can refer to an element outside the buffer if the buffer is full.
-        assert(this.position <= this.buffer_.length);
+    invariant (this.position <= this.buffer_.length);
-    }
 
     /**
      * Params:
@@ -344,12 +325,8 @@ if (isScalarType!T)
      * Precondition: $(D_INLINECODE size > 0 && allocator !is null)
      */
     this(size_t size, shared Allocator allocator = defaultAllocator) @trusted
-    in
+    in (size > 0)
-    {
+    in (allocator !is null)
-        assert(size > 0);
-        assert(allocator !is null);
-    }
-    do
     {
         this.blockSize = size;
         ring = size - 1;
@@ -510,11 +487,7 @@ if (isScalarType!T)
      */
     ref WriteBuffer opOpAssign(string op)(size_t length)
     if (op == "+")
-    in
+    in (length <= this.length)
-    {
-        assert(length <= this.length);
-    }
-    do
     {
         auto afterRing = ring + 1;
         auto oldStart = start;
@@ -649,11 +622,6 @@ if (isScalarType!T)
     mixin DefaultAllocator;
 }
 
-@nogc nothrow pure @safe unittest
-{
-    static assert(is(typeof(WriteBuffer!int(5))));
-}
-
 @nogc nothrow pure @system unittest
 {
     auto b = WriteBuffer!ubyte(4);

source/tanya/container/entry.d

@@ -5,7 +5,7 @@
 /*
  * Internal package used by containers that rely on entries/nodes.
  *
- * Copyright: Eugene Wissner 2016-2018.
+ * Copyright: Eugene Wissner 2016-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@@ -14,9 +14,9 @@
  */
 module tanya.container.entry;
 
-import tanya.algorithm.mutation;
 import tanya.container.array;
 import tanya.memory.allocator;
+import tanya.memory.lifetime;
 import tanya.meta.trait;
 import tanya.meta.transform;
 import tanya.typecons;
@@ -59,12 +59,12 @@ package struct Bucket(K, V = void)
     }
     BucketStatus status = BucketStatus.empty;
 
-    this(ref K key)
+    this()(ref K key)
     {
         this.key = key;
     }
 
-    @property void key(ref K key)
+    @property void key()(ref K key)
     {
         this.key() = key;
         this.status = BucketStatus.used;
@@ -128,22 +128,14 @@ package struct HashArray(alias hasher, K, V = void)
     size_t length;
 
     this(shared Allocator allocator)
-    in
+    in (allocator !is null)
-    {
-        assert(allocator !is null);
-    }
-    do
     {
         this.array = Buckets(allocator);
     }
 
     this(T)(ref T data, shared Allocator allocator)
     if (is(Unqual!T == HashArray))
-    in
+    in (allocator !is null)
-    {
-        assert(allocator !is null);
-    }
-    do
     {
         this.array = Buckets(data.array, allocator);
         this.lengthIndex = data.lengthIndex;
@@ -152,11 +144,7 @@ package struct HashArray(alias hasher, K, V = void)
 
     // Move constructor
     void move(ref HashArray data, shared Allocator allocator)
-    in
+    in (allocator !is null)
-    {
-        assert(allocator !is null);
-    }
-    do
     {
         this.array = Buckets(.move(data.array), allocator);
         this.lengthIndex = data.lengthIndex;
@@ -170,7 +158,7 @@ package struct HashArray(alias hasher, K, V = void)
         .swap(this.length, data.length);
     }
 
-    void opAssign(ref typeof(this) that)
+    void opAssign()(ref typeof(this) that)
     {
         this.array = that.array;
         this.lengthIndex = that.lengthIndex;
@@ -237,11 +225,7 @@ package struct HashArray(alias hasher, K, V = void)
 
     // Takes an index in the primes array.
     void rehashToSize(const size_t n)
-    in
+    in (n < primes.length)
-    {
-        assert(n < primes.length);
-    }
-    do
     {
         auto storage = typeof(this.array)(primes[n], this.array.allocator);
         DataLoop: foreach (ref e1; this.array[])

source/tanya/container/hashtable.d

@@ -5,7 +5,7 @@
 /**
  * Hash table.
  *
- * Copyright: Eugene Wissner 2018.
+ * Copyright: Eugene Wissner 2018-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@@ -18,7 +18,8 @@ import tanya.algorithm.mutation;
 import tanya.container.array;
 import tanya.container.entry;
 import tanya.hash.lookup;
-import tanya.memory;
+import tanya.memory.allocator;
+import tanya.memory.lifetime;
 import tanya.meta.trait;
 import tanya.meta.transform;
 import tanya.range.primitive;
@@ -68,17 +69,10 @@ struct Range(T)
         return this.dataRange.empty();
     }
 
-    @property void popFront()
+    void popFront()
-    in
+    in (!empty)
-    {
+    in (this.dataRange.front.status == BucketStatus.used)
-        assert(!empty);
+    out (; empty || this.dataRange.back.status == BucketStatus.used)
-        assert(this.dataRange.front.status == BucketStatus.used);
-    }
-    out
-    {
-        assert(empty || this.dataRange.back.status == BucketStatus.used);
-    }
-    do
     {
         do
         {
@@ -87,17 +81,10 @@ struct Range(T)
         while (!empty && dataRange.front.status != BucketStatus.used);
     }
 
-    @property void popBack()
+    void popBack()
-    in
+    in (!empty)
-    {
+    in (this.dataRange.back.status == BucketStatus.used)
-        assert(!empty);
+    out (; empty || this.dataRange.back.status == BucketStatus.used)
-        assert(this.dataRange.back.status == BucketStatus.used);
-    }
-    out
-    {
-        assert(empty || this.dataRange.back.status == BucketStatus.used);
-    }
-    do
     {
         do
         {
@@ -107,23 +94,15 @@ struct Range(T)
     }
 
     @property ref inout(KV) front() inout
-    in
+    in (!empty)
-    {
+    in (this.dataRange.front.status == BucketStatus.used)
-        assert(!empty);
-        assert(this.dataRange.front.status == BucketStatus.used);
-    }
-    do
     {
         return this.dataRange.front.kv;
     }
 
     @property ref inout(KV) back() inout
-    in
+    in (!empty)
-    {
+    in (this.dataRange.back.status == BucketStatus.used)
-        assert(!empty);
-        assert(this.dataRange.back.status == BucketStatus.used);
-    }
-    do
     {
         return this.dataRange.back.kv;
     }
@@ -184,16 +163,9 @@ struct ByKey(T)
     }
 
     @property void popFront()
-    in
+    in (!empty)
-    {
+    in (this.dataRange.front.status == BucketStatus.used)
-        assert(!empty);
+    out (; empty || this.dataRange.back.status == BucketStatus.used)
-        assert(this.dataRange.front.status == BucketStatus.used);
-    }
-    out
-    {
-        assert(empty || this.dataRange.back.status == BucketStatus.used);
-    }
-    do
     {
         do
         {
@@ -203,16 +175,9 @@ struct ByKey(T)
     }
 
     @property void popBack()
-    in
+    in (!empty)
-    {
+    in (this.dataRange.back.status == BucketStatus.used)
-        assert(!empty);
+    out (; empty || this.dataRange.back.status == BucketStatus.used)
-        assert(this.dataRange.back.status == BucketStatus.used);
-    }
-    out
-    {
-        assert(empty || this.dataRange.back.status == BucketStatus.used);
-    }
-    do
     {
         do
         {
@@ -222,23 +187,15 @@ struct ByKey(T)
     }
 
     @property ref inout(Key) front() inout
-    in
+    in (!empty)
-    {
+    in (this.dataRange.front.status == BucketStatus.used)
-        assert(!empty);
-        assert(this.dataRange.front.status == BucketStatus.used);
-    }
-    do
     {
         return this.dataRange.front.key;
     }
 
     @property ref inout(Key) back() inout
-    in
+    in (!empty)
-    {
+    in (this.dataRange.back.status == BucketStatus.used)
-        assert(!empty);
-        assert(this.dataRange.back.status == BucketStatus.used);
-    }
-    do
     {
         return this.dataRange.back.key;
     }
@@ -299,16 +256,9 @@ struct ByValue(T)
     }
 
     @property void popFront()
-    in
+    in (!empty)
-    {
+    in (this.dataRange.front.status == BucketStatus.used)
-        assert(!empty);
+    out (; empty || this.dataRange.back.status == BucketStatus.used)
-        assert(this.dataRange.front.status == BucketStatus.used);
-    }
-    out
-    {
-        assert(empty || this.dataRange.back.status == BucketStatus.used);
-    }
-    do
     {
         do
         {
@@ -318,16 +268,9 @@ struct ByValue(T)
     }
 
     @property void popBack()
-    in
+    in (!empty)
-    {
+    in (this.dataRange.back.status == BucketStatus.used)
-        assert(!empty);
+    out (; empty || this.dataRange.back.status == BucketStatus.used)
-        assert(this.dataRange.back.status == BucketStatus.used);
-    }
-    out
-    {
-        assert(empty || this.dataRange.back.status == BucketStatus.used);
-    }
-    do
     {
         do
         {
@@ -337,23 +280,15 @@ struct ByValue(T)
     }
 
     @property ref inout(Value) front() inout
-    in
+    in (!empty)
-    {
+    in (this.dataRange.front.status == BucketStatus.used)
-        assert(!empty);
-        assert(this.dataRange.front.status == BucketStatus.used);
-    }
-    do
     {
         return this.dataRange.front.kv.value;
     }
 
     @property ref inout(Value) back() inout
-    in
+    in (!empty)
-    {
+    in (this.dataRange.back.status == BucketStatus.used)
-        assert(!empty);
-        assert(this.dataRange.back.status == BucketStatus.used);
-    }
-    do
     {
         return this.dataRange.back.kv.value;
     }
@@ -386,7 +321,7 @@ struct ByValue(T)
  *  hasher = Hash function for $(D_PARAM Key).
  */
 struct HashTable(Key, Value, alias hasher = hash)
-if (is(typeof(((Key k) => hasher(k))(Key.init)) == size_t))
+if (isHashFunction!(hasher, Key))
 {
     private alias HashArray = .HashArray!(hasher, Key, Value);
     private alias Buckets = HashArray.Buckets;
@@ -411,10 +346,7 @@ if (is(typeof(((Key k) => hasher(k))(Key.init)) == size_t))
     /// ditto
     alias ConstByValue = .ByValue!(const HashArray);
 
-    invariant
+    invariant (this.data.lengthIndex < primes.length);
-    {
-        assert(this.data.lengthIndex < primes.length);
-    }
 
     /**
      * Constructor.
@@ -426,11 +358,7 @@ if (is(typeof(((Key k) => hasher(k))(Key.init)) == size_t))
      * Precondition: $(D_INLINECODE allocator !is null).
      */
     this(size_t n, shared Allocator allocator = defaultAllocator)
-    in
+    in (allocator !is null)
-    {
-        assert(allocator !is null);
-    }
-    do
     {
         this(allocator);
         this.data.rehash(n);
@@ -445,11 +373,7 @@ if (is(typeof(((Key k) => hasher(k))(Key.init)) == size_t))
 
     /// ditto
     this(shared Allocator allocator)
-    in
+    in (allocator !is null)
-    {
-        assert(allocator !is null);
-    }
-    do
     {
         this.data = HashArray(allocator);
     }
@@ -469,11 +393,7 @@ if (is(typeof(((Key k) => hasher(k))(Key.init)) == size_t))
      */
     this(S)(ref S init, shared Allocator allocator = defaultAllocator)
     if (is(Unqual!S == HashTable))
-    in
+    in (allocator !is null)
-    {
-        assert(allocator !is null);
-    }
-    do
     {
         this.data = HashArray(init.data, allocator);
     }
@@ -481,11 +401,7 @@ if (is(typeof(((Key k) => hasher(k))(Key.init)) == size_t))
     /// ditto
     this(S)(S init, shared Allocator allocator = defaultAllocator)
     if (is(S == HashTable))
-    in
+    in (allocator !is null)
-    {
-        assert(allocator !is null);
-    }
-    do
     {
         this.data.move(init.data, allocator);
     }
@@ -502,11 +418,7 @@ if (is(typeof(((Key k) => hasher(k))(Key.init)) == size_t))
      */
     this(R)(R range, shared Allocator allocator = defaultAllocator)
     if (isForwardRange!R && is(ElementType!R == KeyValue))
-    in
+    in (allocator !is null)
-    {
-        assert(allocator !is null);
-    }
-    do
     {
         this(allocator);
         insert(range);
@@ -536,11 +448,7 @@ if (is(typeof(((Key k) => hasher(k))(Key.init)) == size_t))
      */
     this(size_t n)(KeyValue[n] array,
          shared Allocator allocator = defaultAllocator)
-    in
+    in (allocator !is null)
-    {
-        assert(allocator !is null);
-    }
-    do
     {
         insert(array[]);
     }
@@ -588,11 +496,7 @@ if (is(typeof(((Key k) => hasher(k))(Key.init)) == size_t))
      * Postcondition: $(D_INLINECODE allocator !is null)
      */
     @property shared(Allocator) allocator() const
-    out (allocator)
+    out (allocator; allocator !is null)
-    {
-        assert(allocator !is null);
-    }
-    do
     {
         return this.data.array.allocator;
     }
@@ -759,7 +663,7 @@ if (is(typeof(((Key k) => hasher(k))(Key.init)) == size_t))
      *
      * Returns: The number of the inserted elements with a unique key.
      */
-    size_t insert(ref KeyValue keyValue)
+    size_t insert()(ref KeyValue keyValue)
     {
         auto e = ((ref v) @trusted => &this.data.insert(v))(keyValue.key);
         size_t inserted;
@@ -773,7 +677,7 @@ if (is(typeof(((Key k) => hasher(k))(Key.init)) == size_t))
     }
 
     /// ditto
-    size_t insert(KeyValue keyValue)
+    size_t insert()(KeyValue keyValue)
     {
         auto e = ((ref v) @trusted => &this.data.insert(v))(keyValue.key);
         size_t inserted;
@@ -1084,116 +988,3 @@ if (is(typeof(((Key k) => hasher(k))(Key.init)) == size_t))
     dinos.clear();
     assert(dinos.empty);
 }
-
-@nogc nothrow pure @safe unittest
-{
-    import tanya.range.primitive : isForwardRange;
-    static assert(is(HashTable!(string, int) a));
-    static assert(is(const HashTable!(string, int)));
-    static assert(isForwardRange!(HashTable!(string, int).Range));
-
-    static assert(is(HashTable!(int, int, (ref const int) => size_t.init)));
-    static assert(is(HashTable!(int, int, (int) => size_t.init)));
-}
-
-// Constructs by reference
-@nogc nothrow pure @safe unittest
-{
-    auto hashTable1 = HashTable!(string, int)(7);
-    auto hashTable2 = HashTable!(string, int)(hashTable1);
-    assert(hashTable1.length == hashTable2.length);
-    assert(hashTable1.capacity == hashTable2.capacity);
-}
-
-// Constructs by value
-@nogc nothrow pure @safe unittest
-{
-    auto hashTable = HashTable!(string, int)(HashTable!(string, int)(7));
-    assert(hashTable.capacity == 7);
-}
-
-// Assigns by reference
-@nogc nothrow pure @safe unittest
-{
-    auto hashTable1 = HashTable!(string, int)(7);
-    HashTable!(string, int) hashTable2;
-    hashTable1 = hashTable2;
-    assert(hashTable1.length == hashTable2.length);
-    assert(hashTable1.capacity == hashTable2.capacity);
-}
-
-// Assigns by value
-@nogc nothrow pure @safe unittest
-{
-    HashTable!(string, int) hashTable;
-    hashTable = HashTable!(string, int)(7);
-    assert(hashTable.capacity == 7);
-}
-
-// Postblit copies
-@nogc nothrow pure @safe unittest
-{
-    auto hashTable = HashTable!(string, int)(7);
-    void testFunc(HashTable!(string, int) hashTable)
-    {
-        assert(hashTable.capacity == 7);
-    }
-    testFunc(hashTable);
-}
-
-// Issue 53: https://github.com/caraus-ecms/tanya/issues/53
-@nogc nothrow pure @safe unittest
-{
-    {
-        HashTable!(uint, uint) hashTable;
-        foreach (uint i; 0 .. 14)
-        {
-            hashTable[i + 1] = i;
-        }
-        assert(hashTable.length == 14);
-    }
-    {
-        HashTable!(int, int) hashtable;
-
-        hashtable[1194250162] = 3;
-        hashtable[-1131293824] = 6;
-        hashtable[838100082] = 9;
-
-        hashtable.rehash(11);
-
-        assert(hashtable[-1131293824] == 6);
-    }
-}
-
-@nogc nothrow pure @safe unittest
-{
-    static struct String
-    {
-        bool opEquals(string) const @nogc nothrow pure @safe
-        {
-            return true;
-        }
-
-        bool opEquals(ref const string) const @nogc nothrow pure @safe
-        {
-            return true;
-        }
-
-        bool opEquals(String) const @nogc nothrow pure @safe
-        {
-            return true;
-        }
-
-        bool opEquals(ref const String) const @nogc nothrow pure @safe
-        {
-            return true;
-        }
-
-        size_t toHash() const @nogc nothrow pure @safe
-        {
-            return 0;
-        }
-    }
-    static assert(is(typeof("asdf" in HashTable!(String, int)())));
-    static assert(is(typeof(HashTable!(String, int)()["asdf"])));
-}

source/tanya/container/list.d

@@ -6,7 +6,7 @@
  * This module contains singly-linked ($(D_PSYMBOL SList)) and doubly-linked
  * ($(D_PSYMBOL DList)) lists.
  *
- * Copyright: Eugene Wissner 2016-2018.
+ * Copyright: Eugene Wissner 2016-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@@ -15,11 +15,10 @@
  */
 module tanya.container.list;
 
-import std.algorithm.searching;
 import tanya.algorithm.comparison;
-import tanya.algorithm.mutation;
 import tanya.container.entry;
-import tanya.memory;
+import tanya.memory.allocator;
+import tanya.memory.lifetime;
 import tanya.meta.trait;
 import tanya.meta.transform;
 import tanya.range.array;
@@ -38,10 +37,7 @@ struct SRange(L)
 
     private EntryPointer* head;
 
-    invariant
+    invariant (this.head !is null);
-    {
-        assert(this.head !is null);
-    }
 
     private this(ref EntryPointer head) @trusted
     {
@@ -61,21 +57,13 @@ struct SRange(L)
     }
 
     @property ref inout(E) front() inout
-    in
+    in (!empty)
-    {
-        assert(!empty);
-    }
-    do
     {
         return (*this.head).content;
     }
 
     void popFront() @trusted
-    in
+    in (!empty)
-    {
-        assert(!empty);
-    }
-    do
     {
         this.head = &(*this.head).next;
     }
@@ -156,8 +144,9 @@ struct SList(T)
      *  init      = Initial value to fill the list with.
      *  allocator = Allocator.
      */
-    this(size_t len, T init, shared Allocator allocator = defaultAllocator)
+    this()(size_t len,
-    @trusted
+           auto ref T init,
+           shared Allocator allocator = defaultAllocator)
     {
         this(allocator);
         if (len == 0)
@@ -183,7 +172,18 @@ struct SList(T)
     /// ditto
     this(size_t len, shared Allocator allocator = defaultAllocator)
     {
-        this(len, T.init, allocator);
+        this(allocator);
+        if (len == 0)
+        {
+            return;
+        }
+
+        Entry* next = this.head = allocator.make!Entry();
+        foreach (i; 1 .. len)
+        {
+            next.next = allocator.make!Entry();
+            next = next.next;
+        }
     }
 
     ///
@@ -195,11 +195,7 @@ struct SList(T)
 
     /// ditto
     this(shared Allocator allocator)
-    in
+    in (allocator !is null)
-    {
-        assert(allocator !is null);
-    }
-    do
     {
         this.allocator_ = allocator;
     }
@@ -272,15 +268,19 @@ struct SList(T)
         clear();
     }
 
-    /**
+    static if (isCopyable!T)
-     * Copies the list.
+    {
-     */
         this(this)
         {
             auto list = typeof(this)(this[], this.allocator);
             this.head = list.head;
             list.head = null;
         }
+    }
+    else
+    {
+        @disable this(this);
+    }
 
     ///
     @nogc nothrow pure @safe unittest
@@ -317,11 +317,7 @@ struct SList(T)
      * Precondition: $(D_INLINECODE !empty).
      */
     @property ref inout(T) front() inout
-    in
+    in (!empty)
-    {
-        assert(!empty);
-    }
-    do
     {
         return this.head.content;
     }
@@ -462,11 +458,7 @@ struct SList(T)
      */
     size_t insertBefore(R)(Range r, R el)
     if (isImplicitlyConvertible!(R, T))
-    in
+    in (checkRangeBelonging(r))
-    {
-        assert(checkRangeBelonging(r));
-    }
-    do
     {
         return moveEntry(*r.head, el);
     }
@@ -485,11 +477,7 @@ struct SList(T)
     if (!isInfinite!R
      && isInputRange!R
      && isImplicitlyConvertible!(ElementType!R, T))
-    in
+    in (checkRangeBelonging(r))
-    {
-        assert(checkRangeBelonging(r));
-    }
-    do
     {
         size_t inserted;
         foreach (e; el)
@@ -513,12 +501,8 @@ struct SList(T)
     }
 
     /// ditto
-    size_t insertBefore(Range r, ref T el) @trusted
+    size_t insertBefore()(Range r, ref T el) @trusted
-    in
+    in (checkRangeBelonging(r))
-    {
-        assert(checkRangeBelonging(r));
-    }
-    do
     {
         *r.head = allocator.make!Entry(el, *r.head);
         return 1;
@@ -614,11 +598,7 @@ struct SList(T)
      * Precondition: $(D_INLINECODE !empty)
      */
     void removeFront()
-    in
+    in (!empty)
-    {
-        assert(!empty);
-    }
-    do
     {
         auto n = this.head.next;
 
@@ -653,11 +633,7 @@ struct SList(T)
      * Returns: The number of elements removed.
      */
     size_t removeFront(size_t howMany)
-    out (removed)
+    out (removed; removed <= howMany)
-    {
-        assert(removed <= howMany);
-    }
-    do
     {
         size_t i;
         for (; i < howMany && !empty; ++i)
@@ -689,11 +665,7 @@ struct SList(T)
      * Precondition: $(D_PARAM r) is extracted from this list.
      */
     Range remove(Range r)
-    in
+    in (checkRangeBelonging(r))
-    {
-        assert(checkRangeBelonging(r));
-    }
-    do
     {
         auto outOfScopeList = typeof(this)(allocator);
         outOfScopeList.head = *r.head;
@@ -727,12 +699,8 @@ struct SList(T)
      *               $(D_PARAM range) is extracted from this list.
      */
     Range popFirstOf(Range range)
-    in
+    in (!range.empty)
-    {
+    in (checkRangeBelonging(range))
-        assert(!range.empty);
-        assert(checkRangeBelonging(range));
-    }
-    do
     {
         auto next = (*range.head).next;
 
@@ -908,46 +876,6 @@ struct SList(T)
     assert(i == 3);
 }
 
-@nogc nothrow pure @safe unittest
-{
-    interface Stuff
-    {
-    }
-    static assert(is(SList!Stuff));
-}
-
-@nogc nothrow pure @safe unittest
-{
-    auto l = SList!int(0, 0);
-    assert(l.empty);
-}
-
-// foreach called using opIndex().
-@nogc nothrow pure @safe unittest
-{
-    SList!int l;
-    size_t i;
-
-    l.insertFront(5);
-    l.insertFront(4);
-    l.insertFront(9);
-    foreach (e; l)
-    {
-        assert(i != 0 || e == 9);
-        assert(i != 1 || e == 4);
-        assert(i != 2 || e == 5);
-        ++i;
-    }
-}
-
-@nogc nothrow pure @safe unittest
-{
-    auto l1 = SList!int();
-    auto l2 = SList!int([9, 4]);
-    l1 = l2[];
-    assert(l1 == l2);
-}
-
 /**
  * Bidirectional range for the $(D_PSYMBOL DList).
  *
@@ -962,11 +890,8 @@ struct DRange(L)
     private EntryPointer* head;
     private EntryPointer* tail;
 
-    invariant
+    invariant (this.head !is null);
-    {
+    invariant (this.tail !is null);
-        assert(this.head !is null);
-        assert(this.tail !is null);
-    }
 
     private this(ref EntryPointer head, ref EntryPointer tail) @trusted
     {
@@ -987,41 +912,25 @@ struct DRange(L)
     }
 
     @property ref inout(E) front() inout
-    in
+    in (!empty)
-    {
-        assert(!empty);
-    }
-    do
     {
         return (*this.head).content;
     }
 
     @property ref inout(E) back() inout
-    in
+    in (!empty)
-    {
-        assert(!empty);
-    }
-    do
     {
         return (*this.tail).content;
     }
 
     void popFront() @trusted
-    in
+    in (!empty)
-    {
-        assert(!empty);
-    }
-    do
     {
         this.head = &(*this.head).next;
     }
 
     void popBack() @trusted
-    in
+    in (!empty)
-    {
-        assert(!empty);
-    }
-    do
     {
         this.tail = &(*this.tail).prev;
     }
@@ -1067,13 +976,10 @@ struct DList(T)
     // 0th and the last elements of the list.
     private Entry* head, tail;
 
-    invariant
+    invariant ((this.tail is null && this.head is null)
-    {
-        assert((this.tail is null && this.head is null)
             || (this.tail !is null && this.head !is null));
-        assert(this.tail is null || this.tail.next is null);
+    invariant (this.tail is null || this.tail.next is null);
-        assert(this.head is null || this.head.prev is null);
+    invariant (this.head is null || this.head.prev is null);
-    }
 
     /**
      * Creates a new $(D_PSYMBOL DList) with the elements from a static array.
@@ -1121,8 +1027,9 @@ struct DList(T)
      *  init      = Initial value to fill the list with.
      *  allocator = Allocator.
      */
-    this(size_t len, T init, shared Allocator allocator = defaultAllocator)
+    this()(size_t len,
-    @trusted
+           auto ref T init,
+           shared Allocator allocator = defaultAllocator)
     {
         this(allocator);
         if (len == 0)
@@ -1151,7 +1058,20 @@ struct DList(T)
     /// ditto
     this(size_t len, shared Allocator allocator = defaultAllocator)
     {
-        this(len, T.init, allocator);
+        this(allocator);
+        if (len == 0)
+        {
+            return;
+        }
+
+        Entry* next = this.head = allocator.make!Entry();
+        foreach (i; 1 .. len)
+        {
+            next.next = allocator.make!Entry();
+            next.next.prev = next;
+            next = next.next;
+        }
+        this.tail = next;
     }
 
     ///
@@ -1163,11 +1083,7 @@ struct DList(T)
 
     /// ditto
     this(shared Allocator allocator)
-    in
+    in (allocator !is null)
-    {
-        assert(allocator !is null);
-    }
-    do
     {
         this.allocator_ = allocator;
     }
@@ -1243,9 +1159,8 @@ struct DList(T)
         clear();
     }
 
-    /**
+    static if (isCopyable!T)
-     * Copies the list.
+    {
-     */
         this(this)
         {
             auto list = typeof(this)(this[], this.allocator);
@@ -1253,6 +1168,11 @@ struct DList(T)
             this.tail = list.tail;
             list.head = list .tail = null;
         }
+    }
+    else
+    {
+        @disable this(this);
+    }
 
     ///
     @nogc nothrow pure @safe unittest
@@ -1289,11 +1209,7 @@ struct DList(T)
      * Precondition: $(D_INLINECODE !empty).
      */
     @property ref inout(T) front() inout
-    in
+    in (!empty)
-    {
-        assert(!empty);
-    }
-    do
     {
         return this.head.content;
     }
@@ -1304,11 +1220,7 @@ struct DList(T)
      * Precondition: $(D_INLINECODE !empty).
      */
     @property ref inout(T) back() inout
-    in
+    in (!empty)
-    {
-        assert(!empty);
-    }
-    do
     {
         return this.tail.content;
     }
@@ -1623,11 +1535,7 @@ struct DList(T)
      */
     size_t insertBefore(R)(Range r, R el)
     if (isImplicitlyConvertible!(R, T))
-    in
+    in (checkRangeBelonging(r))
-    {
-        assert(checkRangeBelonging(r));
-    }
-    do
     {
         return moveFront(*r.head, el);
     }
@@ -1642,12 +1550,8 @@ struct DList(T)
     }
 
     /// ditto
-    size_t insertBefore(Range r, ref T el) @trusted
+    size_t insertBefore()(Range r, ref T el) @trusted
-    in
+    in (checkRangeBelonging(r))
-    {
-        assert(checkRangeBelonging(r));
-    }
-    do
     {
         auto temp = allocator.make!Entry(el, *r.head);
 
@@ -1681,11 +1585,7 @@ struct DList(T)
     if (!isInfinite!R
      && isInputRange!R
      && isImplicitlyConvertible!(ElementType!R, T))
-    in
+    in (checkRangeBelonging(r))
-    {
-        assert(checkRangeBelonging(r));
-    }
-    do
     {
         size_t inserted;
         foreach (e; el)
@@ -1738,11 +1638,7 @@ struct DList(T)
      */
     size_t insertAfter(R)(Range r, R el) @trusted
     if (isImplicitlyConvertible!(R, T))
-    in
+    in (checkRangeBelonging(r))
-    {
-        assert(checkRangeBelonging(r));
-    }
-    do
     {
         return moveBack(*r.tail, el);
     }
@@ -1759,12 +1655,8 @@ struct DList(T)
     }
 
     /// ditto
-    size_t insertAfter(Range r, ref T el) @trusted
+    size_t insertAfter()(Range r, ref T el) @trusted
-    in
+    in (checkRangeBelonging(r))
-    {
-        assert(checkRangeBelonging(r));
-    }
-    do
     {
         auto temp = allocator.make!Entry(el, null, *r.tail);
 
@@ -1798,11 +1690,7 @@ struct DList(T)
     if (!isInfinite!R
      && isInputRange!R
      && isImplicitlyConvertible!(ElementType!R, T))
-    in
+    in (checkRangeBelonging(r))
-    {
-        assert(checkRangeBelonging(r));
-    }
-    do
     {
         size_t inserted;
         foreach (e; el)
@@ -1893,11 +1781,7 @@ struct DList(T)
      * Precondition: $(D_INLINECODE !empty)
      */
     void removeFront()
-    in
+    in (!empty)
-    {
-        assert(!empty);
-    }
-    do
     {
         auto n = this.head.next;
 
@@ -1929,11 +1813,7 @@ struct DList(T)
 
     /// ditto
     void removeBack()
-    in
+    in (!empty)
-    {
-        assert(!empty);
-    }
-    do
     {
         auto n = this.tail.prev;
 
@@ -1975,11 +1855,7 @@ struct DList(T)
      * Returns: The number of elements removed.
      */
     size_t removeFront(size_t howMany)
-    out (removed)
+    out (removed; removed <= howMany)
-    {
-        assert(removed <= howMany);
-    }
-    do
     {
         size_t i;
         for (; i < howMany && !empty; ++i)
@@ -2002,11 +1878,7 @@ struct DList(T)
 
     /// ditto
     size_t removeBack(size_t howMany)
-    out (removed)
+    out (removed; removed <= howMany)
-    {
-        assert(removed <= howMany);
-    }
-    do
     {
         size_t i;
         for (; i < howMany && !empty; ++i)
@@ -2038,11 +1910,7 @@ struct DList(T)
      * Precondition: $(D_PARAM r) is extracted from this list.
      */
     Range remove(Range r)
-    in
+    in (checkRangeBelonging(r))
-    {
-        assert(checkRangeBelonging(r));
-    }
-    do
     {
         // Save references to the elements before and after the range.
         Entry* headPrev;
@@ -2114,11 +1982,7 @@ struct DList(T)
      *               $(D_PARAM range) is extracted from this list.
      */
     Range popFirstOf(Range range)
-    in
+    in (!range.empty)
-    {
-        assert(!range.empty);
-    }
-    do
     {
         remove(Range(*range.head, *range.head));
         return range;
@@ -2126,11 +1990,7 @@ struct DList(T)
 
     /// ditto
     Range popLastOf(Range range)
-    in
+    in (!range.empty)
-    {
-        assert(!range.empty);
-    }
-    do
     {
         remove(Range(*range.tail, *range.tail));
         return range;
@@ -2284,75 +2144,3 @@ struct DList(T)
     }
     assert(i == 3);
 }
-
-@nogc nothrow pure @safe unittest
-{
-    class A
-    {
-    }
-    static assert(is(SList!(A*)));
-    static assert(is(DList!(A*)));
-}
-
-// Removes all elements
-@nogc nothrow pure @safe unittest
-{
-    auto l = DList!int([5]);
-    assert(l.remove(l[]).empty);
-}
-
-@nogc nothrow pure @safe unittest
-{
-    auto l1 = DList!int([5, 234, 30, 1]);
-    auto l2 = DList!int([5, 1]);
-    auto r = l1[];
-
-    r.popFront();
-    r.popBack();
-    assert(r.front == 234);
-    assert(r.back == 30);
-
-    assert(!l1.remove(r).empty);
-    assert(l1 == l2);
-}
-
-@nogc nothrow pure @safe unittest
-{
-    auto l = DList!int(0, 0);
-    assert(l.empty);
-}
-
-@nogc nothrow pure @safe unittest
-{
-    auto l1 = DList!int([5, 234]);
-    assert(l1.head is l1.head.next.prev);
-}
-
-@nogc nothrow pure @safe unittest
-{
-    DList!int l;
-    l.insertAfter(l[], 234);
-    assert(l.front == 234);
-    assert(l.back == 234);
-}
-
-@nogc nothrow pure @safe unittest
-{
-    auto l1 = DList!int();
-    auto l2 = DList!int([9, 4]);
-    l1 = l2[];
-    assert(l1 == l2);
-}
-
-// Sets the new head
-@nogc nothrow pure @safe unittest
-{
-    auto l1 = DList!int([5, 234, 30, 1]);
-    auto l2 = DList!int([1]);
-    auto r = l1[];
-
-    r.popBack();
-
-    assert(!l1.remove(r).empty);
-    assert(l1 == l2);
-}

source/tanya/container/package.d

@@ -5,7 +5,7 @@
 /**
  * Abstract data types whose instances are collections of other objects.
  *
- * Copyright: Eugene Wissner 2016-2018.
+ * Copyright: Eugene Wissner 2016-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)

source/tanya/container/set.d

@@ -6,7 +6,7 @@
  * This module implements a $(D_PSYMBOL Set) container that stores unique
  * values without any particular order.
  *
- * Copyright: Eugene Wissner 2017-2018.
+ * Copyright: Eugene Wissner 2017-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@@ -18,7 +18,8 @@ module tanya.container.set;
 import tanya.container.array;
 import tanya.container.entry;
 import tanya.hash.lookup;
-import tanya.memory;
+import tanya.memory.allocator;
+import tanya.memory.lifetime;
 import tanya.meta.trait;
 import tanya.meta.transform;
 import tanya.range.primitive;
@@ -67,17 +68,10 @@ struct Range(T)
         return this.dataRange.empty();
     }
 
-    @property void popFront()
+    void popFront()
-    in
+    in (!empty)
-    {
+    in (this.dataRange.front.status == BucketStatus.used)
-        assert(!empty);
+    out (; empty || this.dataRange.back.status == BucketStatus.used)
-        assert(this.dataRange.front.status == BucketStatus.used);
-    }
-    out
-    {
-        assert(empty || this.dataRange.back.status == BucketStatus.used);
-    }
-    do
     {
         do
         {
@@ -86,17 +80,10 @@ struct Range(T)
         while (!empty && dataRange.front.status != BucketStatus.used);
     }
 
-    @property void popBack()
+    void popBack()
-    in
+    in (!empty)
-    {
+    in (this.dataRange.back.status == BucketStatus.used)
-        assert(!empty);
+    out (; empty || this.dataRange.back.status == BucketStatus.used)
-        assert(this.dataRange.back.status == BucketStatus.used);
-    }
-    out
-    {
-        assert(empty || this.dataRange.back.status == BucketStatus.used);
-    }
-    do
     {
         do
         {
@@ -106,23 +93,15 @@ struct Range(T)
     }
 
     @property ref inout(E) front() inout
-    in
+    in (!empty)
-    {
+    in (this.dataRange.front.status == BucketStatus.used)
-        assert(!empty);
-        assert(this.dataRange.front.status == BucketStatus.used);
-    }
-    do
     {
         return this.dataRange.front.key;
     }
 
     @property ref inout(E) back() inout
-    in
+    in (!empty)
-    {
+    in (this.dataRange.back.status == BucketStatus.used)
-        assert(!empty);
-        assert(this.dataRange.back.status == BucketStatus.used);
-    }
-    do
     {
         return this.dataRange.back.key;
     }
@@ -154,7 +133,7 @@ struct Range(T)
  *  hasher = Hash function for $(D_PARAM T).
  */
 struct Set(T, alias hasher = hash)
-if (is(typeof(((T x) => hasher(x))(T.init)) == size_t))
+if (isHashFunction!(hasher, T))
 {
     private alias HashArray = .HashArray!(hasher, T);
     private alias Buckets = HashArray.Buckets;
@@ -167,12 +146,9 @@ if (is(typeof(((T x) => hasher(x))(T.init)) == size_t))
     /// ditto
     alias ConstRange = .Range!(const HashArray);
 
-    invariant
+    invariant (this.data.lengthIndex < primes.length);
-    {
+    invariant (this.data.array.length == 0
-        assert(this.data.lengthIndex < primes.length);
-        assert(this.data.array.length == 0
             || this.data.array.length == primes[this.data.lengthIndex]);
-    }
 
     /**
      * Constructor.
@@ -184,11 +160,7 @@ if (is(typeof(((T x) => hasher(x))(T.init)) == size_t))
      * Precondition: $(D_INLINECODE allocator !is null).
      */
     this(size_t n, shared Allocator allocator = defaultAllocator)
-    in
+    in (allocator !is null)
-    {
-        assert(allocator !is null);
-    }
-    do
     {
         this(allocator);
         this.data.rehash(n);
@@ -203,11 +175,7 @@ if (is(typeof(((T x) => hasher(x))(T.init)) == size_t))
 
     /// ditto
     this(shared Allocator allocator)
-    in
+    in (allocator !is null)
-    {
-        assert(allocator !is null);
-    }
-    do
     {
         this.data = HashArray(allocator);
     }
@@ -227,11 +195,7 @@ if (is(typeof(((T x) => hasher(x))(T.init)) == size_t))
      */
     this(S)(ref S init, shared Allocator allocator = defaultAllocator)
     if (is(Unqual!S == Set))
-    in
+    in (allocator !is null)
-    {
-        assert(allocator !is null);
-    }
-    do
     {
         this.data = HashArray(init.data, allocator);
     }
@@ -239,11 +203,7 @@ if (is(typeof(((T x) => hasher(x))(T.init)) == size_t))
     /// ditto
     this(S)(S init, shared Allocator allocator = defaultAllocator)
     if (is(S == Set))
-    in
+    in (allocator !is null)
-    {
-        assert(allocator !is null);
-    }
-    do
     {
         this.data.move(init.data, allocator);
     }
@@ -260,11 +220,7 @@ if (is(typeof(((T x) => hasher(x))(T.init)) == size_t))
      */
     this(R)(R range, shared Allocator allocator = defaultAllocator)
     if (isForwardRange!R && isImplicitlyConvertible!(ElementType!R, T))
-    in
+    in (allocator !is null)
-    {
-        assert(allocator !is null);
-    }
-    do
     {
         insert(range);
     }
@@ -290,11 +246,7 @@ if (is(typeof(((T x) => hasher(x))(T.init)) == size_t))
      * Precondition: $(D_INLINECODE allocator !is null).
      */
     this(size_t n)(T[n] array, shared Allocator allocator = defaultAllocator)
-    in
+    in (allocator !is null)
-    {
-        assert(allocator !is null);
-    }
-    do
     {
         insert(array[]);
     }
@@ -341,11 +293,7 @@ if (is(typeof(((T x) => hasher(x))(T.init)) == size_t))
      * Postcondition: $(D_INLINECODE allocator !is null)
      */
     @property shared(Allocator) allocator() const
-    out (allocator)
+    out (allocator; allocator !is null)
-    {
-        assert(allocator !is null);
-    }
-    do
     {
         return this.data.array.allocator;
     }
@@ -459,7 +407,7 @@ if (is(typeof(((T x) => hasher(x))(T.init)) == size_t))
      *
      * Returns: Amount of new elements inserted.
      */
-    size_t insert(ref T value)
+    size_t insert()(ref T value)
     {
         auto e = ((ref v) @trusted => &this.data.insert(v))(value);
         if (e.status != BucketStatus.used)
@@ -470,7 +418,7 @@ if (is(typeof(((T x) => hasher(x))(T.init)) == size_t))
         return 0;
     }
 
-    size_t insert(T value)
+    size_t insert()(T value)
     {
         auto e = ((ref v) @trusted => &this.data.insert(v))(value);
         if (e.status != BucketStatus.used)
@@ -637,139 +585,3 @@ if (is(typeof(((T x) => hasher(x))(T.init)) == size_t))
         assert(set[].back == 8);
     }
 }
-
-// Basic insertion logic.
-@nogc nothrow pure @safe unittest
-{
-    Set!int set;
-
-    assert(set.insert(5) == 1);
-    assert(5 in set);
-    assert(set.data.array.length == 3);
-
-    assert(set.insert(5) == 0);
-    assert(5 in set);
-    assert(set.data.array.length == 3);
-
-    assert(set.insert(9) == 1);
-    assert(9 in set);
-    assert(5 in set);
-    assert(set.data.array.length == 3);
-
-    assert(set.insert(7) == 1);
-    assert(set.insert(8) == 1);
-    assert(8 in set);
-    assert(5 in set);
-    assert(9 in set);
-    assert(7 in set);
-    assert(set.data.array.length == 7);
-
-    assert(set.insert(16) == 1);
-    assert(16 in set);
-    assert(set.data.array.length == 7);
-}
-
-// Static checks.
-@nogc nothrow pure @safe unittest
-{
-    import tanya.range.primitive;
-
-    static assert(isBidirectionalRange!(Set!int.ConstRange));
-    static assert(isBidirectionalRange!(Set!int.Range));
-
-    static assert(!isInfinite!(Set!int.Range));
-    static assert(!hasLength!(Set!int.Range));
-
-    static assert(is(Set!uint));
-    static assert(is(Set!long));
-    static assert(is(Set!ulong));
-    static assert(is(Set!short));
-    static assert(is(Set!ushort));
-    static assert(is(Set!bool));
-}
-
-@nogc nothrow pure @safe unittest
-{
-    const Set!int set;
-    assert(set[].empty);
-}
-
-@nogc nothrow pure @safe unittest
-{
-    Set!int set;
-    set.insert(8);
-
-    auto r1 = set[];
-    auto r2 = r1.save();
-
-    r1.popFront();
-    assert(r1.empty);
-
-    r2.popBack();
-    assert(r2.empty);
-}
-
-// Initial capacity is 0.
-@nogc nothrow pure @safe unittest
-{
-    auto set = Set!int(defaultAllocator);
-    assert(set.capacity == 0);
-}
-
-// Capacity is set to a prime.
-@nogc nothrow pure @safe unittest
-{
-    auto set = Set!int(8);
-    assert(set.capacity == 13);
-}
-
-// Constructs by reference
-@nogc nothrow pure @safe unittest
-{
-    auto set1 = Set!int(7);
-    auto set2 = Set!int(set1);
-    assert(set1.length == set2.length);
-    assert(set1.capacity == set2.capacity);
-}
-
-// Constructs by value
-@nogc nothrow pure @safe unittest
-{
-    auto set = Set!int(Set!int(7));
-    assert(set.capacity == 7);
-}
-
-// Assigns by reference
-@nogc nothrow pure @safe unittest
-{
-    auto set1 = Set!int(7);
-    Set!int set2;
-    set1 = set2;
-    assert(set1.length == set2.length);
-    assert(set1.capacity == set2.capacity);
-}
-
-// Assigns by value
-@nogc nothrow pure @safe unittest
-{
-    Set!int set;
-    set = Set!int(7);
-    assert(set.capacity == 7);
-}
-
-// Postblit copies
-@nogc nothrow pure @safe unittest
-{
-    auto set = Set!int(7);
-    void testFunc(Set!int set)
-    {
-        assert(set.capacity == 7);
-    }
-    testFunc(set);
-}
-
-@nogc nothrow pure @safe unittest
-{
-    // Using hasher that takes argument by ref.
-    Set!(int, (const ref x) => cast(size_t)x) set;
-}

source/tanya/container/string.d

@@ -17,7 +17,7 @@
  * Internally $(D_PSYMBOL String) is represented by a sequence of
  * $(D_KEYWORD char)s.
  *
- * Copyright: Eugene Wissner 2017-2018.
+ * Copyright: Eugene Wissner 2017-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@@ -26,23 +26,16 @@
  */
 module tanya.container.string;
 
-import std.algorithm.comparison : cmp;
-import std.algorithm.mutation : bringToFront;
-import std.algorithm.searching;
 import tanya.algorithm.comparison;
 import tanya.algorithm.mutation;
 import tanya.hash.lookup;
-import tanya.memory;
+import tanya.memory.allocator;
+import tanya.memory.lifetime;
 import tanya.meta.trait;
 import tanya.meta.transform;
 import tanya.range.array;
 import tanya.range.primitive;
 
-version (unittest)
-{
-    import tanya.test.assertion;
-}
-
 /**
  * Thrown on encoding errors.
  */
@@ -77,22 +70,15 @@ if (is(Unqual!E == char))
     private alias ContainerType = CopyConstness!(E, String);
     private ContainerType* container;
 
-    invariant
+    invariant (this.begin <= this.end);
-    {
+    invariant (this.container !is null);
-        assert(this.begin <= this.end);
+    invariant (this.begin >= this.container.data);
-        assert(this.container !is null);
+    invariant (this.end <= this.container.data + this.container.length);
-        assert(this.begin >= this.container.data);
-        assert(this.end <= this.container.data + this.container.length);
-    }
 
     private this(ref ContainerType container, E* begin, E* end) @trusted
-    in
+    in (begin <= end)
-    {
+    in (begin >= container.data)
-        assert(begin <= end);
+    in (end <= container.data + container.length)
-        assert(begin >= container.data);
-        assert(end <= container.data + container.length);
-    }
-    do
     {
         this.container = &container;
         this.begin = begin;
@@ -119,51 +105,31 @@ if (is(Unqual!E == char))
     alias opDollar = length;
 
     @property ref inout(E) front() inout
-    in
+    in (!empty)
-    {
-        assert(!empty);
-    }
-    do
     {
         return *this.begin;
     }
 
     @property ref inout(E) back() inout @trusted
-    in
+    in (!empty)
-    {
-        assert(!empty);
-    }
-    do
     {
         return *(this.end - 1);
     }
 
     void popFront() @trusted
-    in
+    in (!empty)
-    {
-        assert(!empty);
-    }
-    do
     {
         ++this.begin;
     }
 
     void popBack() @trusted
-    in
+    in (!empty)
-    {
-        assert(!empty);
-    }
-    do
     {
         --this.end;
     }
 
     ref inout(E) opIndex(const size_t i) inout @trusted
-    in
+    in (i < length)
-    {
-        assert(i < length);
-    }
-    do
     {
         return *(this.begin + i);
     }
@@ -179,23 +145,15 @@ if (is(Unqual!E == char))
     }
 
     ByCodeUnit opSlice(const size_t i, const size_t j) @trusted
-    in
+    in (i <= j)
-    {
+    in (j <= length)
-        assert(i <= j);
-        assert(j <= length);
-    }
-    do
     {
         return typeof(return)(*this.container, this.begin + i, this.begin + j);
     }
 
     ByCodeUnit!(const E) opSlice(const size_t i, const size_t j) const @trusted
-    in
+    in (i <= j)
-    {
+    in (j <= length)
-        assert(i <= j);
-        assert(j <= length);
-    }
-    do
     {
         return typeof(return)(*this.container, this.begin + i, this.begin + j);
     }
@@ -219,22 +177,15 @@ if (is(Unqual!E == char))
     private alias ContainerType = CopyConstness!(E, String);
     private ContainerType* container;
 
-    invariant
+    invariant (this.begin <= this.end);
-    {
+    invariant (this.container !is null);
-        assert(this.begin <= this.end);
+    invariant (this.begin >= this.container.data);
-        assert(this.container !is null);
+    invariant (this.end <= this.container.data + this.container.length);
-        assert(this.begin >= this.container.data);
-        assert(this.end <= this.container.data + this.container.length);
-    }
 
     private this(ref ContainerType container, E* begin, E* end) @trusted
-    in
+    in (begin <= end)
-    {
+    in (begin >= container.data)
-        assert(begin <= end);
+    in (end <= container.data + container.length)
-        assert(begin >= container.data);
-        assert(end <= container.data + container.length);
-    }
-    do
     {
         this.container = &container;
         this.begin = begin;
@@ -254,15 +205,8 @@ if (is(Unqual!E == char))
     }
 
     @property dchar front() const @trusted
-    in
+    in (!empty)
-    {
+    out (chr; chr < 0xd800 || chr > 0xdfff)
-        assert(!empty);
-    }
-    out (chr)
-    {
-        assert(chr < 0xd800 || chr > 0xdfff);
-    }
-    do
     {
         dchar chr;
         ubyte units;
@@ -292,11 +236,7 @@ if (is(Unqual!E == char))
     }
 
     void popFront() @trusted
-    in
+    in (!empty)
-    {
-        assert(!empty);
-    }
-    do
     {
         ubyte units;
         if ((*begin & 0xf0) == 0xf0)
@@ -342,10 +282,7 @@ struct String
     private char* data;
     private size_t capacity_;
 
-    pure nothrow @safe @nogc invariant
+    @nogc nothrow pure @safe invariant (this.length_ <= this.capacity_);
-    {
-        assert(this.length_ <= this.capacity_);
-    }
 
     /**
      * Constructs the string from a stringish range.
@@ -435,11 +372,7 @@ struct String
 
     /// ditto
     this(shared Allocator allocator) @nogc nothrow pure @safe
-    in
+    in (allocator !is null)
-    {
-        assert(allocator !is null);
-    }
-    do
     {
         this.allocator_ = allocator;
     }
@@ -500,12 +433,6 @@ struct String
         }
     }
 
-    @nogc nothrow pure @safe unittest
-    {
-        auto s = String(0, 'K');
-        assert(s.length == 0);
-    }
-
     this(this) @nogc nothrow pure @trusted
     {
         auto buf = this.data[0 .. this.length_];
@@ -524,12 +451,8 @@ struct String
 
     private void write4Bytes(ref const dchar src)
     @nogc nothrow pure @trusted
-    in
+    in (capacity - length >= 4)
-    {
+    in (src - 0x10000 < 0x100000)
-        assert(capacity - length >= 4);
-        assert(src - 0x10000 < 0x100000);
-    }
-    do
     {
         auto dst = this.data + length;
 
@@ -543,11 +466,7 @@ struct String
 
     private size_t insertWideChar(C)(auto ref const C chr) @trusted
     if (is(C == wchar) || is(C == dchar))
-    in
+    in (capacity - length >= 3)
-    {
-        assert(capacity - length >= 3);
-    }
-    do
     {
         auto dst = this.data + length;
         if (chr < 0x80)
@@ -605,13 +524,6 @@ struct String
         return ret;
     }
 
-    // Allocates enough space for 3-byte character.
-    @nogc pure @safe unittest
-    {
-        String s;
-        s.insertBack('\u8100');
-    }
-
     /// ditto
     size_t insertBack(const dchar chr) @nogc pure @trusted
     {
@@ -633,12 +545,6 @@ struct String
         }
     }
 
-    @nogc pure @safe unittest
-    {
-        assertThrown!UTFException(() => String(1, cast(dchar) 0xd900));
-        assertThrown!UTFException(() => String(1, cast(wchar) 0xd900));
-    }
-
     /**
      * Inserts a stringish range at the end of the string.
      *
@@ -883,13 +789,9 @@ struct String
                                      const size_t i,
                                      const size_t j)
     if (is(Unqual!R == char))
-    in
+    in (i <= j)
-    {
+    in (j <= length)
-        assert(i <= j);
+    in (j - i == value.length)
-        assert(j <= length);
-        assert(j - i == value.length);
-    }
-    do
     {
         auto target = opSlice(i, j);
         copy(value, target);
@@ -901,12 +803,8 @@ struct String
                                   const size_t i,
                                   const size_t j)
     @nogc nothrow pure @trusted
-    in
+    in (i <= j)
-    {
+    in (j <= length)
-        assert(i <= j);
-        assert(j <= length);
-    }
-    do
     {
         copy(value[], this.data[i .. j]);
         return opSlice(i, j);
@@ -917,12 +815,8 @@ struct String
                                   const size_t i,
                                   const size_t j)
     @nogc nothrow pure @trusted
-    in
+    in (i <= j)
-    {
+    in (j <= length)
-        assert(i <= j);
-        assert(j <= length);
-    }
-    do
     {
         for (auto p = this.data + i; p < this.data + j; ++p)
         {
@@ -999,11 +893,7 @@ struct String
      * Precondition: $(D_INLINECODE length > pos).
      */
     ref inout(char) opIndex(const size_t pos) inout @nogc nothrow pure @trusted
-    in
+    in (length > pos)
-    {
-        assert(length > pos);
-    }
-    do
     {
         return *(this.data + pos);
     }
@@ -1148,12 +1038,8 @@ struct String
      */
     ByCodeUnit!char opSlice(const size_t i, const size_t j)
     @nogc nothrow pure @trusted
-    in
+    in (i <= j)
-    {
+    in (j <= length)
-        assert(i <= j);
-        assert(j <= length);
-    }
-    do
     {
         return typeof(return)(this, this.data + i, this.data + j);
     }
@@ -1161,12 +1047,8 @@ struct String
     /// ditto
     ByCodeUnit!(const char) opSlice(const size_t i, const size_t j)
     const @nogc nothrow pure @trusted
-    in
+    in (i <= j)
-    {
+    in (j <= length)
-        assert(i <= j);
-        assert(j <= length);
-    }
-    do
     {
         return typeof(return)(this, this.data + i, this.data + j);
     }
@@ -1284,14 +1166,14 @@ struct String
     int opCmp(S)(auto ref S that) const @trusted
     if (is(Unqual!S == String))
     {
-        return cmp(this.data[0 .. length], that.data[0 .. that.length]);
+        return compare(this.data[0 .. length], that.data[0 .. that.length]);
     }
 
     /// ditto
     int opCmp(S)(ByCodeUnit!S that) const @trusted
     if (is(Unqual!S == char))
     {
-        return cmp(this.data[0 .. length],
+        return compare(this.data[0 .. length],
                        that.begin[0 .. that.end - that.begin]);
     }
 
@@ -1299,14 +1181,14 @@ struct String
     int opCmp(S)(ByCodePoint!S that) const @trusted
     if (is(Unqual!S == char))
     {
-        return cmp(this.data[0 .. length],
+        return compare(this.data[0 .. length],
                        that.begin[0 .. that.end - that.begin]);
     }
 
     /// ditto
     int opCmp()(const char[] that) const @trusted
     {
-        return cmp(this.data[0 .. length], that);
+        return compare(this.data[0 .. length], that);
     }
 
     ///
@@ -1421,40 +1303,18 @@ struct String
         return opSliceAssign(value, 0, length);
     }
 
-    @nogc nothrow pure @safe unittest
-    {
-        auto s1 = String("Buttercup");
-        auto s2 = String("Cap");
-        s2[] = s1[6 .. $];
-        assert(s2 == "cup");
-    }
-
     /// ditto
     ByCodeUnit!char opIndexAssign(const char value) @nogc nothrow pure @safe
     {
         return opSliceAssign(value, 0, length);
     }
 
-    @nogc nothrow pure @safe unittest
-    {
-        auto s1 = String("Wow");
-        s1[] = 'a';
-        assert(s1 == "aaa");
-    }
-
     /// ditto
     ByCodeUnit!char opIndexAssign(const char[] value) @nogc nothrow pure @safe
     {
         return opSliceAssign(value, 0, length);
     }
 
-    @nogc nothrow pure @safe unittest
-    {
-        auto s1 = String("ö");
-        s1[] = "oe";
-        assert(s1 == "oe");
-    }
-
     /**
      * Remove all characters beloning to $(D_PARAM r).
      *
@@ -1469,13 +1329,9 @@ struct String
      */
     R remove(R)(R r) @trusted
     if (is(R == ByCodeUnit!char) || is(R == ByCodePoint!char))
-    in
+    in (r.container is &this)
-    {
+    in (r.begin >= this.data)
-        assert(r.container is &this);
+    in (r.end <= this.data + length)
-        assert(r.begin >= this.data);
-        assert(r.end <= this.data + length);
-    }
-    do
     {
         auto end = this.data + this.length;
         copy(ByCodeUnit!char(this, r.end, end), ByCodeUnit!char(this, r.begin, end));
@@ -1486,6 +1342,8 @@ struct String
     ///
     @nogc pure @safe unittest
     {
+        import tanya.algorithm.searching : count;
+
         auto s = String("Из пословицы слова не выкинешь.");
 
         assert(s.remove(s[5 .. 24]).length == 33);
@@ -1522,20 +1380,15 @@ struct String
      && isInputRange!T
      && isSomeChar!(ElementType!T)))
      && (is(R == ByCodeUnit!char) || is(R == ByCodePoint!char)))
-    in
+    in (r.container is &this)
-    {
+    in (r.begin >= this.data)
-        assert(r.container is &this);
+    in (r.end <= this.data + length)
-        assert(r.begin >= this.data);
-        assert(r.end <= this.data + length);
-    }
-    do
     {
         const oldLength = length;
-        const rangeEnd = r.end - this.data;
+        const after = r.end - this.data;
         const inserted = insertBack(el);
-        auto containerEnd = this.data + oldLength;
+
-        bringToFront(ByCodeUnit!char(this, this.data + rangeEnd, containerEnd),
+        rotate(this.data[after .. oldLength], this.data[oldLength .. length]);
-                     ByCodeUnit!char(this, containerEnd, this.data + length));
         return inserted;
     }
 
@@ -1557,13 +1410,9 @@ struct String
      && isInputRange!T
      && isSomeChar!(ElementType!T)))
      && (is(R == ByCodeUnit!char) || is(R == ByCodePoint!char)))
-    in
+    in (r.container is &this)
-    {
+    in (r.begin >= this.data)
-        assert(r.container is &this);
+    in (r.end <= this.data + length)
-        assert(r.begin >= this.data);
-        assert(r.end <= this.data + length);
-    }
-    do
     {
         return insertAfter(R(this, this.data, r.begin), el);
     }
@@ -1592,76 +1441,3 @@ struct String
 
     mixin DefaultAllocator;
 }
-
-// Postblit works
-@nogc nothrow pure @safe unittest
-{
-    void internFunc(String arg)
-    {
-    }
-    void middleFunc(S...)(S args)
-    {
-        foreach (arg; args)
-        {
-            internFunc(arg);
-        }
-    }
-    void topFunc(String args)
-    {
-        middleFunc(args);
-    }
-    topFunc(String("asdf"));
-}
-
-// Const range produces mutable ranges
-@nogc pure @safe unittest
-{
-    auto s = const String("И снизу лед, и сверху - маюсь между.");
-    {
-        const constRange = s[];
-
-        auto fromConstRange = constRange[];
-        fromConstRange.popFront();
-        assert(fromConstRange.front == s[1]);
-
-        fromConstRange = constRange[0 .. $];
-        fromConstRange.popFront();
-        assert(fromConstRange.front == s[1]);
-
-        assert(constRange.get() is s.get());
-    }
-    {
-        const constRange = s.byCodePoint();
-
-        auto fromConstRange = constRange[];
-        fromConstRange.popFront();
-        assert(fromConstRange.front == ' ');
-    }
-}
-
-// Can pop multibyte characters
-@nogc pure @safe unittest
-{
-    auto s = String("\U00024B62\U00002260");
-    auto range = s.byCodePoint();
-
-    range.popFront();
-    assert(!range.empty);
-
-    range.popFront();
-    assert(range.empty);
-
-    range = s.byCodePoint();
-    range.popFront();
-    s[$ - 3] = 0xf0;
-    assertThrown!UTFException(&(range.popFront));
-}
-
-// Inserts own char range correctly
-@nogc nothrow pure @safe unittest
-{
-    auto s1 = String(`ü`);
-    String s2;
-    s2.insertBack(s1[]);
-    assert(s1 == s2);
-}

source/tanya/conv.d

@@ -5,7 +5,7 @@
 /**
  * This module provides functions for converting between different types.
  *
- * Copyright: Eugene Wissner 2017-2018.
+ * Copyright: Eugene Wissner 2017-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@@ -15,235 +15,12 @@
 module tanya.conv;
 
 import tanya.container.string;
-import tanya.format;
+import tanya.memory.allocator;
-import tanya.memory;
+deprecated("Use tanya.memory.lifetime.emplace instead")
-import tanya.memory.op;
+public import tanya.memory.lifetime : emplace;
 import tanya.meta.trait;
 import tanya.meta.transform;
-import tanya.range.array;
+import tanya.range;
-import tanya.range.primitive;
-
-version (unittest)
-{
-    import tanya.test.assertion;
-}
-
-/**
- * Constructs a new object of type $(D_PARAM T) in $(D_PARAM memory) with the
- * given arguments.
- *
- * If $(D_PARAM T) is a $(D_KEYWORD class), emplace returns a class reference
- * of type $(D_PARAM T), otherwise a pointer to the constructed object is
- * returned.
- *
- * If $(D_PARAM T) is a nested class inside another class, $(D_PARAM outer)
- * should be an instance of the outer class.
- *
- * $(D_PARAM args) are arguments for the constructor of $(D_PARAM T). If
- * $(D_PARAM T) isn't an aggregate type and doesn't have a constructor,
- * $(D_PARAM memory) can be initialized to `args[0]` if `Args.length == 1`,
- * `Args[0]` should be implicitly convertible to $(D_PARAM T) then.
- *
- * Params:
- *  T     = Constructed type.
- *  U     = Type of the outer class if $(D_PARAM T) is a nested class.
- *  Args  = Types of the constructor arguments if $(D_PARAM T) has a constructor
- *          or the type of the initial value.
- *  outer = Outer class instance if $(D_PARAM T) is a nested class.
- *  args  = Constructor arguments if $(D_PARAM T) has a constructor or the
- *          initial value.
- *
- * Returns: New instance of type $(D_PARAM T) constructed in $(D_PARAM memory).
- *
- * Precondition: `memory.length == stateSize!T`.
- * Postcondition: $(D_PARAM memory) and the result point to the same memory.
- */
-T emplace(T, U, Args...)(void[] memory, U outer, auto ref Args args)
-if (!isAbstractClass!T && isInnerClass!T && is(typeof(T.outer) == U))
-in
-{
-    assert(memory.length >= stateSize!T);
-}
-out (result)
-{
-    assert(memory.ptr is (() @trusted => cast(void*) result)());
-}
-do
-{
-    copy(typeid(T).initializer, memory);
-
-    auto result = (() @trusted => cast(T) memory.ptr)();
-    result.outer = outer;
-
-    static if (is(typeof(result.__ctor(args))))
-    {
-        result.__ctor(args);
-    }
-
-    return result;
-}
-
-/// ditto
-T emplace(T, Args...)(void[] memory, auto ref Args args)
-if (is(T == class) && !isAbstractClass!T && !isInnerClass!T)
-in
-{
-    assert(memory.length == stateSize!T);
-}
-out (result)
-{
-    assert(memory.ptr is (() @trusted => cast(void*) result)());
-}
-do
-{
-    copy(typeid(T).initializer, memory);
-
-    auto result = (() @trusted => cast(T) memory.ptr)();
-    static if (is(typeof(result.__ctor(args))))
-    {
-        result.__ctor(args);
-    }
-    return result;
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    import tanya.memory : stateSize;
-
-    class C
-    {
-        int i = 5;
-        class Inner
-        {
-            int i;
-
-            this(int param) pure nothrow @safe @nogc
-            {
-                this.i = param;
-            }
-        }
-    }
-    ubyte[stateSize!C] memory1;
-    ubyte[stateSize!(C.Inner)] memory2;
-
-    auto c = emplace!C(memory1);
-    assert(c.i == 5);
-
-    auto inner = emplace!(C.Inner)(memory2, c, 8);
-    assert(c.i == 5);
-    assert(inner.i == 8);
-    assert(inner.outer is c);
-}
-
-/// ditto
-T* emplace(T, Args...)(void[] memory, auto ref Args args)
-if (!isAggregateType!T && (Args.length <= 1))
-in
-{
-    assert(memory.length >= T.sizeof);
-}
-out (result)
-{
-    assert(memory.ptr is result);
-}
-do
-{
-    auto result = (() @trusted => cast(T*) memory.ptr)();
-    static if (Args.length == 1)
-    {
-        *result = T(args[0]);
-    }
-    else
-    {
-        *result = T.init;
-    }
-    return result;
-}
-
-/// ditto
-T* emplace(T, Args...)(void[] memory, auto ref Args args)
-if (!isPolymorphicType!T && isAggregateType!T)
-in
-{
-    assert(memory.length >= T.sizeof);
-}
-out (result)
-{
-    assert(memory.ptr is result);
-}
-do
-{
-    auto result = (() @trusted => cast(T*) memory.ptr)();
-    static if (!hasElaborateAssign!T && isAssignable!T)
-    {
-        *result = T.init;
-    }
-    else
-    {
-        static const T init = T.init;
-        copy((cast(void*) &init)[0 .. T.sizeof], memory);
-    }
-
-    static if (Args.length == 0)
-    {
-        static assert(is(typeof({ static T t; })),
-                      "Default constructor is disabled");
-    }
-    else static if (is(typeof(T(args))))
-    {
-        *result = T(args);
-    }
-    else static if (is(typeof(result.__ctor(args))))
-    {
-        result.__ctor(args);
-    }
-    else
-    {
-        static assert(false,
-                      "Unable to construct value with the given arguments");
-    }
-    return result;
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    ubyte[4] memory;
-
-    auto i = emplace!int(memory);
-    static assert(is(typeof(i) == int*));
-    assert(*i == 0);
-
-    i = emplace!int(memory, 5);
-    assert(*i == 5);
-
-    static struct S
-    {
-        int i;
-        @disable this();
-        @disable this(this);
-        this(int i) @nogc nothrow pure @safe
-        {
-            this.i = i;
-        }
-    }
-    auto s = emplace!S(memory, 8);
-    static assert(is(typeof(s) == S*));
-    assert(s.i == 8);
-}
-
-// Handles "Cannot access frame pointer" error.
-@nogc nothrow pure @safe unittest
-{
-    struct F
-    {
-        ~this() @nogc nothrow pure @safe
-        {
-        }
-    }
-    static assert(is(typeof(emplace!F((void[]).init))));
-}
 
 /**
  * Thrown if a type conversion fails.
@@ -287,12 +64,8 @@ if (isInputRange!R
  && isSomeChar!(ElementType!R)
  && isIntegral!T
  && isUnsigned!T)
-in
+in (base >= 2)
-{
+in (base <= 36)
-    assert(base >= 2);
-    assert(base <= 36);
-}
-do
 {
     T boundary = cast(T) (T.max / base);
     if (range.empty)
@@ -360,86 +133,6 @@ do
     return n;
 }
 
-// ':' is not a hex value
-@nogc nothrow pure @safe unittest
-{
-    string colon = ":";
-    auto actual = readIntegral!ubyte(colon, 16);
-    assert(actual == 0);
-    assert(colon.length == 1);
-}
-
-// reads ubyte.max
-@nogc nothrow pure @safe unittest
-{
-    string number = "255";
-    assert(readIntegral!ubyte(number) == 255);
-    assert(number.empty);
-}
-
-// detects integer overflow
-@nogc nothrow pure @safe unittest
-{
-    string number = "500";
-    readIntegral!ubyte(number);
-    assert(number.front == '0');
-    assert(number.length == 1);
-}
-
-// stops on a non-digit
-@nogc nothrow pure @safe unittest
-{
-    string number = "10-";
-    readIntegral!ubyte(number);
-    assert(number.front == '-');
-}
-
-// returns false if the number string is empty
-@nogc nothrow pure @safe unittest
-{
-    string number = "";
-    readIntegral!ubyte(number);
-    assert(number.empty);
-}
-
-@nogc nothrow pure @safe unittest
-{
-    string number = "29";
-    assert(readIntegral!ubyte(number) == 29);
-    assert(number.empty);
-}
-
-@nogc nothrow pure @safe unittest
-{
-    string number = "25467";
-    readIntegral!ubyte(number);
-    assert(number.front == '6');
-}
-
-// Converts lower case hexadecimals
-@nogc nothrow pure @safe unittest
-{
-    string number = "a";
-    assert(readIntegral!ubyte(number, 16) == 10);
-    assert(number.empty);
-}
-
-// Converts upper case hexadecimals
-@nogc nothrow pure @safe unittest
-{
-    string number = "FF";
-    assert(readIntegral!ubyte(number, 16) == 255);
-    assert(number.empty);
-}
-
-// Handles small overflows
-@nogc nothrow pure @safe unittest
-{
-    string number = "256";
-    assert(readIntegral!ubyte(number, 10) == 25);
-    assert(number.front == '6');
-}
-
 /**
  * If the source type $(D_PARAM From) and the target type $(D_PARAM To) are
  * equal, does nothing. If $(D_PARAM From) can be implicitly converted to
@@ -479,12 +172,6 @@ template to(To)
     static assert(is(typeof(val) == int));
 }
 
-@nogc nothrow pure @safe unittest
-{
-    int val = 5;
-    assert(val.to!int() == 5);
-}
-
 /**
  * Performs checked conversion from an integral type $(D_PARAM From) to an
  * integral type $(D_PARAM To).
@@ -547,83 +234,6 @@ if (isIntegral!From
     }
 }
 
-@nogc nothrow pure @safe unittest
-{
-    // ubyte -> ushort
-    assert((cast(ubyte) 0).to!ushort == 0);
-    assert((cast(ubyte) 1).to!ushort == 1);
-    assert((cast(ubyte) (ubyte.max - 1)).to!ushort == ubyte.max - 1);
-    assert((cast(ubyte) ubyte.max).to!ushort == ubyte.max);
-
-    // ubyte -> short
-    assert((cast(ubyte) 0).to!short == 0);
-    assert((cast(ubyte) 1).to!short == 1);
-    assert((cast(ubyte) (ubyte.max - 1)).to!short == ubyte.max - 1);
-    assert((cast(ubyte) ubyte.max).to!short == ubyte.max);
-}
-
-@nogc pure @safe unittest
-{
-    // ubyte <- ushort
-    assert((cast(ushort) 0).to!ubyte == 0);
-    assert((cast(ushort) 1).to!ubyte == 1);
-    assert((cast(ushort) (ubyte.max - 1)).to!ubyte == ubyte.max - 1);
-    assert((cast(ushort) ubyte.max).to!ubyte == ubyte.max);
-
-    // ubyte <- short
-    assert((cast(short) 0).to!ubyte == 0);
-    assert((cast(short) 1).to!ubyte == 1);
-    assert((cast(short) (ubyte.max - 1)).to!ubyte == ubyte.max - 1);
-    assert((cast(short) ubyte.max).to!ubyte == ubyte.max);
-
-    // short <-> int
-    assert(short.min.to!int == short.min);
-    assert((short.min + 1).to!int == short.min + 1);
-    assert((cast(short) -1).to!int == -1);
-    assert((cast(short) 0).to!int == 0);
-    assert((cast(short) 1).to!int == 1);
-    assert((short.max - 1).to!int == short.max - 1);
-    assert(short.max.to!int == short.max);
-
-    assert((cast(int) short.min).to!short == short.min);
-    assert((cast(int) short.min + 1).to!short == short.min + 1);
-    assert((cast(int) -1).to!short == -1);
-    assert((cast(int) 0).to!short == 0);
-    assert((cast(int) 1).to!short == 1);
-    assert((cast(int) short.max - 1).to!short == short.max - 1);
-    assert((cast(int) short.max).to!short == short.max);
-
-    // uint <-> int
-    assert((cast(uint) 0).to!int == 0);
-    assert((cast(uint) 1).to!int == 1);
-    assert((cast(uint) (int.max - 1)).to!int == int.max - 1);
-    assert((cast(uint) int.max).to!int == int.max);
-
-    assert((cast(int) 0).to!uint == 0);
-    assert((cast(int) 1).to!uint == 1);
-    assert((cast(int) (int.max - 1)).to!uint == int.max - 1);
-    assert((cast(int) int.max).to!uint == int.max);
-}
-
-@nogc pure @safe unittest
-{
-    assertThrown!ConvException(&to!(short, int), int.min);
-    assertThrown!ConvException(&to!(short, int), int.max);
-    assertThrown!ConvException(&to!(ushort, uint), uint.max);
-    assertThrown!ConvException(&to!(uint, int), -1);
-}
-
-@nogc nothrow pure @safe unittest
-{
-    enum Test : int
-    {
-        one,
-        two,
-    }
-    assert(Test.one.to!int == 0);
-    assert(Test.two.to!int == 1);
-}
-
 /**
  * Converts a floating point number to an integral type.
  *
@@ -666,13 +276,6 @@ if (isFloatingPoint!From
     assert(2147483646.5.to!uint == 2147483646);
 }
 
-@nogc pure @safe unittest
-{
-    assertThrown!ConvException(&to!(int, double), 2147483647.5);
-    assertThrown!ConvException(&to!(int, double), -2147483648.5);
-    assertThrown!ConvException(&to!(uint, double), -21474.5);
-}
-
 /**
  * Performs checked conversion from an integral type $(D_PARAM From) to an
  * $(D_KEYWORD enum).
@@ -714,16 +317,6 @@ if (isIntegral!From && is(To == enum))
     assert(1.to!Test == Test.two);
 }
 
-@nogc pure @safe unittest
-{
-    enum Test : uint
-    {
-        one,
-        two,
-    }
-    assertThrown!ConvException(&to!(Test, int), 5);
-}
-
 /**
  * Converts $(D_PARAM from) to a boolean.
  *
@@ -775,12 +368,6 @@ if (isNumeric!From && is(Unqual!To == bool) && !is(Unqual!To == Unqual!From))
     assert(1.to!bool);
 }
 
-@nogc pure @safe unittest
-{
-    assertThrown!ConvException(&to!(bool, int), -1);
-    assertThrown!ConvException(&to!(bool, int), 2);
-}
-
 /// ditto
 To to(To, From)(auto ref const From from)
 if ((is(From == String) || isSomeString!From) && is(Unqual!To == bool))
@@ -807,11 +394,6 @@ if ((is(From == String) || isSomeString!From) && is(Unqual!To == bool))
 
 }
 
-@nogc pure @safe unittest
-{
-    assertThrown!ConvException(() => "1".to!bool);
-}
-
 /**
  * Converts a boolean to $(D_PARAM To).
  *
@@ -856,13 +438,6 @@ if (is(Unqual!From == bool) && isNumeric!To && !is(Unqual!To == Unqual!From))
     assert(false.to!int == 0);
 }
 
-deprecated("Use tanya.format.format instead")
-To to(To, From)(auto ref From from)
-if (is(Unqual!To == String))
-{
-    return format!"{}"(from);
-}
-
 /**
  * Converts a stringish range to an integral value.
  *
@@ -985,12 +560,5 @@ if (isInputRange!From && isSomeChar!(ElementType!From) && isIntegral!To)
     assert("010".to!int() == 8);
     assert("-010".to!int() == -8);
 
-
     assert("-128".to!byte == cast(byte) -128);
-
-    assertThrown!ConvException(() => "".to!int);
-    assertThrown!ConvException(() => "-".to!int);
-    assertThrown!ConvException(() => "-5".to!uint);
-    assertThrown!ConvException(() => "-129".to!byte);
-    assertThrown!ConvException(() => "256".to!ubyte);
 }

source/tanya/exception.d

@@ -2,65 +2,15 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-/**
+/*
- * Common exceptions and errors.
+ * Copyright: Eugene Wissner 2017-2019.
- *
- * Copyright: Eugene Wissner 2017-2018.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
  * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/exception.d,
  *                 tanya/exception.d)
  */
+deprecated("Use tanya.memory.allocator instead")
 module tanya.exception;
 
-import tanya.conv;
+public import tanya.memory.allocator : onOutOfMemoryError, OutOfMemoryError;
-import tanya.memory;
-
-/**
- * Error thrown if memory allocation fails.
- */
-final class OutOfMemoryError : Error
-{
-    /**
-     * Constructs new error.
-     *
-     * Params:
-     *  msg  = The message for the exception.
-     *  file = The file where the exception occurred.
-     *  line = The line number where the exception occurred.
-     *  next = The previous exception in the chain of exceptions, if any.
-     */
-    this(string msg = "Out of memory",
-         string file = __FILE__,
-         size_t line = __LINE__,
-         Throwable next = null) @nogc nothrow pure @safe
-    {
-        super(msg, file, line, next);
-    }
-
-    /// ditto
-    this(string msg,
-         Throwable next,
-         string file = __FILE__,
-         size_t line = __LINE__) @nogc nothrow pure @safe
-    {
-        super(msg, file, line, next);
-    }
-}
-
-/**
- * Allocates $(D_PSYMBOL OutOfMemoryError) in a static storage and throws it.
- *
- * Params:
- *  msg = Custom error message.
- *
- * Throws: $(D_PSYMBOL OutOfMemoryError).
- */
-void onOutOfMemoryError(string msg = "Out of memory")
-@nogc nothrow pure @trusted
-{
-    static ubyte[stateSize!OutOfMemoryError] memory;
-    alias PureType = OutOfMemoryError function(string) @nogc nothrow pure;
-    throw (cast(PureType) () => emplace!OutOfMemoryError(memory))(msg);
-}

source/tanya/format.d

@@ -17,11 +17,19 @@
  * To escape `{` or `}`, use `{{` and `}}` respectively. `{{` will be outputted
  * as a single `{`, `}}` - as a single `}`.
  *
- * If a custom data type (like $(D_KEYWORD struct) or $(D_KEYWORD class))
+ * To define the string representation for a custom data type (like
- * defines a `stringify()` function that is callable without arguments and
+ * $(D_KEYWORD class) or $(D_KEYWORD struct)), `toString()`-function can be
- * returns a $(D_PSYMBOL String), this function is used to produce a string
+ * implemented for that type. `toString()` should be $(D_KEYWORD const) and
- * representation for the value. String conversions for the most built-in
+ * accept exactly one argument: an output range for `const(char)[]`. It should
- * data types a also available.
+ * return the same output range, advanced after putting the corresponding value
+ * into it. That is `toString()` signature should look like:
+ *
+ * ---
+ * OR toString(OR)(OR range) const
+ * if (isOutputRange!(OR, const(char)[]));
+ * ---
+ *
+ * String conversions for the most built-in data types a also available.
  *
  * $(D_KEYWORD char), $(D_KEYWORD wchar) and $(D_KEYWORD dchar) ranges are
  * outputted as plain strings (without any delimiters between their elements).
@@ -30,7 +38,7 @@
  *
  * More advanced formatting is currently not implemented.
  *
- * Copyright: Eugene Wissner 2017-2018.
+ * Copyright: Eugene Wissner 2017-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@@ -43,12 +51,11 @@ import tanya.algorithm.comparison;
 import tanya.container.string;
 import tanya.encoding.ascii;
 import tanya.math;
-import tanya.memory.op;
+static import tanya.memory.op;
 import tanya.meta.metafunction;
 import tanya.meta.trait;
 import tanya.meta.transform;
-import tanya.range.array;
+import tanya.range;
-import tanya.range.primitive;
 import tanya.typecons : Tuple;
 
 // Returns the last part of buffer with converted number.
@@ -117,18 +124,6 @@ if (isIntegral!T)
     return buffer[$ - l - 1 .. $ - 1];
 }
 
-// Converting an integer to string.
-@nogc nothrow pure @system unittest
-{
-    char[21] buf;
-
-    assert(integral2String(80, buf) == "80");
-    assert(integral2String(-80, buf) == "-80");
-    assert(integral2String(0, buf) == "0");
-    assert(integral2String(uint.max, buf) == "4294967295");
-    assert(integral2String(int.min, buf) == "-2147483648");
-}
-
 private int frexp(const double x) @nogc nothrow pure @safe
 {
     const FloatBits!double bits = { x };
@@ -1180,11 +1175,7 @@ private struct uint128
     }
 
     Tuple!(uint128, uint128) divMod(ulong rhs) const @nogc nothrow pure @safe
-    in
+    in (rhs != uint128(), "Division by 0")
-    {
-        assert(rhs != uint128(), "Division by 0");
-    }
-    do
     {
         if (rhs == 1)
         {
@@ -1284,11 +1275,7 @@ private int indexMismatch(ulong low, ulong high) @nogc nothrow pure @safe
 private char[] errol2(double value,
                       return ref char[512] buffer,
                       out int exponent) @nogc nothrow pure @safe
-in
+in (value > 9.007199254740992e15 && value < 3.40282366920938e38)
-{
-    assert(value > 9.007199254740992e15 && value < 3.40282366920938e38);
-}
-do
 {
     auto v = uint128(value);
     auto leftBoundary = v + raise2ToExp((value - previous(value)) / 2.0);
@@ -1351,7 +1338,7 @@ do
         intSlice.popBack();
     }
     const begin = buffer.length - intSlice.length;
-    copy(intSlice, buffer[begin .. $]);
+    tanya.memory.op.copy(intSlice, buffer[begin .. $]);
 
     exponent = cast(int) (intSlice.length + mismatch);
 
@@ -1373,11 +1360,7 @@ do
 private char[] errolFixed(double value,
                           return ref char[512] buffer,
                           out int exponent) @nogc nothrow pure @safe
-in
+in (value >= 16.0 && value <= 9.007199254740992e15)
-{
-    assert(value >= 16.0 && value <= 9.007199254740992e15);
-}
-do
 {
     auto decimal = cast(ulong) value;
     auto n = cast(double) decimal;
@@ -1388,7 +1371,7 @@ do
 
     char[21] intBuffer;
     auto intSlice = integral2String(decimal, intBuffer);
-    copy(intSlice, buffer);
+    tanya.memory.op.copy(intSlice, buffer);
     exponent = cast(int) intSlice.length;
 
     size_t position = exponent;
@@ -1903,7 +1886,7 @@ private char[] errol3(double value,
         if (pathologies[middle].representation == bits.integral)
         {
             exponent = pathologies[middle].exponent;
-            copy(pathologies[middle].digits, buffer);
+            tanya.memory.op.copy(pathologies[middle].digits, buffer);
             return buffer[0 .. pathologies[middle].digits.length];
         }
         else if (pathologies[middle].representation < bits.integral)
@@ -1945,7 +1928,7 @@ private char[] errol3(double value,
  * $(D_PARAM sign).
  */
 private const(char)[] real2String(double value,
-                                  ref char[512] buffer,
+                                  return ref char[512] buffer,
                                   out int exponent,
                                   out bool sign) @nogc nothrow pure @trusted
 {
@@ -1989,7 +1972,7 @@ private const(char)[] real2String(double value,
     }
 }
 
-private void formatReal(T)(ref T arg, ref String result)
+private void formatReal(T, OR)(ref T arg, OR result)
 if (isFloatingPoint!T)
 {
     char[512] buffer; // Big enough for e+308 or e-307.
@@ -2017,11 +2000,11 @@ if (isFloatingPoint!T)
 
     if (negative)
     {
-        result.insertBack('-');
+        put(result, "-");
     }
     if (decimalPoint == special)
     {
-        result.insertBack(realString);
+        put(result, realString);
         return;
     }
 
@@ -2054,7 +2037,7 @@ if (isFloatingPoint!T)
         {
             length = precision + 1;
         }
-        realString[1 .. length].copy(bufferSlice);
+        tanya.memory.op.copy(realString[1 .. length], bufferSlice);
         bufferSlice.popFrontExactly(length - 1);
 
         // Dump the exponent.
@@ -2116,7 +2099,7 @@ if (isFloatingPoint!T)
                 n = precision;
             }
 
-            fill!'0'(bufferSlice[0 .. n]);
+            tanya.memory.op.fill!'0'(bufferSlice[0 .. n]);
             bufferSlice.popFrontExactly(n);
 
             if ((length + n) > precision)
@@ -2124,7 +2107,7 @@ if (isFloatingPoint!T)
                 length = precision - n;
             }
 
-            realString[0 .. length].copy(bufferSlice);
+            tanya.memory.op.copy(realString[0 .. length], bufferSlice);
             bufferSlice.popFrontExactly(length);
         }
         else if (cast(uint) decimalPoint >= length)
@@ -2142,7 +2125,7 @@ if (isFloatingPoint!T)
             {
                 n = decimalPoint - n;
 
-                fill!'0'(bufferSlice[0 .. n]);
+                tanya.memory.op.fill!'0'(bufferSlice[0 .. n]);
                 bufferSlice.popFrontExactly(n);
             }
             if (precision != 0)
@@ -2173,7 +2156,7 @@ if (isFloatingPoint!T)
                 length = precision + decimalPoint;
             }
 
-            realString[n .. length].copy(bufferSlice);
+            tanya.memory.op.copy(realString[n .. length], bufferSlice);
             bufferSlice.popFrontExactly(length - n);
         }
     }
@@ -2181,11 +2164,11 @@ if (isFloatingPoint!T)
     // Get the length that we've copied.
     length = cast(uint) (buffer.length - bufferSlice.length);
 
-    result.insertBack(buffer[64 .. length]); // Number.
+    put(result, buffer[64 .. length]); // Number.
-    result.insertBack(tail[1 .. tail[0] + 1]); // Tail.
+    put(result, tail[1 .. tail[0] + 1]); // Tail.
 }
 
-private void formatStruct(T)(ref T arg, ref String result)
+private void formatStruct(T, OR)(ref T arg, OR result)
 if (is(T == struct))
 {
     template pred(alias f)
@@ -2202,24 +2185,24 @@ if (is(T == struct))
     }
     alias fields = Filter!(pred, __traits(allMembers, T));
 
-    result.insertBack(T.stringof);
+    put(result, T.stringof);
-    result.insertBack('(');
+    put(result, "(");
     static if (fields.length > 0)
     {
         printToString!"{}"(result, __traits(getMember, arg, fields[0]));
         foreach (field; fields[1 .. $])
         {
-            result.insertBack(", ");
+            put(result, ", ");
             printToString!"{}"(result, __traits(getMember, arg, field));
         }
     }
-    result.insertBack(')');
+    put(result, ")");
 }
 
-private void formatRange(T)(ref T arg, ref String result)
+private void formatRange(T, OR)(ref T arg, OR result)
 if (isInputRange!T && !isInfinite!T)
 {
-    result.insertBack('[');
+    put(result, "[");
     if (!arg.empty)
     {
         printToString!"{}"(result, arg.front);
@@ -2227,24 +2210,24 @@ if (isInputRange!T && !isInfinite!T)
     }
     foreach (e; arg)
     {
-        result.insertBack(", ");
+        put(result, ", ");
         printToString!"{}"(result, e);
     }
-    result.insertBack(']');
+    put(result, "]");
 }
 
-private ref String printToString(string fmt, Args...)(return ref String result,
+private void printToString(string fmt, OR, Args...)(ref OR result,
                                                     auto ref Args args)
 {
     alias Arg = Args[0];
 
     static if (is(Unqual!Arg == typeof(null))) // null
     {
-        result.insertBack("null");
+        put(result, "null");
     }
     else static if (is(Unqual!Arg == bool)) // Boolean
     {
-        result.insertBack(args[0] ? "true" : "false");
+        put(result, args[0] ? "true" : "false");
     }
     else static if (is(Arg == enum)) // Enum
     {
@@ -2252,19 +2235,19 @@ private ref String printToString(string fmt, Args...)(return ref String result,
         {
             if (args[0] == __traits(getMember, Arg, m))
             {
-                result.insertBack(m);
+                put(result, m);
             }
         }
     }
     else static if (isSomeChar!Arg || isSomeString!Arg) // String or char
     {
-        result.insertBack(args[0]);
+        put(result, args[0]);
     }
     else static if (isInputRange!Arg
                  && !isInfinite!Arg
                  && isSomeChar!(ElementType!Arg)) // Stringish range
     {
-        result.insertBack(args[0]);
+        put(result, args[0]);
     }
     else static if (isInputRange!Arg && !isInfinite!Arg)
     {
@@ -2272,29 +2255,49 @@ private ref String printToString(string fmt, Args...)(return ref String result,
     }
     else static if (is(Unqual!(typeof(args[0].stringify())) == String))
     {
+        pragma(msg, ".stringify() is deprecated. Use toString() with an output"
+                  ~ " range instead");
         static if (is(Arg == class) || is(Arg == interface))
         {
             if (args[0] is null)
             {
-                result.insertBack("null");
+                put(result, "null");
             }
             else
             {
-                result.insertBack(args[0].stringify()[]);
+                put(result, args[0].stringify()[]);
             }
         }
         else
         {
-            result.insertBack(args[0].stringify()[]);
+            put(result, args[0].stringify()[]);
+        }
+    }
+    else static if (is(typeof(args[0].toString(result)) == OR))
+    {
+        static if (is(Arg == class) || is(Arg == interface))
+        {
+            if (args[0] is null)
+            {
+                put(result, "null");
+            }
+            else
+            {
+                result = args[0].toString(result);
+            }
+        }
+        else
+        {
+            result = args[0].toString(result);
         }
     }
     else static if (is(Arg == class))
     {
-        result.insertBack(args[0] is null ? "null" : args[0].toString());
+        put(result, args[0] is null ? "null" : args[0].toString());
     }
     else static if (is(Arg == interface))
     {
-        result.insertBack(Arg.classinfo.name);
+        put(result, Arg.classinfo.name);
     }
     else static if (is(Arg == struct))
     {
@@ -2302,7 +2305,7 @@ private ref String printToString(string fmt, Args...)(return ref String result,
     }
     else static if (is(Arg == union))
     {
-        result.insertBack(Arg.stringof);
+        put(result, Arg.stringof);
     }
     else static if (isFloatingPoint!Arg) // Float
     {
@@ -2321,21 +2324,19 @@ private ref String printToString(string fmt, Args...)(return ref String result,
         }
         while (address != 0);
 
-        result.insertBack("0x");
+        put(result, "0x");
-        result.insertBack(buffer[position .. $]);
+        put(result, buffer[position .. $]);
     }
     else static if (isIntegral!Arg) // Integer
     {
         char[21] buffer;
-        result.insertBack(integral2String(args[0], buffer));
+        put(result, integral2String(args[0], buffer));
     }
     else
     {
         static assert(false,
                       "Formatting type " ~ Arg.stringof ~ " is not supported");
     }
-
-    return result;
 }
 
 /**
@@ -2351,265 +2352,47 @@ private ref String printToString(string fmt, Args...)(return ref String result,
 String format(string fmt, Args...)(auto ref Args args)
 {
     String formatted;
+    sformat!fmt(backInserter(formatted), args);
+    return formatted;
+}
 
+/**
+ * Produces a string according to the specified format and writes it into an
+ * output range. $(D_PSYMBOL sformat) writes the final string in chunks, so the
+ * output range should be in output range for `const(char)[]`.
+ *
+ * Params:
+ *  fmt    = Format.
+ *  R      = Output range type.
+ *  output = Output range.
+ *  args   = Arguments.
+ *
+ * Returns: $(D_PARAM output).
+ */
+R sformat(string fmt, R, Args...)(R output, auto ref Args args)
+if (isOutputRange!(R, const(char)[]))
+{
     alias Specs = ParseFmt!fmt;
     enum bool FormatSpecFilter(alias spec) = is(typeof(spec) == FormatSpec);
     static assert((Filter!(FormatSpecFilter, ParseFmt!fmt)).length == Args.length,
-                  "Number of the arguments doesn't match the format strign");
+                  "Number of the arguments doesn't match the format string");
 
     foreach (spec; Specs)
     {
         static if (FormatSpecFilter!spec)
         {
-            printToString!"{}"(formatted, args[spec.position]);
+            printToString!"{}"(output, args[spec.position]);
         }
         else static if (isSomeString!(typeof(spec)))
         {
-            formatted.insertBack(spec);
+            put(output, spec);
         }
         else
         {
             static assert(false, "Format string parsed incorrectly");
         }
     }
-    return formatted;
+    return output;
-}
-
-// doesn't print the first argument repeatedly
-@nogc nothrow pure @safe unittest
-{
-    assert(format!"{}{}"(1, 2) == "12");
-}
-
-@nogc nothrow pure @safe unittest
-{
-    assert(format!"Without arguments"() == "Without arguments");
-    assert(format!""().length == 0);
-
-    static assert(!is(typeof(format!"{}"())));
-    static assert(!is(typeof(format!"{j}"(5))));
-}
-
-// Enum.
-@nogc nothrow pure @safe unittest
-{
-    enum E1 : int
-    {
-        one,
-        two,
-    }
-    assert(format!"{}"(E1.one) == "one");
-
-    const E1 e1;
-    assert(format!"{}"(e1) == "one");
-}
-
-// One argument tests.
-@nogc pure @safe unittest
-{
-    // Modifiers.
-    assert(format!"{}"(8.5) == "8.5");
-    assert(format!"{}"(8.6) == "8.6");
-    assert(format!"{}"(1000) == "1000");
-    assert(format!"{}"(1) == "1");
-    assert(format!"{}"(10.25) == "10.25");
-    assert(format!"{}"(1) == "1");
-    assert(format!"{}"(0.01) == "0.01");
-
-    // String printing.
-    assert(format!"{}"("Some weired string") == "Some weired string");
-    assert(format!"{}"(cast(string) null) == "");
-    assert(format!"{}"('c') == "c");
-
-    // Integer.
-    assert(format!"{}"(8) == "8");
-    assert(format!"{}"(8) == "8");
-    assert(format!"{}"(-8) == "-8");
-    assert(format!"{}"(-8L) == "-8");
-    assert(format!"{}"(8) == "8");
-    assert(format!"{}"(100000001) == "100000001");
-    assert(format!"{}"(99999999L) == "99999999");
-    assert(format!"{}"(10) == "10");
-    assert(format!"{}"(10L) == "10");
-
-    // Floating point.
-    assert(format!"{}"(0.1234) == "0.1234");
-    assert(format!"{}"(0.3) == "0.3");
-    assert(format!"{}"(0.333333333333) == "0.333333");
-    assert(format!"{}"(38234.1234) == "38234.1");
-    assert(format!"{}"(-0.3) == "-0.3");
-    assert(format!"{}"(0.000000000000000006) == "6e-18");
-    assert(format!"{}"(0.0) == "0");
-    assert(format!"{}"(double.init) == "NaN");
-    assert(format!"{}"(-double.init) == "-NaN");
-    assert(format!"{}"(double.infinity) == "Inf");
-    assert(format!"{}"(-double.infinity) == "-Inf");
-    assert(format!"{}"(0.000000000000000000000000003) == "3e-27");
-    assert(format!"{}"(0.23432e304) == "2.3432e+303");
-    assert(format!"{}"(-0.23432e8) == "-2.3432e+07");
-    assert(format!"{}"(1e-307) == "1e-307");
-    assert(format!"{}"(1e+8) == "1e+08");
-    assert(format!"{}"(111234.1) == "111234");
-    assert(format!"{}"(0.999) == "0.999");
-    assert(format!"{}"(0x1p-16382L) == "0");
-    assert(format!"{}"(1e+3) == "1000");
-    assert(format!"{}"(38234.1234) == "38234.1");
-    assert(format!"{}"(double.max) == "1.79769e+308");
-
-    // typeof(null).
-    assert(format!"{}"(null) == "null");
-
-    // Boolean.
-    assert(format!"{}"(true) == "true");
-    assert(format!"{}"(false) == "false");
-}
-
-// Unsafe tests with pointers.
-@nogc pure @system unittest
-{
-    // Pointer convesions
-    assert(format!"{}"(cast(void*) 1) == "0x1");
-    assert(format!"{}"(cast(void*) 20) == "0x14");
-    assert(format!"{}"(cast(void*) null) == "0x0");
-}
-
-// Structs.
-@nogc pure @safe unittest
-{
-    static struct WithoutStringify1
-    {
-        int a;
-        void func()
-        {
-        }
-    }
-    assert(format!"{}"(WithoutStringify1(6)) == "WithoutStringify1(6)");
-
-    static struct WithoutStringify2
-    {
-    }
-    assert(format!"{}"(WithoutStringify2()) == "WithoutStringify2()");
-
-    static struct WithoutStringify3
-    {
-        int a = -2;
-        int b = 8;
-    }
-    assert(format!"{}"(WithoutStringify3()) == "WithoutStringify3(-2, 8)");
-
-    struct Nested
-    {
-        int i;
-
-        void func()
-        {
-        }
-    }
-    assert(format!"{}"(Nested()) == "Nested(0)");
-
-    static struct WithStringify
-    {
-        String stringify() const @nogc nothrow pure @safe
-        {
-            return String("stringify method");
-        }
-    }
-    assert(format!"{}"(WithStringify()) == "stringify method");
-}
-
-// Aggregate types.
-@system unittest // Object.toString has no attributes.
-{
-    import tanya.memory;
-    import tanya.memory.smartref;
-
-    interface I
-    {
-    }
-    class A : I
-    {
-    }
-    auto instance = defaultAllocator.unique!A();
-    assert(format!"{}"(instance.get()) == instance.get().toString());
-    assert(format!"{}"(cast(I) instance.get()) == I.classinfo.name);
-    assert(format!"{}"(cast(A) null) == "null");
-
-    class B
-    {
-        String stringify() @nogc nothrow pure @safe
-        {
-            return String("Class B");
-        }
-    }
-    assert(format!"{}"(cast(B) null) == "null");
-}
-
-// Unions.
-unittest
-{
-    union U
-    {
-        int i;
-        char c;
-    }
-    assert(format!"{}"(U(2)) == "U");
-}
-
-// Ranges.
-@nogc pure @safe unittest
-{
-    static struct Stringish
-    {
-        private string content = "Some content";
-
-        immutable(char) front() const @nogc nothrow pure @safe
-        {
-            return this.content[0];
-        }
-
-        void popFront() @nogc nothrow pure @safe
-        {
-            this.content = this.content[1 .. $];
-        }
-
-        bool empty() const @nogc nothrow pure @safe
-        {
-            return this.content.length == 0;
-        }
-    }
-    assert(format!"{}"(Stringish()) == "Some content");
-
-    static struct Intish
-    {
-        private int front_ = 3;
-
-        int front() const @nogc nothrow pure @safe
-        {
-            return this.front_;
-        }
-
-        void popFront() @nogc nothrow pure @safe
-        {
-            --this.front_;
-        }
-
-        bool empty() const @nogc nothrow pure @safe
-        {
-            return this.front == 0;
-        }
-    }
-    assert(format!"{}"(Intish()) == "[3, 2, 1]");
-}
-
-// Typeid.
-nothrow pure @safe unittest
-{
-    assert(format!"{}"(typeid(int[])) == "int[]");
-
-    class C
-    {
-    }
-    assert(format!"{}"(typeid(C)) == typeid(C).toString());
 }
 
 private struct FormatSpec

source/tanya/functional.d

@@ -2,70 +2,17 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-/**
+/*
  * Functions that manipulate other functions and their argument lists.
  *
- * Copyright: Eugene Wissner 2018.
+ * Copyright: Eugene Wissner 2018-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
  * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/functional.d,
  *                 tanya/functional.d)
  */
+deprecated("Use tanya.memory.lifetime instead")
 module tanya.functional;
 
-import tanya.algorithm.mutation;
+public import tanya.memory.lifetime : forward;
-import tanya.meta.metafunction;
-
-private template forwardOne(alias arg)
-{
-    static if (__traits(isRef, arg) || __traits(isOut, arg))
-    {
-        alias forwardOne = arg;
-    }
-    else
-    {
-        @property auto forwardOne()
-        {
-            return move(arg);
-        }
-    }
-}
-
-/**
- * Forwards its argument list preserving $(D_KEYWORD ref) and $(D_KEYWORD out)
- * storage classes.
- *
- * $(D_PSYMBOL forward) accepts a list of variables or literals. It returns an
- * argument list of the same length that can be for example passed to a
- * function accepting the arguments of this type.
- *
- * Params:
- *  args = Argument list.
- *
- * Returns: $(D_PARAM args) with their original storage classes.
- */
-template forward(args...)
-{
-    static if (args.length == 1)
-    {
-        alias forward = forwardOne!(args[0]);
-    }
-    else
-    {
-        alias forward = Map!(forwardOne, args);
-    }
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    static assert(is(typeof((int i) { int v = forward!i; })));
-    static assert(is(typeof((ref int i) { int v = forward!i; })));
-    static assert(is(typeof({
-        void f(int i, ref int j, out int k)
-        {
-            f(forward!(i, j, k));
-        }
-    })));
-}

source/tanya/hash/lookup.d

@@ -5,7 +5,7 @@
 /**
  * Non-cryptographic, lookup hash functions.
  *
- * Copyright: Eugene Wissner 2018.
+ * Copyright: Eugene Wissner 2018-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@@ -17,7 +17,7 @@ module tanya.hash.lookup;
 import tanya.meta.trait;
 import tanya.range.primitive;
 
-private struct FNV
+private struct Hasher
 {
     static if (size_t.sizeof == 4)
     {
@@ -29,6 +29,11 @@ private struct FNV
         enum ulong offsetBasis = 14695981039346656037UL;
         enum ulong prime = 1099511628211UL;
     }
+    else static if (size_t.sizeof == 16)
+    {
+        enum size_t offsetBasis = (size_t(0x6c62272e07bb0142UL) << 64) + 0x62b821756295c58dUL;
+        enum size_t prime = (size_t(1) << 88) + (1 << 8) + 0x3b;
+    }
     else
     {
         static assert(false, "FNV requires at least 32-bit hash length");
@@ -44,11 +49,33 @@ private struct FNV
         }
         else static if (isScalarType!T || isPointer!T)
         {
-            (() @trusted => add((cast(const ubyte*) &key)[0 .. T.sizeof]))();
+            // Treat as an array of words
+            static if (T.sizeof % size_t.sizeof == 0
+                    && T.alignof >= size_t.alignof)
+                alias CastT = size_t;
+            // (64-bit or 128-bit) Treat as an array of ints
+            else static if (T.sizeof % uint.sizeof == 0
+                    && T.alignof >= uint.alignof)
+                alias CastT = uint;
+            // Treat as an array of bytes
+            else
+                alias CastT = ubyte;
+            add((() @trusted => (cast(const CastT*) &key)[0 .. T.sizeof / CastT.sizeof])());
         }
         else static if (isArray!T && isScalarType!(ElementType!T))
         {
-            add(cast(const ubyte[]) key);
+            // Treat as an array of words
+            static if (ElementType!T.sizeof % size_t.sizeof == 0
+                    && ElementType!T.alignof >= size_t.alignof)
+                alias CastT = size_t;
+            // (64-bit or 128-bit) Treat as an array of ints
+            else static if (ElementType!T.sizeof % uint.sizeof == 0
+                    && ElementType!T.alignof >= uint.alignof)
+                alias CastT = uint;
+            // Treat as an array of bytes
+            else
+                alias CastT = ubyte;
+            add(cast(const CastT[]) key);
         }
         else static if (is(T == typeof(null)))
         {
@@ -67,13 +94,166 @@ private struct FNV
         }
     }
 
-    void add(const ubyte[] key) @nogc nothrow pure @safe
+    void add(scope const ubyte[] key) @nogc nothrow pure @safe
     {
+        // FNV-1a
         foreach (c; key)
         {
             this.hash = (this.hash ^ c) * prime;
         }
     }
+
+    void add(scope const size_t[] key) @nogc nothrow pure @safe
+    {
+        static if (size_t.sizeof == 4)
+        {
+            // Partial MurmurHash3_x86_32 (no finalization)
+            enum uint c1 = 0xcc9e2d51;
+            enum uint c2 = 0x1b873593;
+            alias h1 = hash;
+            foreach (x; key)
+            {
+                auto k1 = x * c1;
+                k1 = (k1 << 15) | (k1 >> (32 - 15));
+                k1 *= c2;
+
+                h1 ^= k1;
+                h1 = (h1 << 13) | (h1 >> (32 - 13));
+                h1 = h1 * 5 + 0xe6546b64;
+            }
+        }
+        else static if (size_t.sizeof == 8)
+        {
+            // Partial 64-bit MurmurHash64A (no finalization)
+            alias h = hash;
+            enum ulong m = 0xc6a4a7935bd1e995UL;
+            foreach (x; key)
+            {
+                auto k = x * m;
+                k ^= k >>> 47;
+                k *= m;
+
+                h ^= k;
+                h *= m;
+            }
+        }
+        else static if (size_t.sizeof == 16)
+        {
+            // Partial MurmurHash3_x64_128 (no finalization)
+            // treating each size_t as a pair of ulong.
+            ulong h1 = cast(ulong) hash;
+            ulong h2 = cast(ulong) (hash >> 64);
+
+            enum ulong c1 = 0x87c37b91114253d5UL;
+            enum ulong c2 = 0x4cf5ad432745937fUL;
+
+            foreach (x; key)
+            {
+                auto k1 = cast(ulong) x;
+                auto k2 = cast(ulong) (x >> 64);
+
+                k1 *= c1; k1 = (k1 << 32) | (k1 >> (64 - 31)); k1 *= c2; h1 ^= k1;
+                h1 = (h1 << 27) | (h1 >> (64 - 27)); h1 += h2; h1 = h1*5+0x52dce729;
+                k2 *= c2; k2 = (k2 << 33) | (k2 >> (64 - 33)); k2 *= c1; h2 ^= k2;
+                h2 = (h2 << 31) | (h2 >> (64 - 31)); h2 += h1; h2 = h2*5+0x38495ab5;
+            }
+
+            hash = cast(size_t) h1 + ((cast(size_t) h2) << 64);
+        }
+        else
+        {
+            static assert(0, "Hash length must be either 32, 64, or 128 bits.");
+        }
+    }
+
+    static if (size_t.sizeof != uint.sizeof)
+    void add(scope const uint[] key) @nogc nothrow pure @trusted
+    {
+        static if (size_t.sizeof == 8)
+        {
+            // Partial 32-bit MurmurHash64B (no finalization)
+            enum uint m = 0x5bd1e995;
+            enum r = 24;
+
+            uint h1 = cast(uint) hash;
+            uint h2 = cast(uint) (hash >> 32);
+            const(uint)* data = key.ptr;
+            auto len = key.length;
+
+            for (; len >= 2; data += 2, len -= 2)
+            {
+                uint k1 = data[0];
+                k1 *= m; k1 ^= k1 >> r; k1 *= m;
+                h1 *= m; h1 ^= k1;
+
+                uint k2 = data[1];
+                k2 *= m; k2 ^= k2 >> r; k2 *= m;
+                h2 *= m; h2 ^= k2;
+            }
+            if (len)
+            {
+                uint k1 = data[0];
+                k1 *= m; k1 ^= k1 >> r; k1 *= m;
+                h1 *= m; h1 ^= k1;
+            }
+            hash = cast(ulong) h1 + ((cast(ulong) h2) << 32);
+        }
+        else static if (size_t.sizeof == 16)
+        {
+            // Partial MurmurHash3_x86_128 (no finalization)
+            enum uint c1 = 0x239b961b;
+            enum uint c2 = 0xab0e9789;
+            enum uint c3 = 0x38b34ae5;
+            enum uint c4 = 0xa1e38b93;
+
+            uint h1 = cast(uint) hash;
+            uint h2 = cast(uint) (hash >> 32);
+            uint h3 = cast(uint) (hash >> 64);
+            uint h4 = cast(uint) (hash >> 96);
+            const(uint)* data = key.ptr;
+            auto len = key.length;
+
+            for (; len >= 4; data += 4, len -= 4)
+            {
+                uint k1 = data[0];
+                uint k2 = data[1];
+                uint k3 = data[2];
+                uint k4 = data[3];
+
+                h1 = (h1 << 19) | (h1 >> (32 - 19)); h1 += h2; h1 = h1*5+0x561ccd1b;
+                k2 *= c2; k2 = (k2 << 16) | (k2 >> (32 - 16)); k2 *= c3; h2 ^= k2;
+                h2 = (h2 << 17) | (h2 >> (32 - 17)); h2 += h3; h2 = h2*5+0x0bcaa747;
+                k3 *= c3; k3 = (k3 << 17) | (k3 >> (32 - 17)); k3 *= c4; h3 ^= k3;
+                h3 = (h3 << 15) | (h3 >> (32 - 15)); h3 += h4; h3 = h3*5+0x96cd1c35;
+                k4 *= c4; k4 = (k4 << 18) | (k4 >> (32 - 18)); k4 *= c1; h4 ^= k4;
+                h4 = (h4 << 13) | (h4 >> (32 - 13)); h4 += h1; h4 = h4*5+0x32ac3b17;
+            }
+            uint k1, k2, k3;
+            switch (len) // 0, 1, 2, 3
+            {
+                case 3:
+                    k3 = data[2];
+                    k3 *= c3; k3 = (k3 << 17) | (k3 >> (32 - 17)); k3 *= c4; h3 ^= k3;
+                    goto case;
+                case 2:
+                    k2 = data[1];
+                    k2 *= c2; k2 = (k2 << 16) | (k2 >> (32 - 16)); k2 *= c3; h2 ^= k2;
+                    goto case;
+                case 1:
+                    k1 = data[0];
+                    k1 *= c1; k1 = (k1 << 15) | (k1 >> (32 - 15)); k1 *= c2; h1 ^= k1;
+                    break;
+            }
+            hash = cast(size_t) h1 +
+                   ((cast(size_t) h2) << 32) +
+                   ((cast(size_t) h3) << 64) +
+                   ((cast(size_t) h4) << 96);
+        }
+        else
+        {
+            static assert(0, "Hash length must be either 32, 64, or 128 bits.");
+        }
+    }
 }
 
 /**
@@ -92,7 +272,8 @@ private struct FNV
  * For pointers and for scalar types implicitly convertible to `size_t` this
  * is an identity operation (i.e. the value is cast to `size_t` and returned
  * unaltered). Integer types wider than `size_t` are XOR folded down to
- * `size_t`. Other scalar types use the FNV-1a (Fowler-Noll-Vo) hash function.
+ * `size_t`. Other scalar types use an architecture-dependent hash function
+ * based on their width and alignment.
  * If the type provides a `toHash`-function, only `toHash()` is called and its
  * result is returned.
  *
@@ -128,511 +309,32 @@ size_t hash(T)(auto ref T key)
     }
     else
     {
-        FNV fnv;
+        Hasher hasher;
-        fnv(key);
+        hasher(key);
-        return fnv.hash;
+        return hasher.hash;
     }
 }
 
-version (unittest)
+/**
+ * Determines whether $(D_PARAM hasher) is hash function for $(D_PARAM T), i.e.
+ * it is callable with a value of type $(D_PARAM T) and returns a
+ * $(D_PSYMBOL size_t) value.
+ *
+ * Params:
+ *  hasher = Hash function candidate.
+ *  T      = Type to test the hash function with.
+ *
+ * Returns: $(D_KEYWORD true) if $(D_PARAM hasher) is a hash function for
+ *          $(D_PARAM T), $(D_KEYWORD false) otherwise.
+ */
+template isHashFunction(alias hasher, T)
 {
-    enum string r10(string x) = x ~ x ~ x ~ x ~ x ~ x ~ x ~ x ~ x ~ x;
+    private alias wrapper = (T x) => hasher(x);
-    enum string r100(string x) = r10!x ~ r10!x ~ r10!x ~ r10!x ~ r10!x
+    enum bool isHashFunction = is(typeof(wrapper(T.init)) == size_t);
-                               ~ r10!x ~ r10!x ~ r10!x ~ r10!x ~ r10!x;
-    enum string r500(string x) = r100!x ~ r100!x ~ r100!x ~ r100!x ~ r100!x;
-
-    private static struct ToHash
-    {
-        size_t toHash() const @nogc nothrow pure @safe
-        {
-            return 0;
-        }
 }
 
-    private static struct HashRange
+///
-    {
-        string fo = "fo";
-
-        @property ubyte front() const @nogc nothrow pure @safe
-        {
-            return this.fo[0];
-        }
-
-        void popFront() @nogc nothrow pure @safe
-        {
-            this.fo = this.fo[1 .. $];
-        }
-
-        @property bool empty() const @nogc nothrow pure @safe
-        {
-            return this.fo.length == 0;
-        }
-    }
-
-    private static struct ToHashRange
-    {
-        bool empty_;
-
-        @property ToHash front() const @nogc nothrow pure @safe
-        {
-            return ToHash();
-        }
-
-        void popFront() @nogc nothrow pure @safe
-        {
-            this.empty_ = true;
-        }
-
-         @property bool empty() const @nogc nothrow pure @safe
-         {
-             return this.empty_;
-         }
-    }
-}
-
-// Tests that work for any hash size
 @nogc nothrow pure @safe unittest
 {
-    assert(hash(null) == 0);
+    static assert(isHashFunction!(hash, int));
-    assert(hash(ToHash()) == 0U);
-    assert(hash('a') == 'a');
-}
-
-static if (size_t.sizeof == 4) @nogc nothrow pure @safe unittest
-{
-    assert(hash(HashRange()) == 0x6222e842U);
-    assert(hash(ToHashRange()) == 1268118805U);
-}
-static if (size_t.sizeof == 8) @nogc nothrow pure @safe unittest
-{
-    assert(hash(HashRange()) == 0x08985907b541d342UL);
-    assert(hash(ToHashRange()) == 12161962213042174405UL);
-}
-
-static if (size_t.sizeof == 4) @nogc nothrow pure @system unittest
-{
-    assert(hash(cast(void*) 0x6e6f6863) == 0x6e6f6863);
-}
-static if (size_t.sizeof == 8) @nogc nothrow pure @system unittest
-{
-    assert(hash(cast(void*) 0x77206f676e6f6863) == 0x77206f676e6f6863);
-}
-
-/*
- * These are official FNV-1a test vectors and they are in the public domain.
- */
-// FNV-1a 32 bit test vectors
-static if (size_t.sizeof == 4) @nogc nothrow pure @safe unittest
-{
-    assert(hash("") == 0x811c9dc5U);
-    assert(hash("a") == 0xe40c292cU);
-    assert(hash("b") == 0xe70c2de5U);
-    assert(hash("c") == 0xe60c2c52U);
-    assert(hash("d") == 0xe10c2473U);
-    assert(hash("e") == 0xe00c22e0U);
-    assert(hash("f") == 0xe30c2799U);
-    assert(hash("fo") == 0x6222e842U);
-    assert(hash("foo") == 0xa9f37ed7U);
-    assert(hash("foob") == 0x3f5076efU);
-    assert(hash("fooba") == 0x39aaa18aU);
-    assert(hash("foobar") == 0xbf9cf968U);
-    assert(hash("\0") == 0x050c5d1fU);
-    assert(hash("a\0") == 0x2b24d044U);
-    assert(hash("b\0") == 0x9d2c3f7fU);
-    assert(hash("c\0") == 0x7729c516U);
-    assert(hash("d\0") == 0xb91d6109U);
-    assert(hash("e\0") == 0x931ae6a0U);
-    assert(hash("f\0") == 0x052255dbU);
-    assert(hash("fo\0") == 0xbef39fe6U);
-    assert(hash("foo\0") == 0x6150ac75U);
-    assert(hash("foob\0") == 0x9aab3a3dU);
-    assert(hash("fooba\0") == 0x519c4c3eU);
-    assert(hash("foobar\0") == 0x0c1c9eb8U);
-    assert(hash("ch") == 0x5f299f4eU);
-    assert(hash("cho") == 0xef8580f3U);
-    assert(hash("chon") == 0xac297727U);
-    assert(hash("chong") == 0x4546b9c0U);
-    assert(hash("chongo") == 0xbd564e7dU);
-    assert(hash("chongo ") == 0x6bdd5c67U);
-    assert(hash("chongo w") == 0xdd77ed30U);
-    assert(hash("chongo wa") == 0xf4ca9683U);
-    assert(hash("chongo was") == 0x4aeb9bd0U);
-    assert(hash("chongo was ") == 0xe0e67ad0U);
-    assert(hash("chongo was h") == 0xc2d32fa8U);
-    assert(hash("chongo was he") == 0x7f743fb7U);
-    assert(hash("chongo was her") == 0x6900631fU);
-    assert(hash("chongo was here") == 0xc59c990eU);
-    assert(hash("chongo was here!") == 0x448524fdU);
-    assert(hash("chongo was here!\n") == 0xd49930d5U);
-    assert(hash("ch\0") == 0x1c85c7caU);
-    assert(hash("cho\0") == 0x0229fe89U);
-    assert(hash("chon\0") == 0x2c469265U);
-    assert(hash("chong\0") == 0xce566940U);
-    assert(hash("chongo\0") == 0x8bdd8ec7U);
-    assert(hash("chongo \0") == 0x34787625U);
-    assert(hash("chongo w\0") == 0xd3ca6290U);
-    assert(hash("chongo wa\0") == 0xddeaf039U);
-    assert(hash("chongo was\0") == 0xc0e64870U);
-    assert(hash("chongo was \0") == 0xdad35570U);
-    assert(hash("chongo was h\0") == 0x5a740578U);
-    assert(hash("chongo was he\0") == 0x5b004d15U);
-    assert(hash("chongo was her\0") == 0x6a9c09cdU);
-    assert(hash("chongo was here\0") == 0x2384f10aU);
-    assert(hash("chongo was here!\0") == 0xda993a47U);
-    assert(hash("chongo was here!\n\0") == 0x8227df4fU);
-    assert(hash("cu") == 0x4c298165U);
-    assert(hash("cur") == 0xfc563735U);
-    assert(hash("curd") == 0x8cb91483U);
-    assert(hash("curds") == 0x775bf5d0U);
-    assert(hash("curds ") == 0xd5c428d0U);
-    assert(hash("curds a") == 0x34cc0ea3U);
-    assert(hash("curds an") == 0xea3b4cb7U);
-    assert(hash("curds and") == 0x8e59f029U);
-    assert(hash("curds and ") == 0x2094de2bU);
-    assert(hash("curds and w") == 0xa65a0ad4U);
-    assert(hash("curds and wh") == 0x9bbee5f4U);
-    assert(hash("curds and whe") == 0xbe836343U);
-    assert(hash("curds and whey") == 0x22d5344eU);
-    assert(hash("curds and whey\n") == 0x19a1470cU);
-    assert(hash("cu\0") == 0x4a56b1ffU);
-    assert(hash("cur\0") == 0x70b8e86fU);
-    assert(hash("curd\0") == 0x0a5b4a39U);
-    assert(hash("curds\0") == 0xb5c3f670U);
-    assert(hash("curds \0") == 0x53cc3f70U);
-    assert(hash("curds a\0") == 0xc03b0a99U);
-    assert(hash("curds an\0") == 0x7259c415U);
-    assert(hash("curds and\0") == 0x4095108bU);
-    assert(hash("curds and \0") == 0x7559bdb1U);
-    assert(hash("curds and w\0") == 0xb3bf0bbcU);
-    assert(hash("curds and wh\0") == 0x2183ff1cU);
-    assert(hash("curds and whe\0") == 0x2bd54279U);
-    assert(hash("curds and whey\0") == 0x23a156caU);
-    assert(hash("curds and whey\n\0") == 0x64e2d7e4U);
-    assert(hash("hi") == 0x683af69aU);
-    assert(hash("hi\0") == 0xaed2346eU);
-    assert(hash("hello") == 0x4f9f2cabU);
-    assert(hash("hello\0") == 0x02935131U);
-    assert(hash("\xff\x00\x00\x01") == 0xc48fb86dU);
-    assert(hash("\x01\x00\x00\xff") == 0x2269f369U);
-    assert(hash("\xff\x00\x00\x02") == 0xc18fb3b4U);
-    assert(hash("\x02\x00\x00\xff") == 0x50ef1236U);
-    assert(hash("\xff\x00\x00\x03") == 0xc28fb547U);
-    assert(hash("\x03\x00\x00\xff") == 0x96c3bf47U);
-    assert(hash("\xff\x00\x00\x04") == 0xbf8fb08eU);
-    assert(hash("\x04\x00\x00\xff") == 0xf3e4d49cU);
-    assert(hash("\x40\x51\x4e\x44") == 0x32179058U);
-    assert(hash("\x44\x4e\x51\x40") == 0x280bfee6U);
-    assert(hash("\x40\x51\x4e\x4a") == 0x30178d32U);
-    assert(hash("\x4a\x4e\x51\x40") == 0x21addaf8U);
-    assert(hash("\x40\x51\x4e\x54") == 0x4217a988U);
-    assert(hash("\x54\x4e\x51\x40") == 0x772633d6U);
-    assert(hash("127.0.0.1") == 0x08a3d11eU);
-    assert(hash("127.0.0.1\0") == 0xb7e2323aU);
-    assert(hash("127.0.0.2") == 0x07a3cf8bU);
-    assert(hash("127.0.0.2\0") == 0x91dfb7d1U);
-    assert(hash("127.0.0.3") == 0x06a3cdf8U);
-    assert(hash("127.0.0.3\0") == 0x6bdd3d68U);
-    assert(hash("64.81.78.68") == 0x1d5636a7U);
-    assert(hash("64.81.78.68\0") == 0xd5b808e5U);
-    assert(hash("64.81.78.74") == 0x1353e852U);
-    assert(hash("64.81.78.74\0") == 0xbf16b916U);
-    assert(hash("64.81.78.84") == 0xa55b89edU);
-    assert(hash("64.81.78.84\0") == 0x3c1a2017U);
-    assert(hash("feedface") == 0x0588b13cU);
-    assert(hash("feedface\0") == 0xf22f0174U);
-    assert(hash("feedfacedaffdeed") == 0xe83641e1U);
-    assert(hash("feedfacedaffdeed\0") == 0x6e69b533U);
-    assert(hash("feedfacedeadbeef") == 0xf1760448U);
-    assert(hash("feedfacedeadbeef\0") == 0x64c8bd58U);
-    assert(hash("line 1\nline 2\nline 3") == 0x97b4ea23U);
-    assert(hash("chongo <Landon Curt Noll> /\\../\\") == 0x9a4e92e6U);
-    assert(hash("chongo <Landon Curt Noll> /\\../\\\0") == 0xcfb14012U);
-    assert(hash("chongo (Landon Curt Noll) /\\../\\") == 0xf01b2511U);
-    assert(hash("chongo (Landon Curt Noll) /\\../\\\0") == 0x0bbb59c3U);
-    assert(hash("http://antwrp.gsfc.nasa.gov/apod/astropix.html") == 0xce524afaU);
-    assert(hash("http://en.wikipedia.org/wiki/Fowler_Noll_Vo_hash") == 0xdd16ef45U);
-    assert(hash("http://epod.usra.edu/") == 0x60648bb3U);
-    assert(hash("http://exoplanet.eu/") == 0x7fa4bcfcU);
-    assert(hash("http://hvo.wr.usgs.gov/cam3/") == 0x5053ae17U);
-    assert(hash("http://hvo.wr.usgs.gov/cams/HMcam/") == 0xc9302890U);
-    assert(hash("http://hvo.wr.usgs.gov/kilauea/update/deformation.html") == 0x956ded32U);
-    assert(hash("http://hvo.wr.usgs.gov/kilauea/update/images.html") == 0x9136db84U);
-    assert(hash("http://hvo.wr.usgs.gov/kilauea/update/maps.html") == 0xdf9d3323U);
-    assert(hash("http://hvo.wr.usgs.gov/volcanowatch/current_issue.html") == 0x32bb6cd0U);
-    assert(hash("http://neo.jpl.nasa.gov/risk/") == 0xc8f8385bU);
-    assert(hash("http://norvig.com/21-days.html") == 0xeb08bfbaU);
-    assert(hash("http://primes.utm.edu/curios/home.php") == 0x62cc8e3dU);
-    assert(hash("http://slashdot.org/") == 0xc3e20f5cU);
-    assert(hash("http://tux.wr.usgs.gov/Maps/155.25-19.5.html") == 0x39e97f17U);
-    assert(hash("http://volcano.wr.usgs.gov/kilaueastatus.php") == 0x7837b203U);
-    assert(hash("http://www.avo.alaska.edu/activity/Redoubt.php") == 0x319e877bU);
-    assert(hash("http://www.dilbert.com/fast/") == 0xd3e63f89U);
-    assert(hash("http://www.fourmilab.ch/gravitation/orbits/") == 0x29b50b38U);
-    assert(hash("http://www.fpoa.net/") == 0x5ed678b8U);
-    assert(hash("http://www.ioccc.org/index.html") == 0xb0d5b793U);
-    assert(hash("http://www.isthe.com/cgi-bin/number.cgi") == 0x52450be5U);
-    assert(hash("http://www.isthe.com/chongo/bio.html") == 0xfa72d767U);
-    assert(hash("http://www.isthe.com/chongo/index.html") == 0x95066709U);
-    assert(hash("http://www.isthe.com/chongo/src/calc/lucas-calc") == 0x7f52e123U);
-    assert(hash("http://www.isthe.com/chongo/tech/astro/venus2004.html") == 0x76966481U);
-    assert(hash("http://www.isthe.com/chongo/tech/astro/vita.html") == 0x063258b0U);
-    assert(hash("http://www.isthe.com/chongo/tech/comp/c/expert.html") == 0x2ded6e8aU);
-    assert(hash("http://www.isthe.com/chongo/tech/comp/calc/index.html") == 0xb07d7c52U);
-    assert(hash("http://www.isthe.com/chongo/tech/comp/fnv/index.html") == 0xd0c71b71U);
-    assert(hash("http://www.isthe.com/chongo/tech/math/number/howhigh.html") == 0xf684f1bdU);
-    assert(hash("http://www.isthe.com/chongo/tech/math/number/number.html") == 0x868ecfa8U);
-    assert(hash("http://www.isthe.com/chongo/tech/math/prime/mersenne.html") == 0xf794f684U);
-    assert(hash("http://www.isthe.com/chongo/tech/math/prime/mersenne.html#largest") == 0xd19701c3U);
-    assert(hash("http://www.lavarnd.org/cgi-bin/corpspeak.cgi") == 0x346e171eU);
-    assert(hash("http://www.lavarnd.org/cgi-bin/haiku.cgi") == 0x91f8f676U);
-    assert(hash("http://www.lavarnd.org/cgi-bin/rand-none.cgi") == 0x0bf58848U);
-    assert(hash("http://www.lavarnd.org/cgi-bin/randdist.cgi") == 0x6317b6d1U);
-    assert(hash("http://www.lavarnd.org/index.html") == 0xafad4c54U);
-    assert(hash("http://www.lavarnd.org/what/nist-test.html") == 0x0f25681eU);
-    assert(hash("http://www.macosxhints.com/") == 0x91b18d49U);
-    assert(hash("http://www.mellis.com/") == 0x7d61c12eU);
-    assert(hash("http://www.nature.nps.gov/air/webcams/parks/havoso2alert/havoalert.cfm") == 0x5147d25cU);
-    assert(hash("http://www.nature.nps.gov/air/webcams/parks/havoso2alert/timelines_24.cfm") == 0x9a8b6805U);
-    assert(hash("http://www.paulnoll.com/") == 0x4cd2a447U);
-    assert(hash("http://www.pepysdiary.com/") == 0x1e549b14U);
-    assert(hash("http://www.sciencenews.org/index/home/activity/view") == 0x2fe1b574U);
-    assert(hash("http://www.skyandtelescope.com/") == 0xcf0cd31eU);
-    assert(hash("http://www.sput.nl/~rob/sirius.html") == 0x6c471669U);
-    assert(hash("http://www.systemexperts.com/") == 0x0e5eef1eU);
-    assert(hash("http://www.tq-international.com/phpBB3/index.php") == 0x2bed3602U);
-    assert(hash("http://www.travelquesttours.com/index.htm") == 0xb26249e0U);
-    assert(hash("http://www.wunderground.com/global/stations/89606.html") == 0x2c9b86a4U);
-    assert(hash(r10!"21701") == 0xe415e2bbU);
-    assert(hash(r10!"M21701") == 0x18a98d1dU);
-    assert(hash(r10!"2^21701-1") == 0xb7df8b7bU);
-    assert(hash(r10!"\x54\xc5") == 0x241e9075U);
-    assert(hash(r10!"\xc5\x54") == 0x063f70ddU);
-    assert(hash(r10!"23209") == 0x0295aed9U);
-    assert(hash(r10!"M23209") == 0x56a7f781U);
-    assert(hash(r10!"2^23209-1") == 0x253bc645U);
-    assert(hash(r10!"\x5a\xa9") == 0x46610921U);
-    assert(hash(r10!"\xa9\x5a") == 0x7c1577f9U);
-    assert(hash(r10!"391581216093") == 0x512b2851U);
-    assert(hash(r10!"391581*2^216093-1") == 0x76823999U);
-    assert(hash(r10!"\x05\xf9\x9d\x03\x4c\x81") == 0xc0586935U);
-    assert(hash(r10!"FEDCBA9876543210") == 0xf3415c85U);
-    assert(hash(r10!"\xfe\xdc\xba\x98\x76\x54\x32\x10") == 0x0ae4ff65U);
-    assert(hash(r10!"EFCDAB8967452301") == 0x58b79725U);
-    assert(hash(r10!"\xef\xcd\xab\x89\x67\x45\x23\x01") == 0xdea43aa5U);
-    assert(hash(r10!"0123456789ABCDEF") == 0x2bb3be35U);
-    assert(hash(r10!"\x01\x23\x45\x67\x89\xab\xcd\xef") == 0xea777a45U);
-    assert(hash(r10!"1032547698BADCFE") == 0x8f21c305U);
-    assert(hash(r10!"\x10\x32\x54\x76\x98\xba\xdc\xfe") == 0x5c9d0865U);
-    assert(hash(r500!"\x00") == 0xfa823dd5U);
-    assert(hash(r500!"\x07") == 0x21a27271U);
-    assert(hash(r500!"~") == 0x83c5c6d5U);
-    assert(hash(r500!"\x7f") == 0x813b0881U);
-}
-
-// FNV-1a 64 bit test vectors
-static if (size_t.sizeof == 8) @nogc nothrow pure @safe unittest
-{
-    assert(hash("") == 0xcbf29ce484222325UL);
-    assert(hash("a") == 0xaf63dc4c8601ec8cUL);
-    assert(hash("b") == 0xaf63df4c8601f1a5UL);
-    assert(hash("c") == 0xaf63de4c8601eff2UL);
-    assert(hash("d") == 0xaf63d94c8601e773UL);
-    assert(hash("e") == 0xaf63d84c8601e5c0UL);
-    assert(hash("f") == 0xaf63db4c8601ead9UL);
-    assert(hash("fo") == 0x08985907b541d342UL);
-    assert(hash("foo") == 0xdcb27518fed9d577UL);
-    assert(hash("foob") == 0xdd120e790c2512afUL);
-    assert(hash("fooba") == 0xcac165afa2fef40aUL);
-    assert(hash("foobar") == 0x85944171f73967e8UL);
-    assert(hash("\0") == 0xaf63bd4c8601b7dfUL);
-    assert(hash("a\0") == 0x089be207b544f1e4UL);
-    assert(hash("b\0") == 0x08a61407b54d9b5fUL);
-    assert(hash("c\0") == 0x08a2ae07b54ab836UL);
-    assert(hash("d\0") == 0x0891b007b53c4869UL);
-    assert(hash("e\0") == 0x088e4a07b5396540UL);
-    assert(hash("f\0") == 0x08987c07b5420ebbUL);
-    assert(hash("fo\0") == 0xdcb28a18fed9f926UL);
-    assert(hash("foo\0") == 0xdd1270790c25b935UL);
-    assert(hash("foob\0") == 0xcac146afa2febf5dUL);
-    assert(hash("fooba\0") == 0x8593d371f738acfeUL);
-    assert(hash("foobar\0") == 0x34531ca7168b8f38UL);
-    assert(hash("ch") == 0x08a25607b54a22aeUL);
-    assert(hash("cho") == 0xf5faf0190cf90df3UL);
-    assert(hash("chon") == 0xf27397910b3221c7UL);
-    assert(hash("chong") == 0x2c8c2b76062f22e0UL);
-    assert(hash("chongo") == 0xe150688c8217b8fdUL);
-    assert(hash("chongo ") == 0xf35a83c10e4f1f87UL);
-    assert(hash("chongo w") == 0xd1edd10b507344d0UL);
-    assert(hash("chongo wa") == 0x2a5ee739b3ddb8c3UL);
-    assert(hash("chongo was") == 0xdcfb970ca1c0d310UL);
-    assert(hash("chongo was ") == 0x4054da76daa6da90UL);
-    assert(hash("chongo was h") == 0xf70a2ff589861368UL);
-    assert(hash("chongo was he") == 0x4c628b38aed25f17UL);
-    assert(hash("chongo was her") == 0x9dd1f6510f78189fUL);
-    assert(hash("chongo was here") == 0xa3de85bd491270ceUL);
-    assert(hash("chongo was here!") == 0x858e2fa32a55e61dUL);
-    assert(hash("chongo was here!\n") == 0x46810940eff5f915UL);
-    assert(hash("ch\0") == 0xf5fadd190cf8edaaUL);
-    assert(hash("cho\0") == 0xf273ed910b32b3e9UL);
-    assert(hash("chon\0") == 0x2c8c5276062f6525UL);
-    assert(hash("chong\0") == 0xe150b98c821842a0UL);
-    assert(hash("chongo\0") == 0xf35aa3c10e4f55e7UL);
-    assert(hash("chongo \0") == 0xd1ed680b50729265UL);
-    assert(hash("chongo w\0") == 0x2a5f0639b3dded70UL);
-    assert(hash("chongo wa\0") == 0xdcfbaa0ca1c0f359UL);
-    assert(hash("chongo was\0") == 0x4054ba76daa6a430UL);
-    assert(hash("chongo was \0") == 0xf709c7f5898562b0UL);
-    assert(hash("chongo was h\0") == 0x4c62e638aed2f9b8UL);
-    assert(hash("chongo was he\0") == 0x9dd1a8510f779415UL);
-    assert(hash("chongo was her\0") == 0xa3de2abd4911d62dUL);
-    assert(hash("chongo was here\0") == 0x858e0ea32a55ae0aUL);
-    assert(hash("chongo was here!\0") == 0x46810f40eff60347UL);
-    assert(hash("chongo was here!\n\0") == 0xc33bce57bef63eafUL);
-    assert(hash("cu") == 0x08a24307b54a0265UL);
-    assert(hash("cur") == 0xf5b9fd190cc18d15UL);
-    assert(hash("curd") == 0x4c968290ace35703UL);
-    assert(hash("curds") == 0x07174bd5c64d9350UL);
-    assert(hash("curds ") == 0x5a294c3ff5d18750UL);
-    assert(hash("curds a") == 0x05b3c1aeb308b843UL);
-    assert(hash("curds an") == 0xb92a48da37d0f477UL);
-    assert(hash("curds and") == 0x73cdddccd80ebc49UL);
-    assert(hash("curds and ") == 0xd58c4c13210a266bUL);
-    assert(hash("curds and w") == 0xe78b6081243ec194UL);
-    assert(hash("curds and wh") == 0xb096f77096a39f34UL);
-    assert(hash("curds and whe") == 0xb425c54ff807b6a3UL);
-    assert(hash("curds and whey") == 0x23e520e2751bb46eUL);
-    assert(hash("curds and whey\n") == 0x1a0b44ccfe1385ecUL);
-    assert(hash("cu\0") == 0xf5ba4b190cc2119fUL);
-    assert(hash("cur\0") == 0x4c962690ace2baafUL);
-    assert(hash("curd\0") == 0x0716ded5c64cda19UL);
-    assert(hash("curds\0") == 0x5a292c3ff5d150f0UL);
-    assert(hash("curds \0") == 0x05b3e0aeb308ecf0UL);
-    assert(hash("curds a\0") == 0xb92a5eda37d119d9UL);
-    assert(hash("curds an\0") == 0x73ce41ccd80f6635UL);
-    assert(hash("curds and\0") == 0xd58c2c132109f00bUL);
-    assert(hash("curds and \0") == 0xe78baf81243f47d1UL);
-    assert(hash("curds and w\0") == 0xb0968f7096a2ee7cUL);
-    assert(hash("curds and wh\0") == 0xb425a84ff807855cUL);
-    assert(hash("curds and whe\0") == 0x23e4e9e2751b56f9UL);
-    assert(hash("curds and whey\0") == 0x1a0b4eccfe1396eaUL);
-    assert(hash("curds and whey\n\0") == 0x54abd453bb2c9004UL);
-    assert(hash("hi") == 0x08ba5f07b55ec3daUL);
-    assert(hash("hi\0") == 0x337354193006cb6eUL);
-    assert(hash("hello") == 0xa430d84680aabd0bUL);
-    assert(hash("hello\0") == 0xa9bc8acca21f39b1UL);
-    assert(hash("\xff\x00\x00\x01") == 0x6961196491cc682dUL);
-    assert(hash("\x01\x00\x00\xff") == 0xad2bb1774799dfe9UL);
-    assert(hash("\xff\x00\x00\x02") == 0x6961166491cc6314UL);
-    assert(hash("\x02\x00\x00\xff") == 0x8d1bb3904a3b1236UL);
-    assert(hash("\xff\x00\x00\x03") == 0x6961176491cc64c7UL);
-    assert(hash("\x03\x00\x00\xff") == 0xed205d87f40434c7UL);
-    assert(hash("\xff\x00\x00\x04") == 0x6961146491cc5faeUL);
-    assert(hash("\x04\x00\x00\xff") == 0xcd3baf5e44f8ad9cUL);
-    assert(hash("\x40\x51\x4e\x44") == 0xe3b36596127cd6d8UL);
-    assert(hash("\x44\x4e\x51\x40") == 0xf77f1072c8e8a646UL);
-    assert(hash("\x40\x51\x4e\x4a") == 0xe3b36396127cd372UL);
-    assert(hash("\x4a\x4e\x51\x40") == 0x6067dce9932ad458UL);
-    assert(hash("\x40\x51\x4e\x54") == 0xe3b37596127cf208UL);
-    assert(hash("\x54\x4e\x51\x40") == 0x4b7b10fa9fe83936UL);
-    assert(hash("127.0.0.1") == 0xaabafe7104d914beUL);
-    assert(hash("127.0.0.1\0") == 0xf4d3180b3cde3edaUL);
-    assert(hash("127.0.0.2") == 0xaabafd7104d9130bUL);
-    assert(hash("127.0.0.2\0") == 0xf4cfb20b3cdb5bb1UL);
-    assert(hash("127.0.0.3") == 0xaabafc7104d91158UL);
-    assert(hash("127.0.0.3\0") == 0xf4cc4c0b3cd87888UL);
-    assert(hash("64.81.78.68") == 0xe729bac5d2a8d3a7UL);
-    assert(hash("64.81.78.68\0") == 0x74bc0524f4dfa4c5UL);
-    assert(hash("64.81.78.74") == 0xe72630c5d2a5b352UL);
-    assert(hash("64.81.78.74\0") == 0x6b983224ef8fb456UL);
-    assert(hash("64.81.78.84") == 0xe73042c5d2ae266dUL);
-    assert(hash("64.81.78.84\0") == 0x8527e324fdeb4b37UL);
-    assert(hash("feedface") == 0x0a83c86fee952abcUL);
-    assert(hash("feedface\0") == 0x7318523267779d74UL);
-    assert(hash("feedfacedaffdeed") == 0x3e66d3d56b8caca1UL);
-    assert(hash("feedfacedaffdeed\0") == 0x956694a5c0095593UL);
-    assert(hash("feedfacedeadbeef") == 0xcac54572bb1a6fc8UL);
-    assert(hash("feedfacedeadbeef\0") == 0xa7a4c9f3edebf0d8UL);
-    assert(hash("line 1\nline 2\nline 3") == 0x7829851fac17b143UL);
-    assert(hash("chongo <Landon Curt Noll> /\\../\\") == 0x2c8f4c9af81bcf06UL);
-    assert(hash("chongo <Landon Curt Noll> /\\../\\\0") == 0xd34e31539740c732UL);
-    assert(hash("chongo (Landon Curt Noll) /\\../\\") == 0x3605a2ac253d2db1UL);
-    assert(hash("chongo (Landon Curt Noll) /\\../\\\0") == 0x08c11b8346f4a3c3UL);
-    assert(hash("http://antwrp.gsfc.nasa.gov/apod/astropix.html") == 0x6be396289ce8a6daUL);
-    assert(hash("http://en.wikipedia.org/wiki/Fowler_Noll_Vo_hash") == 0xd9b957fb7fe794c5UL);
-    assert(hash("http://epod.usra.edu/") == 0x05be33da04560a93UL);
-    assert(hash("http://exoplanet.eu/") == 0x0957f1577ba9747cUL);
-    assert(hash("http://hvo.wr.usgs.gov/cam3/") == 0xda2cc3acc24fba57UL);
-    assert(hash("http://hvo.wr.usgs.gov/cams/HMcam/") == 0x74136f185b29e7f0UL);
-    assert(hash("http://hvo.wr.usgs.gov/kilauea/update/deformation.html") == 0xb2f2b4590edb93b2UL);
-    assert(hash("http://hvo.wr.usgs.gov/kilauea/update/images.html") == 0xb3608fce8b86ae04UL);
-    assert(hash("http://hvo.wr.usgs.gov/kilauea/update/maps.html") == 0x4a3a865079359063UL);
-    assert(hash("http://hvo.wr.usgs.gov/volcanowatch/current_issue.html") == 0x5b3a7ef496880a50UL);
-    assert(hash("http://neo.jpl.nasa.gov/risk/") == 0x48fae3163854c23bUL);
-    assert(hash("http://norvig.com/21-days.html") == 0x07aaa640476e0b9aUL);
-    assert(hash("http://primes.utm.edu/curios/home.php") == 0x2f653656383a687dUL);
-    assert(hash("http://slashdot.org/") == 0xa1031f8e7599d79cUL);
-    assert(hash("http://tux.wr.usgs.gov/Maps/155.25-19.5.html") == 0xa31908178ff92477UL);
-    assert(hash("http://volcano.wr.usgs.gov/kilaueastatus.php") == 0x097edf3c14c3fb83UL);
-    assert(hash("http://www.avo.alaska.edu/activity/Redoubt.php") == 0xb51ca83feaa0971bUL);
-    assert(hash("http://www.dilbert.com/fast/") == 0xdd3c0d96d784f2e9UL);
-    assert(hash("http://www.fourmilab.ch/gravitation/orbits/") == 0x86cd26a9ea767d78UL);
-    assert(hash("http://www.fpoa.net/") == 0xe6b215ff54a30c18UL);
-    assert(hash("http://www.ioccc.org/index.html") == 0xec5b06a1c5531093UL);
-    assert(hash("http://www.isthe.com/cgi-bin/number.cgi") == 0x45665a929f9ec5e5UL);
-    assert(hash("http://www.isthe.com/chongo/bio.html") == 0x8c7609b4a9f10907UL);
-    assert(hash("http://www.isthe.com/chongo/index.html") == 0x89aac3a491f0d729UL);
-    assert(hash("http://www.isthe.com/chongo/src/calc/lucas-calc") == 0x32ce6b26e0f4a403UL);
-    assert(hash("http://www.isthe.com/chongo/tech/astro/venus2004.html") == 0x614ab44e02b53e01UL);
-    assert(hash("http://www.isthe.com/chongo/tech/astro/vita.html") == 0xfa6472eb6eef3290UL);
-    assert(hash("http://www.isthe.com/chongo/tech/comp/c/expert.html") == 0x9e5d75eb1948eb6aUL);
-    assert(hash("http://www.isthe.com/chongo/tech/comp/calc/index.html") == 0xb6d12ad4a8671852UL);
-    assert(hash("http://www.isthe.com/chongo/tech/comp/fnv/index.html") == 0x88826f56eba07af1UL);
-    assert(hash("http://www.isthe.com/chongo/tech/math/number/howhigh.html") == 0x44535bf2645bc0fdUL);
-    assert(hash("http://www.isthe.com/chongo/tech/math/number/number.html") == 0x169388ffc21e3728UL);
-    assert(hash("http://www.isthe.com/chongo/tech/math/prime/mersenne.html") == 0xf68aac9e396d8224UL);
-    assert(hash("http://www.isthe.com/chongo/tech/math/prime/mersenne.html#largest") == 0x8e87d7e7472b3883UL);
-    assert(hash("http://www.lavarnd.org/cgi-bin/corpspeak.cgi") == 0x295c26caa8b423deUL);
-    assert(hash("http://www.lavarnd.org/cgi-bin/haiku.cgi") == 0x322c814292e72176UL);
-    assert(hash("http://www.lavarnd.org/cgi-bin/rand-none.cgi") == 0x8a06550eb8af7268UL);
-    assert(hash("http://www.lavarnd.org/cgi-bin/randdist.cgi") == 0xef86d60e661bcf71UL);
-    assert(hash("http://www.lavarnd.org/index.html") == 0x9e5426c87f30ee54UL);
-    assert(hash("http://www.lavarnd.org/what/nist-test.html") == 0xf1ea8aa826fd047eUL);
-    assert(hash("http://www.macosxhints.com/") == 0x0babaf9a642cb769UL);
-    assert(hash("http://www.mellis.com/") == 0x4b3341d4068d012eUL);
-    assert(hash("http://www.nature.nps.gov/air/webcams/parks/havoso2alert/havoalert.cfm") == 0xd15605cbc30a335cUL);
-    assert(hash("http://www.nature.nps.gov/air/webcams/parks/havoso2alert/timelines_24.cfm") == 0x5b21060aed8412e5UL);
-    assert(hash("http://www.paulnoll.com/") == 0x45e2cda1ce6f4227UL);
-    assert(hash("http://www.pepysdiary.com/") == 0x50ae3745033ad7d4UL);
-    assert(hash("http://www.sciencenews.org/index/home/activity/view") == 0xaa4588ced46bf414UL);
-    assert(hash("http://www.skyandtelescope.com/") == 0xc1b0056c4a95467eUL);
-    assert(hash("http://www.sput.nl/~rob/sirius.html") == 0x56576a71de8b4089UL);
-    assert(hash("http://www.systemexperts.com/") == 0xbf20965fa6dc927eUL);
-    assert(hash("http://www.tq-international.com/phpBB3/index.php") == 0x569f8383c2040882UL);
-    assert(hash("http://www.travelquesttours.com/index.htm") == 0xe1e772fba08feca0UL);
-    assert(hash("http://www.wunderground.com/global/stations/89606.html") == 0x4ced94af97138ac4UL);
-    assert(hash(r10!"21701") == 0xc4112ffb337a82fbUL);
-    assert(hash(r10!"M21701") == 0xd64a4fd41de38b7dUL);
-    assert(hash(r10!"2^21701-1") == 0x4cfc32329edebcbbUL);
-    assert(hash(r10!"\x54\xc5") == 0x0803564445050395UL);
-    assert(hash(r10!"\xc5\x54") == 0xaa1574ecf4642ffdUL);
-    assert(hash(r10!"23209") == 0x694bc4e54cc315f9UL);
-    assert(hash(r10!"M23209") == 0xa3d7cb273b011721UL);
-    assert(hash(r10!"2^23209-1") == 0x577c2f8b6115bfa5UL);
-    assert(hash(r10!"\x5a\xa9") == 0xb7ec8c1a769fb4c1UL);
-    assert(hash(r10!"\xa9\x5a") == 0x5d5cfce63359ab19UL);
-    assert(hash(r10!"391581216093") == 0x33b96c3cd65b5f71UL);
-    assert(hash(r10!"391581*2^216093-1") == 0xd845097780602bb9UL);
-    assert(hash(r10!"\x05\xf9\x9d\x03\x4c\x81") == 0x84d47645d02da3d5UL);
-    assert(hash(r10!"FEDCBA9876543210") == 0x83544f33b58773a5UL);
-    assert(hash(r10!"\xfe\xdc\xba\x98\x76\x54\x32\x10") == 0x9175cbb2160836c5UL);
-    assert(hash(r10!"EFCDAB8967452301") == 0xc71b3bc175e72bc5UL);
-    assert(hash(r10!"\xef\xcd\xab\x89\x67\x45\x23\x01") == 0x636806ac222ec985UL);
-    assert(hash(r10!"0123456789ABCDEF") == 0xb6ef0e6950f52ed5UL);
-    assert(hash(r10!"\x01\x23\x45\x67\x89\xab\xcd\xef") == 0xead3d8a0f3dfdaa5UL);
-    assert(hash(r10!"1032547698BADCFE") == 0x922908fe9a861ba5UL);
-    assert(hash(r10!"\x10\x32\x54\x76\x98\xba\xdc\xfe") == 0x6d4821de275fd5c5UL);
-    assert(hash(r500!"\x00") == 0x1fe3fce62bd816b5UL);
-    assert(hash(r500!"\x07") == 0xc23e9fccd6f70591UL);
-    assert(hash(r500!"~") == 0xc1af12bdfe16b5b5UL);
-    assert(hash(r500!"\x7f") == 0x39e9f18f2f85e221UL);
 }

source/tanya/hash/package.d

@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
- * Copyright: Eugene Wissner 2018.
+ * Copyright: Eugene Wissner 2018-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)

source/tanya/math/mp.d

@@ -5,7 +5,7 @@
 /**
  * Arbitrary precision arithmetic.
  *
- * Copyright: Eugene Wissner 2016-2018.
+ * Copyright: Eugene Wissner 2016-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@@ -14,16 +14,16 @@
  */
 module tanya.math.mp;
 
-import std.algorithm.comparison : cmp;
-import std.algorithm.mutation : fill, reverse;
-import std.range;
 import tanya.algorithm.comparison;
+import tanya.algorithm.iteration;
 import tanya.algorithm.mutation;
 import tanya.container.array;
 import tanya.encoding.ascii;
-import tanya.memory;
+import tanya.memory.allocator;
+import tanya.memory.lifetime;
 import tanya.meta.trait;
 import tanya.meta.transform;
+import tanya.range;
 
 /**
  * Algebraic sign.
@@ -108,11 +108,7 @@ struct Integer
 
     /// ditto
     this(shared Allocator allocator) @nogc nothrow pure @safe
-    in
+    in (allocator !is null)
-    {
-        assert(allocator !is null);
-    }
-    do
     {
         this.allocator_ = allocator;
     }
@@ -629,7 +625,7 @@ struct Integer
         }
         return this.rep[0 .. this.size]
                    .retro
-                   .cmp(that.rep[0 .. that.size].retro);
+                   .compare(that.rep[0 .. that.size].retro);
     }
 
     /**
@@ -868,11 +864,7 @@ struct Integer
 
     /// ditto
     ref Integer opOpAssign(string op : "/")(auto ref const Integer operand)
-    in
+    in (operand.length > 0, "Division by zero.")
-    {
-        assert(operand.length > 0, "Division by zero.");
-    }
-    do
     {
         divide(operand, this);
         return this;
@@ -880,37 +872,12 @@ struct Integer
 
      /// ditto
     ref Integer opOpAssign(string op : "%")(auto ref const Integer operand)
-    in
+    in (operand.length > 0, "Division by zero")
-    {
-        assert(operand.length > 0, "Division by zero.");
-    }
-    do
     {
         divide(operand, null, this);
         return this;
     }
 
-    @nogc nothrow pure @safe unittest
-    {
-        auto h1 = Integer(18);
-        auto h2 = Integer(4);
-        h1 %= h2;
-        assert(h1 == 2);
-
-        h1 = 8;
-        h1 %= h2;
-        assert(h1 == 0);
-
-        h1 = 7;
-        h1 %= h2;
-        assert(h1 == 3);
-
-        h1 = 56088;
-        h2 = 456;
-        h1 /= h2;
-        assert(h1 == 123);
-    }
-
     /// ditto
     ref Integer opOpAssign(string op : ">>")(const size_t operand)
     {
@@ -930,7 +897,7 @@ struct Integer
             const shift = digitBitCount - bit;
             digit carry;
 
-            foreach (ref d; this.rep[0 .. this.size].retro)
+            foreach_reverse (ref d; this.rep[0 .. this.size])
             {
                 const newCarry = d & mask;
                 d = (d >> bit) | (carry << shift);
@@ -1056,7 +1023,7 @@ struct Integer
         return this;
     }
 
-    //
+    ///
     @nogc nothrow pure @safe unittest
     {
         auto h1 = Integer(79);
@@ -1163,11 +1130,7 @@ struct Integer
     /// ditto
     Integer opBinary(string op)(const auto ref Integer operand) const
     if (op == "/" || op == "%")
-    in
+    in (operand.length > 0, "Division by zero")
-    {
-        assert(operand.length > 0, "Division by zero.");
-    }
-    do
     {
         mixin("return Integer(this, allocator) " ~ op ~ "= operand;");
     }
@@ -1282,11 +1245,7 @@ struct Integer
     if ((is(Q : typeof(null))
      || (is(Q : Integer) && __traits(isRef, quotient)))
      && (ARGS.length == 0 || (ARGS.length == 1 && is(ARGS[0] : Integer))))
-    in
+    in (divisor != 0, "Division by zero")
-    {
-        assert(divisor != 0, "Division by zero.");
-    }
-    do
     {
         if (compare(divisor) < 0)
         {
@@ -1506,14 +1465,11 @@ struct Integer
             tmp = this;
         }
 
-        do
+        array.length = length;
+        for (size_t i = array.length - 1; tmp != 0; tmp >>= 8, --i)
         {
-            array.insertBack(cast(ubyte) (tmp.rep[0] & 0xff));
+            array[i] = (cast(ubyte) (tmp.rep[0] & 0xff));
-            tmp >>= 8;
         }
-        while (tmp != 0);
-
-        array[].reverse();
 
         return array;
     }
@@ -1530,46 +1486,5 @@ struct Integer
         }
     }
 
-    @nogc nothrow pure @safe unittest
-    {
-        {
-            Integer integer;
-            assert(integer.toArray().length == 0);
-        }
-        {
-            auto integer = Integer(0x03);
-            ubyte[1] expected = [ 0x03 ];
-
-            auto array = integer.toArray();
-            assert(equal(array[], expected[]));
-        }
-        {
-            ubyte[63] expected = [
-                0x02, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
-                0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10,
-                0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18,
-                0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20,
-                0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28,
-                0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0x30,
-                0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38,
-                0x39, 0x3a, 0x3b, 0x00, 0x61, 0x62, 0x63,
-            ];
-            auto integer = Integer(Sign.positive, expected[]);
-
-            auto array = integer.toArray();
-            assert(equal(array[], expected[]));
-        }
-        {
-            ubyte[14] expected = [
-                0x22, 0x33, 0x44, 0x55, 0x05, 0x06, 0x07,
-                0x08, 0x3a, 0x3b, 0x00, 0x61, 0x62, 0x63,
-            ];
-            auto integer = Integer(Sign.positive, expected[]);
-
-            auto array = integer.toArray();
-            assert(equal(array[], expected[]));
-        }
-    }
-
     mixin DefaultAllocator;
 }

source/tanya/math/nbtheory.d

@@ -5,7 +5,7 @@
 /**
  * Number theory.
  *
- * Copyright: Eugene Wissner 2017-2018.
+ * Copyright: Eugene Wissner 2017-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)

source/tanya/math/package.d

@@ -12,7 +12,7 @@
  * be found in its submodules. $(D_PSYMBOL tanya.math) doesn't import any
  * submodules publically, they should be imported explicitly.
  *
- * Copyright: Eugene Wissner 2016-2018.
+ * Copyright: Eugene Wissner 2016-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@@ -21,7 +21,6 @@
  */
 module tanya.math;
 
-import tanya.algorithm.mutation;
 import tanya.math.mp;
 import tanya.math.nbtheory;
 import tanya.meta.trait;
@@ -255,21 +254,6 @@ if (isFloatingPoint!F)
     assert(classify(-real.infinity) == FloatingPointClass.infinite);
 }
 
-@nogc nothrow pure @safe unittest
-{
-    static if (ieeePrecision!float == IEEEPrecision.doubleExtended)
-    {
-        assert(classify(1.68105e-10) == FloatingPointClass.normal);
-        assert(classify(1.68105e-4932L) == FloatingPointClass.subnormal);
-
-        // Emulate unnormals, because they aren't generated anymore since i386
-        FloatBits!real unnormal;
-        unnormal.exp = 0x123;
-        unnormal.mantissa = 0x1;
-        assert(classify(unnormal) == FloatingPointClass.subnormal);
-    }
-}
-
 /**
  * Determines whether $(D_PARAM x) is a finite number.
  *
@@ -582,11 +566,7 @@ if (isFloatingPoint!F)
  */
 H pow(I, G, H)(in auto ref I x, in auto ref G y, in auto ref H z)
 if (isIntegral!I && isIntegral!G && isIntegral!H)
-in
+in (z > 0, "Division by zero")
-{
-    assert(z > 0, "Division by zero.");
-}
-do
 {
     G mask = G.max / 2 + 1;
     H result;
@@ -623,11 +603,7 @@ do
 /// ditto
 I pow(I)(const auto ref I x, const auto ref I y, const auto ref I z)
 if (is(I == Integer))
-in
+in (z.length > 0, "Division by zero")
-{
-    assert(z.length > 0, "Division by zero.");
-}
-do
 {
     size_t i;
     auto tmp1 = Integer(x, x.allocator);
@@ -709,33 +685,3 @@ bool isPseudoprime(ulong x) @nogc nothrow pure @safe
     assert(15485867.isPseudoprime);
     assert(!15485868.isPseudoprime);
 }
-
-@nogc nothrow pure @safe unittest
-{
-    assert(74653.isPseudoprime);
-    assert(74687.isPseudoprime);
-    assert(74699.isPseudoprime);
-    assert(74707.isPseudoprime);
-    assert(74713.isPseudoprime);
-    assert(74717.isPseudoprime);
-    assert(74719.isPseudoprime);
-    assert(74747.isPseudoprime);
-    assert(74759.isPseudoprime);
-    assert(74761.isPseudoprime);
-    assert(74771.isPseudoprime);
-    assert(74779.isPseudoprime);
-    assert(74797.isPseudoprime);
-    assert(74821.isPseudoprime);
-    assert(74827.isPseudoprime);
-    assert(9973.isPseudoprime);
-    assert(49979693.isPseudoprime);
-    assert(104395303.isPseudoprime);
-    assert(593441861.isPseudoprime);
-    assert(104729.isPseudoprime);
-    assert(15485867.isPseudoprime);
-    assert(49979693.isPseudoprime);
-    assert(104395303.isPseudoprime);
-    assert(593441861.isPseudoprime);
-    assert(899809363.isPseudoprime);
-    assert(982451653.isPseudoprime);
-}

source/tanya/math/random.d

@@ -5,7 +5,7 @@
 /**
  * Random number generator.
  *
- * Copyright: Eugene Wissner 2016-2018.
+ * Copyright: Eugene Wissner 2016-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@@ -14,12 +14,8 @@
  */
 module tanya.math.random;
 
-import std.digest.sha;
+import tanya.memory.allocator;
-import std.typecons;
+import tanya.typecons;
-import tanya.memory;
-
-/// Block size of entropy accumulator (SHA-512).
-enum blockSize = 64;
 
 /// Maximum amount gathered from the entropy sources.
 enum maxGather = 128;
@@ -39,7 +35,7 @@ class EntropyException : Exception
     this(string msg,
          string file = __FILE__,
          size_t line = __LINE__,
-         Throwable next = null) pure @safe nothrow const @nogc
+         Throwable next = null) const @nogc nothrow pure @safe
     {
         super(msg, file, line, next);
     }
@@ -56,17 +52,17 @@ abstract class EntropySource
     /**
      * Returns: Minimum bytes required from the entropy source.
      */
-    @property ubyte threshold() const pure nothrow @safe @nogc;
+    @property ubyte threshold() const @nogc nothrow pure @safe;
 
     /**
      * Returns: Whether this entropy source is strong.
      */
-    @property bool strong() const pure nothrow @safe @nogc;
+    @property bool strong() const @nogc nothrow pure @safe;
 
     /**
      * Returns: Amount of already generated entropy.
      */
-    @property ushort size() const pure nothrow @safe @nogc
+    @property ushort size() const @nogc nothrow pure @safe
     {
         return size_;
     }
@@ -76,7 +72,7 @@ abstract class EntropySource
      *  size = Amount of already generated entropy. Cannot be smaller than the
      *         already set value.
      */
-    @property void size(ushort size) pure nothrow @safe @nogc
+    @property void size(ushort size) @nogc nothrow pure @safe
     {
         size_ = size;
     }
@@ -89,9 +85,13 @@ abstract class EntropySource
      *           to fill the buffer).
      *
      * Returns: Number of bytes that were copied to the $(D_PARAM output)
-     *          or $(D_PSYMBOL Nullable!ubyte.init) on error.
+     *          or nothing on error.
+     *
+     * Postcondition: Returned length is less than or equal to
+     *                $(D_PARAM output) length.
      */
-    Nullable!ubyte poll(out ubyte[maxGather] output) @nogc;
+    Option!ubyte poll(out ubyte[maxGather] output) @nogc
+    out (length; length.isNothing || length.get <= maxGather);
 }
 
 version (CRuntime_Bionic)
@@ -118,7 +118,7 @@ else version (Solaris)
 version (linux)
 {
     import core.stdc.config : c_long;
-    extern (C) c_long syscall(c_long number, ...) nothrow @system @nogc;
+    private extern(C) c_long syscall(c_long number, ...) @nogc nothrow @system;
 
     /**
      * Uses getrandom system call.
@@ -128,7 +128,7 @@ version (linux)
         /**
          * Returns: Minimum bytes required from the entropy source.
          */
-        override @property ubyte threshold() const pure nothrow @safe @nogc
+        override @property ubyte threshold() const @nogc nothrow pure @safe
         {
             return 32;
         }
@@ -136,7 +136,7 @@ version (linux)
         /**
          * Returns: Whether this entropy source is strong.
          */
-        override @property bool strong() const pure nothrow @safe @nogc
+        override @property bool strong() const @nogc nothrow pure @safe
         {
             return true;
         }
@@ -149,19 +149,14 @@ version (linux)
          *           to fill the buffer).
          *
          * Returns: Number of bytes that were copied to the $(D_PARAM output)
-         *          or $(D_PSYMBOL Nullable!ubyte.init) on error.
+         *          or nothing on error.
          */
-        override Nullable!ubyte poll(out ubyte[maxGather] output) nothrow @nogc
+        override Option!ubyte poll(out ubyte[maxGather] output) @nogc nothrow
-        out (length)
-        {
-            assert(length <= maxGather);
-        }
-        do
         {
             // int getrandom(void *buf, size_t buflen, unsigned int flags);
             import mir.linux._asm.unistd : NR_getrandom;
             auto length = syscall(NR_getrandom, output.ptr, output.length, 0);
-            Nullable!ubyte ret;
+            Option!ubyte ret;
 
             if (length >= 0)
             {
@@ -170,19 +165,11 @@ version (linux)
             return ret;
         }
     }
-
-    @nogc @system unittest
-    {
-        auto entropy = defaultAllocator.make!Entropy();
-        ubyte[blockSize] output;
-        output = entropy.random;
-
-        defaultAllocator.dispose(entropy);
-    }
 }
 else version (SecureARC4Random)
 {
-    private extern (C) void arc4random_buf(scope void* buf, size_t nbytes) nothrow @nogc @system;
+    private extern(C) void arc4random_buf(scope void* buf, size_t nbytes)
+    @nogc nothrow @system;
 
     /**
      * Uses arc4random_buf.
@@ -192,7 +179,7 @@ else version (SecureARC4Random)
         /**
          * Returns: Minimum bytes required from the entropy source.
          */
-        override @property ubyte threshold() const pure nothrow @safe @nogc
+        override @property ubyte threshold() const @nogc nothrow pure @safe
         {
             return 32;
         }
@@ -200,7 +187,7 @@ else version (SecureARC4Random)
         /**
          * Returns: Whether this entropy source is strong.
          */
-        override @property bool strong() const pure nothrow @safe @nogc
+        override @property bool strong() const @nogc nothrow pure @safe
         {
             return true;
         }
@@ -213,23 +200,15 @@ else version (SecureARC4Random)
          *           to fill the buffer).
          *
          * Returns: Number of bytes that were copied to the $(D_PARAM output)
-         *          or $(D_PSYMBOL Nullable!ubyte.init) on error.
+         *          or nothing on error.
          */
-        override Nullable!ubyte poll(out ubyte[maxGather] output) nothrow @nogc @safe
+        override Option!ubyte poll(out ubyte[maxGather] output)
+        @nogc nothrow @safe
         {
             (() @trusted => arc4random_buf(output.ptr, output.length))();
-            return Nullable!ubyte(cast(ubyte) (output.length));
+            return Option!ubyte(cast(ubyte) (output.length));
         }
     }
-
-    @nogc @system unittest
-    {
-        auto entropy = defaultAllocator.make!Entropy();
-        ubyte[blockSize] output;
-        output = entropy.random;
-
-        defaultAllocator.dispose(entropy);
-    }
 }
 else version (Windows)
 {
@@ -248,22 +227,31 @@ else version (Windows)
         BOOL CryptReleaseContext(HCRYPTPROV, ULONG_PTR);
     }
 
-    private bool initCryptGenRandom(scope ref HCRYPTPROV hProvider) @nogc nothrow @trusted
+    private bool initCryptGenRandom(scope ref HCRYPTPROV hProvider)
+    @nogc nothrow @trusted
     {
         // https://msdn.microsoft.com/en-us/library/windows/desktop/aa379886(v=vs.85).aspx
         // For performance reasons, we recommend that you set the pszContainer
         // parameter to NULL and the dwFlags parameter to CRYPT_VERIFYCONTEXT
         // in all situations where you do not require a persisted key.
-        // CRYPT_SILENT is intended for use with applications for which the UI cannot be displayed by the CSP.
+        // CRYPT_SILENT is intended for use with applications for which the UI
-        if (!CryptAcquireContextW(&hProvider, null, null, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT | CRYPT_SILENT))
+        // cannot be displayed by the CSP.
+        if (!CryptAcquireContextW(&hProvider,
+                                  null,
+                                  null,
+                                  PROV_RSA_FULL,
+                                  CRYPT_VERIFYCONTEXT | CRYPT_SILENT))
         {
-            if (GetLastError() == NTE_BAD_KEYSET)
+            if (GetLastError() != NTE_BAD_KEYSET)
             {
-                // Attempt to create default container
-                if (!CryptAcquireContextA(&hProvider, null, null, PROV_RSA_FULL, CRYPT_NEWKEYSET | CRYPT_SILENT))
                 return false;
             }
-            else
+            // Attempt to create default container
+            if (!CryptAcquireContextA(&hProvider,
+                                      null,
+                                      null,
+                                      PROV_RSA_FULL,
+                                      CRYPT_NEWKEYSET | CRYPT_SILENT))
             {
                 return false;
             }
@@ -299,7 +287,7 @@ else version (Windows)
         /**
          * Returns: Minimum bytes required from the entropy source.
          */
-        override @property ubyte threshold() const pure nothrow @safe @nogc
+        override @property ubyte threshold() const @nogc nothrow pure @safe
         {
             return 32;
         }
@@ -307,7 +295,7 @@ else version (Windows)
         /**
          * Returns: Whether this entropy source is strong.
          */
-        override @property bool strong() const pure nothrow @safe @nogc
+        override @property bool strong() const @nogc nothrow pure @safe
         {
             return true;
         }
@@ -320,16 +308,14 @@ else version (Windows)
          *           to fill the buffer).
          *
          * Returns: Number of bytes that were copied to the $(D_PARAM output)
-         *          or $(D_PSYMBOL Nullable!ubyte.init) on error.
+         *          or nothing on error.
          */
-        override Nullable!ubyte poll(out ubyte[maxGather] output) @nogc nothrow @safe
+        override Option!ubyte poll(out ubyte[maxGather] output)
-        in
+        @nogc nothrow @safe
         {
-            assert(hProvider > 0, "hProvider not properly initialized.");
+            Option!ubyte ret;
-        }
+
-        do
+            assert(hProvider > 0, "hProvider not properly initialized");
-        {
-            Nullable!ubyte ret;
             if ((() @trusted => CryptGenRandom(hProvider, output.length, cast(PBYTE) output.ptr))())
             {
                 ret = cast(ubyte) (output.length);
@@ -337,185 +323,4 @@ else version (Windows)
             return ret;
         }
     }
-
-    @nogc @system unittest
-    {
-        auto entropy = defaultAllocator.make!Entropy();
-        ubyte[blockSize] output;
-        output = entropy.random;
-
-        defaultAllocator.dispose(entropy);
-    }
-}
-
-/**
- * Pseudorandom number generator.
- * ---
- * auto entropy = defaultAllocator.make!Entropy();
- *
- * ubyte[blockSize] output;
- *
- * output = entropy.random;
- *
- * defaultAllocator.dispose(entropy);
- * ---
- */
-class Entropy
-{
-    /// Entropy sources.
-    protected EntropySource[] sources;
-
-    private ubyte sourceCount_;
-
-    /// Entropy accumulator.
-    protected SHA!(maxGather * 8, 512) accumulator;
-
-    /**
-     * Params:
-     *  maxSources = Maximum amount of entropy sources can be set.
-     *  allocator  = Allocator to allocate entropy sources available on the
-     *               system.
-     */
-    this(const size_t maxSources = 20,
-         shared Allocator allocator = defaultAllocator) @nogc
-    in
-    {
-        assert(maxSources > 0 && maxSources <= ubyte.max);
-        assert(allocator !is null);
-    }
-    do
-    {
-        allocator.resize(sources, maxSources);
-
-        static if (is(PlatformEntropySource))
-        {
-            this ~= allocator.make!PlatformEntropySource;
-        }
-    }
-
-    /**
-     * Returns: Amount of the registered entropy sources.
-     */
-    @property ubyte sourceCount() const pure nothrow @safe @nogc
-    {
-        return sourceCount_;
-    }
-
-    /**
-     * Add an entropy source.
-     *
-     * Params:
-     *  source = Entropy source.
-     *
-     * Returns: $(D_PSYMBOL this).
-     *
-     * See_Also:
-     *  $(D_PSYMBOL EntropySource)
-     */
-    Entropy opOpAssign(string op)(EntropySource source)
-    pure nothrow @safe @nogc
-    if (op == "~")
-    in
-    {
-        assert(sourceCount_ <= sources.length);
-    }
-    do
-    {
-        sources[sourceCount_++] = source;
-        return this;
-    }
-
-    /**
-     * Returns: Generated random sequence.
-     *
-     * Throws: $(D_PSYMBOL EntropyException) if no strong entropy source was
-     *         registered or it failed.
-     */
-    @property ubyte[blockSize] random() @nogc
-    in
-    {
-        assert(sourceCount_ > 0, "No entropy sources defined.");
-    }
-    do
-    {
-        bool haveStrong;
-        ushort done;
-        ubyte[blockSize] output;
-
-        do
-        {
-            ubyte[maxGather] buffer;
-
-            // Run through our entropy sources
-            for (ubyte i; i < sourceCount; ++i)
-            {
-                auto outputLength = sources[i].poll(buffer);
-
-                if (!outputLength.isNull)
-                {
-                    if (outputLength > 0)
-                    {
-                        update(i, buffer, outputLength);
-                        sources[i].size = cast(ushort) (sources[i].size + outputLength);
-                    }
-                    if (sources[i].size < sources[i].threshold)
-                    {
-                        continue;
-                    }
-                    else if (sources[i].strong)
-                    {
-                        haveStrong = true;
-                    }
-                }
-                done = 257;
-            }
-        }
-        while (++done < 256);
-
-        if (!haveStrong)
-        {
-            throw defaultAllocator.make!EntropyException("No strong entropy source defined.");
-        }
-
-        output = accumulator.finish();
-
-        // Reset accumulator and counters and recycle existing entropy
-        accumulator.start();
-
-        // Perform second SHA-512 on entropy
-        output = sha512Of(output);
-
-        for (ubyte i; i < sourceCount; ++i)
-        {
-            sources[i].size = 0;
-        }
-        return output;
-    }
-
-    /**
-     * Update entropy accumulator.
-     *
-     * Params:
-     *  sourceId = Entropy source index in $(D_PSYMBOL sources).
-     *  data     = Data got from the entropy source.
-     *  length   = Length of the received data.
-     */
-    protected void update(in ubyte sourceId,
-                          ref ubyte[maxGather] data,
-                          ubyte length) pure nothrow @safe @nogc
-    {
-        ubyte[2] header;
-
-        if (length > blockSize)
-        {
-            data[0 .. 64] = sha512Of(data);
-            length = blockSize;
-        }
-
-        header[0] = sourceId;
-        header[1] = length;
-
-        accumulator.put(header);
-        accumulator.put(data[0 .. length]);
-    }
 }

source/tanya/memory/allocator.d

@@ -1,81 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/**
- * This module contains the interface for implementing custom allocators.
- *
- * Allocators are classes encapsulating memory allocation strategy. This allows
- * to decouple memory management from the algorithms and the data. 
- *
- * Copyright: Eugene Wissner 2016-2018.
- * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
- *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/memory/allocator.d,
- *                 tanya/memory/allocator.d)
- */
-module tanya.memory.allocator;
-
-/**
- * Abstract class implementing a basic allocator.
- */
-interface Allocator
-{
-    /**
-     * Returns: Alignment offered.
-     */
-    @property uint alignment() const shared pure nothrow @safe @nogc;
-
-    /**
-     * Allocates $(D_PARAM size) bytes of memory.
-     *
-     * Params:
-     *  size = Amount of memory to allocate.
-     *
-     * Returns: Pointer to the new allocated memory.
-     */
-    void[] allocate(size_t size) shared pure nothrow @nogc;
-
-    /**
-     * Deallocates a memory block.
-     *
-     * Params:
-     *  p = A pointer to the memory block to be freed.
-     *
-     * Returns: Whether the deallocation was successful.
-     */
-    bool deallocate(void[] p) shared pure nothrow @nogc;
-
-    /**
-     * Increases or decreases the size of a memory block.
-     *
-     * Params:
-     *  p    = A pointer to the memory block.
-     *  size = Size of the reallocated block.
-     *
-     * Returns: Pointer to the allocated memory.
-     */
-    bool reallocate(ref void[] p, size_t size) shared pure nothrow @nogc;
-
-    /**
-     * Reallocates a memory block in place if possible or returns
-     * $(D_KEYWORD false). This function cannot be used to allocate or
-     * deallocate memory, so if $(D_PARAM p) is $(D_KEYWORD null) or
-     * $(D_PARAM size) is `0`, it should return $(D_KEYWORD false).
-     *
-     * Params:
-     *  p    = A pointer to the memory block.
-     *  size = Size of the reallocated block.
-     *
-     * Returns: $(D_KEYWORD true) if successful, $(D_KEYWORD false) otherwise.
-     */
-    bool reallocateInPlace(ref void[] p, size_t size)
-    shared pure nothrow @nogc;
-}
-
-package template GetPureInstance(T : Allocator)
-{
-    alias GetPureInstance = shared(T) function()
-                            pure nothrow @nogc;
-}

source/tanya/net/iface.d

@@ -5,7 +5,7 @@
 /**
  * Network interfaces.
  *
- * Copyright: Eugene Wissner 2018.
+ * Copyright: Eugene Wissner 2018-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@@ -14,7 +14,6 @@
  */
 module tanya.net.iface;
 
-import tanya.algorithm.comparison;
 import tanya.algorithm.mutation;
 import tanya.container.string;
 import tanya.meta.trait;
@@ -209,20 +208,3 @@ String indexToName(uint index) @nogc nothrow @trusted
         return String(findNullTerminated(buffer));
     }
 }
-
-@nogc nothrow @safe unittest
-{
-    version (linux)
-    {
-        assert(equal(indexToName(1)[], "lo"));
-    }
-    else version (Windows)
-    {
-        assert(equal(indexToName(1)[], "loopback_0"));
-    }
-    else
-    {
-        assert(equal(indexToName(1)[], "lo0"));
-    }
-    assert(indexToName(uint.max).empty);
-}

source/tanya/net/inet.d

@@ -5,7 +5,7 @@
 /**
  * Internet utilities.
  *
- * Copyright: Eugene Wissner 2016-2018.
+ * Copyright: Eugene Wissner 2016-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@@ -72,11 +72,7 @@ if (L > ubyte.sizeof && L <= ulong.sizeof)
      */
     this(T)(T value)
     if (isUnsigned!T)
-    in
+    in (value <= (2 ^^ (L * 8)) - 1)
-    {
-        assert(value <= (2 ^^ (L * 8)) - 1);
-    }
-    do
     {
         this.value = value & StorageType.max;
     }
@@ -87,11 +83,7 @@ if (L > ubyte.sizeof && L <= ulong.sizeof)
      * Precondition: $(D_INLINECODE length > 0).
      */
     @property ubyte back() const
-    in
+    in (this.length > 0)
-    {
-        assert(this.length > 0);
-    }
-    do
     {
         return this.value & 0xff;
     }
@@ -102,11 +94,7 @@ if (L > ubyte.sizeof && L <= ulong.sizeof)
      * Precondition: $(D_INLINECODE length > 0).
      */
     @property ubyte front() const
-    in
+    in (this.length > 0)
-    {
-        assert(this.length > 0);
-    }
-    do
     {
         return (this.value >> ((this.length - 1) * 8)) & 0xff;
     }
@@ -117,11 +105,7 @@ if (L > ubyte.sizeof && L <= ulong.sizeof)
      * Precondition: $(D_INLINECODE length > 0).
      */
     void popBack()
-    in
+    in (this.length > 0)
-    {
-        assert(this.length > 0);
-    }
-    do
     {
         this.value >>= 8;
         --this.size;
@@ -133,11 +117,7 @@ if (L > ubyte.sizeof && L <= ulong.sizeof)
      * Precondition: $(D_INLINECODE length > 0).
      */
     void popFront()
-    in
+    in (this.length > 0)
-    {
-        assert(this.length > 0);
-    }
-    do
     {
         this.value &= StorageType.max >> ((StorageType.sizeof - this.length) * 8);
         --this.size;
@@ -189,15 +169,6 @@ if (L > ubyte.sizeof && L <= ulong.sizeof)
     assert(networkOrder.empty);
 }
 
-// Static tests
-@nogc nothrow pure @safe unittest
-{
-    static assert(isBidirectionalRange!(NetworkOrder!4));
-    static assert(isBidirectionalRange!(NetworkOrder!8));
-    static assert(!is(NetworkOrder!9));
-    static assert(!is(NetworkOrder!1));
-}
-
 /**
  * Converts the $(D_KEYWORD ubyte) input range $(D_PARAM range) to
  * $(D_PARAM T).

source/tanya/net/ip.d

@@ -5,7 +5,7 @@
 /**
  * Internet Protocol implementation.
  *
- * Copyright: Eugene Wissner 2018.
+ * Copyright: Eugene Wissner 2018-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@@ -14,11 +14,14 @@
  */
 module tanya.net.ip;
 
+import tanya.algorithm.comparison;
+import tanya.algorithm.iteration;
 import tanya.algorithm.mutation;
 import tanya.container.string;
 import tanya.conv;
 import tanya.encoding.ascii;
 import tanya.format;
+import tanya.memory.lifetime;
 import tanya.meta.trait;
 import tanya.meta.transform;
 import tanya.net.iface;
@@ -54,10 +57,9 @@ struct Address4
      * Params:
      *  address = The address as an unsigned integer in host byte order.
      */
-    this(uint address) @nogc nothrow pure @safe
+    this(uint address) @nogc nothrow pure @trusted
     {
-        copy(NetworkOrder!4(address),
+        copy(NetworkOrder!4(address), (cast(ubyte*) &this.address)[0 .. 4]);
-             (() @trusted => (cast(ubyte*) &this.address)[0 .. 4])());
     }
 
     ///
@@ -66,12 +68,43 @@ struct Address4
         assert(Address4(0x00202000U).toUInt() == 0x00202000U);
     }
 
+    /**
+     * Compares two $(D_PARAM Address4) objects.
+     *
+     * Params:
+     *  that = Another address.
+     *
+     * Returns: Positive number if $(D_KEYWORD this) is larger than
+     *          $(D_PARAM that), negative - if it is smaller, or 0 if they
+     *          equal.
+     */
+    int opCmp(ref const Address4 that) const @nogc nothrow pure @safe
+    {
+        const lhs = toUInt();
+        const rhs = that.toUInt();
+        return (rhs < lhs) - (lhs < rhs);
+    }
+
+    /// ditto
+    int opCmp(const Address4 that) const @nogc nothrow pure @safe
+    {
+        return opCmp(that);
+    }
+
+    ///
+    @nogc nothrow pure @safe unittest
+    {
+        assert(address4("127.0.0.1") > address4("126.0.0.0"));
+        assert(address4("127.0.0.1") < address4("127.0.0.2"));
+        assert(address4("127.0.0.1") == address4("127.0.0.1"));
+    }
+
     /**
      * Returns object that represents 127.0.0.1.
      *
      * Returns: Object that represents the Loopback address.
      */
-    static Address4 loopback() @nogc nothrow pure @safe
+    static @property Address4 loopback() @nogc nothrow pure @safe
     {
         typeof(return) address;
         address.address = Address4.loopback_;
@@ -89,7 +122,7 @@ struct Address4
      *
      * Returns: Object that represents any address.
      */
-    static Address4 any() @nogc nothrow pure @safe
+    static @property Address4 any() @nogc nothrow pure @safe
     {
         typeof(return) address;
         address.address = Address4.any_;
@@ -116,7 +149,7 @@ struct Address4
     ///
     @nogc nothrow pure @safe unittest
     {
-        assert(address4("127.0.0.1").isLoopback());
+        assert(address4("127.0.0.1").get.isLoopback());
     }
 
     /**
@@ -134,7 +167,7 @@ struct Address4
     ///
     @nogc nothrow pure @safe unittest
     {
-        assert(address4("0.0.0.0").isAny());
+        assert(address4("0.0.0.0").get.isAny());
     }
 
     /**
@@ -151,7 +184,7 @@ struct Address4
     ///
     @nogc nothrow pure @safe unittest
     {
-        assert(address4("255.255.255.255").isBroadcast());
+        assert(address4("255.255.255.255").get.isBroadcast());
     }
 
     /**
@@ -178,7 +211,7 @@ struct Address4
     ///
     @nogc nothrow pure @safe unittest
     {
-        assert(address4("224.0.0.3").isMulticast());
+        assert(address4("224.0.0.3").get.isMulticast());
     }
 
     /**
@@ -197,7 +230,7 @@ struct Address4
     ///
     @nogc nothrow pure @safe unittest
     {
-        assert(address4("192.168.0.1").isUnicast());
+        assert(address4("192.168.0.1").get.isUnicast());
     }
 
     /**
@@ -205,6 +238,7 @@ struct Address4
      *
      * Returns: This address in dotted-decimal notation.
      */
+    deprecated("Use Address4.toString() instead")
     String stringify() const @nogc nothrow pure @safe
     {
         const octets = (() @trusted => (cast(ubyte*) &this.address)[0 .. 4])();
@@ -219,12 +253,50 @@ struct Address4
         }
     }
 
+    /**
+     * Writes this IPv4 address in dotted-decimal notation.
+     *
+     * Params:
+     *  OR     = Type of the output range.
+     *  output = Output range.
+     *
+     * Returns: $(D_PARAM output).
+     */
+    OR toString(OR)(OR output) const @nogc nothrow pure @safe
+    if (isOutputRange!(OR, const(char)[]))
+    {
+        const octets = (() @trusted => (cast(ubyte*) &this.address)[0 .. 4])();
+        enum string fmt = "{}.{}.{}.{}";
+        version (LittleEndian)
+        {
+            return sformat!fmt(output,
+                               octets[0],
+                               octets[1],
+                               octets[2],
+                               octets[3]);
+        }
+        else
+        {
+            return sformat!fmt(output,
+                               octets[3],
+                               octets[2],
+                               octets[1],
+                               octets[0]);
+        }
+    }
+
     ///
     @nogc nothrow pure @safe unittest
     {
+        import tanya.container.string : String;
+        import tanya.range : backInserter;
+
         const dottedDecimal = "192.168.0.1";
+        String actual;
         const address = address4(dottedDecimal);
-        assert(address.get.stringify() == dottedDecimal);
+
+        address.get.toString(backInserter(actual));
+        assert(actual == dottedDecimal);
     }
 
     /**
@@ -244,7 +316,7 @@ struct Address4
     {
         const actual = address4("192.168.0.1");
         const ubyte[4] expected = [192, 168, 0, 1];
-        assert(actual.toBytes() == expected);
+        assert(actual.get.toBytes() == expected);
     }
 
     /**
@@ -261,7 +333,7 @@ struct Address4
     ///
     @nogc nothrow pure @safe unittest
     {
-        assert(address4("127.0.0.1").toUInt() == 0x7f000001U);
+        assert(address4("127.0.0.1").get.toUInt() == 0x7f000001U);
     }
 }
 
@@ -311,17 +383,6 @@ if (isForwardRange!R && is(Unqual!(ElementType!R) == char) && hasLength!R)
     return range.empty ? typeof(return)(result) : typeof(return)();
 }
 
-// Rejects malformed addresses
-@nogc nothrow pure @safe unittest
-{
-    assert(address4("256.0.0.1").isNothing);
-    assert(address4(".0.0.1").isNothing);
-    assert(address4("0..0.1").isNothing);
-    assert(address4("0.0.0.").isNothing);
-    assert(address4("0.0.").isNothing);
-    assert(address4("").isNothing);
-}
-
 /**
  * Constructs an $(D_PSYMBOL Address4) from raw bytes in network byte order.
  *
@@ -362,7 +423,7 @@ if (isInputRange!R && is(Unqual!(ElementType!R) == ubyte))
 {
     {
         ubyte[4] actual = [127, 0, 0, 1];
-        assert(address4(actual[]).isLoopback());
+        assert(address4(actual[]).get.isLoopback());
     }
     {
         ubyte[3] actual = [127, 0, 0];
@@ -374,20 +435,6 @@ if (isInputRange!R && is(Unqual!(ElementType!R) == ubyte))
     }
 }
 
-@nogc nothrow pure @safe unittest
-{
-    assert(address4(cast(ubyte[]) []).isNothing);
-}
-
-// Assignment and comparison works
-@nogc nothrow pure @safe unittest
-{
-    auto address1 = Address4.loopback();
-    auto address2 = Address4.any();
-    address1 = address2;
-    assert(address1 == address2);
-}
-
 /**
  * IPv6 internet address.
  */
@@ -423,12 +470,51 @@ struct Address6
         assert(actual.scopeID == 1);
     }
 
+    /**
+     * Compares two $(D_PARAM Address6) objects.
+     *
+     * If $(D_KEYWORD this) and $(D_PARAM that) contain the same address, scope
+     * IDs are compared.
+     *
+     * Params:
+     *  that = Another address.
+     *
+     * Returns: Positive number if $(D_KEYWORD this) is larger than
+     *          $(D_PARAM that), negative - if it is smaller, or 0 if they
+     *          equal.
+     */
+    int opCmp(ref const Address6 that) const @nogc nothrow pure @safe
+    {
+        const diff = compare(this.address[], that.address[]);
+        if (diff == 0)
+        {
+            return (that.scopeID < this.scopeID) - (this.scopeID < that.scopeID);
+        }
+        return diff;
+    }
+
+    /// ditto
+    int opCmp(const Address6 that) const @nogc nothrow pure @safe
+    {
+        return opCmp(that);
+    }
+
+    ///
+    @nogc nothrow @safe unittest
+    {
+        assert(address6("::14") > address6("::1"));
+        assert(address6("::1") < address6("::14"));
+        assert(address6("::1") == address6("::1"));
+        assert(address6("fe80::1%1") < address6("fe80::1%2"));
+        assert(address6("fe80::1%2") > address6("fe80::1%1"));
+    }
+
     /**
      * Returns object that represents ::.
      *
      * Returns: Object that represents any address.
      */
-    static Address6 any() @nogc nothrow pure @safe
+    static @property Address6 any() @nogc nothrow pure @safe
     {
         return Address6();
     }
@@ -444,7 +530,7 @@ struct Address6
      *
      * Returns: Object that represents the Loopback address.
      */
-    static Address6 loopback() @nogc nothrow pure @safe
+    static @property Address6 loopback() @nogc nothrow pure @safe
     {
         typeof(return) address;
         address.address[$ - 1] = 1;
@@ -472,7 +558,7 @@ struct Address6
     ///
     @nogc nothrow @safe unittest
     {
-        assert(address6("::").isAny());
+        assert(address6("::").get.isAny());
     }
 
     /**
@@ -489,7 +575,7 @@ struct Address6
     ///
     @nogc nothrow @safe unittest
     {
-        assert(address6("::1").isLoopback());
+        assert(address6("::1").get.isLoopback());
     }
 
     /**
@@ -508,7 +594,7 @@ struct Address6
     ///
     @nogc nothrow @safe unittest
     {
-        assert(address6("ff00::").isMulticast());
+        assert(address6("ff00::").get.isMulticast());
     }
 
     /**
@@ -527,7 +613,7 @@ struct Address6
     ///
     @nogc nothrow @safe unittest
     {
-        assert(address6("::1").isUnicast());
+        assert(address6("::1").get.isUnicast());
     }
 
     /**
@@ -544,7 +630,7 @@ struct Address6
     ///
     @nogc nothrow @safe unittest
     {
-        assert(address6("fe80::1").isLinkLocal());
+        assert(address6("fe80::1").get.isLinkLocal());
     }
 
     /**
@@ -561,7 +647,7 @@ struct Address6
     ///
     @nogc nothrow @safe unittest
     {
-        assert(address6("fd80:124e:34f3::1").isUniqueLocal());
+        assert(address6("fd80:124e:34f3::1").get.isUniqueLocal());
     }
 
     /**
@@ -569,34 +655,78 @@ struct Address6
      *
      * Returns: text representation of this address.
      */
+    deprecated("Use Address6.toString() instead")
     String stringify() const @nogc nothrow pure @safe
     {
         String output;
-        foreach (i, b; this.address)
-        {
-            ubyte low = b & 0xf;
-            ubyte high = b >> 4;
 
-            if (high < 10)
+        toString(backInserter(output));
+        return output;
+    }
+
+    /**
+     * Writes text representation of this address to an output range.
+     *
+     * Params:
+     *  OR     = Type of the output range.
+     *  output = Output range.
+     *
+     * Returns: $(D_PARAM output).
+     */
+    OR toString(OR)(OR output) const
+    if (isOutputRange!(OR, const(char)[]))
     {
-                output.insertBack(cast(char) (high + '0'));
+        ptrdiff_t largestGroupIndex = -1;
+        size_t largestGroupSize;
+        size_t zeroesInGroup;
+        size_t groupIndex;
+
+        // Look for the longest group of zeroes
+        for (size_t i; i < this.address.length; i += 2)
+        {
+            if (this.address[i] == 0 && this.address[i + 1] == 0)
+            {
+                if (zeroesInGroup++ == 0)
+                {
+                    groupIndex = i;
+                }
             }
             else
             {
-                output.insertBack(cast(char) (high - 10 + 'a'));
+                zeroesInGroup = 0;
             }
-            if (low < 10)
+            if (zeroesInGroup > largestGroupSize && zeroesInGroup > 1)
             {
-                output.insertBack(cast(char) (low + '0'));
+                largestGroupSize = zeroesInGroup;
+                largestGroupIndex = groupIndex;
             }
-            else
+        }
+
+        // Write the address
+        size_t i;
+        if (largestGroupIndex != 0)
         {
-                output.insertBack(cast(char) (low - 10 + 'a'));
+            writeGroup(output, i);
         }
-            if (i % 2 != 0 && i != (this.address.length - 1))
+        if (largestGroupIndex != -1)
         {
-                output.insertBack(':');
+            while (i < largestGroupIndex)
+            {
+                put(output, ":");
+                writeGroup(output, i);
             }
+            put(output, "::");
+            i += largestGroupSize + 2;
+            if (i < (this.address.length - 1))
+            {
+                writeGroup(output, i);
+            }
+        }
+
+        while (i < this.address.length - 1)
+        {
+            put(output, ":");
+            writeGroup(output, i);
         }
 
         return output;
@@ -605,10 +735,30 @@ struct Address6
     ///
     @nogc nothrow @safe unittest
     {
-        import tanya.algorithm.comparison : equal;
+        import tanya.container.string : String;
+        import tanya.range : backInserter;
 
-        assert(equal(address6("1:2:3:4:5:6:7:8").stringify()[],
+        String actual;
-               "0001:0002:0003:0004:0005:0006:0007:0008"));
+
+        address6("1:2:3:4:5:6:7:8").get.toString(backInserter(actual));
+        assert(actual == "1:2:3:4:5:6:7:8");
+    }
+
+    private void writeGroup(OR)(ref OR output, ref size_t i) const
+    {
+        ubyte low = this.address[i] & 0xf;
+        ubyte high = this.address[i] >> 4;
+
+        bool groupStarted = writeHexDigit!OR(output, high);
+        groupStarted = writeHexDigit!OR(output, low, groupStarted);
+
+        ++i;
+        low = this.address[i] & 0xf;
+        high = this.address[i] >> 4;
+
+        writeHexDigit!OR(output, high, groupStarted);
+        put(output, low.toHexDigit.singleton);
+        ++i;
     }
 
     /**
@@ -626,17 +776,36 @@ struct Address6
     {
         auto actual = address6("1:2:3:4:5:6:7:8");
         ubyte[16] expected = [0, 1, 0, 2, 0, 3, 0, 4, 0, 5, 0, 6, 0, 7, 0, 8];
-        assert(actual.toBytes() == expected);
+        assert(actual.get.toBytes() == expected);
     }
 }
 
-private void write2Bytes(R)(ref R range, ubyte[] address)
+private void read2Bytes(R)(ref R range, ubyte[] address)
 {
     ushort group = readIntegral!ushort(range, 16);
     address[0] = cast(ubyte) (group >> 8);
     address[1] = group & 0xff;
 }
 
+private char toHexDigit(ubyte digit) @nogc nothrow pure @safe
+in (digit < 16)
+{
+    return cast(char) (digit >= 10 ? (digit - 10 + 'a') : (digit + '0'));
+}
+
+private bool writeHexDigit(OR)(ref OR output,
+                               ubyte digit,
+                               bool groupStarted = false)
+in (digit < 16)
+{
+    if (digit != 0 || groupStarted)
+    {
+        put(output, digit.toHexDigit.singleton);
+        return true;
+    }
+    return groupStarted;
+}
+
 /**
  * Parses a string containing an IPv6 address.
  *
@@ -645,20 +814,17 @@ private void write2Bytes(R)(ref R range, ubyte[] address)
  * is specified (i.e. first character after `%` is not a digit), the parser
  * tries to convert it to the ID of that interface. If the interface with the
  * given name can't be found, the parser doesn't fail, but just ignores the
- * invalid interface name.
+ * invalid interface name, scope ID is `0` then.
  *
  * If an ID is given (i.e. first character after `%` is a digit),
  * $(D_PSYMBOL address6) just stores it in $(D_PSYMBOL Address6.scopeID) without
  * checking whether an interface with this ID really exists. If the ID is
  * invalid (if it is too long or contains non decimal characters), parsing
- * and nothing is returned.
+ * fails and nothing is returned.
  *
  * If neither an ID nor a name is given, $(D_PSYMBOL Address6.scopeID) is set
  * to `0`.
  *
- * The parser doesn't support notation with an embedded IPv4 address (e.g.
- * ::1.2.3.4).
- *
  * Params:
  *  R     = Input range type.
  *  range = Stringish range containing the address.
@@ -675,7 +841,6 @@ if (isForwardRange!R && is(Unqual!(ElementType!R) == char) && hasLength!R)
     }
     Address6 result;
     ubyte[12] tail;
-    size_t i;
     size_t j;
 
     // An address begins with a number, not ':'. But there is a special case
@@ -693,10 +858,27 @@ if (isForwardRange!R && is(Unqual!(ElementType!R) == char) && hasLength!R)
 
     // Parse the address before '::'.
     // This loop parses the whole address if it doesn't contain '::'.
-    for (; i < 13; i += 2)
+    static foreach (i; 0 .. 7)
     {
-        write2Bytes(range, result.address[i .. $]);
+        { // To make "state" definition local
-        if (range.empty || range.front != ':')
+            static if (i == 6) // Can be embedded IPv4
+            {
+                auto state = range.save();
+            }
+            read2Bytes(range, result.address[i * 2 .. $]);
+            if (range.empty)
+            {
+                return typeof(return)();
+            }
+            static if (i == 6)
+            {
+                if (range.front == '.')
+                {
+                    swap(range, state);
+                    goto ParseIPv4;
+                }
+            }
+            if (range.front != ':')
             {
                 return typeof(return)();
             }
@@ -711,7 +893,8 @@ if (isForwardRange!R && is(Unqual!(ElementType!R) == char) && hasLength!R)
                 goto ParseTail;
             }
         }
-    write2Bytes(range, result.address[14 .. $]);
+    }
+    read2Bytes(range, result.address[14 .. $]);
 
     if (range.empty)
     {
@@ -739,7 +922,10 @@ ParseTail: // after ::
     {
         return typeof(return)();
     }
-    write2Bytes(range, tail[j .. $]);
+    { // To make "state" definition local
+        auto state = range.save();
+
+        read2Bytes(range, tail[j .. $]);
         if (range.empty)
         {
             goto CopyTail;
@@ -748,19 +934,27 @@ ParseTail: // after ::
         {
             goto ParseIface;
         }
+        else if (range.front == '.')
+        {
+            swap(range, state);
+            goto ParseIPv4;
+        }
         else if (range.front != ':')
         {
             return typeof(return)();
         }
         range.popFront();
+    }
 
-    for (i = 2, j = 2; i <= 11; i += 2, j += 2, range.popFront())
+    j = 2;
+    for (size_t i = 2; i <= 11; i += 2, j += 2, range.popFront())
     {
         if (range.empty || range.front == ':')
         {
             return typeof(return)();
         }
-        write2Bytes(range, tail[j .. $]);
+        auto state = range.save();
+        read2Bytes(range, tail[j .. $]);
 
         if (range.empty)
         {
@@ -770,12 +964,45 @@ ParseTail: // after ::
         {
             goto ParseIface;
         }
+        else if (range.front == '.')
+        {
+            swap(range, state);
+            goto ParseIPv4;
+        }
         else if (range.front != ':')
         {
             return typeof(return)();
         }
     }
 
+ParseIPv4:
+    // We know there is a number followed by '.'. We have to ensure this number
+    // is an octet
+    tail[j] = readIntegral!ubyte(range);
+    static foreach (i; 1 .. 4)
+    {
+        if (range.empty || range.front != '.')
+        {
+            return typeof(return)();
+        }
+        range.popFront();
+        if (range.empty)
+        {
+            return typeof(return)();
+        }
+        tail[j + i] = readIntegral!ubyte(range);
+    }
+    j += 2;
+
+    if (range.empty)
+    {
+        goto CopyTail;
+    }
+    else if (range.front != '%')
+    {
+        return typeof(return)();
+    }
+
 ParseIface: // Scope name or ID
     range.popFront();
     if (range.empty)
@@ -804,41 +1031,6 @@ CopyTail:
     return typeof(return)(result);
 }
 
-@nogc nothrow @safe unittest
-{
-    {
-        ubyte[16] expected = [0, 1, 0, 2, 0, 3, 0, 4, 0, 5, 0, 6, 0, 7, 0, 8];
-        auto actual = address6("1:2:3:4:5:6:7:8");
-        assert(actual.address == expected);
-    }
-    {
-        ubyte[16] expected;
-        auto actual = address6("::");
-        assert(actual.address == expected);
-    }
-    {
-        ubyte[16] expected = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1];
-        auto actual = address6("::1");
-        assert(actual.address == expected);
-    }
-    {
-        ubyte[16] expected = [0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
-        auto actual = address6("1::");
-        assert(actual.address == expected);
-    }
-}
-
-// Rejects malformed addresses
-@nogc nothrow @safe unittest
-{
-    assert(address6("").isNothing);
-    assert(address6(":").isNothing);
-    assert(address6(":a").isNothing);
-    assert(address6("a:").isNothing);
-    assert(address6("1:2:3:4::6:").isNothing);
-    assert(address6("1:2:3:4::6:7:8%").isNothing);
-}
-
 /**
  * Constructs an $(D_PSYMBOL Address6) from raw bytes in network byte order and
  * the scope ID.
@@ -888,3 +1080,252 @@ if (isInputRange!R && is(Unqual!(ElementType!R) == ubyte))
         assert(address6(cast(ubyte[]) []).isNothing);
     }
 }
+
+/**
+ * Address storage, that can hold either an IPv4 or IPv6 address.
+ */
+struct Address
+{
+    private Variant!(Address4, Address6) address;
+
+    @disable this();
+
+    /**
+     * Initializes the addres with an IPv4 address.
+     *
+     * Params:
+     *  address = IPv6 address.
+     */
+    this(Address4 address) @nogc nothrow pure @safe
+    {
+        this.address = address;
+    }
+
+    /**
+     * Initializes the addres with an IPv4 address.
+     *
+     * Params:
+     *  address = IPv6 address.
+     */
+    this(Address6 address) @nogc nothrow pure @safe
+    {
+        this.address = address;
+    }
+
+    /**
+     * Determines whether this is an IPv4 address.
+     *
+     * Returns: $(D_KEYWORD true) if this is an IPv4 address,
+     *          $(D_KEYWORD false) otherwise.
+     */
+    bool isV4() const @nogc nothrow pure @safe
+    {
+        return this.address.peek!Address4;
+    }
+
+    ///
+    @nogc nothrow pure @safe unittest
+    {
+        assert(Address(Address4.any()).isV4());
+    }
+
+    /**
+     * Determines whether this is an IPv6 address.
+     *
+     * Returns: $(D_KEYWORD true) if this is an IPv6 address,
+     *          $(D_KEYWORD false) otherwise.
+     */
+    bool isV6() const @nogc nothrow pure @safe
+    {
+        return this.address.peek!Address6;
+    }
+
+    ///
+    @nogc nothrow pure @safe unittest
+    {
+        assert(Address(Address6.any()).isV6());
+    }
+
+    /**
+     * Get the address as an IPv4 address.
+     *
+     * This method doesn't convert the address, so the address should be
+     * already an IPv4 one.
+     *
+     * Returns: IPv4 address.
+     *
+     * Precondition: This is an IPv4 address.
+     */
+    ref inout(Address4) toV4() inout @nogc nothrow pure @safe
+    in (this.address.peek!Address4)
+    {
+        return this.address.get!Address4;
+    }
+
+    ///
+    @nogc nothrow pure @safe unittest
+    {
+        auto expected = Address4.loopback;
+        assert(Address(expected).toV4() == expected);
+    }
+
+    /**
+     * Get the address as an IPv6 address.
+     *
+     * This method doesn't convert the address, so the address should be
+     * already an IPv6 one.
+     *
+     * Returns: IPv6 address.
+     *
+     * Precondition: This is an IPv6 address.
+     */
+    ref inout(Address6) toV6() inout @nogc nothrow pure @safe
+    in (this.address.peek!Address6)
+    {
+        return this.address.get!Address6;
+    }
+
+    ///
+    @nogc nothrow pure @safe unittest
+    {
+        auto expected = Address6.loopback;
+        assert(Address(expected).toV6() == expected);
+    }
+
+    /**
+     * Determines whether this is a loopback address.
+     *
+     * Returns: $(D_KEYWORD true) if this is a loopback address,
+     *          $(D_KEYWORD false) otherwise.
+     *
+     * See_Also: $(D_PSYMBOL Address4.loopback),
+     *           $(D_PSYMBOL Address6.loopback).
+     */
+    bool isLoopback() const @nogc nothrow pure @safe
+    in (this.address.hasValue)
+    {
+        if (this.address.peek!Address4)
+        {
+            return this.address.get!Address4.isLoopback();
+        }
+        return this.address.get!Address6.isLoopback();
+    }
+
+    ///
+    @nogc nothrow pure @safe unittest
+    {
+        assert(Address(Address4.loopback()).isLoopback());
+        assert(Address(Address6.loopback()).isLoopback());
+    }
+
+    /**
+     * Determines whether this address' destination is a group of endpoints.
+     *
+     * Returns: $(D_KEYWORD true) if this is a multicast address,
+     *          $(D_KEYWORD false) otherwise.
+     *
+     * See_Also: $(D_PSYMBOL Address4.isMulticast),
+     *           $(D_PSYMBOL Address6.isMulticast).
+     */
+    bool isMulticast() const @nogc nothrow pure @safe
+    in (this.address.hasValue)
+    {
+        if (this.address.peek!Address4)
+        {
+            return this.address.get!Address4.isMulticast();
+        }
+        return this.address.get!Address6.isMulticast();
+    }
+
+    ///
+    @nogc nothrow @safe unittest
+    {
+        assert(Address(address4("224.0.0.3").get).isMulticast());
+        assert(Address(address6("ff00::").get).isMulticast());
+    }
+
+    /**
+     * Determines whether this is an unspecified address.
+     *
+     * Returns: $(D_KEYWORD true) if this is an unspecified address,
+     *          $(D_KEYWORD false) otherwise.
+     *
+     * See_Also: $(D_PSYMBOL Address4.isAny), $(D_PSYMBOL Address6.isAny).
+     */
+    bool isAny() const @nogc nothrow pure @safe
+    in (this.address.hasValue)
+    {
+        if (this.address.peek!Address4)
+        {
+            return this.address.get!Address4.isAny();
+        }
+        return this.address.get!Address6.isAny();
+    }
+
+    ///
+    @nogc nothrow pure @safe unittest
+    {
+        assert(Address(Address4.any).isAny());
+        assert(Address(Address6.any).isAny());
+    }
+
+    /**
+     * Compares two addresses for equality.
+     *
+     * Params:
+     *  T    = The type of the other address. It can be $(D_PSYMBOL Address),
+     *         $(D_PSYMBOL Address4) or $(D_PSYMBOL Address6).
+     *  that = The address to compare with.
+     *
+     * Returns: $(D_KEYWORD true) if this and $(D_PARAM that) addresses are
+     *          representations of the same IP address, $(D_KEYWORD false)
+     *          otherwise.
+     */
+    bool opEquals(T)(T that) const
+    if (is(Unqual!T == Address4) || is(Unqual!T == Address6))
+    {
+        alias AddressType = Unqual!T;
+        if (this.address.peek!AddressType)
+        {
+            return this.address.get!AddressType == that;
+        }
+        return false;
+    }
+
+    ///
+    @nogc nothrow pure @safe unittest
+    {
+        assert(Address(Address4.loopback) == Address4.loopback);
+        assert(Address(Address6.loopback) == Address6.loopback);
+        assert(Address(Address4.loopback) != Address6.loopback);
+    }
+
+    /// ditto
+    bool opEquals(T)(T that) const
+    if (is(Unqual!T == Address))
+    {
+        return this.address == that.address;
+    }
+
+    ///
+    @nogc nothrow pure @safe unittest
+    {
+        assert(Address(Address6.loopback) == Address(Address6.loopback));
+        assert(Address(Address4.loopback) != Address(Address6.loopback));
+    }
+
+    ref Address opAssign(T)(T that)
+    if (is(Unqual!T == Address4) || is(Unqual!T == Address6))
+    {
+        this.address = that;
+        return this;
+    }
+
+    ///
+    @nogc nothrow pure @safe unittest
+    {
+        Address address = Address4.any;
+        address = Address4.loopback;
+        assert(address == Address4.loopback);
+    }
+}

source/tanya/net/package.d

@@ -5,7 +5,7 @@
 /**
  * Network programming.
  *
- * Copyright: Eugene Wissner 2017-2018.
+ * Copyright: Eugene Wissner 2017-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@@ -14,5 +14,7 @@
  */
 module tanya.net;
 
+public import tanya.net.iface;
 public import tanya.net.inet;
+public import tanya.net.ip;
 public import tanya.net.uri;

source/tanya/net/uri.d

@@ -5,7 +5,7 @@
 /**
  * URL parser.
  *
- * Copyright: Eugene Wissner 2017-2018.
+ * Copyright: Eugene Wissner 2017-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@@ -16,12 +16,7 @@ module tanya.net.uri;
 
 import tanya.conv;
 import tanya.encoding.ascii;
-import tanya.memory;
+import tanya.memory.allocator;
-
-version (unittest)
-{
-    import tanya.test.assertion;
-}
 
 /**
  * Thrown if an invalid URI was specified.
@@ -370,90 +365,6 @@ struct URL
     assert(u.fragment == "fragment");
 }
 
-@nogc pure @system unittest
-{
-    auto u = URL("127.0.0.1");
-    assert(u.path == "127.0.0.1");
-
-    u = URL("http://127.0.0.1");
-    assert(u.scheme == "http");
-    assert(u.host == "127.0.0.1");
-
-    u = URL("http://127.0.0.1:9000");
-    assert(u.scheme == "http");
-    assert(u.host == "127.0.0.1");
-    assert(u.port == 9000);
-
-    u = URL("127.0.0.1:80");
-    assert(u.host == "127.0.0.1");
-    assert(u.port == 80);
-    assert(u.path is null);
-
-    u = URL("//example.net");
-    assert(u.host == "example.net");
-    assert(u.scheme is null);
-
-    u = URL("//example.net?q=before:after");
-    assert(u.host == "example.net");
-    assert(u.query == "q=before:after");
-
-    u = URL("localhost:8080");
-    assert(u.host == "localhost");
-    assert(u.port == 8080);
-    assert(u.path is null);
-
-    u = URL("ftp:");
-    assert(u.scheme == "ftp");
-
-    u = URL("file:///C:\\Users");
-    assert(u.scheme == "file");
-    assert(u.path == "C:\\Users");
-
-    u = URL("localhost:66000");
-    assert(u.scheme == "localhost");
-    assert(u.path == "66000");
-
-    u = URL("file:///home/");
-    assert(u.scheme == "file");
-    assert(u.path == "/home/");
-
-    u = URL("file:///home/?q=asdf");
-    assert(u.scheme == "file");
-    assert(u.path == "/home/");
-    assert(u.query == "q=asdf");
-
-    u = URL("http://secret@example.org");
-    assert(u.scheme == "http");
-    assert(u.host == "example.org");
-    assert(u.user == "secret");
-
-    u = URL("h_tp://:80");
-    assert(u.path == "h_tp://:80");
-    assert(u.port == 0);
-
-    u = URL("zlib:/home/user/file.gz");
-    assert(u.scheme == "zlib");
-    assert(u.path == "/home/user/file.gz");
-
-    u = URL("h_tp:asdf");
-    assert(u.path == "h_tp:asdf");
-}
-
-@nogc pure @system unittest
-{
-    assertThrown!URIException(() => URL("http://:80"));
-    assertThrown!URIException(() => URL(":80"));
-    assertThrown!URIException(() => URL("http://u1:p1@u2:p2@example.org"));
-    assertThrown!URIException(() => URL("http://blah.com:port"));
-    assertThrown!URIException(() => URL("http://blah.com:66000"));
-}
-
-@nogc pure @system unittest
-{
-    auto u = URL("ftp://");
-    assert(u.scheme == "ftp");
-}
-
 /**
  * Attempts to parse an URL from a string and returns the specified component
  * of the URL or $(D_PSYMBOL URL) if no component is specified.

source/tanya/network/package.d

@@ -5,7 +5,7 @@
 /**
  * Network programming.
  *
- * Copyright: Eugene Wissner 2016-2018.
+ * Copyright: Eugene Wissner 2016-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)

source/tanya/network/socket.d

@@ -41,7 +41,7 @@
  * For an example of an asynchronous server refer to the documentation of the
  * $(D_PSYMBOL tanya.async.loop) module.
  *
- * Copyright: Eugene Wissner 2016-2018.
+ * Copyright: Eugene Wissner 2016-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@@ -53,10 +53,10 @@ module tanya.network.socket;
 import core.stdc.errno;
 import core.time;
 public import std.socket : SocketOption, SocketOptionLevel;
-import std.traits;
-import std.typecons;
 import tanya.algorithm.comparison;
-import tanya.memory;
+import tanya.bitmanip;
+import tanya.memory.allocator;
+import tanya.meta.trait;
 import tanya.os.error;
 
 /// Value returned by socket operations on error.

source/tanya/range/adapter.d

@@ -3,260 +3,202 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
- * Range adapters.
+ * Range adapters transform some data structures into ranges.
  *
- * A range adapter wraps another range and modifies the way, how the original
+ * Copyright: Eugene Wissner 2018-2019.
- * range is iterated, or the order in which its elements are accessed.
- *
- * All adapters are lazy algorithms, they request the next element of the
- * adapted range on demand.
- *
- * Copyright: Eugene Wissner 2018.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
  * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/range/adapter.d,
  *                 tanya/range/adapter.d)
  */
-deprecated("Use tanya.algorithm.iteration instead")
 module tanya.range.adapter;
 
 import tanya.algorithm.mutation;
-import tanya.math;
+import tanya.memory.lifetime;
-import tanya.range.primitive;
+import tanya.meta.trait;
+import tanya.range;
 
-private mixin template Take(R, bool exactly)
+private mixin template InserterCtor()
 {
-    private R source;
+    private Container* container;
-    size_t length_;
 
-    @disable this();
+    private this(ref Container container) @trusted
-
-    private this(R source, size_t length)
     {
-        this.source = source;
+        this.container = &container;
-        static if (!exactly && hasLength!R)
-        {
-            this.length_ = min(source.length, length);
-        }
-        else
-        {
-            this.length_ = length;
-        }
-    }
-
-    @property auto ref front()
-    in
-    {
-        assert(!empty);
-    }
-    do
-    {
-        return this.source.front;
-    }
-
-    void popFront()
-    in
-    {
-        assert(!empty);
-    }
-    do
-    {
-        this.source.popFront();
-        --this.length_;
-    }
-
-    @property bool empty()
-    {
-        static if (exactly || isInfinite!R)
-        {
-            return length == 0;
-        }
-        else
-        {
-            return length == 0 || this.source.empty;
-        }
-    }
-
-    @property size_t length()
-    {
-        return this.length_;
-    }
-
-    static if (hasAssignableElements!R)
-    {
-        @property void front(ref ElementType!R value)
-        in
-        {
-            assert(!empty);
-        }
-        do
-        {
-            this.source.front = value;
-        }
-
-        @property void front(ElementType!R value)
-        in
-        {
-            assert(!empty);
-        }
-        do
-        {
-            this.source.front = move(value);
-        }
-    }
-
-    static if (isForwardRange!R)
-    {
-        typeof(this) save()
-        {
-            return typeof(this)(this.source.save(), length);
-        }
-    }
-    static if (isRandomAccessRange!R)
-    {
-        @property auto ref back()
-        in
-        {
-            assert(!empty);
-        }
-        do
-        {
-            return this.source[this.length - 1];
-        }
-
-        void popBack()
-        in
-        {
-            assert(!empty);
-        }
-        do
-        {
-            --this.length_;
-        }
-
-        auto ref opIndex(size_t i)
-        in
-        {
-            assert(i < length);
-        }
-        do
-        {
-            return this.source[i];
-        }
-
-        static if (hasAssignableElements!R)
-        {
-            @property void back(ref ElementType!R value)
-            in
-            {
-                assert(!empty);
-            }
-            do
-            {
-                this.source[length - 1] = value;
-            }
-
-            @property void back(ElementType!R value)
-            in
-            {
-                assert(!empty);
-            }
-            do
-            {
-                this.source[length - 1] = move(value);
-            }
-
-            void opIndexAssign(ref ElementType!R value, size_t i)
-            in
-            {
-                assert(i < length);
-            }
-            do
-            {
-                this.source[i] = value;
-            }
-
-            void opIndexAssign(ElementType!R value, size_t i)
-            in
-            {
-                assert(i < length);
-            }
-            do
-            {
-                this.source[i] = move(value);
-            }
-        }
-    }
-    static if (hasSlicing!R)
-    {
-        auto opSlice(size_t i, size_t j)
-        in
-        {
-            assert(i <= j);
-            assert(j <= length);
-        }
-        do
-        {
-            return take(this.source[i .. j], length);
-        }
     }
 }
 
 /**
- * Takes $(D_PARAM n) elements from $(D_PARAM range).
+ * If $(D_PARAM container) is a container with `insertBack`-support,
+ * $(D_PSYMBOL backInserter) returns an output range that puts the elements
+ * into the container with `insertBack`.
  *
- * If $(D_PARAM range) doesn't have $(D_PARAM n) elements, the resulting range
+ * The resulting output range supports all types `insertBack` supports.
- * spans all elements of $(D_PARAM range).
  *
- * $(D_PSYMBOL take) is particulary useful with infinite ranges. You can take
+ * The range keeps a reference to the container passed to it, it doesn't use
- ` $(B n) elements from such range and pass the result to an algorithm which
+ * any other storage. So there is no method to get the written data out of the
- * expects a finit range.
+ * range - the container passed to $(D_PSYMBOL backInserter) contains that data
+ * and can be used directly after all operations on the output range are
+ * completed. It also means that the result range is not allowed to outlive its
+ * container.
  *
  * Params:
- *  R     = Type of the adapted range.
+ *  Container = Container type.
- *  range = The range to take the elements from.
+ *  container = Container used as an output range.
- *  n     = The number of elements to take.
  *
- * Returns: A range containing maximum $(D_PARAM n) first elements of
+ * Returns: `insertBack`-based output range.
- *          $(D_PARAM range).
- *
- * See_Also: $(D_PSYMBOL takeExactly).
  */
-auto take(R)(R range, size_t n)
+auto backInserter(Container)(return scope ref Container container)
-if (isInputRange!R)
+if (hasMember!(Container, "insertBack"))
 {
-    struct Take
+    static struct Inserter
     {
-        mixin .Take!(R, false);
+        void opCall(T)(auto ref T data)
+        {
+            this.container.insertBack(forward!data);
         }
-    return Take(range, n);
+
+        mixin InserterCtor;
+    }
+    return Inserter(container);
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    static struct Container
+    {
+        int element;
+
+        void insertBack(int element)
+        {
+            this.element = element;
+        }
+    }
+    Container container;
+    backInserter(container)(5);
+
+    assert(container.element == 5);
 }
 
 /**
- * Takes exactly $(D_PARAM n) elements from $(D_PARAM range).
+ * If $(D_PARAM container) is a container with `insertFront`-support,
+ * $(D_PSYMBOL frontInserter) returns an output range that puts the elements
+ * into the container with `insertFront`.
  *
- * $(D_PARAM range) must have at least $(D_PARAM n) elements.
+ * The resulting output range supports all types `insertFront` supports.
  *
- * $(D_PSYMBOL takeExactly) is particulary useful with infinite ranges. You can
+ * The range keeps a reference to the container passed to it, it doesn't use
- ` take $(B n) elements from such range and pass the result to an algorithm
+ * any other storage. So there is no method to get the written data out of the
- * which expects a finit range.
+ * range - the container passed to $(D_PSYMBOL frontInserter) contains that data
+ * and can be used directly after all operations on the output range are
+ * completed. It also means that the result range is not allowed to outlive its
+ * container.
  *
  * Params:
- *  R     = Type of the adapted range.
+ *  Container = Container type.
- *  range = The range to take the elements from.
+ *  container = Container used as an output range.
- *  n     = The number of elements to take.
  *
- * Returns: A range containing $(D_PARAM n) first elements of $(D_PARAM range).
+ * Returns: `insertFront`-based output range.
- *
- * See_Also: $(D_PSYMBOL take).
  */
-auto takeExactly(R)(R range, size_t n)
+auto frontInserter(Container)(return scope ref Container container)
-if (isInputRange!R)
+if (hasMember!(Container, "insertFront"))
 {
-    struct TakeExactly
+    static struct Inserter
     {
-        mixin Take!(R, true);
+        void opCall(T)(auto ref T data)
+        {
+            this.container.insertFront(forward!data);
         }
-    return TakeExactly(range, n);
+
+        mixin InserterCtor;
+    }
+    return Inserter(container);
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    static struct Container
+    {
+        int element;
+
+        void insertFront(int element)
+        {
+            this.element = element;
+        }
+    }
+    Container container;
+    frontInserter(container)(5);
+
+    assert(container.element == 5);
+}
+
+/**
+ * $(D_PSYMBOL arrayInserter) makes an output range out of an array.
+ *
+ * The returned output range accepts single values as well as input ranges that
+ * can be copied into the target array.
+ *
+ * Params:
+ *  Array = Array type.
+ *  array = Array.
+ *
+ * Returns: An output range writing into $(D_PARAM array).
+ */
+auto arrayInserter(Array)(return scope ref Array array)
+if (isArray!Array)
+{
+    static if (is(Array ArrayT : ArrayT[size], size_t size))
+    {
+        alias E = ArrayT;
+    }
+    else
+    {
+        alias E = ElementType!Array;
+    }
+
+    static struct ArrayInserter
+    {
+        private E[] data;
+
+        private this(ref Array data) @trusted
+        {
+            this.data = data[];
+        }
+
+        void opCall(T)(auto ref T data)
+        if (is(T : E))
+        in (!this.data.empty)
+        {
+            put(this.data, data);
+        }
+
+        void opCall(R)(auto ref R data)
+        if (isInputRange!R && isOutputRange!(E[], ElementType!R))
+        {
+            this.data = copy(data, this.data);
+        }
+    }
+    return ArrayInserter(array);
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    int[1] array;
+
+    arrayInserter(array)(5);
+    assert(array[0] == 5);
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    char[1] array;
+    alias Actual = typeof(arrayInserter(array));
+
+    static assert(isOutputRange!(Actual, char));
+    static assert(isOutputRange!(Actual, char[]));
 }

source/tanya/range/array.d

@@ -31,7 +31,7 @@
  * (D_INLINECODE dchar[])) are treated as any other normal array, they aren't
  * auto-decoded.
  *
- * Copyright: Eugene Wissner 2017-2018.
+ * Copyright: Eugene Wissner 2017-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@@ -54,12 +54,8 @@ module tanya.range.array;
  *
  * Precondition: $(D_INLINECODE array.length > 0).
  */
-@property ref T front(T)(T[] array)
+@property ref inout(T) front(T)(return scope inout(T)[] array)
-in
+in (array.length > 0)
-{
-    assert(array.length > 0);
-}
-do
 {
     return array[0];
 }
@@ -94,12 +90,8 @@ do
  *
  * Precondition: $(D_INLINECODE array.length > 0).
  */
-@property ref T back(T)(T[] array)
+@property ref inout(T) back(T)(return scope inout(T)[] array)
-in
+in (array.length > 0)
-{
-    assert(array.length > 0);
-}
-do
 {
     return array[$ - 1];
 }
@@ -133,23 +125,15 @@ do
  *
  * Precondition: $(D_INLINECODE array.length > 0).
  */
-void popFront(T)(ref T[] array)
+void popFront(T)(scope ref inout(T)[] array)
-in
+in (array.length > 0)
-{
-    assert(array.length > 0);
-}
-do
 {
     array = array[1 .. $];
 }
 
 /// ditto
-void popBack(T)(ref T[] array)
+void popBack(T)(scope ref inout(T)[] array)
-in
+in (array.length > 0)
-{
-    assert(array.length > 0);
-}
-do
 {
     array = array[0 .. $ - 1];
 }
@@ -178,7 +162,7 @@ do
  * Returns: $(D_KEYWORD true) if $(D_PARAM array) has no elements,
  *          $(D_KEYWORD false) otherwise.
  */
-@property bool empty(T)(const T[] array)
+@property bool empty(T)(scope const T[] array)
 {
     return array.length == 0;
 }
@@ -203,7 +187,7 @@ do
  *
  * Returns: A copy of the slice $(D_PARAM array).
  */
-@property T[] save(T)(T[] array)
+@property inout(T)[] save(T)(return scope inout(T)[] array)
 {
     return array;
 }

source/tanya/range/package.d

@@ -6,7 +6,7 @@
  * This package contains generic functions and templates to be used with D
  * ranges.
  *
- * Copyright: Eugene Wissner 2017-2018.
+ * Copyright: Eugene Wissner 2017-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)

source/tanya/typecons.d

@@ -8,7 +8,7 @@
  * This module contains templates that allow to build new types from the
  * available ones.
  *
- * Copyright: Eugene Wissner 2017-2018.
+ * Copyright: Eugene Wissner 2017-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@@ -17,8 +17,8 @@
  */
 module tanya.typecons;
 
-import tanya.algorithm.mutation;
 import tanya.format;
+import tanya.memory.lifetime;
 import tanya.meta.metafunction;
 import tanya.meta.trait;
 
@@ -35,6 +35,8 @@ import tanya.meta.trait;
  *
  * Params:
  *  Specs = Field types and names.
+ *
+ * See_Also: $(D_PSYMBOL tuple).
  */
 template Tuple(Specs...)
 {
@@ -114,23 +116,41 @@ template Tuple(Specs...)
     assert(pair[1] == "second");
 }
 
+/**
+ * Creates a new $(D_PSYMBOL Tuple).
+ *
+ * Params:
+ *  Names = Field names.
+ *
+ * See_Also: $(D_PSYMBOL Tuple).
+ */
+template tuple(Names...)
+{
+    /**
+     * Creates a new $(D_PSYMBOL Tuple).
+     *
+     * Params:
+     *  Args = Field types.
+     *  args = Field values.
+     *
+     * Returns: Newly created $(D_PSYMBOL Tuple).
+     */
+    auto tuple(Args...)(auto ref Args args)
+    if (Args.length >= Names.length && isTypeTuple!Args)
+    {
+        alias Zipped = ZipWith!(AliasSeq, Pack!Args, Pack!Names);
+        alias Nameless = Args[Names.length .. $];
+
+        return Tuple!(Zipped, Nameless)(forward!args);
+    }
+}
+
+///
 @nogc nothrow pure @safe unittest
 {
-    static assert(is(Tuple!(int, int)));
+    auto t = tuple!("one", "two")(20, 5);
-    static assert(!is(Tuple!(int, 5)));
+    assert(t.one == 20);
-
+    assert(t.two == 5);
-    static assert(is(Tuple!(int, "first", int)));
-    static assert(is(Tuple!(int, "first", int, "second")));
-    static assert(is(Tuple!(int, "first", int)));
-
-    static assert(is(Tuple!(int, int, "second")));
-    static assert(!is(Tuple!("first", int, "second", int)));
-    static assert(!is(Tuple!(int, int, int)));
-
-    static assert(!is(Tuple!(int, "first")));
-
-    static assert(!is(Tuple!(int, double, char)));
-    static assert(!is(Tuple!(int, "first", double, "second", char, "third")));
 }
 
 /**
@@ -138,6 +158,8 @@ template Tuple(Specs...)
  *
  * Params:
  *  T = Type of the encapsulated value.
+ *
+ * See_Also: $(D_PSYMBOL option).
  */
 struct Option(T)
 {
@@ -184,11 +206,15 @@ struct Option(T)
      * Precondition: `!isNothing`.
      */
     @property ref inout(T) get() inout
-    in
+    in (!isNothing, "Option is nothing")
     {
-        assert(!isNothing, "Option is nothing");
+        return this.value;
     }
-    do
+
+    /// ditto
+    deprecated("Call Option.get explicitly instead of relying on alias this")
+    @property ref inout(T) get_() inout
+    in (!isNothing, "Option is nothing")
     {
         return this.value;
     }
@@ -270,11 +296,7 @@ struct Option(T)
     /// ditto
     bool opEquals(U)(auto ref const U that) const
     if (ifTestable!(U, a => a == T.init) && !is(U == Option))
-    in
+    in (!isNothing)
-    {
-        assert(!isNothing);
-    }
-    do
     {
         return get == that;
     }
@@ -324,8 +346,15 @@ struct Option(T)
     ref typeof(this) opAssign(U)(ref U that)
     if (is(U == Option))
     {
-        this.value = that;
+        if (that.isNothing)
-        this.isNothing_ = that.isNothing;
+        {
+            reset();
+        }
+        else
+        {
+            this.value = that.get;
+            this.isNothing_ = false;
+        }
         return this;
     }
 
@@ -338,7 +367,25 @@ struct Option(T)
         return this;
     }
 
-    alias get this;
+    version (D_Ddoc)
+    {
+        /**
+         * If $(D_PARAM T) has a `toHash()` method, $(D_PSYMBOL Option) defines
+         * `toHash()` which returns `T.toHash()` if it is set or 0 otherwise.
+         *
+         * Returns: Hash value.
+         */
+        size_t toHash() const;
+    }
+    else static if (is(typeof(T.init.toHash()) == size_t))
+    {
+        size_t toHash() const
+        {
+            return isNothing ? 0U : this.value.toHash();
+        }
+    }
+
+    alias get_ this;
 }
 
 ///
@@ -357,98 +404,298 @@ struct Option(T)
     assert(option.isNothing);
 }
 
-// Assigns a new value
+/**
+ * Creates a new $(D_PSYMBOL Option).
+ *
+ * Params:
+ *  T     = Option type.
+ *  value = Initial value.
+ *
+ * See_Also: $(D_PSYMBOL Option).
+ */
+Option!T option(T)(auto ref T value)
+{
+    return Option!T(forward!value);
+}
+
+/// ditto
+Option!T option(T)()
+{
+    return Option!T();
+}
+
+///
 @nogc nothrow pure @safe unittest
 {
-    {
+    assert(option!int().isNothing);
-        Option!int option = 5;
+    assert(option(5) == 5);
-        option = 8;
-        assert(!option.isNothing);
-        assert(option == 8);
 }
+
+/**
+ * Type that can hold one of the types listed as its template parameters.
+ *
+ * $(D_PSYMBOL Variant) is a type similar to $(D_KEYWORD union), but
+ * $(D_PSYMBOL Variant) keeps track of the actually used type and throws an
+ * assertion error when trying to access an invalid type at runtime.
+ *
+ * Params:
+ *  Specs = Types this $(D_SPYBMOL Variant) can hold.
+ */
+template Variant(Specs...)
+if (isTypeTuple!Specs && NoDuplicates!Specs.length == Specs.length)
 {
-        Option!int option;
+    union AlignedUnion(Args...)
-        const int newValue = 8;
+    {
-        assert(option.isNothing);
+        static if (Args.length > 0)
-        option = newValue;
+        {
-        assert(!option.isNothing);
+            Args[0] value;
-        assert(option == newValue);
         }
+        static if (Args.length > 1)
         {
-        Option!int option1;
+            AlignedUnion!(Args[1 .. $]) rest;
-        Option!int option2 = 5;
-        assert(option1.isNothing);
-        option1 = option2;
-        assert(!option1.isNothing);
-        assert(option1.get == 5);
         }
     }
 
-// Constructs with a value passed by reference
+    private struct VariantAccessorInfo
-@nogc nothrow pure @safe unittest
     {
-    int i = 5;
+        string accessor;
-    assert(Option!int(i).get == 5);
+        ptrdiff_t tag;
     }
 
-// Moving
+    template accessor(T, Union)
-@nogc nothrow pure @safe unittest
     {
-    static struct NotCopyable
+        enum VariantAccessorInfo info = accessorImpl!(T, Union, 1);
-    {
+        enum accessor = VariantAccessorInfo("this.values" ~ info.accessor, info.tag);
-        @disable this(this);
     }
 
-    static assert(is(typeof(Option!NotCopyable(NotCopyable()))));
+    template accessorImpl(T, Union, size_t tag)
-    // The value cannot be returned by reference because the default value
-    // isn't passed by reference
-    static assert(!is(typeof(Option!DisabledPostblit().or(NotCopyable()))));
     {
-        NotCopyable notCopyable;
+        static if (is(T == typeof(Union.value)))
-        static assert(is(typeof(Option!NotCopyable().or(notCopyable))));
+        {
+            enum accessorImpl = VariantAccessorInfo(".value", tag);
         }
+        else
         {
-        Option!NotCopyable option;
+            enum VariantAccessorInfo info = accessorImpl!(T, typeof(Union.rest), tag + 1);
-        assert(option.isNothing);
+            enum accessorImpl = VariantAccessorInfo(".rest" ~ info.accessor, info.tag);
-        option = NotCopyable();
-        assert(!option.isNothing);
-    }
-    {
-        Option!NotCopyable option;
-        assert(option.isNothing);
-        option = Option!NotCopyable(NotCopyable());
-        assert(!option.isNothing);
         }
     }
 
-// Cast to bool is done before touching the encapsulated value
+    struct Variant
-@nogc nothrow pure @safe unittest
     {
-    assert(Option!bool(false));
+        /// Types can be present in this $(D_PSYMBOL Variant).
+        alias Types = Specs;
+
+        private ptrdiff_t tag = -1;
+        private AlignedUnion!Types values;
+
+        /**
+         * Constructs this $(D_PSYMBOL Variant) with one of the types supported
+         * in it.
+         *
+         * Params:
+         *  T     = Type of the initial value.
+         *  value = Initial value.
+         */
+        this(T)(ref T value)
+        if (canFind!(T, Types))
+        {
+            copyAssign!T(value);
         }
 
-// Option can be const
+        /// ditto
-@nogc nothrow pure @safe unittest
+        this(T)(T value)
+        if (canFind!(T, Types))
         {
-    assert((const Option!int(5)).get == 5);
+            moveAssign!T(value);
-    assert((const Option!int()).or(5) == 5);
         }
 
-// Equality
+        ~this()
-@nogc nothrow pure @safe unittest
         {
-    assert(Option!int() == Option!int());
+            reset();
-    assert(Option!int(0) != Option!int());
-    assert(Option!int(5) == Option!int(5));
-    assert(Option!int(5) == 5);
-    assert(Option!int(5) == cast(ubyte) 5);
         }
 
-// Returns default value
+        this(this)
+        {
+            alias pred(U) = hasElaborateCopyConstructor!(U.Seq[1]);
+            static foreach (Type; Filter!(pred, Enumerate!Types))
+            {
+                if (this.tag == Type.Seq[0])
+                {
+                    get!(Type.Seq[1]).__postblit();
+                }
+            }
+        }
+
+        /**
+         * Tells whether this $(D_PSYMBOL Variant) is initialized.
+         *
+         * Returns: $(D_KEYWORD true) if this $(D_PSYMBOL Variant) contains a
+         *          value, $(D_KEYWORD false) otherwise.
+         */
+        bool hasValue() const
+        {
+            return this.tag != -1;
+        }
+
+        /**
+         * Tells whether this $(D_PSYMBOL Variant) holds currently a value of
+         * type $(D_PARAM T).
+         *
+         * Params:
+         *  T = Examined type.
+         *
+         * Returns: $(D_KEYWORD true) if this $(D_PSYMBOL Variant) currently
+         *          contains a value of type $(D_PARAM T), $(D_KEYWORD false)
+         *          otherwise.
+         */
+        bool peek(T)() const
+        if (canFind!(T, Types))
+        {
+            return this.tag == staticIndexOf!(T, Types);
+        }
+
+        /**
+         * Returns the underlying value, assuming it is of the type $(D_PARAM T).
+         *
+         * Params:
+         *  T = Type of the value should be returned.
+         *
+         * Returns: The underyling value.
+         *
+         * Precondition: The $(D_PSYMBOL Variant) has a value.
+         *
+         * See_Also: $(D_PSYMBOL peek), $(D_PSYMBOL hasValue).
+         */
+        ref inout(T) get(T)() inout
+        if (canFind!(T, Types))
+        in (this.tag == staticIndexOf!(T, Types), "Variant isn't initialized")
+        {
+            mixin("return " ~ accessor!(T, AlignedUnion!Types).accessor ~ ";");
+        }
+
+        /**
+         * Reassigns the value.
+         *
+         * Params:
+         *  T    = Type of the new value
+         *  that = New value.
+         *
+         * Returns: $(D_KEYWORD this).
+         */
+        ref typeof(this) opAssign(T)(T that)
+        if (canFind!(T, Types))
+        {
+            reset();
+            return moveAssign!T(that);
+        }
+
+        /// ditto
+        ref typeof(this) opAssign(T)(ref T that)
+        if (canFind!(T, Types))
+        {
+            reset();
+            return copyAssign!T(that);
+        }
+
+        private ref typeof(this) moveAssign(T)(ref T that) @trusted
+        {
+            this.tag = staticIndexOf!(T, Types);
+
+            enum string accessorMixin = accessor!(T, AlignedUnion!Types).accessor;
+            moveEmplace(that, mixin(accessorMixin));
+
+            return this;
+        }
+
+        private ref typeof(this) copyAssign(T)(ref T that) return
+        {
+            this.tag = staticIndexOf!(T, Types);
+
+            enum string accessorMixin = accessor!(T, AlignedUnion!Types).accessor;
+            emplace!T((() @trusted => (&mixin(accessorMixin))[0 .. 1])(), that);
+
+            return this;
+        }
+
+        private void reset()
+        {
+            alias pred(U) = hasElaborateDestructor!(U.Seq[1]);
+            static foreach (Type; Filter!(pred, Enumerate!Types))
+            {
+                if (this.tag == Type.Seq[0])
+                {
+                    destroy(get!(Type.Seq[1]));
+                }
+            }
+        }
+
+        /**
+         * Returns $(D_PSYMBOL TypeInfo) corresponding to the current type.
+         *
+         * If this $(D_PSYMBOL Variant) isn't initialized, returns
+         * $(D_KEYWORD null).
+         *
+         * Returns: $(D_PSYMBOL TypeInfo) of the current type.
+         */
+        @property TypeInfo type()
+        {
+            static foreach (i, Type; Types)
+            {
+                if (this.tag == i)
+                {
+                    return typeid(Type);
+                }
+            }
+            return null;
+        }
+
+        /**
+         * Compares this $(D_PSYMBOL Variant) with another one with the same
+         * specification for equality.
+         *
+         * $(UL
+         *  $(LI If both hold values of the same type, these values are
+         *       compared.)
+         *  $(LI If they hold values of different types, then the
+         *       $(D_PSYMBOL Variant)s aren't equal.)
+         *  $(LI If only one of them is initialized but another one not, they
+         *       aren't equal.)
+         *  $(LI If neither of them is initialized, they are equal.)
+         * )
+         *
+         * Params:
+         *  that = The $(D_PSYMBOL Variant) to compare with.
+         *
+         * Returns: $(D_KEYWORD true) if this $(D_PSYMBOL Variant) is equal to
+         *          $(D_PARAM that), $(D_KEYWORD false) otherwise.
+         */
+        bool opEquals()(auto ref inout Variant that) inout
+        {
+            if (this.tag != that.tag)
+            {
+                return false;
+            }
+            static foreach (i, Type; Types)
+            {
+                if (this.tag == i)
+                {
+                    return get!Type == that.get!Type;
+                }
+            }
+            return true;
+        }
+    }
+}
+
+///
 @nogc nothrow pure @safe unittest
 {
-    {
+    Variant!(int, double) variant = 5;
-        int i = 5;
+    assert(variant.peek!int);
-        assert(((ref e) => e)(Option!int().or(i)) == 5);
+    assert(variant.get!int == 5);
-    }
+
+    variant = 5.4;
+    assert(!variant.peek!int);
+    assert(variant.get!double == 5.4);
 }

sys/dub.json

@@ -0,0 +1,12 @@
+{
+	"name": "sys",
+	"description": "Low-level operating system bindings and definitions",
+	"targetType": "library",
+
+	"sourcePaths": [
+		"."
+	],
+	"importPaths": [
+		"."
+	]
+}

sys/tanya/sys/linux/syscall.d

@@ -3,12 +3,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /*
- * Copyright: Eugene Wissner 2018.
+ * Copyright: Eugene Wissner 2018-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/sys/linux/syscall.d,
- *                 tanya/sys/linux/syscall.d)
  */
 module tanya.sys.linux.syscall;
 

sys/tanya/sys/posix/ioctl.d

@@ -3,12 +3,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /*
- * Copyright: Eugene Wissner 2018.
+ * Copyright: Eugene Wissner 2018-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/sys/posix/ioctl.d,
- *                 tanya/sys/posix/ioctl.d)
  */
 module tanya.sys.posix.ioctl;
 

sys/tanya/sys/posix/mman.d

@@ -3,12 +3,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /*
- * Copyright: Eugene Wissner 2018.
+ * Copyright: Eugene Wissner 2018-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/sys/posix/mman.d,
- *                 tanya/sys/posix/mman.d)
  */
 module tanya.sys.posix.mman;
 

sys/tanya/sys/posix/net/if_.d

@@ -3,12 +3,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /*
- * Copyright: Eugene Wissner 2018.
+ * Copyright: Eugene Wissner 2018-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/sys/posix/net/if_.d,
- *                 tanya/sys/posix/net/if_.d)
  */
 module tanya.sys.posix.net.if_;
 

sys/tanya/sys/posix/socket.d

@@ -3,12 +3,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /*
- * Copyright: Eugene Wissner 2018.
+ * Copyright: Eugene Wissner 2018-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/sys/posix/socket.d,
- *                 tanya/sys/posix/socket.d)
  */
 module tanya.sys.posix.socket;
 

sys/tanya/sys/windows/def.d

@@ -16,12 +16,10 @@
  * defined here.
  * Also aliases for specific types like $(D_PSYMBOL SOCKET) are defined here.
  *
- * Copyright: Eugene Wissner 2017-2018.
+ * Copyright: Eugene Wissner 2017-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/sys/windows/def.d,
- *                 tanya/sys/windows/def.d)
  */
 module tanya.sys.windows.def;
 

sys/tanya/sys/windows/ifdef.d

@@ -3,12 +3,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
- * Copyright: Eugene Wissner 2018.
+ * Copyright: Eugene Wissner 2018-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/sys/windows/ifdef.d,
- *                 tanya/sys/windows/ifdef.d)
  */
 module tanya.sys.windows.ifdef;
 

sys/tanya/sys/windows/iphlpapi.d

@@ -3,12 +3,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
- * Copyright: Eugene Wissner 2018.
+ * Copyright: Eugene Wissner 2018-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/sys/windows/iphlpapi.d,
- *                 tanya/sys/windows/iphlpapi.d)
  */
 module tanya.sys.windows.iphlpapi;
 

sys/tanya/sys/windows/package.d

@@ -3,12 +3,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
- * Copyright: Eugene Wissner 2017-2018.
+ * Copyright: Eugene Wissner 2017-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/sys/windows/package.d,
- *                 tanya/sys/windows/package.d)
  */
 module tanya.sys.windows;
 

sys/tanya/sys/windows/winbase.d

@@ -5,12 +5,10 @@
 /**
  * Definitions from winbase.h.
  *
- * Copyright: Eugene Wissner 2017-2018.
+ * Copyright: Eugene Wissner 2017-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/sys/windows/winbase.d,
- *                 tanya/sys/windows/winbase.d)
  */
 module tanya.sys.windows.winbase;
 

sys/tanya/sys/windows/winsock2.d

@@ -5,12 +5,10 @@
 /**
  * Definitions from winsock2.h, ws2def.h and MSWSock.h.
  *
- * Copyright: Eugene Wissner 2017-2018.
+ * Copyright: Eugene Wissner 2017-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/sys/windows/winsock2.d,
- *                 tanya/sys/windows/winsock2.d)
  */
 module tanya.sys.windows.winsock2;
 

test/dub.json

@@ -0,0 +1,16 @@
+{
+	"name": "test",
+	"description": "Test suite for unittest-blocks",
+	"targetType": "library",
+
+	"dependencies": {
+		"tanya:middle": "*"
+	},
+
+	"sourcePaths": [
+		"."
+	],
+	"importPaths": [
+		"."
+	]
+}

test/tanya/test/assertion.d

@@ -13,7 +13,7 @@
  * The functions can cause segmentation fault if the module is compiled
  * in production mode and the condition fails.
  *
- * Copyright: Eugene Wissner 2017-2018.
+ * Copyright: Eugene Wissner 2017-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@@ -22,7 +22,7 @@
  */
 module tanya.test.assertion;
 
-import tanya.memory;
+import tanya.memory.allocator;
 import tanya.meta.trait;
 
 /**

test/tanya/test/package.d

@@ -5,7 +5,7 @@
 /**
  * Test suite for $(D_KEYWORD unittest)-blocks.
  *
- * Copyright: Eugene Wissner 2017-2018.
+ * Copyright: Eugene Wissner 2017-2019.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@@ -15,3 +15,4 @@
 module tanya.test;
 
 public import tanya.test.assertion;
+public import tanya.test.stub;

test/tanya/test/stub.d

@@ -0,0 +1,373 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/**
+ * Range and generic type generators.
+ *
+ * Copyright: Eugene Wissner 2018-2019.
+ * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
+ *                  Mozilla Public License, v. 2.0).
+ * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
+ * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/test/stub.d,
+ *                 tanya/test/stub.d)
+ */
+module tanya.test.stub;
+
+/**
+ * Attribute signalizing that the generated range should contain the given
+ * number of elements.
+ *
+ * $(D_PSYMBOL Count) should be always specified with some value and not as a
+ * type, so $(D_INLINECODE Count(1)) instead just $(D_INLINECODE Count),
+ * otherwise you can just omit $(D_PSYMBOL Count) and it will default to 0.
+ *
+ * $(D_PSYMBOL Count) doesn't generate `.length` property - use
+ * $(D_PSYMBOL Length) for that.
+ *
+ * If neither $(D_PSYMBOL Length) nor $(D_PSYMBOL Infinite) is given,
+ * $(D_ILNINECODE Count(0)) is assumed.
+ *
+ * This attribute conflicts with $(D_PSYMBOL Infinite) and $(D_PSYMBOL Length).
+ */
+struct Count
+{
+    /// Original range length.
+    size_t count = 0;
+
+    @disable this();
+
+    /**
+     * Constructs the attribute with the given length.
+     *
+     * Params:
+     *  count = Original range length.
+     */
+    this(size_t count) @nogc nothrow pure @safe
+    {
+        this.count = count;
+    }
+}
+
+/**
+ * Attribute signalizing that the generated range should be infinite.
+ *
+ * This attribute conflicts with $(D_PSYMBOL Count) and $(D_PSYMBOL Length).
+ */
+struct Infinite
+{
+}
+
+/**
+ * Generates `.length` property for the range.
+ *
+ * The length of the range can be specified as a constructor argument,
+ * otherwise it is 0.
+ *
+ * This attribute conflicts with $(D_PSYMBOL Count) and $(D_PSYMBOL Infinite).
+ */
+struct Length
+{
+    /// Original range length.
+    size_t length = 0;
+}
+
+/**
+ * Attribute signalizing that the generated range should return values by
+ * reference.
+ *
+ * This atribute affects the return values of `.front`, `.back` and `[]`.
+ */
+struct WithLvalueElements
+{
+}
+
+/**
+ * Generates an input range.
+ *
+ * Params:
+ *  E = Element type.
+ */
+mixin template InputRangeStub(E = int)
+{
+    import tanya.meta.metafunction : Alias;
+    import tanya.meta.trait : evalUDA, getUDAs, hasUDA;
+
+    /*
+     * Aliases for the attribute lookups to access them faster
+     */
+    private enum bool infinite = hasUDA!(typeof(this), Infinite);
+    private enum bool withLvalueElements = hasUDA!(typeof(this),
+                                                   WithLvalueElements);
+    private alias Count = getUDAs!(typeof(this), .Count);
+    private alias Length = getUDAs!(typeof(this), .Length);
+
+    static if (Count.length != 0)
+    {
+        private enum size_t count = Count[0].count;
+
+        static assert (!infinite,
+                       "Range cannot have count and be infinite at the same time");
+        static assert (Length.length == 0,
+                       "Range cannot have count and length at the same time");
+    }
+    else static if (Length.length != 0)
+    {
+        private enum size_t count = evalUDA!(Length[0]).length;
+
+        static assert (!infinite,
+                       "Range cannot have length and be infinite at the same time");
+    }
+    else static if (!infinite)
+    {
+        private enum size_t count = 0;
+    }
+
+    /*
+     * Member generation
+     */
+    static if (infinite)
+    {
+        enum bool empty = false;
+    }
+    else
+    {
+        private size_t length_ = count;
+
+        @property bool empty() const @nogc nothrow pure @safe
+        {
+            return this.length_ == 0;
+        }
+    }
+
+    static if (withLvalueElements)
+    {
+        private E* element; // Pointer to enable range copying in save()
+    }
+
+    void popFront() @nogc nothrow pure @safe
+    in (!empty)
+    {
+        static if (!infinite)
+        {
+            --this.length_;
+        }
+    }
+
+    static if (withLvalueElements)
+    {
+        ref E front() @nogc nothrow pure @safe
+        in (!empty)
+        {
+            return *this.element;
+        }
+    }
+    else
+    {
+        E front() @nogc nothrow pure @safe
+        in (!empty)
+        {
+            return E.init;
+        }
+    }
+
+    static if (Length.length != 0)
+    {
+        size_t length() const @nogc nothrow pure @safe
+        {
+            return this.length_;
+        }
+    }
+}
+
+/**
+ * Generates a forward range.
+ *
+ * This mixin includes input range primitives as well, but can be combined with
+ * $(D_PSYMBOL RandomAccessRangeStub).
+ *
+ * Params:
+ *  E = Element type.
+ */
+mixin template ForwardRangeStub(E = int)
+{
+    static if (!is(typeof(this.InputRangeMixin) == void))
+    {
+        mixin InputRangeStub!E InputRangeMixin;
+    }
+
+    auto save() @nogc nothrow pure @safe
+    {
+        return this;
+    }
+}
+
+/**
+ * Generates a bidirectional range.
+ *
+ * This mixin includes forward range primitives as well, but can be combined with
+ * $(D_PSYMBOL RandomAccessRangeStub).
+ *
+ * Params:
+ *  E = Element type.
+ */
+mixin template BidirectionalRangeStub(E = int)
+{
+    mixin ForwardRangeStub!E;
+
+    void popBack() @nogc nothrow pure @safe
+    in (!empty)
+    {
+        static if (!infinite)
+        {
+            --this.length_;
+        }
+    }
+
+    static if (withLvalueElements)
+    {
+        ref E back() @nogc nothrow pure @safe
+        in (!empty)
+        {
+            return *this.element;
+        }
+    }
+    else
+    {
+        E back() @nogc nothrow pure @safe
+        in (!empty)
+        {
+            return E.init;
+        }
+    }
+}
+
+/**
+ * Generates a random-access range.
+ *
+ * This mixin includes input range primitives as well, but can be combined with
+ * $(D_PSYMBOL ForwardRangeStub) or $(D_PSYMBOL BidirectionalRangeStub).
+ *
+ * Note that a random-access range also requires $(D_PSYMBOL Length) or
+ * $(D_PARAM Infinite) by definition.
+ *
+ * Params:
+ *  E = Element type.
+ */
+mixin template RandomAccessRangeStub(E = int)
+{
+    static if (!is(typeof(this.InputRangeMixin) == void))
+    {
+        mixin InputRangeStub!E InputRangeMixin;
+    }
+
+    static if (withLvalueElements)
+    {
+        ref E opIndex(size_t) @nogc nothrow pure @safe
+        {
+            return *this.element;
+        }
+    }
+    else
+    {
+        E opIndex(size_t) @nogc nothrow pure @safe
+        {
+            return E.init;
+        }
+    }
+}
+
+/**
+ * Struct with a disabled postblit constructor.
+ *
+ * $(D_PSYMBOL NonCopyable) can be used as an attribute for
+ * $(D_PSYMBOL StructStub) or as a standalone type.
+ */
+struct NonCopyable
+{
+    @disable this(this);
+}
+
+/**
+ * Struct with an elaborate destructor.
+ *
+ * $(D_PSYMBOL WithDtor) can be used as an attribute for
+ * $(D_PSYMBOL StructStub) or as a standalone type.
+ *
+ * When used as a standalone object the constructor of $(D_PSYMBOL WithDtor)
+ * accepts an additional `counter` argument, which is incremented by the
+ * destructor. $(D_PSYMBOL WithDtor) stores a pointer to the passed variable,
+ * so the variable can be investigated after the struct isn't available
+ * anymore.
+ */
+struct WithDtor
+{
+    size_t* counter;
+
+    this(ref size_t counter) @nogc nothrow pure @trusted
+    {
+        this.counter = &counter;
+    }
+
+    ~this() @nogc nothrow pure @safe
+    {
+        if (this.counter !is null)
+        {
+            ++*this.counter;
+        }
+    }
+}
+
+/**
+ * Struct supporting hashing.
+ *
+ * $(D_PSYMBOL Hashable) can be used as an attribute for
+ * $(D_PSYMBOL StructStub) or as a standalone type.
+ *
+ * The constructor accepts an additional parameter, which is returned by the
+ * `toHash()`-function. `0U` is returned if no hash value is given.
+ */
+struct Hashable
+{
+    size_t hash;
+
+    size_t toHash() const @nogc nothrow pure @safe
+    {
+        return this.hash;
+    }
+}
+
+/**
+ * Generates a $(D_KEYWORD struct) with common functionality.
+ *
+ * To specify the needed functionality use user-defined attributes on the
+ * $(D_KEYWORD struct) $(D_PSYMBOL StructStub) is mixed in.
+ *
+ * Supported attributes are: $(D_PSYMBOL NonCopyable), $(D_PSYMBOL Hashable),
+ * $(D_PSYMBOL WithDtor).
+ */
+mixin template StructStub()
+{
+    import tanya.meta.trait : evalUDA, getUDAs, hasUDA;
+
+    static if (hasUDA!(typeof(this), NonCopyable))
+    {
+        @disable this(this);
+    }
+
+    private alias Hashable = getUDAs!(typeof(this), .Hashable);
+    static if (Hashable.length > 0)
+    {
+        size_t toHash() const @nogc nothrow pure @safe
+        {
+            return evalUDA!(Hashable[0]).hash;
+        }
+    }
+
+    static if (hasUDA!(typeof(this), WithDtor))
+    {
+        ~this() @nogc nothrow pure @safe
+        {
+        }
+    }
+}

tests/tanya/algorithm/tests/comparison.d

@@ -0,0 +1,97 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+module tanya.algorithm.tests.comparison;
+
+import tanya.algorithm.comparison;
+import tanya.math;
+import tanya.range;
+
+@nogc nothrow pure @safe unittest
+{
+    static assert(!is(typeof(min(1, 1UL))));
+}
+
+@nogc nothrow pure @safe unittest
+{
+    assert(min(5, 3) == 3);
+    assert(min(4, 4) == 4);
+    assert(min(5.2, 3.0) == 3.0);
+
+    assert(min(5.2, double.nan) == 5.2);
+    assert(min(double.nan, 3.0) == 3.0);
+    assert(isNaN(min(double.nan, double.nan)));
+}
+
+@nogc nothrow pure @safe unittest
+{
+    assert(min(cast(ubyte[]) []).empty);
+}
+
+@nogc nothrow pure @safe unittest
+{
+    static assert(!is(typeof(max(1, 1UL))));
+}
+
+@nogc nothrow pure @safe unittest
+{
+    assert(max(5, 3) == 5);
+    assert(max(4, 4) == 4);
+    assert(max(5.2, 3.0) == 5.2);
+
+    assert(max(5.2, double.nan) == 5.2);
+    assert(max(double.nan, 3.0) == 3.0);
+    assert(isNaN(max(double.nan, double.nan)));
+}
+
+@nogc nothrow pure @safe unittest
+{
+    assert(max(cast(ubyte[]) []).empty);
+}
+
+// min/max compare const and mutable structs.
+@nogc nothrow pure @safe unittest
+{
+    static struct S
+    {
+        int s;
+
+        int opCmp(typeof(this) that) const @nogc nothrow pure @safe
+        {
+            return this.s - that.s;
+        }
+    }
+    {
+        const s1 = S(1);
+        assert(min(s1, S(2)).s == 1);
+        assert(max(s1, S(2)).s == 2);
+    }
+    {
+        auto s2 = S(2), s3 = S(3);
+        assert(min(s2, s3).s == 2);
+        assert(max(s2, s3).s == 3);
+    }
+}
+
+@nogc nothrow pure @safe unittest
+{
+    static struct OpCmp(int value)
+    {
+        int opCmp(OpCmp) @nogc nothrow pure @safe
+        {
+            return value;
+        }
+    }
+    {
+        OpCmp!(-1)[1] range;
+        assert(compare(range[], range[]) < 0);
+    }
+    {
+        OpCmp!1[1] range;
+        assert(compare(range[], range[]) > 0);
+    }
+    {
+        OpCmp!0[1] range;
+        assert(compare(range[], range[]) == 0);
+    }
+}

tests/tanya/algorithm/tests/iteration.d

@@ -0,0 +1,127 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+module tanya.algorithm.tests.iteration;
+
+import tanya.algorithm.iteration;
+import tanya.range;
+import tanya.test.stub;
+
+// length is unknown when taking from a range without length
+@nogc nothrow pure @safe unittest
+{
+    static struct R
+    {
+        mixin InputRangeStub;
+    }
+    auto actual = take(R(), 100);
+
+    static assert(!hasLength!(typeof(actual)));
+}
+
+// Takes minimum length if the range length > n
+@nogc nothrow pure @safe unittest
+{
+    auto range = take(cast(int[]) null, 8);
+    assert(range.length == 0);
+}
+
+@nogc nothrow pure @safe unittest
+{
+    const int[9] range = [1, 2, 3, 4, 5, 6, 7, 8, 9];
+    {
+        auto slice = take(range[], 8)[1 .. 3];
+
+        assert(slice.length == 2);
+        assert(slice.front == 2);
+        assert(slice.back == 3);
+    }
+    {
+        auto slice = takeExactly(range[], 8)[1 .. 3];
+
+        assert(slice.length == 2);
+        assert(slice.front == 2);
+        assert(slice.back == 3);
+    }
+}
+
+// Elements are accessible in reverse order
+@nogc nothrow pure @safe unittest
+{
+    const int[3] given = [1, 2, 3];
+    auto actual = retro(given[]);
+
+    assert(actual.back == given[].front);
+    assert(actual[0] == 3);
+    assert(actual[2] == 1);
+
+    actual.popBack();
+    assert(actual.back == 2);
+    assert(actual[1] == 2);
+
+    // Check slicing.
+    auto slice = retro(given[])[1 .. $];
+    assert(slice.length == 2 && slice.front == 2 && slice.back == 1);
+}
+
+// Elements can be assigned
+@nogc nothrow pure @safe unittest
+{
+    int[4] given = [1, 2, 3, 4];
+    auto actual = retro(given[]);
+
+    actual.front = 5;
+    assert(given[].back == 5);
+
+    actual.back = 8;
+    assert(given[].front == 8);
+
+    actual[2] = 10;
+    assert(given[1] == 10);
+}
+
+// Singleton range is bidirectional and random-access
+@nogc nothrow pure @safe unittest
+{
+    static assert(isBidirectionalRange!(typeof(singleton('a'))));
+    static assert(isRandomAccessRange!(typeof(singleton('a'))));
+
+    assert({ char a; return isBidirectionalRange!(typeof(singleton(a))); });
+    assert({ char a; return isRandomAccessRange!(typeof(singleton(a))); });
+}
+
+@nogc nothrow pure @safe unittest
+{
+    char a = 'a';
+    auto single = singleton(a);
+
+    assert(single.front == 'a');
+    assert(single.back == 'a');
+    assert(single[0] == 'a');
+    assert(single.length == 1);
+    assert(!single.empty);
+}
+
+// popFront makes SingletonByRef empty
+@nogc nothrow pure @safe unittest
+{
+    char a = 'a';
+    auto single = singleton(a);
+
+    single.popFront();
+    assert(single.empty);
+    assert(single.length == 0);
+    assert(single.empty);
+}
+
+// popBack makes SingletonByRef empty
+@nogc nothrow pure @safe unittest
+{
+    char a = 'b';
+    auto single = singleton(a);
+
+    single.popBack();
+    assert(single.empty);
+    assert(single.length == 0);
+    assert(single.empty);
+}

tests/tanya/algorithm/tests/mutation.d

@@ -0,0 +1,128 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+module tanya.algorithm.tests.mutation;
+
+import tanya.algorithm.mutation;
+import tanya.range;
+import tanya.test.stub;
+
+// Returns advanced target
+@nogc nothrow pure @safe unittest
+{
+    int[5] input = [1, 2, 3, 4, 5];
+    assert(copy(input[3 .. 5], input[]).front == 3);
+}
+
+// Copies overlapping arrays
+@nogc nothrow pure @safe unittest
+{
+    import tanya.algorithm.comparison : equal;
+
+    int[6] actual = [1, 2, 3, 4, 5, 6];
+    const int[6] expected = [1, 2, 1, 2, 3, 4];
+
+    copy(actual[0 .. 4], actual[2 .. 6]);
+    assert(equal(actual[], expected[]));
+}
+
+@nogc nothrow pure @safe unittest
+{
+    static assert(is(typeof(copy((ubyte[]).init, (ushort[]).init))));
+    static assert(!is(typeof(copy((ushort[]).init, (ubyte[]).init))));
+}
+
+@nogc nothrow pure @safe unittest
+{
+    static struct OutPutRange
+    {
+        int value;
+
+        void opCall(int value) @nogc nothrow pure @safe
+        in (this.value == 0)
+        {
+            this.value = value;
+        }
+    }
+    int[1] source = [5];
+    OutPutRange target;
+
+    assert(copy(source[], target).value == 5);
+}
+
+// [] is called where possible
+@nogc nothrow pure @system unittest
+{
+    static struct Slice
+    {
+        bool* slicingCalled;
+
+        int front() @nogc nothrow pure @safe
+        {
+            return 0;
+        }
+
+        void front(int) @nogc nothrow pure @safe
+        {
+        }
+
+        void popFront() @nogc nothrow pure @safe
+        {
+        }
+
+        bool empty() @nogc nothrow pure @safe
+        {
+            return true;
+        }
+
+        void opIndexAssign(int) @nogc nothrow pure @safe
+        {
+            *this.slicingCalled = true;
+        }
+    }
+    bool slicingCalled;
+    auto range = Slice(&slicingCalled);
+    fill(range, 0);
+    assert(slicingCalled);
+}
+
+@nogc nothrow pure @safe unittest
+{
+    NonCopyable[] nonCopyable;
+    initializeAll(nonCopyable);
+}
+
+@nogc nothrow pure @safe unittest
+{
+    import tanya.algorithm.comparison : equal;
+
+    const int[5] expected = [1, 2, 3, 4, 5];
+    int[5] actual = [4, 5, 1, 2, 3];
+
+    rotate(actual[0 .. 2], actual[2 .. $]);
+    assert(equal(actual[], expected[]));
+}
+
+// Doesn't cause an infinite loop if back is shorter than the front
+@nogc nothrow pure @safe unittest
+{
+    import tanya.algorithm.comparison : equal;
+
+    const int[5] expected = [1, 2, 3, 4, 5];
+    int[5] actual = [3, 4, 5, 1, 2];
+
+    rotate(actual[0 .. 3], actual[3 .. $]);
+    assert(equal(actual[], expected[]));
+}
+
+// Doesn't call .front on an empty front
+@nogc nothrow pure @safe unittest
+{
+    import tanya.algorithm.comparison : equal;
+
+    const int[2] expected = [2, 8];
+    int[2] actual = expected;
+
+    rotate(actual[0 .. 0], actual[]);
+    assert(equal(actual[], expected[]));
+}

tests/tanya/algorithm/tests/searching.d

@@ -0,0 +1,17 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+module tanya.algorithm.tests.searching;
+
+import tanya.algorithm.searching;
+import tanya.test.stub;
+
+@nogc nothrow pure @safe unittest
+{
+    @Count(3)
+    static struct Range
+    {
+        mixin InputRangeStub!int;
+    }
+    assert(count(Range()) == 3);
+}

tests/tanya/async/tests/loop.d

@@ -0,0 +1,97 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+module tanya.async.tests.loop;
+
+import core.time;
+import tanya.async.loop;
+import tanya.async.watcher;
+import tanya.memory.allocator;
+
+private final class DummyWatcher : Watcher
+{
+    bool invoked;
+
+    override void invoke() @nogc
+    {
+        this.invoked = true;
+    }
+}
+
+private final class TestLoop : Loop
+{
+    override protected bool reify(SocketWatcher watcher,
+                                  EventMask oldEvents,
+                                  EventMask events) @nogc
+    {
+        return true;
+    }
+
+    override protected void poll() @nogc
+    {
+        assert(!this.done);
+        unloop();
+    }
+
+    override protected @property uint maxEvents()
+    const pure nothrow @safe @nogc
+    {
+        return 64U;
+    }
+
+    @nogc @system unittest
+    {
+        auto loop = defaultAllocator.make!TestLoop;
+        assert(loop.blockTime == 1.dur!"minutes");
+
+        loop.blockTime = 2.dur!"minutes";
+        assert(loop.blockTime == 2.dur!"minutes");
+
+        defaultAllocator.dispose(loop);
+    }
+
+    @nogc @system unittest
+    {
+        auto loop = defaultAllocator.make!TestLoop;
+        assert(loop.done);
+
+        loop.run();
+        assert(loop.done);
+
+        defaultAllocator.dispose(loop);
+    }
+
+    @nogc @system unittest
+    {
+        auto loop = defaultAllocator.make!TestLoop;
+        auto watcher = defaultAllocator.make!DummyWatcher;
+        loop.pendings.insertBack(watcher);
+
+        assert(!watcher.invoked);
+        loop.run();
+        assert(watcher.invoked);
+
+        defaultAllocator.dispose(loop);
+        defaultAllocator.dispose(watcher);
+    }
+}
+
+@nogc @system unittest
+{
+    auto loop = defaultAllocator.make!TestLoop;
+    assert(loop.maxEvents == 64);
+
+    defaultAllocator.dispose(loop);
+}
+
+@nogc @system unittest
+{
+    auto oldLoop = defaultLoop;
+    auto loop = defaultAllocator.make!TestLoop;
+
+    defaultLoop = loop;
+    assert(defaultLoop is loop);
+
+    defaultLoop = oldLoop;
+    defaultAllocator.dispose(loop);
+}

tests/tanya/container/tests/array.d

@@ -0,0 +1,196 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+module tanya.container.tests.array;
+
+import tanya.algorithm.comparison;
+import tanya.container.array;
+import tanya.memory.allocator;
+import tanya.test.stub;
+
+// const arrays return usable ranges
+@nogc nothrow pure @safe unittest
+{
+    auto v = const Array!int([1, 2, 4]);
+    auto r1 = v[];
+
+    assert(r1.back == 4);
+    r1.popBack();
+    assert(r1.back == 2);
+    r1.popBack();
+    assert(r1.back == 1);
+    r1.popBack();
+    assert(r1.length == 0);
+
+    static assert(!is(typeof(r1[0] = 5)));
+    static assert(!is(typeof(v[0] = 5)));
+
+    const r2 = r1[];
+    static assert(is(typeof(r2[])));
+}
+
+@nogc nothrow pure @safe unittest
+{
+    Array!int v1;
+    const Array!int v2;
+
+    auto r1 = v1[];
+    auto r2 = v1[];
+
+    assert(r1.length == 0);
+    assert(r2.empty);
+    assert(r1 == r2);
+
+    v1.insertBack([1, 2, 4]);
+    assert(v1[] == v1);
+    assert(v2[] == v2);
+    assert(v2[] != v1);
+    assert(v1[] != v2);
+    assert(v1[].equal(v1[]));
+    assert(v2[].equal(v2[]));
+    assert(!v1[].equal(v2[]));
+}
+
+@nogc nothrow pure @safe unittest
+{
+    struct MutableEqualsStruct
+    {
+        bool opEquals(typeof(this) that) @nogc nothrow pure @safe
+        {
+            return true;
+        }
+    }
+    struct ConstEqualsStruct
+    {
+        bool opEquals(const typeof(this) that) const @nogc nothrow pure @safe
+        {
+            return true;
+        }
+    }
+    auto v1 = Array!ConstEqualsStruct();
+    auto v2 = Array!ConstEqualsStruct();
+    assert(v1 == v2);
+    assert(v1[] == v2);
+    assert(v1 == v2[]);
+    assert(v1[].equal(v2[]));
+
+    auto v3 = const Array!ConstEqualsStruct();
+    auto v4 = const Array!ConstEqualsStruct();
+    assert(v3 == v4);
+    assert(v3[] == v4);
+    assert(v3 == v4[]);
+    assert(v3[].equal(v4[]));
+
+    auto v7 = Array!MutableEqualsStruct(1, MutableEqualsStruct());
+    auto v8 = Array!MutableEqualsStruct(1, MutableEqualsStruct());
+    assert(v7 == v8);
+    assert(v7[] == v8);
+    assert(v7 == v8[]);
+    assert(v7[].equal(v8[]));
+}
+
+// Destructor can destroy empty arrays
+@nogc nothrow pure @safe unittest
+{
+    auto v = Array!WithDtor();
+}
+
+@nogc nothrow pure @safe unittest
+{
+    class A
+    {
+    }
+    A a1, a2;
+    auto v1 = Array!A([a1, a2]);
+
+    static assert(is(Array!(A*)));
+}
+
+@nogc nothrow pure @safe unittest
+{
+    auto v = Array!int([5, 15, 8]);
+    {
+        size_t i;
+
+        foreach (e; v)
+        {
+            assert(i != 0 || e == 5);
+            assert(i != 1 || e == 15);
+            assert(i != 2 || e == 8);
+            ++i;
+        }
+        assert(i == 3);
+    }
+    {
+        size_t i = 3;
+
+        foreach_reverse (e; v)
+        {
+            --i;
+            assert(i != 2 || e == 8);
+            assert(i != 1 || e == 15);
+            assert(i != 0 || e == 5);
+        }
+        assert(i == 0);
+    }
+}
+
+// const constructor tests
+@nogc nothrow pure @safe unittest
+{
+    auto v1 = const Array!int([1, 2, 3]);
+    auto v2 = Array!int(v1);
+    assert(v1.get !is v2.get);
+    assert(v1 == v2);
+
+    auto v3 = const Array!int(Array!int([1, 2, 3]));
+    assert(v1 == v3);
+    assert(v3.length == 3);
+    assert(v3.capacity == 3);
+}
+
+@nogc nothrow pure @safe unittest
+{
+    auto v1 = Array!int(defaultAllocator);
+}
+
+@nogc nothrow pure @safe unittest
+{
+    Array!int v;
+    auto r = v[];
+    assert(r.length == 0);
+    assert(r.empty);
+}
+
+@nogc nothrow pure @safe unittest
+{
+    auto v1 = const Array!int([5, 15, 8]);
+    Array!int v2;
+    v2 = v1[0 .. 2];
+    assert(equal(v1[0 .. 2], v2[]));
+}
+
+// Move assignment
+@nogc nothrow pure @safe unittest
+{
+    Array!int v1;
+    v1 = Array!int([5, 15, 8]);
+}
+
+// Postblit is safe
+@nogc nothrow pure @safe unittest
+{
+    auto array = Array!int(3);
+    void func(Array!int arg)
+    {
+        assert(arg.capacity == 3);
+    }
+    func(array);
+}
+
+// Can have non-copyable elements
+@nogc nothrow pure @safe unittest
+{
+    static assert(is(Array!NonCopyable));
+    static assert(is(typeof({ Array!NonCopyable.init[0] = NonCopyable(); })));
+}

tests/tanya/container/tests/buffer.d

@@ -0,0 +1,17 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+module tanya.container.tests.buffer;
+
+import tanya.container.buffer;
+
+@nogc nothrow pure @safe unittest
+{
+    static assert(is(ReadBuffer!int));
+}
+
+@nogc nothrow pure @safe unittest
+{
+    static assert(is(typeof(WriteBuffer!int(5))));
+}
+

tests/tanya/container/tests/entry.d

@@ -0,0 +1,17 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+module tanya.container.tests.entry;
+
+import tanya.container.entry;
+import tanya.test.stub;
+
+// Can be constructed with non-copyable key/values
+@nogc nothrow pure @safe unittest
+{
+    static assert(is(Bucket!NonCopyable));
+    static assert(is(Bucket!(NonCopyable, NonCopyable)));
+
+    static assert(is(HashArray!((ref NonCopyable) => 0U, NonCopyable)));
+    static assert(is(HashArray!((ref NonCopyable) => 0U, NonCopyable, NonCopyable)));
+}

tests/tanya/container/tests/hashtable.d

@@ -0,0 +1,133 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+module tanya.container.tests.hashtable;
+
+import tanya.container.hashtable;
+import tanya.test.stub;
+
+@nogc nothrow pure @safe unittest
+{
+    import tanya.range.primitive : isForwardRange;
+    static assert(is(HashTable!(string, int) a));
+    static assert(is(const HashTable!(string, int)));
+    static assert(isForwardRange!(HashTable!(string, int).Range));
+
+    static assert(is(HashTable!(int, int, (ref const int) => size_t.init)));
+    static assert(is(HashTable!(int, int, (int) => size_t.init)));
+}
+
+// Constructs by reference
+@nogc nothrow pure @safe unittest
+{
+    auto hashTable1 = HashTable!(string, int)(7);
+    auto hashTable2 = HashTable!(string, int)(hashTable1);
+    assert(hashTable1.length == hashTable2.length);
+    assert(hashTable1.capacity == hashTable2.capacity);
+}
+
+// Constructs by value
+@nogc nothrow pure @safe unittest
+{
+    auto hashTable = HashTable!(string, int)(HashTable!(string, int)(7));
+    assert(hashTable.capacity == 7);
+}
+
+// Assigns by reference
+@nogc nothrow pure @safe unittest
+{
+    auto hashTable1 = HashTable!(string, int)(7);
+    HashTable!(string, int) hashTable2;
+    hashTable1 = hashTable2;
+    assert(hashTable1.length == hashTable2.length);
+    assert(hashTable1.capacity == hashTable2.capacity);
+}
+
+// Assigns by value
+@nogc nothrow pure @safe unittest
+{
+    HashTable!(string, int) hashTable;
+    hashTable = HashTable!(string, int)(7);
+    assert(hashTable.capacity == 7);
+}
+
+// Postblit copies
+@nogc nothrow pure @safe unittest
+{
+    auto hashTable = HashTable!(string, int)(7);
+    void testFunc(HashTable!(string, int) hashTable)
+    {
+        assert(hashTable.capacity == 7);
+    }
+    testFunc(hashTable);
+}
+
+// Issue 53: https://github.com/caraus-ecms/tanya/issues/53
+@nogc nothrow pure @safe unittest
+{
+    {
+        HashTable!(uint, uint) hashTable;
+        foreach (uint i; 0 .. 14)
+        {
+            hashTable[i + 1] = i;
+        }
+        assert(hashTable.length == 14);
+    }
+    {
+        HashTable!(int, int) hashtable;
+
+        hashtable[1194250162] = 3;
+        hashtable[-1131293824] = 6;
+        hashtable[838100082] = 9;
+
+        hashtable.rehash(11);
+
+        assert(hashtable[-1131293824] == 6);
+    }
+}
+
+@nogc nothrow pure @safe unittest
+{
+    static struct String
+    {
+        bool opEquals(string) const @nogc nothrow pure @safe
+        {
+            return true;
+        }
+
+        bool opEquals(ref const string) const @nogc nothrow pure @safe
+        {
+            return true;
+        }
+
+        bool opEquals(String) const @nogc nothrow pure @safe
+        {
+            return true;
+        }
+
+        bool opEquals(ref const String) const @nogc nothrow pure @safe
+        {
+            return true;
+        }
+
+        size_t toHash() const @nogc nothrow pure @safe
+        {
+            return 0;
+        }
+    }
+    static assert(is(typeof("asdf" in HashTable!(String, int)())));
+    static assert(is(typeof(HashTable!(String, int)()["asdf"])));
+}
+
+// Can have non-copyable keys and elements
+@nogc nothrow pure @safe unittest
+{
+    @NonCopyable @Hashable
+    static struct S
+    {
+        mixin StructStub;
+    }
+    static assert(is(HashTable!(S, int)));
+    static assert(is(HashTable!(int, S)));
+    static assert(is(HashTable!(S, S)));
+}

tests/tanya/container/tests/list.d

@@ -0,0 +1,120 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+module tanya.container.tests.list;
+
+import tanya.container.list;
+import tanya.test.stub;
+
+@nogc nothrow pure @safe unittest
+{
+    interface Stuff
+    {
+    }
+    static assert(is(SList!Stuff));
+}
+
+@nogc nothrow pure @safe unittest
+{
+    auto l = SList!int(0, 0);
+    assert(l.empty);
+}
+
+// foreach called using opIndex().
+@nogc nothrow pure @safe unittest
+{
+    SList!int l;
+    size_t i;
+
+    l.insertFront(5);
+    l.insertFront(4);
+    l.insertFront(9);
+    foreach (e; l)
+    {
+        assert(i != 0 || e == 9);
+        assert(i != 1 || e == 4);
+        assert(i != 2 || e == 5);
+        ++i;
+    }
+}
+
+@nogc nothrow pure @safe unittest
+{
+    auto l1 = SList!int();
+    auto l2 = SList!int([9, 4]);
+    l1 = l2[];
+    assert(l1 == l2);
+}
+
+@nogc nothrow pure @safe unittest
+{
+    class A
+    {
+    }
+    static assert(is(SList!(A*)));
+    static assert(is(DList!(A*)));
+}
+
+// Removes all elements
+@nogc nothrow pure @safe unittest
+{
+    auto l = DList!int([5]);
+    assert(l.remove(l[]).empty);
+}
+
+@nogc nothrow pure @safe unittest
+{
+    auto l1 = DList!int([5, 234, 30, 1]);
+    auto l2 = DList!int([5, 1]);
+    auto r = l1[];
+
+    r.popFront();
+    r.popBack();
+    assert(r.front == 234);
+    assert(r.back == 30);
+
+    assert(!l1.remove(r).empty);
+    assert(l1 == l2);
+}
+
+@nogc nothrow pure @safe unittest
+{
+    auto l = DList!int(0, 0);
+    assert(l.empty);
+}
+
+@nogc nothrow pure @safe unittest
+{
+    DList!int l;
+    l.insertAfter(l[], 234);
+    assert(l.front == 234);
+    assert(l.back == 234);
+}
+
+@nogc nothrow pure @safe unittest
+{
+    auto l1 = DList!int();
+    auto l2 = DList!int([9, 4]);
+    l1 = l2[];
+    assert(l1 == l2);
+}
+
+// Sets the new head
+@nogc nothrow pure @safe unittest
+{
+    auto l1 = DList!int([5, 234, 30, 1]);
+    auto l2 = DList!int([1]);
+    auto r = l1[];
+
+    r.popBack();
+
+    assert(!l1.remove(r).empty);
+    assert(l1 == l2);
+}
+
+// Can have non-copyable elements
+@nogc nothrow pure @safe unittest
+{
+    static assert(is(SList!NonCopyable));
+    static assert(is(DList!NonCopyable));
+}

tests/tanya/container/tests/set.d

@@ -0,0 +1,155 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+module tanya.container.tests.set;
+
+import tanya.container.set;
+import tanya.memory.allocator;
+import tanya.test.stub;
+
+// Basic insertion logic.
+@nogc nothrow pure @safe unittest
+{
+    Set!int set;
+
+    assert(set.insert(5) == 1);
+    assert(5 in set);
+    assert(set.capacity == 3);
+
+    assert(set.insert(5) == 0);
+    assert(5 in set);
+    assert(set.capacity == 3);
+
+    assert(set.insert(9) == 1);
+    assert(9 in set);
+    assert(5 in set);
+    assert(set.capacity == 3);
+
+    assert(set.insert(7) == 1);
+    assert(set.insert(8) == 1);
+    assert(8 in set);
+    assert(5 in set);
+    assert(9 in set);
+    assert(7 in set);
+    assert(set.capacity == 7);
+
+    assert(set.insert(16) == 1);
+    assert(16 in set);
+    assert(set.capacity == 7);
+}
+
+// Static checks.
+@nogc nothrow pure @safe unittest
+{
+    import tanya.range.primitive;
+
+    static assert(isBidirectionalRange!(Set!int.ConstRange));
+    static assert(isBidirectionalRange!(Set!int.Range));
+
+    static assert(!isInfinite!(Set!int.Range));
+    static assert(!hasLength!(Set!int.Range));
+
+    static assert(is(Set!uint));
+    static assert(is(Set!long));
+    static assert(is(Set!ulong));
+    static assert(is(Set!short));
+    static assert(is(Set!ushort));
+    static assert(is(Set!bool));
+}
+
+@nogc nothrow pure @safe unittest
+{
+    const Set!int set;
+    assert(set[].empty);
+}
+
+@nogc nothrow pure @safe unittest
+{
+    Set!int set;
+    set.insert(8);
+
+    auto r1 = set[];
+    auto r2 = r1.save();
+
+    r1.popFront();
+    assert(r1.empty);
+
+    r2.popBack();
+    assert(r2.empty);
+}
+
+// Initial capacity is 0.
+@nogc nothrow pure @safe unittest
+{
+    auto set = Set!int(defaultAllocator);
+    assert(set.capacity == 0);
+}
+
+// Capacity is set to a prime.
+@nogc nothrow pure @safe unittest
+{
+    auto set = Set!int(8);
+    assert(set.capacity == 13);
+}
+
+// Constructs by reference
+@nogc nothrow pure @safe unittest
+{
+    auto set1 = Set!int(7);
+    auto set2 = Set!int(set1);
+    assert(set1.length == set2.length);
+    assert(set1.capacity == set2.capacity);
+}
+
+// Constructs by value
+@nogc nothrow pure @safe unittest
+{
+    auto set = Set!int(Set!int(7));
+    assert(set.capacity == 7);
+}
+
+// Assigns by reference
+@nogc nothrow pure @safe unittest
+{
+    auto set1 = Set!int(7);
+    Set!int set2;
+    set1 = set2;
+    assert(set1.length == set2.length);
+    assert(set1.capacity == set2.capacity);
+}
+
+// Assigns by value
+@nogc nothrow pure @safe unittest
+{
+    Set!int set;
+    set = Set!int(7);
+    assert(set.capacity == 7);
+}
+
+// Postblit copies
+@nogc nothrow pure @safe unittest
+{
+    auto set = Set!int(7);
+    void testFunc(Set!int set)
+    {
+        assert(set.capacity == 7);
+    }
+    testFunc(set);
+}
+
+// Hasher can take argument by ref
+@nogc nothrow pure @safe unittest
+{
+    static assert(is(Set!(int, (const ref x) => cast(size_t) x)));
+}
+
+// Can have non-copyable elements
+@nogc nothrow pure @safe unittest
+{
+    @NonCopyable @Hashable
+    static struct S
+    {
+        mixin StructStub;
+    }
+    static assert(is(Set!S));
+}