Implement IPv6 parser, fix #49

A lot of algorithms like lazy sort() can be also classified as adapters
since it wraps the original range and allows to access the elements of
the range in a particular order. The only reason why take() was in
range.adapter is that take() is trivial - it doesn't change the order of
elements but can turn an infinite range into finite one. This
distinction between trivial and non-trivial algorithms isn't absolutely
clear. So let us put all algorithms and any adapters that change the
range iteration in some way into "algorithm" package to avoid any
confusion later.

- range.adapter is renamed into algorithm.iteration
- range.adapter is deprecated
- Added missing imports for take() and takeExactly()
- takeExactly() doesn't wrap ranges that have slicing anymore
- Voldemort structs for take() takeExactly() are now static

.travis.yml

@@ -7,10 +7,8 @@ os:
 language: d
 
 d:
-  - dmd-2.080.1
-  - dmd-2.079.1
-  - dmd-2.078.3
-  - dmd-2.077.1
+  - dmd-2.082.0
+  - dmd-2.081.2
 
 env:
   matrix:
@@ -23,7 +21,7 @@ addons:
       - gcc-multilib
 
 before_script:
-  - if [ "`$DC --version | head -n 1 | grep 'v2.080.1'`" ]; then
+  - if [ "`$DC --version | head -n 1 | grep 'v2.082.0'`" ]; then
       export UNITTEST="unittest-cov";
     fi
 
@@ -31,7 +29,7 @@ script:
   - dub test -b ${UNITTEST:-unittest} --arch=$ARCH --compiler=$DC
   - if [ "$UNITTEST" ] && [ "$ARCH" = "x86_64" ] && [ "$TRAVIS_OS_NAME" = "linux" ];
     then
-      dub fetch dscanner;
+      dub fetch dscanner --version=0.5.10;
       dub run dscanner -- --styleCheck ./source/;
     fi
 

README.md

@@ -32,6 +32,8 @@ 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.
 * `hash`: Hash algorithms.
 * `math`: Arbitrary precision integer and a set of functions.
 * `memory`: Tools for manual memory management (allocators, smart pointers).
@@ -170,12 +172,10 @@ parameter is used)
 
 ### Supported compilers
 
-| DMD     | GCC       |
-|:-------:|:---------:|
-| 2.080.1 | *master*  |
-| 2.079.1 |           |
-| 2.078.3 |           |
-| 2.077.1 |           |
+| DMD     | GCC    |
+|:-------:|:------:|
+| 2.082.0 | gdc-8  |
+| 2.081.2 | gdc-7  |
 
 ### Release management
 

appveyor.yml

@@ -4,28 +4,16 @@ os: Visual Studio 2015
 environment:
   matrix:
     - DC: dmd
-      DVersion: 2.080.1
+      DVersion: 2.082.0
       arch: x64
     - DC: dmd
-      DVersion: 2.080.1
+      DVersion: 2.082.0
       arch: x86
     - DC: dmd
-      DVersion: 2.079.1
+      DVersion: 2.081.2
       arch: x64
     - DC: dmd
-      DVersion: 2.079.1
-      arch: x86
-    - DC: dmd
-      DVersion: 2.078.3
-      arch: x64
-    - DC: dmd
-      DVersion: 2.078.3
-      arch: x86
-    - DC: dmd
-      DVersion: 2.077.1
-      arch: x64
-    - DC: dmd
-      DVersion: 2.077.1
+      DVersion: 2.081.2
       arch: x86
 
 skip_tags: true
@@ -46,7 +34,7 @@ install:
 before_build:
   - ps: if($env:arch -eq "x86"){
           $env:compilersetupargs = "x86";
-          $env:Darch = "x86";
+          $env:Darch = "x86_mscoff";
         }
         elseif($env:arch -eq "x64"){
           $env:compilersetupargs = "amd64";

arch/x64/linux/memory/cmp.S

@@ -8,10 +8,9 @@
  * rdx - r2 length.
  * rcx - r2 data.
  */
-	.globl _D5tanya6memory2op9cmpMemoryFNaNbNixAvxAvZi
-	.type _D5tanya6memory2op9cmpMemoryFNaNbNixAvxAvZi, @function
-
-_D5tanya6memory2op9cmpMemoryFNaNbNixAvxAvZi:
+	.globl _D5tanya6memory2op9cmpMemoryFNaNbNixAvxQdZi
+	.type _D5tanya6memory2op9cmpMemoryFNaNbNixAvxQdZi, @function
+_D5tanya6memory2op9cmpMemoryFNaNbNixAvxQdZi:
 		// Compare the lengths
 		cmp %rdx, %rdi
 		jl  less

arch/x64/linux/syscall.S

@@ -11,10 +11,11 @@ The returned value is placed in %rax.
 */
 	.text
 
-	.globl syscall1
-	.type syscall1, @function
+// 1 parameter.
+	.globl _D5tanya3sys5linux7syscallQiFNbNillZl
+	.type _D5tanya3sys5linux7syscallQiFNbNillZl, @function
 
-syscall1:
+_D5tanya3sys5linux7syscallQiFNbNillZl:
 	movq %rsi, %rax // Syscall number.
 
 	syscall
@@ -23,10 +24,10 @@ syscall1:
 
 
 // 2 parameters.
-	.globl _D5tanya3sys5linux7syscall7syscallFNbNilllZl
-	.type _D5tanya3sys5linux7syscall7syscallFNbNilllZl, @function
+	.globl _D5tanya3sys5linux7syscallQiFNbNilllZl
+	.type _D5tanya3sys5linux7syscallQiFNbNilllZl, @function
 
-_D5tanya3sys5linux7syscall7syscallFNbNilllZl:
+_D5tanya3sys5linux7syscallQiFNbNilllZl:
 	movq %rdx, %rax
 
 	syscall
@@ -34,11 +35,23 @@ _D5tanya3sys5linux7syscall7syscallFNbNilllZl:
 	ret
 
 
-// 6 parameters.
-	.globl _D5tanya3sys5linux7syscall7syscallFNbNilllllllZl
-	.type _D5tanya3sys5linux7syscall7syscallFNbNilllllllZl, @function
+// 3 parameters.
+	.globl _D5tanya3sys5linux7syscallQiFNbNillllZl
+	.type _D5tanya3sys5linux7syscallQiFNbNillllZl, @function
 
-_D5tanya3sys5linux7syscall7syscallFNbNilllllllZl:
+_D5tanya3sys5linux7syscallQiFNbNillllZl:
+	movq %rcx, %rax
+
+	syscall
+
+	ret
+
+
+// 6 parameters.
+	.globl _D5tanya3sys5linux7syscallQiFNbNilllllllZl
+	.type _D5tanya3sys5linux7syscallQiFNbNilllllllZl, @function
+
+_D5tanya3sys5linux7syscallQiFNbNilllllllZl:
 	pushq %rbp
 	movq %rsp, %rbp
 

dub.json

@@ -34,5 +34,7 @@
 		}
 	],
 
-	"libs-windows": ["advapi32"]
+	"libs-windows": ["advapi32"],
+	"libs-windows-x86_mscoff": ["iphlpapi"],
+	"libs-windows-x86_64": ["iphlpapi"]
 }

source/tanya/algorithm/iteration.d

@@ -0,0 +1,409 @@
+/* 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 adapters.
+ *
+ * A range adapter wraps another range and modifies 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
+ * 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/algorithm/iteration.d,
+ *                 tanya/algorithm/iteration.d)
+ */
+module tanya.algorithm.iteration;
+
+import tanya.algorithm.comparison;
+import tanya.algorithm.mutation;
+import tanya.range;
+
+private mixin template Take(R, bool exactly)
+{
+    private R source;
+    size_t length_;
+
+    @disable this();
+
+    private this(R source, size_t length)
+    {
+        this.source = source;
+        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);
+            }
+        }
+    }
+}
+
+/**
+ * Takes $(D_PARAM n) elements from $(D_PARAM range).
+ *
+ * If $(D_PARAM range) doesn't have $(D_PARAM n) elements, the resulting range
+ * spans all elements of $(D_PARAM range).
+ *
+ * $(D_PSYMBOL take) is particulary useful with infinite ranges. You can take
+ ` $(B n) elements from such range and pass the result to an algorithm which
+ * expects a finit range.
+ *
+ * Params:
+ *  R     = Type of the adapted range.
+ *  range = The range to take the elements from.
+ *  n     = The number of elements to take.
+ *
+ * Returns: A range containing maximum $(D_PARAM n) first elements of
+ *          $(D_PARAM range).
+ *
+ * See_Also: $(D_PSYMBOL takeExactly).
+ */
+auto take(R)(R range, size_t n)
+if (isInputRange!R)
+{
+    static struct Take
+    {
+        mixin .Take!(R, false);
+
+        static if (hasSlicing!R)
+        {
+            auto opSlice(size_t i, size_t j)
+            in
+            {
+                assert(i <= j);
+                assert(j <= length);
+            }
+            do
+            {
+                return typeof(this)(this.source[i .. j], length);
+            }
+        }
+    }
+    return Take(range, n);
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    static struct InfiniteRange
+    {
+        private size_t front_ = 1;
+
+        enum bool empty = false;
+
+        @property size_t front() @nogc nothrow pure @safe
+        {
+            return this.front_;
+        }
+
+        @property void front(size_t i) @nogc nothrow pure @safe
+        {
+            this.front_ = i;
+        }
+
+        void popFront() @nogc nothrow pure @safe
+        {
+            ++this.front_;
+        }
+
+        size_t opIndex(size_t i) @nogc nothrow pure @safe
+        {
+            return this.front_ + i;
+        }
+
+        void opIndexAssign(size_t value, size_t i) @nogc nothrow pure @safe
+        {
+            this.front = i + value;
+        }
+
+        InfiniteRange save() @nogc nothrow pure @safe
+        {
+            return this;
+        }
+    }
+
+    auto t = InfiniteRange().take(3);
+    assert(t.length == 3);
+    assert(t.front == 1);
+    assert(t.back == 3);
+
+    t.popFront();
+    assert(t.front == 2);
+    assert(t.back == 3);
+
+    t.popBack();
+    assert(t.front == 2);
+    assert(t.back == 2);
+
+    t.popFront();
+    assert(t.empty);
+}
+
+/**
+ * Takes exactly $(D_PARAM n) elements from $(D_PARAM range).
+ *
+ * $(D_PARAM range) must have at least $(D_PARAM n) elements.
+ *
+ * $(D_PSYMBOL takeExactly) is particulary useful with infinite ranges. You can
+ ` take $(B n) elements from such range and pass the result to an algorithm
+ * which expects a finit range.
+ *
+ * Params:
+ *  R     = Type of the adapted range.
+ *  range = The range to take the elements from.
+ *  n     = The number of elements to take.
+ *
+ * Returns: A range containing $(D_PARAM n) first elements of $(D_PARAM range).
+ *
+ * See_Also: $(D_PSYMBOL take).
+ */
+auto takeExactly(R)(R range, size_t n)
+if (isInputRange!R)
+{
+    static if (hasSlicing!R)
+    {
+        return range[0 .. n];
+    }
+    else
+    {
+        static struct TakeExactly
+        {
+            mixin Take!(R, true);
+        }
+        return TakeExactly(range, n);
+    }
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    static struct InfiniteRange
+    {
+        private size_t front_ = 1;
+
+        enum bool empty = false;
+
+        @property size_t front() @nogc nothrow pure @safe
+        {
+            return this.front_;
+        }
+
+        @property void front(size_t i) @nogc nothrow pure @safe
+        {
+            this.front_ = i;
+        }
+
+        void popFront() @nogc nothrow pure @safe
+        {
+            ++this.front_;
+        }
+
+        size_t opIndex(size_t i) @nogc nothrow pure @safe
+        {
+            return this.front_ + i;
+        }
+
+        void opIndexAssign(size_t value, size_t i) @nogc nothrow pure @safe
+        {
+            this.front = i + value;
+        }
+
+        InfiniteRange save() @nogc nothrow pure @safe
+        {
+            return this;
+        }
+    }
+
+    auto t = InfiniteRange().takeExactly(3);
+    assert(t.length == 3);
+    assert(t.front == 1);
+    assert(t.back == 3);
+
+    t.popFront();
+    assert(t.front == 2);
+    assert(t.back == 3);
+
+    t.popBack();
+    assert(t.front == 2);
+    assert(t.back == 2);
+
+    t.popFront();
+    assert(t.empty);
+}
+
+// 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);
+    }
+}

source/tanya/algorithm/mutation.d

@@ -14,8 +14,10 @@
  */
 module tanya.algorithm.mutation;
 
-import tanya.memory.op;
+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)
 {
@@ -39,11 +41,12 @@ private void deinitialize(bool zero, T)(ref T value)
         }
         static if (zero)
         {
-            fill!0((cast(void*) &value)[0 .. size]);
+            tanya.memory.op.fill!0((cast(void*) &value)[0 .. size]);
         }
         else
         {
-            copy(typeid(T).initializer()[0 .. size], (&value)[0 .. 1]);
+            tanya.memory.op.copy(typeid(T).initializer()[0 .. size],
+                                 (&value)[0 .. 1]);
         }
     }
 }
@@ -81,7 +84,7 @@ do
 {
     static if (is(T == struct) || isStaticArray!T)
     {
-        copy((&source)[0 .. 1], (&target)[0 .. 1]);
+        tanya.memory.op.copy((&source)[0 .. 1], (&target)[0 .. 1]);
 
         static if (hasElaborateCopyConstructor!T || hasElaborateDestructor!T)
         {
@@ -273,3 +276,115 @@ void swap(T)(ref T a, ref T b) @trusted
     assert(a == 5);
     assert(b == 3);
 }
+
+/**
+ * Copies the $(D_PARAM source) range into the $(D_PARAM target) range.
+ *
+ * Params:
+ *  Source = Input range type.
+ *  Target = Output range type.
+ *  source = Source input range.
+ *  target = Target output range.
+ *
+ * Returns: $(D_PARAM target) range, whose front element is the one past the
+ *          last element copied.
+ *
+ * Precondition: $(D_PARAM target) should be large enough to accept all
+ *               $(D_PARAM source) elements.
+ */
+Target copy(Source, Target)(Source source, Target target)
+if (isInputRange!Source && isOutputRange!(Target, Source))
+in
+{
+    static if (hasLength!Source && hasLength!Target)
+    {
+        assert(target.length >= source.length);
+    }
+}
+do
+{
+    alias E = ElementType!Source;
+    static if (isDynamicArray!Source
+            && is(Unqual!E == ElementType!Target)
+            && !hasElaborateCopyConstructor!E
+            && !hasElaborateAssign!E
+            && !hasElaborateDestructor!E)
+    {
+        if (source.ptr < target.ptr
+         && (() @trusted => (target.ptr - source.ptr) < source.length)())
+        {
+            tanya.memory.op.copyBackward(source, target);
+        }
+        else if (source.ptr !is target.ptr)
+        {
+            tanya.memory.op.copy(source, target);
+        }
+        return target[source.length .. $];
+    }
+    else
+    {
+        for (; !source.empty; source.popFront())
+        {
+            put(target, source.front);
+        }
+        return target;
+    }
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    import tanya.algorithm.comparison : equal;
+
+    const int[2] source = [1, 2];
+    int[2] target = [3, 4];
+
+    copy(source[], target[]);
+    assert(equal(source[], target[]));
+}
+
+// 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 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);
+}

source/tanya/algorithm/package.d

@@ -15,4 +15,5 @@
 module tanya.algorithm;
 
 public import tanya.algorithm.comparison;
+public import tanya.algorithm.iteration;
 public import tanya.algorithm.mutation;

source/tanya/async/event/kqueue.d

@@ -84,12 +84,12 @@ enum : short
 
 struct kevent_t
 {
-    uintptr_t    ident; /* identifier for this event */
-    short       filter; /* filter for event */
-    ushort       flags;
-    uint        fflags;
-    intptr_t      data;
-    void        *udata; /* opaque user data identifier */
+    uintptr_t ident; // Identifier for this event
+    short filter; // Filter for event
+    ushort flags;
+    uint fflags;
+    intptr_t data;
+    void* udata; // Opaque user data identifier
 }
 
 enum
@@ -168,7 +168,7 @@ final class KqueueLoop : SelectorLoop
                filter,
                flags,
                0U,
-               0L,
+               0,
                null);
         ++changeCount;
     }

source/tanya/container/entry.d

@@ -82,12 +82,18 @@ package struct Bucket(K, V = void)
         }
     }
 
-    bool opEquals(ref inout(K) key) inout
+    void moveKey(ref K key)
+    {
+        move(key, this.key());
+        this.status = BucketStatus.used;
+    }
+
+    bool opEquals(T)(ref const T key) const
     {
         return this.status == BucketStatus.used && this.key == key;
     }
 
-    bool opEquals(ref inout(typeof(this)) that) inout
+    bool opEquals(ref const(typeof(this)) that) const
     {
         return key == that.key && this.status == that.status;
     }
@@ -171,24 +177,29 @@ package struct HashArray(alias hasher, K, V = void)
         this.length = that.length;
     }
 
+    @property size_t bucketCount() const
+    {
+        return primes[this.lengthIndex];
+    }
+
     /*
      * Returns bucket position for `hash`. `0` may mean the 0th position or an
      * empty `buckets` array.
      */
-    size_t locateBucket(ref const Key key) const
+    size_t locateBucket(T)(ref const T key) const
     {
-        return this.array.length == 0
-             ? 0
-             : hasher(key) % primes[this.lengthIndex];
+        return this.array.length == 0 ? 0 : hasher(key) % bucketCount;
     }
 
     /*
-     * Inserts a key into an empty or deleted bucket. If the key is
-     * already in there, does nothing. Returns the bucket with the key.
+     * If the key doesn't already exists, returns an empty bucket the key can
+     * be inserted in and adjusts the element count. Otherwise returns the
+     * bucket containing the key.
      */
     ref Bucket insert(ref Key key)
     {
-        while ((this.lengthIndex + 1) != primes.length)
+        const newLengthIndex = this.lengthIndex + 1;
+        if (newLengthIndex != primes.length)
         {
             foreach (ref e; this.array[locateBucket(key) .. $])
             {
@@ -203,17 +214,29 @@ package struct HashArray(alias hasher, K, V = void)
                 }
             }
 
-            if (this.rehashToSize(this.lengthIndex + 1))
+            this.rehashToSize(newLengthIndex);
+        }
+
+        foreach (ref e; this.array[locateBucket(key) .. $])
+        {
+            if (e == key)
             {
-                ++this.lengthIndex;
+                return e;
+            }
+            else if (e.status != BucketStatus.used)
+            {
+                ++this.length;
+                return e;
             }
         }
-        this.array.insertBack(Bucket(key));
+
+        this.array.length = this.array.length + 1;
+        ++this.length;
         return this.array[$ - 1];
     }
 
     // Takes an index in the primes array.
-    bool rehashToSize(const size_t n)
+    void rehashToSize(const size_t n)
     in
     {
         assert(n < primes.length);
@@ -231,15 +254,15 @@ package struct HashArray(alias hasher, K, V = void)
                 {
                     if (e2.status != BucketStatus.used) // Insert the key
                     {
-                        e2 = e1;
+                        .move(e1, e2);
                         continue DataLoop;
                     }
                 }
-                return false; // Rehashing failed.
+                storage.insertBack(.move(e1));
             }
         }
         .move(storage, this.array);
-        return true;
+        this.lengthIndex = n;
     }
 
     void rehash(const size_t n)
@@ -252,9 +275,9 @@ package struct HashArray(alias hasher, K, V = void)
                 break;
             }
         }
-        if (this.rehashToSize(lengthIndex))
+        if (lengthIndex > this.lengthIndex)
         {
-            this.lengthIndex = lengthIndex;
+            this.rehashToSize(lengthIndex);
         }
     }
 
@@ -287,7 +310,7 @@ package struct HashArray(alias hasher, K, V = void)
         return 0;
     }
 
-    bool opBinaryRight(string op : "in")(ref inout(Key) key) inout
+    bool opBinaryRight(string op : "in", T)(ref const T key) const
     {
         foreach (ref e; this.array[locateBucket(key) .. $])
         {

source/tanya/container/hashtable.d

@@ -14,6 +14,7 @@
  */
 module tanya.container.hashtable;
 
+import tanya.algorithm.mutation;
 import tanya.container.array;
 import tanya.container.entry;
 import tanya.hash.lookup;
@@ -138,6 +139,236 @@ struct Range(T)
     }
 }
 
+/**
+ * Bidirectional range iterating over the key of a $(D_PSYMBOL HashTable).
+ *
+ * Params:
+ *  T = Type of the internal hash storage.
+ */
+struct ByKey(T)
+{
+    private alias Key = CopyConstness!(T, T.Key);
+    static if (isMutable!T)
+    {
+        private alias DataRange = T.array.Range;
+    }
+    else
+    {
+        private alias DataRange = T.array.ConstRange;
+    }
+    private DataRange dataRange;
+
+    @disable this();
+
+    private this(DataRange dataRange)
+    {
+        while (!dataRange.empty && dataRange.front.status != BucketStatus.used)
+        {
+            dataRange.popFront();
+        }
+        while (!dataRange.empty && dataRange.back.status != BucketStatus.used)
+        {
+            dataRange.popBack();
+        }
+        this.dataRange = dataRange;
+    }
+
+    @property ByKey save()
+    {
+        return this;
+    }
+
+    @property bool empty() const
+    {
+        return this.dataRange.empty();
+    }
+
+    @property void popFront()
+    in
+    {
+        assert(!empty);
+        assert(this.dataRange.front.status == BucketStatus.used);
+    }
+    out
+    {
+        assert(empty || this.dataRange.back.status == BucketStatus.used);
+    }
+    do
+    {
+        do
+        {
+            this.dataRange.popFront();
+        }
+        while (!empty && dataRange.front.status != BucketStatus.used);
+    }
+
+    @property void popBack()
+    in
+    {
+        assert(!empty);
+        assert(this.dataRange.back.status == BucketStatus.used);
+    }
+    out
+    {
+        assert(empty || this.dataRange.back.status == BucketStatus.used);
+    }
+    do
+    {
+        do
+        {
+            this.dataRange.popBack();
+        }
+        while (!empty && dataRange.back.status != BucketStatus.used);
+    }
+
+    @property ref inout(Key) front() inout
+    in
+    {
+        assert(!empty);
+        assert(this.dataRange.front.status == BucketStatus.used);
+    }
+    do
+    {
+        return this.dataRange.front.key;
+    }
+
+    @property ref inout(Key) back() inout
+    in
+    {
+        assert(!empty);
+        assert(this.dataRange.back.status == BucketStatus.used);
+    }
+    do
+    {
+        return this.dataRange.back.key;
+    }
+
+    ByKey opIndex()
+    {
+        return typeof(return)(this.dataRange[]);
+    }
+
+    ByKey!(const T) opIndex() const
+    {
+        return typeof(return)(this.dataRange[]);
+    }
+}
+
+/**
+ * Bidirectional range iterating over the key of a $(D_PSYMBOL HashTable).
+ *
+ * Params:
+ *  T = Type of the internal hash storage.
+ */
+struct ByValue(T)
+{
+    private alias Value = CopyConstness!(T, T.Value);
+    static if (isMutable!T)
+    {
+        private alias DataRange = T.array.Range;
+    }
+    else
+    {
+        private alias DataRange = T.array.ConstRange;
+    }
+    private DataRange dataRange;
+
+    @disable this();
+
+    private this(DataRange dataRange)
+    {
+        while (!dataRange.empty && dataRange.front.status != BucketStatus.used)
+        {
+            dataRange.popFront();
+        }
+        while (!dataRange.empty && dataRange.back.status != BucketStatus.used)
+        {
+            dataRange.popBack();
+        }
+        this.dataRange = dataRange;
+    }
+
+    @property ByValue save()
+    {
+        return this;
+    }
+
+    @property bool empty() const
+    {
+        return this.dataRange.empty();
+    }
+
+    @property void popFront()
+    in
+    {
+        assert(!empty);
+        assert(this.dataRange.front.status == BucketStatus.used);
+    }
+    out
+    {
+        assert(empty || this.dataRange.back.status == BucketStatus.used);
+    }
+    do
+    {
+        do
+        {
+            this.dataRange.popFront();
+        }
+        while (!empty && dataRange.front.status != BucketStatus.used);
+    }
+
+    @property void popBack()
+    in
+    {
+        assert(!empty);
+        assert(this.dataRange.back.status == BucketStatus.used);
+    }
+    out
+    {
+        assert(empty || this.dataRange.back.status == BucketStatus.used);
+    }
+    do
+    {
+        do
+        {
+            this.dataRange.popBack();
+        }
+        while (!empty && dataRange.back.status != BucketStatus.used);
+    }
+
+    @property ref inout(Value) front() inout
+    in
+    {
+        assert(!empty);
+        assert(this.dataRange.front.status == BucketStatus.used);
+    }
+    do
+    {
+        return this.dataRange.front.kv.value;
+    }
+
+    @property ref inout(Value) back() inout
+    in
+    {
+        assert(!empty);
+        assert(this.dataRange.back.status == BucketStatus.used);
+    }
+    do
+    {
+        return this.dataRange.back.kv.value;
+    }
+
+    ByValue opIndex()
+    {
+        return typeof(return)(this.dataRange[]);
+    }
+
+    ByValue!(const T) opIndex() const
+    {
+        return typeof(return)(this.dataRange[]);
+    }
+}
+
 /**
  * Hash table is a data structure that stores pairs of keys and values without
  * any particular order.
@@ -155,7 +386,7 @@ struct Range(T)
  *  hasher = Hash function for $(D_PARAM Key).
  */
 struct HashTable(Key, Value, alias hasher = hash)
-if (is(typeof(hasher(Key.init)) == size_t))
+if (is(typeof(((Key k) => hasher(k))(Key.init)) == size_t))
 {
     private alias HashArray = .HashArray!(hasher, Key, Value);
     private alias Buckets = HashArray.Buckets;
@@ -171,11 +402,18 @@ if (is(typeof(hasher(Key.init)) == size_t))
     /// ditto
     alias ConstRange = .Range!(const HashArray);
 
+    /// ditto
+    alias ByKey = .ByKey!(const HashArray);
+
+    /// ditto
+    alias ByValue = .ByValue!HashArray;
+
+    /// ditto
+    alias ConstByValue = .ByValue!(const HashArray);
+
     invariant
     {
         assert(this.data.lengthIndex < primes.length);
-        assert(this.data.array.length == 0
-            || this.data.array.length == primes[this.data.lengthIndex]);
     }
 
     /**
@@ -440,6 +678,23 @@ if (is(typeof(hasher(Key.init)) == size_t))
         assert(hashTable.empty);
     }
 
+    /**
+     * Returns current bucket count in the container.
+     *
+     * Bucket count equals to the number of the elements can be saved in the
+     * container in the best case scenario for key distribution, i.d. every key
+     * has a unique hash value. In a worse case the bucket count can be less
+     * than the number of elements stored in the container.
+     *
+     * Returns: Current bucket count.
+     *
+     * See_Also: $(D_PSYMBOL rehash).
+     */
+    @property size_t bucketCount() const
+    {
+        return this.data.bucketCount;
+    }
+
     /// The maximum number of buckets the container can have.
     enum size_t maxBucketCount = primes[$ - 1];
 
@@ -453,14 +708,28 @@ if (is(typeof(hasher(Key.init)) == size_t))
      *
      * Returns: Just inserted element.
      */
-    ref Value opIndexAssign(Value value, Key key)
+    ref Value opIndexAssign()(auto ref Value value, auto ref Key key)
     {
         auto e = ((ref v) @trusted => &this.data.insert(v))(key);
         if (e.status != BucketStatus.used)
         {
-            e.key = key;
+            static if (__traits(isRef, key))
+            {
+                e.key = key;
+            }
+            else
+            {
+                e.moveKey(key);
+            }
+        }
+        static if (__traits(isRef, value))
+        {
+            return e.kv.value = value;
+        }
+        else
+        {
+            return e.kv.value = move(value);
         }
-        return e.kv.value = value;
     }
 
     ///
@@ -490,7 +759,7 @@ if (is(typeof(hasher(Key.init)) == size_t))
      *
      * Returns: The number of the inserted elements with a unique key.
      */
-    size_t insert(KeyValue keyValue)
+    size_t insert(ref KeyValue keyValue)
     {
         auto e = ((ref v) @trusted => &this.data.insert(v))(keyValue.key);
         size_t inserted;
@@ -503,6 +772,20 @@ if (is(typeof(hasher(Key.init)) == size_t))
         return inserted;
     }
 
+    /// ditto
+    size_t insert(KeyValue keyValue)
+    {
+        auto e = ((ref v) @trusted => &this.data.insert(v))(keyValue.key);
+        size_t inserted;
+        if (e.status != BucketStatus.used)
+        {
+            e.moveKey(keyValue.key);
+            inserted = 1;
+        }
+        move(keyValue.value, e.kv.value);
+        return inserted;
+    }
+
     ///
     @nogc nothrow pure @safe unittest
     {
@@ -557,13 +840,15 @@ if (is(typeof(hasher(Key.init)) == size_t))
      * Find the element with the key $(D_PARAM key).
      *
      * Params:
+     *  T   = Type comparable with the key type, used for the lookup.
      *  key = The key to be find.
      *
      * Returns: The value associated with $(D_PARAM key).
      *
      * Precondition: Element with $(D_PARAM key) is in this hash table.
      */
-    ref Value opIndex(Key key)
+    ref Value opIndex(T)(auto ref const T key)
+    if (ifTestable!(T, a => Key.init == a))
     {
         const code = this.data.locateBucket(key);
 
@@ -619,12 +904,14 @@ if (is(typeof(hasher(Key.init)) == size_t))
      * Looks for $(D_PARAM key) in this hash table.
      *
      * Params:
+     *  T   = Type comparable with the key type, used for the lookup.
      *  key = The key to look for.
      *
      * Returns: $(D_KEYWORD true) if $(D_PARAM key) exists in the hash table,
      *          $(D_KEYWORD false) otherwise.
      */
-    bool opBinaryRight(string op : "in")(auto ref inout(Key) key) inout
+    bool opBinaryRight(string op : "in", T)(auto ref const T key) const
+    if (ifTestable!(T, a => Key.init == a))
     {
         return key in this.data;
     }
@@ -645,18 +932,15 @@ if (is(typeof(hasher(Key.init)) == size_t))
      * Sets the number of buckets in the container to at least $(D_PARAM n)
      * and rearranges all the elements according to their hash values.
      *
-     * If $(D_PARAM n) is greater than the current $(D_PSYMBOL capacity)
+     * If $(D_PARAM n) is greater than the current $(D_PSYMBOL bucketCount)
      * and lower than or equal to $(D_PSYMBOL maxBucketCount), a rehash is
      * forced.
      *
      * If $(D_PARAM n) is greater than $(D_PSYMBOL maxBucketCount),
      * $(D_PSYMBOL maxBucketCount) is used instead as a new number of buckets.
      *
-     * If $(D_PARAM n) is equal to the current $(D_PSYMBOL capacity), rehashing
-     * is forced without resizing the container.
-     *
-     * If $(D_PARAM n) is lower than the current $(D_PSYMBOL capacity), the
-     * function may have no effect.
+     * If $(D_PARAM n) is less than or equal to the current
+     * $(D_PSYMBOL bucketCount), the function may have no effect.
      *
      * Rehashing is automatically performed whenever the container needs space
      * to insert new elements.
@@ -697,6 +981,86 @@ if (is(typeof(hasher(Key.init)) == size_t))
         assert(hashTable[].front == hashTable.KeyValue("Iguanodon", 9));
         assert(hashTable[].back == hashTable.KeyValue("Iguanodon", 9));
     }
+
+    /**
+     * Returns a bidirectional range that iterats over the keys of this
+     * $(D_PSYMBOL HashTable).
+     *
+     * This function always returns a $(D_KEYWORD const) range, since changing
+     * a key of a hash table would probably change its hash value and require
+     * rehashing.
+     *
+     * Returns: $(D_KEYWORD const) bidirectional range that iterates over the
+     *          keys of the container.
+     *
+     * See_Also: $(D_PSYMBOL byValue).
+     */
+    ByKey byKey() const
+    {
+        return typeof(return)(this.data.array[]);
+    }
+
+    ///
+    @nogc nothrow pure @safe unittest
+    {
+        HashTable!(string, int) hashTable;
+        hashTable["one"] = 1;
+        hashTable["two"] = 2;
+
+        auto byKey = hashTable.byKey();
+        assert(!byKey.empty);
+
+        assert(byKey.front == "one" || byKey.front == "two");
+        assert(byKey.back == "one" || byKey.back == "two");
+        assert(byKey.front != byKey.back);
+
+        byKey.popFront();
+        assert(byKey.front == byKey.back);
+
+        byKey.popBack();
+        assert(byKey.empty);
+    }
+
+    /**
+     * Returns a bidirectional range that iterats over the values of this
+     * $(D_PSYMBOL HashTable).
+     *
+     * Returns: A bidirectional range that iterates over the values of the
+     *          container.
+     *
+     * See_Also: $(D_PSYMBOL byKey).
+     */
+    ByValue byValue()
+    {
+        return typeof(return)(this.data.array[]);
+    }
+
+    /// ditto
+    ConstByValue byValue() const
+    {
+        return typeof(return)(this.data.array[]);
+    }
+
+    ///
+    @nogc nothrow pure @safe unittest
+    {
+        HashTable!(string, int) hashTable;
+        hashTable["one"] = 1;
+        hashTable["two"] = 2;
+
+        auto byValue = hashTable.byValue();
+        assert(!byValue.empty);
+
+        assert(byValue.front == 1 || byValue.front == 2);
+        assert(byValue.back == 1 || byValue.back == 2);
+        assert(byValue.front != byValue.back);
+
+        byValue.popFront();
+        assert(byValue.front == byValue.back);
+
+        byValue.popBack();
+        assert(byValue.empty);
+    }
 }
 
 @nogc nothrow pure @safe unittest
@@ -727,6 +1091,9 @@ if (is(typeof(hasher(Key.init)) == size_t))
     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
@@ -773,3 +1140,60 @@ if (is(typeof(hasher(Key.init)) == size_t))
     }
     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/package.d

@@ -20,26 +20,3 @@ public import tanya.container.hashtable;
 public import tanya.container.list;
 public import tanya.container.set;
 public import tanya.container.string;
-
-/**
- * Thrown if $(D_PSYMBOL Set) cannot insert a new element because the container
- * is full.
- */
-deprecated
-class HashContainerFullException : Exception
-{
-    /**
-     * 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,
-         string file = __FILE__,
-         size_t line = __LINE__,
-         Throwable next = null) @nogc nothrow pure @safe
-    {
-        super(msg, file, line, next);
-    }
-}

source/tanya/container/set.d

@@ -15,7 +15,6 @@
  */
 module tanya.container.set;
 
-import tanya.algorithm.mutation;
 import tanya.container.array;
 import tanya.container.entry;
 import tanya.hash.lookup;
@@ -155,7 +154,7 @@ struct Range(T)
  *  hasher = Hash function for $(D_PARAM T).
  */
 struct Set(T, alias hasher = hash)
-if (is(typeof(hasher(T.init)) == size_t))
+if (is(typeof(((T x) => hasher(x))(T.init)) == size_t))
 {
     private alias HashArray = .HashArray!(hasher, T);
     private alias Buckets = HashArray.Buckets;
@@ -432,6 +431,23 @@ if (is(typeof(hasher(T.init)) == size_t))
         assert(set.empty);
     }
 
+    /**
+     * Returns current bucket count in the container.
+     *
+     * Bucket count equals to the number of the elements can be saved in the
+     * container in the best case scenario for key distribution, i.d. every key
+     * has a unique hash value. In a worse case the bucket count can be less
+     * than the number of elements stored in the container.
+     *
+     * Returns: Current bucket count.
+     *
+     * See_Also: $(D_PSYMBOL rehash).
+     */
+    @property size_t bucketCount() const
+    {
+        return this.data.bucketCount;
+    }
+
     /// The maximum number of buckets the container can have.
     enum size_t maxBucketCount = primes[$ - 1];
 
@@ -443,6 +459,17 @@ if (is(typeof(hasher(T.init)) == size_t))
      *
      * Returns: Amount of new elements inserted.
      */
+    size_t insert(ref T value)
+    {
+        auto e = ((ref v) @trusted => &this.data.insert(v))(value);
+        if (e.status != BucketStatus.used)
+        {
+            e.moveKey(value);
+            return 1;
+        }
+        return 0;
+    }
+
     size_t insert(T value)
     {
         auto e = ((ref v) @trusted => &this.data.insert(v))(value);
@@ -534,12 +561,14 @@ if (is(typeof(hasher(T.init)) == size_t))
      * $(D_KEYWORD in) operator.
      *
      * Params:
+     *  U     = Type comparable with the element type, used for the lookup.
      *  value = Element to be searched for.
      *
      * Returns: $(D_KEYWORD true) if the given element exists in the container,
      *          $(D_KEYWORD false) otherwise.
      */
-    bool opBinaryRight(string op : "in")(auto ref inout(T) value) inout
+    bool opBinaryRight(string op : "in", U)(auto ref const U value) const
+    if (ifTestable!(U, a => T.init == a))
     {
         return value in this.data;
     }
@@ -559,18 +588,15 @@ if (is(typeof(hasher(T.init)) == size_t))
      * Sets the number of buckets in the container to at least $(D_PARAM n)
      * and rearranges all the elements according to their hash values.
      *
-     * If $(D_PARAM n) is greater than the current $(D_PSYMBOL capacity)
+     * If $(D_PARAM n) is greater than the current $(D_PSYMBOL bucketCount)
      * and lower than or equal to $(D_PSYMBOL maxBucketCount), a rehash is
      * forced.
      *
      * If $(D_PARAM n) is greater than $(D_PSYMBOL maxBucketCount),
      * $(D_PSYMBOL maxBucketCount) is used instead as a new number of buckets.
      *
-     * If $(D_PARAM n) is equal to the current $(D_PSYMBOL capacity), rehashing
-     * is forced without resizing the container.
-     *
-     * If $(D_PARAM n) is lower than the current $(D_PSYMBOL capacity), the
-     * function may have no effect.
+     * If $(D_PARAM n) is less than or equal to the current
+     * $(D_PSYMBOL bucketCount), the function may have no effect.
      *
      * Rehashing is automatically performed whenever the container needs space
      * to insert new elements.
@@ -741,3 +767,9 @@ if (is(typeof(hasher(T.init)) == size_t))
     }
     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

@@ -27,10 +27,11 @@
 module tanya.container.string;
 
 import std.algorithm.comparison : cmp;
-import std.algorithm.mutation : bringToFront, copy;
+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.meta.trait;
 import tanya.meta.transform;
@@ -499,7 +500,7 @@ struct String
         }
     }
 
-    @nogc pure @safe unittest
+    @nogc nothrow pure @safe unittest
     {
         auto s = String(0, 'K');
         assert(s.length == 0);
@@ -579,16 +580,10 @@ struct String
      * Params:
      *  chr = The character should be inserted.
      *
-     * Returns: The number of bytes inserted.
-     *
-     * Throws: $(D_PSYMBOL UTFException).
+     * Returns: The number of bytes inserted (1).
      */
-    size_t insertBack(const char chr) @nogc pure @trusted
+    size_t insertBack(char chr) @nogc nothrow pure @trusted
     {
-        if ((chr & 0x80) != 0)
-        {
-            throw defaultAllocator.make!UTFException("Invalid UTF-8 character");
-        }
         reserve(length + 1);
 
         *(data + length) = chr;
@@ -652,8 +647,6 @@ struct String
      *  str = String should be inserted.
      *
      * Returns: The number of bytes inserted.
-     *
-     * Throws: $(D_PSYMBOL UTFException).
      */
     size_t insertBack(R)(R str) @trusted
     if (!isInfinite!R
@@ -673,46 +666,18 @@ struct String
             this.length_ = size;
             return str.length;
         }
+        else static if (isInstanceOf!(ByCodeUnit, R))
+        {
+            str.get.copy(this.data[length .. size]);
+            this.length_ = size;
+            return str.length;
+        }
         else
         {
             size_t insertedLength;
-            while (!str.empty)
+            foreach (c; str)
             {
-                ubyte expectedLength;
-                if ((str.front & 0x80) == 0x00)
-                {
-                    expectedLength = 1;
-                }
-                else if ((str.front & 0xe0) == 0xc0)
-                {
-                    expectedLength = 2;
-                }
-                else if ((str.front & 0xf0) == 0xe0)
-                {
-                    expectedLength = 3;
-                }
-                else if ((str.front & 0xf8) == 0xf0)
-                {
-                    expectedLength = 4;
-                }
-                else
-                {
-                    throw defaultAllocator.make!UTFException("Invalid UTF-8 sequeunce");
-                }
-                size = length + expectedLength;
-                reserve(size);
-
-                for (; expectedLength > 0; --expectedLength)
-                {
-                    if (str.empty)
-                    {
-                        throw defaultAllocator.make!UTFException("Invalid UTF-8 sequeunce");
-                    }
-                    *(data + length) = str.front;
-                    str.popFront();
-                }
-                insertedLength += expectedLength;
-                this.length_ = size;
+                insertedLength += insertBack(c);
             }
             return insertedLength;
         }
@@ -828,7 +793,7 @@ struct String
     }
 
     ///
-    @nogc pure @safe unittest
+    @nogc nothrow pure @safe unittest
     {
         String s;
         assert(s.capacity == 0);
@@ -869,7 +834,7 @@ struct String
     }
 
     ///
-    @nogc pure @safe unittest
+    @nogc nothrow pure @safe unittest
     {
         auto s = String("Die Alten lasen laut.");
         assert(s.capacity == 21);
@@ -894,7 +859,7 @@ struct String
     }
 
     ///
-    @nogc pure @safe unittest
+    @nogc nothrow pure @safe unittest
     {
         auto s = String("In allem Schreiben ist Schamlosigkeit.");
         assert(s.capacity == 38);
@@ -991,7 +956,7 @@ struct String
      *
      * Returns: Null-terminated string.
      */
-    const(char)* toStringz() @nogc nothrow pure
+    const(char)* toStringz() @nogc nothrow pure @system
     {
         reserve(length + 1);
         this.data[length] = '\0';
@@ -999,7 +964,7 @@ struct String
     }
 
     ///
-    @nogc pure unittest
+    @nogc nothrow pure @system unittest
     {
         auto s = String("C string.");
         assert(s.toStringz()[0] == 'C');
@@ -1018,7 +983,7 @@ struct String
     alias opDollar = length;
 
     ///
-    @nogc pure @safe unittest
+    @nogc nothrow pure @safe unittest
     {
         auto s = String("Piscis primuin a capite foetat.");
         assert(s.length == 31);
@@ -1044,7 +1009,7 @@ struct String
     }
 
     ///
-    @nogc pure @safe unittest
+    @nogc nothrow pure @safe unittest
     {
         auto s = String("Alea iacta est.");
         assert(s[0] == 'A');
@@ -1067,7 +1032,7 @@ struct String
     }
 
     ///
-    @nogc pure @safe unittest
+    @nogc nothrow pure @safe unittest
     {
         auto s = String("Plutarchus");
         auto r = s[];
@@ -1086,7 +1051,7 @@ struct String
     }
 
     ///
-    @nogc pure @safe unittest
+    @nogc nothrow pure @safe unittest
     {
         auto s = const String("Was ich vermag, soll gern geschehen. Goethe");
         auto r1 = s[];
@@ -1162,7 +1127,7 @@ struct String
     }
 
     ///
-    @nogc pure @safe unittest
+    @nogc nothrow pure @safe unittest
     {
         String s;
         assert(s.empty);
@@ -1207,7 +1172,7 @@ struct String
     }
 
     ///
-    @nogc pure @safe unittest
+    @nogc nothrow pure @safe unittest
     {
         auto s = String("Vladimir Soloviev");
         auto r = s[9 .. $];
@@ -1271,7 +1236,7 @@ struct String
     }
 
     ///
-    @nogc pure @safe unittest
+    @nogc nothrow pure @safe unittest
     {
         auto s = String("Черная, потом пропахшая выть!");
         s = String("Как мне тебя не ласкать, не любить?");
@@ -1299,10 +1264,11 @@ struct String
     }
 
     ///
-    @nogc pure @safe unittest
+    @nogc nothrow pure @safe unittest
     {
         auto s = String("Оловом светится лужная голь...");
         s = "Грустная песня, ты - русская боль.";
+        assert(s == "Грустная песня, ты - русская боль.");
     }
 
     /**
@@ -1344,7 +1310,7 @@ struct String
     }
 
     ///
-    @nogc pure @safe unittest
+    @nogc nothrow pure @safe unittest
     {
         assert(String("Голубая кофта.") < String("Синие глаза."));
         assert(String("Никакой я правды") < String("милой не сказал")[]);
@@ -1397,7 +1363,7 @@ struct String
     }
 
     ///
-    @nogc pure @safe unittest
+    @nogc nothrow pure @safe unittest
     {
         assert(String("Милая спросила:") != String("Крутит ли метель?"));
         assert(String("Затопить бы печку,") != String("постелить постель.")[]);
@@ -1430,7 +1396,7 @@ struct String
     }
 
     ///
-    @nogc pure @safe unittest
+    @nogc nothrow pure @safe unittest
     {
         auto s = String("alea iacta est.");
 
@@ -1455,7 +1421,7 @@ struct String
         return opSliceAssign(value, 0, length);
     }
 
-    @nogc pure @safe unittest
+    @nogc nothrow pure @safe unittest
     {
         auto s1 = String("Buttercup");
         auto s2 = String("Cap");
@@ -1469,7 +1435,7 @@ struct String
         return opSliceAssign(value, 0, length);
     }
 
-    @nogc pure @safe unittest
+    @nogc nothrow pure @safe unittest
     {
         auto s1 = String("Wow");
         s1[] = 'a';
@@ -1482,7 +1448,7 @@ struct String
         return opSliceAssign(value, 0, length);
     }
 
-    @nogc pure @safe unittest
+    @nogc nothrow pure @safe unittest
     {
         auto s1 = String("ö");
         s1[] = "oe";
@@ -1574,7 +1540,7 @@ struct String
     }
 
     ///
-    @nogc pure @safe unittest
+    @nogc nothrow pure @safe unittest
     {
         auto s = String("Казнить нельзя помиловать.");
         s.insertAfter(s[0 .. 27], ",");
@@ -1603,7 +1569,7 @@ struct String
     }
 
     ///
-    @nogc pure @safe unittest
+    @nogc nothrow pure @safe unittest
     {
         auto s = String("Казнить нельзя помиловать.");
         s.insertBefore(s[27 .. $], ",");
@@ -1614,11 +1580,21 @@ struct String
         assert(s == "Казнить, нельзя помиловать.");
     }
 
+    /**
+     * Calculates the hash value for the string.
+     *
+     * Returns: Hash value for the string.
+     */
+    size_t toHash() const @nogc nothrow pure @safe
+    {
+        return hash(get);
+    }
+
     mixin DefaultAllocator;
 }
 
-// Postblit works.
-@nogc pure @safe unittest
+// Postblit works
+@nogc nothrow pure @safe unittest
 {
     void internFunc(String arg)
     {
@@ -1637,7 +1613,7 @@ struct String
     topFunc(String("asdf"));
 }
 
-// Const range produces mutable ranges.
+// Const range produces mutable ranges
 @nogc pure @safe unittest
 {
     auto s = const String("И снизу лед, и сверху - маюсь между.");
@@ -1663,7 +1639,7 @@ struct String
     }
 }
 
-// Can pop multibyte characters.
+// Can pop multibyte characters
 @nogc pure @safe unittest
 {
     auto s = String("\U00024B62\U00002260");
@@ -1680,3 +1656,12 @@ struct String
     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

@@ -282,8 +282,8 @@ final class ConvException : Exception
  *
  * The function doesn't handle the sign (+ or -) or number prefixes (like 0x).
  */
-package T readIntegral(T, R)(ref R range, ubyte base = 10)
-if (isForwardRange!R
+package T readIntegral(T, R)(ref R range, const ubyte base = 10)
+if (isInputRange!R
  && isSomeChar!(ElementType!R)
  && isIntegral!T
  && isUnsigned!T)
@@ -301,18 +301,18 @@ do
     }
 
     T n;
-    while (n <= boundary)
+    int digit;
+    do
     {
-        int digit;
         if (range.front >= 'a')
         {
             digit = range.front - 'W';
         }
-        else if (range.front >= 'A')
+        else if (range.front >= 'A' && range.front <= 'Z')
         {
             digit = range.front - '7';
         }
-        else if (range.front >= '0')
+        else if (range.front >= '0' && range.front <= '9')
         {
             digit = range.front - '0';
         }
@@ -332,21 +332,43 @@ do
             return n;
         }
     }
-    if (range.length > 1)
+    while (n < boundary);
+
+    if (range.front >= 'a')
+    {
+        digit = range.front - 'W';
+    }
+    else if (range.front >= 'A')
+    {
+        digit = range.front - '7';
+    }
+    else if (range.front >= '0')
+    {
+        digit = range.front - '0';
+    }
+    else
     {
         return n;
     }
-
-    int digit = range.front - '0';
     if (n > cast(T) ((T.max - digit) / base))
     {
         return n;
     }
     n = cast(T) (n * base + digit);
+    range.popFront();
 
     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
 {
@@ -410,6 +432,14 @@ do
     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
@@ -826,31 +856,141 @@ if (is(Unqual!From == bool) && isNumeric!To && !is(Unqual!To == Unqual!From))
     assert(false.to!int == 0);
 }
 
-/**
- * Converts $(D_PARAM From) to a $(D_PSYMBOL String).
- *
- * Params:
- *  From = Source type.
- *  To   = Target type.
- *  from = Source value.
- *
- * Returns: $(D_PARAM from) converted to $(D_PSYMBOL String).
- */
+deprecated("Use tanya.format.format instead")
 To to(To, From)(auto ref From from)
 if (is(Unqual!To == String))
 {
     return format!"{}"(from);
 }
 
-///
-@nogc nothrow pure @safe unittest
+/**
+ * Converts a stringish range to an integral value.
+ *
+ * Params:
+ *  From = Source type.
+ *  To   = Target type.
+ *  from = Source value.
+ *
+ * Returns: $(D_PARAM from) converted to $(D_PARAM To).
+ *
+ * Throws: $(D_PSYMBOL ConvException) if $(D_PARAM from) doesn't contain an
+ *         integral value.
+ */
+To to(To, From)(auto ref From from)
+if (isInputRange!From && isSomeChar!(ElementType!From) && isIntegral!To)
 {
-    assert(true.to!String == "true");
-    assert(false.to!String == "false");
+    if (from.empty)
+    {
+        throw make!ConvException(defaultAllocator, "Input range is empty");
+    }
+
+    static if (isSigned!To)
+    {
+        bool negative;
+    }
+    if (from.front == '-')
+    {
+        static if (isUnsigned!To)
+        {
+            throw make!ConvException(defaultAllocator,
+                                     "Negative integer overflow");
+        }
+        else
+        {
+            negative = true;
+            from.popFront();
+        }
+    }
+
+    if (from.empty)
+    {
+        throw make!ConvException(defaultAllocator, "Input range is empty");
+    }
+
+    ubyte base = 10;
+    if (from.front == '0')
+    {
+        from.popFront();
+        if (from.empty)
+        {
+            return To.init;
+        }
+        else if (from.front == 'x' || from.front == 'X')
+        {
+            base = 16;
+            from.popFront();
+        }
+        else if (from.front == 'b' || from.front == 'B')
+        {
+            base = 2;
+            from.popFront();
+        }
+        else
+        {
+            base = 8;
+        }
+    }
+
+    auto unsigned = readIntegral!(Unsigned!To, From)(from, base);
+    if (!from.empty)
+    {
+        throw make!ConvException(defaultAllocator, "Integer overflow");
+    }
+
+    static if (isSigned!To)
+    {
+        if (negative)
+        {
+            auto predecessor = cast(Unsigned!To) (unsigned - 1);
+            if (predecessor > cast(Unsigned!To) To.max)
+            {
+                throw make!ConvException(defaultAllocator,
+                                         "Negative integer overflow");
+            }
+            return cast(To) (-(cast(Largest!(To, ptrdiff_t)) predecessor) - 1);
+        }
+        else if (unsigned > cast(Unsigned!To) To.max)
+        {
+            throw make!ConvException(defaultAllocator, "Integer overflow");
+        }
+        else
+        {
+            return unsigned;
+        }
+    }
+    else
+    {
+        return unsigned;
+    }
 }
 
-@nogc nothrow pure @safe unittest
+///
+@nogc pure @safe unittest
 {
-    static assert(is(typeof((const String("true")).to!bool)));
-    static assert(is(typeof(false.to!(const String) == "false")));
+    assert("1234".to!uint() == 1234);
+    assert("1234".to!int() == 1234);
+    assert("1234".to!int() == 1234);
+
+    assert("0".to!int() == 0);
+    assert("-0".to!int() == 0);
+
+    assert("0x10".to!int() == 16);
+    assert("0X10".to!int() == 16);
+    assert("-0x10".to!int() == -16);
+
+    assert("0b10".to!int() == 2);
+    assert("0B10".to!int() == 2);
+    assert("-0b10".to!int() == -2);
+
+    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/functional.d

@@ -0,0 +1,71 @@
+/* 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/. */
+
+/**
+ * Functions that manipulate other functions and their argument lists.
+ *
+ * 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/functional.d,
+ *                 tanya/functional.d)
+ */
+module tanya.functional;
+
+import tanya.algorithm.mutation;
+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

@@ -89,7 +89,10 @@ private struct FNV
  * }
  * ---
  *
- * For scalar types FNV-1a (Fowler-Noll-Vo) hash function is used internally.
+ * 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.
  * If the type provides a `toHash`-function, only `toHash()` is called and its
  * result is returned.
  *
@@ -110,6 +113,19 @@ size_t hash(T)(auto ref T key)
     {
         return key.toHash();
     }
+    else static if ((isIntegral!T || isSomeChar!T || isBoolean!T)
+            && T.sizeof <= size_t.sizeof)
+    {
+        return cast(size_t) key;
+    }
+    else static if (isIntegral!T && T.sizeof > size_t.sizeof)
+    {
+        return cast(size_t) (key ^ (key >>> (size_t.sizeof * 8)));
+    }
+    else static if (isPointer!T || is(T : typeof(null)))
+    {
+        return (() @trusted => cast(size_t) key)();
+    }
     else
     {
         FNV fnv;
@@ -177,30 +193,29 @@ version (unittest)
 // Tests that work for any hash size
 @nogc nothrow pure @safe unittest
 {
-    assert(hash(null) == FNV.offsetBasis);
+    assert(hash(null) == 0);
     assert(hash(ToHash()) == 0U);
+    assert(hash('a') == 'a');
 }
 
 static if (size_t.sizeof == 4) @nogc nothrow pure @safe unittest
 {
-    assert(hash('a') == 0xe40c292cU);
     assert(hash(HashRange()) == 0x6222e842U);
     assert(hash(ToHashRange()) == 1268118805U);
 }
 static if (size_t.sizeof == 8) @nogc nothrow pure @safe unittest
 {
-    assert(hash('a') == 0xaf63dc4c8601ec8cUL);
     assert(hash(HashRange()) == 0x08985907b541d342UL);
     assert(hash(ToHashRange()) == 12161962213042174405UL);
 }
 
 static if (size_t.sizeof == 4) @nogc nothrow pure @system unittest
 {
-    assert(hash(cast(void*) 0x6e6f6863) == 0xac297727U);
+    assert(hash(cast(void*) 0x6e6f6863) == 0x6e6f6863);
 }
 static if (size_t.sizeof == 8) @nogc nothrow pure @system unittest
 {
-    assert(hash(cast(void*) 0x77206f676e6f6863) == 0xd1edd10b507344d0UL);
+    assert(hash(cast(void*) 0x77206f676e6f6863) == 0x77206f676e6f6863);
 }
 
 /*

source/tanya/math/mp.d

@@ -15,14 +15,13 @@
 module tanya.math.mp;
 
 import std.algorithm.comparison : cmp;
-import std.algorithm.mutation : copy, fill, reverse;
+import std.algorithm.mutation : fill, reverse;
 import std.range;
 import tanya.algorithm.comparison;
 import tanya.algorithm.mutation;
 import tanya.container.array;
 import tanya.encoding.ascii;
 import tanya.memory;
-static import tanya.memory.op;
 import tanya.meta.trait;
 import tanya.meta.transform;
 
@@ -211,7 +210,7 @@ struct Integer
     this(this) @nogc nothrow pure @safe
     {
         auto tmp = allocator.resize!digit(null, this.size);
-        tanya.memory.op.copy(this.rep[0 .. this.size], tmp);
+        copy(this.rep[0 .. this.size], tmp);
         this.rep = tmp;
     }
 
@@ -344,8 +343,7 @@ struct Integer
     if (is(Unqual!T == Integer))
     {
         this.rep = allocator.resize(this.rep, value.size);
-        tanya.memory.op.copy(value.rep[0 .. value.size],
-                             this.rep[0 .. value.size]);
+        copy(value.rep[0 .. value.size], this.rep[0 .. value.size]);
         this.size = value.size;
         this.sign = value.sign;
 

source/tanya/math/package.d

@@ -87,7 +87,7 @@ if (isFloatingPoint!F)
     static assert(ieeePrecision!double == IEEEPrecision.double_);
 }
 
-private union FloatBits(F)
+package(tanya) union FloatBits(F)
 {
     Unqual!F floating;
     static if (ieeePrecision!F == IEEEPrecision.single)
@@ -739,101 +739,3 @@ bool isPseudoprime(ulong x) @nogc nothrow pure @safe
     assert(899809363.isPseudoprime);
     assert(982451653.isPseudoprime);
 }
-
-deprecated("Use tanya.algorithm.comparison.min instead")
-T min(T)(T x, T y)
-if (isIntegral!T)
-{
-    return x < y ? x : y;
-}
-
-deprecated("Use tanya.algorithm.comparison.min instead")
-T min(T)(T x, T y)
-if (isFloatingPoint!T)
-{
-    if (isNaN(x))
-    {
-        return y;
-    }
-    if (isNaN(y))
-    {
-        return x;
-    }
-    return x < y ? x : y;
-}
-
-deprecated("Use tanya.algorithm.comparison.min instead")
-ref T min(T)(ref T x, ref T y)
-if (is(Unqual!T == Integer))
-{
-    return x < y ? x : y;
-}
-
-deprecated("Use tanya.algorithm.comparison.min instead")
-T min(T)(T x, T y)
-if (is(T == Integer))
-{
-    return x < y ? move(x) : move(y);
-}
-
-@nogc nothrow pure @safe unittest
-{
-    assert(min(Integer(5), Integer(3)) == 3);
-}
-
-deprecated("Use tanya.algorithm.comparison.max instead")
-T max(T)(T x, T y)
-if (isIntegral!T)
-{
-    return x > y ? x : y;
-}
-
-deprecated("Use tanya.algorithm.comparison.max instead")
-T max(T)(T x, T y)
-if (isFloatingPoint!T)
-{
-    if (isNaN(x))
-    {
-        return y;
-    }
-    if (isNaN(y))
-    {
-        return x;
-    }
-    return x > y ? x : y;
-}
-
-deprecated("Use tanya.algorithm.comparison.max instead")
-ref T max(T)(ref T x, ref T y)
-if (is(Unqual!T == Integer))
-{
-    return x > y ? x : y;
-}
-
-deprecated("Use tanya.algorithm.comparison.max instead")
-T max(T)(T x, T y)
-if (is(T == Integer))
-{
-    return x > y ? move(x) : move(y);
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    assert(max(Integer(5), Integer(3)) == 5);
-}
-
-// min/max accept const and mutable references.
-@nogc nothrow pure @safe unittest
-{
-    {
-        Integer i1 = 5, i2 = 3;
-        assert(min(i1, i2) == 3);
-        assert(max(i1, i2) == 5);
-    }
-    {
-        const Integer i1 = 5, i2 = 3;
-        assert(min(i1, i2) == 3);
-        assert(max(i1, i2) == 5);
-    }
-}

source/tanya/memory/op.d

@@ -305,7 +305,7 @@ do
  *          first occurrence of $(D_PARAM needle). If $(D_PARAM needle)
  *          couldn't be found, an empty `inout void[]` is returned.
  */
-inout(void[]) find(return inout void[] haystack, const ubyte needle)
+inout(void[]) find(return inout void[] haystack, ubyte needle)
 @nogc nothrow pure @trusted
 in
 {
@@ -326,19 +326,19 @@ do
         {
             return bytes[0 .. length];
         }
-        bytes++;
-        length--;
+        ++bytes;
+        --length;
     }
 
     // Check if some of the words has the needle
     auto words = cast(inout(size_t)*) bytes;
     while (length >= size_t.sizeof)
     {
-        if (((*words ^ needleWord) - highBits) & (~*words) & mask)
+        if ((((*words ^ needleWord) - highBits) & (~*words) & mask) != 0)
         {
             break;
         }
-        words++;
+        ++words;
         length -= size_t.sizeof;
     }
 
@@ -350,8 +350,8 @@ do
         {
             return bytes[0 .. length];
         }
-        bytes++;
-        length--;
+        ++bytes;
+        --length;
     }
 
     return haystack[$ .. $];
@@ -362,14 +362,89 @@ do
 {
     const ubyte[9] haystack = ['a', 'b', 'c', 'd', 'e', 'f', 'b', 'g', 'h'];
 
-    assert(find(haystack, 'a') == haystack[]);
-    assert(find(haystack, 'b') == haystack[1 .. $]);
-    assert(find(haystack, 'c') == haystack[2 .. $]);
-    assert(find(haystack, 'd') == haystack[3 .. $]);
-    assert(find(haystack, 'e') == haystack[4 .. $]);
-    assert(find(haystack, 'f') == haystack[5 .. $]);
-    assert(find(haystack, 'h') == haystack[8 .. $]);
+    assert(cmp(find(haystack, 'a'), haystack[]) == 0);
+    assert(cmp(find(haystack, 'b'), haystack[1 .. $]) == 0);
+    assert(cmp(find(haystack, 'c'), haystack[2 .. $]) == 0);
+    assert(cmp(find(haystack, 'd'), haystack[3 .. $]) == 0);
+    assert(cmp(find(haystack, 'e'), haystack[4 .. $]) == 0);
+    assert(cmp(find(haystack, 'f'), haystack[5 .. $]) == 0);
+    assert(cmp(find(haystack, 'h'), haystack[8 .. $]) == 0);
     assert(find(haystack, 'i').length == 0);
 
     assert(find(null, 'a').length == 0);
 }
+
+/**
+ * Looks for `\0` in the $(D_PARAM haystack) and returns the part of the
+ * $(D_PARAM haystack) ahead of it.
+ *
+ * Returns $(D_KEYWORD null) if $(D_PARAM haystack) doesn't contain a null
+ * character.
+ *
+ * Params:
+ *  haystack = Memory block.
+ *
+ * Returns: The subrange that spans all bytes before the null character or
+ *          $(D_KEYWORD null) if the $(D_PARAM haystack) doesn't contain any.
+ */
+inout(char[]) findNullTerminated(return inout char[] haystack)
+@nogc nothrow pure @trusted
+in
+{
+    assert(haystack.length == 0 || haystack.ptr !is null);
+}
+do
+{
+    auto length = haystack.length;
+    enum size_t highBits = filledBytes!(0x01, 0);
+    enum size_t mask = filledBytes!(0x80, 0);
+
+    // Align
+    auto bytes = cast(inout(ubyte)*) haystack;
+    while (length > 0 && ((cast(size_t) bytes) & 3) != 0)
+    {
+        if (*bytes == '\0')
+        {
+            return haystack[0 .. haystack.length - length];
+        }
+        ++bytes;
+        --length;
+    }
+
+    // Check if some of the words contains 0
+    auto words = cast(inout(size_t)*) bytes;
+    while (length >= size_t.sizeof)
+    {
+        if (((*words - highBits) & (~*words) & mask) != 0)
+        {
+            break;
+        }
+        ++words;
+        length -= size_t.sizeof;
+    }
+
+    // Find the exact 0 position in the word
+    bytes = cast(inout(ubyte)*) words;
+    while (length > 0)
+    {
+        if (*bytes == '\0')
+        {
+            return haystack[0 .. haystack.length - length];
+        }
+        ++bytes;
+        --length;
+    }
+
+    return null;
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    assert(cmp(findNullTerminated("abcdef\0gh"), "abcdef") == 0);
+    assert(cmp(findNullTerminated("\0garbage"), "") == 0);
+    assert(cmp(findNullTerminated("\0"), "") == 0);
+    assert(cmp(findNullTerminated("cstring\0"), "cstring") == 0);
+    assert(findNullTerminated(null) is null);
+    assert(findNullTerminated("abcdef") is null);
+}

source/tanya/memory/package.d

@@ -14,7 +14,7 @@
  */
 module tanya.memory;
 
-import std.algorithm.mutation;
+import std.algorithm.mutation : uninitializedFill;
 import tanya.conv;
 import tanya.exception;
 public import tanya.memory.allocator;

source/tanya/meta/metafunction.d

@@ -116,7 +116,7 @@ if (Args.length > 0 && __traits(isTemplate, pred))
 }
 
 /**
- * Zips one or more $(D_PSYMBOL Tuple)s with $(D_PARAM f).
+ * Zips one or more $(D_PSYMBOL Pack)s with $(D_PARAM f).
  *
  * Given $(D_PARAM f) and tuples t1, t2, ..., tk, where tk[i] denotes the
  * $(I i)-th element of the tuple $(I k)-th tuple, $(D_PSYMBOL ZipWith)
@@ -129,7 +129,7 @@ if (Args.length > 0 && __traits(isTemplate, pred))
  * f(tk[0], tk[1], ... tk[i]),
  * ---
  *
- * $(D_PSYMBOL ZipWith) begins with the first elements from $(D_PARAM Tuples)
+ * $(D_PSYMBOL ZipWith) begins with the first elements from $(D_PARAM Packs)
  * and applies $(D_PARAM f) to them, then it takes the second
  * ones and does the same, and so on.
  *
@@ -140,16 +140,17 @@ if (Args.length > 0 && __traits(isTemplate, pred))
  *
  * Params:
  *  f      = Some template that can be applied to the elements of
- *           $(D_PARAM Tuples).
- *  Tuples = $(D_PSYMBOL Tuple) instances.
+ *           $(D_PARAM Packs).
+ *  Packs  = $(D_PSYMBOL Pack) instances.
  *
  * Returns: A sequence, whose $(I i)-th element contains the $(I i)-th element
- *          from each of the $(D_PARAM Tuples).
+ *          from each of the $(D_PARAM Packs).
  */
-template ZipWith(alias f, Tuples...)
-if (Tuples.length > 0
+template ZipWith(alias f, Packs...)
+if (Packs.length > 0
  && __traits(isTemplate, f)
- && allSatisfy!(ApplyLeft!(isInstanceOf, Tuple), Tuples))
+ && (allSatisfy!(ApplyLeft!(isInstanceOf, Pack), Packs)
+ || allSatisfy!(ApplyLeft!(isInstanceOf, Tuple), Packs)))
 {
     private template GetIth(size_t i, Args...)
     {
@@ -164,43 +165,37 @@ if (Tuples.length > 0
     }
     private template Iterate(size_t i, Args...)
     {
-        alias Tuple = GetIth!(i, Args);
+        alias Pack = GetIth!(i, Args);
 
-        static if (Tuple.length < Tuples.length)
+        static if (Pack.length < Packs.length)
         {
             alias Iterate = AliasSeq!();
         }
         else
         {
-            alias Iterate = AliasSeq!(f!Tuple,
-                                      Iterate!(i + 1, Args));
+            alias Iterate = AliasSeq!(f!Pack, Iterate!(i + 1, Args));
         }
     }
-    alias ZipWith = Iterate!(0, Tuples);
+    alias ZipWith = Iterate!(0, Packs);
 }
 
 ///
 @nogc nothrow pure @safe unittest
 {
-    alias Result1 = ZipWith!(AliasSeq,
-                             Tuple!(1, 2),
-                             Tuple!(5, 6),
-                             Tuple!(9, 10));
+    alias Result1 = ZipWith!(AliasSeq, Pack!(1, 2), Pack!(5, 6), Pack!(9, 10));
     static assert(Result1 == AliasSeq!(1, 5, 9, 2, 6, 10));
 
-    alias Result2 = ZipWith!(AliasSeq,
-                             Tuple!(1, 2, 3),
-                             Tuple!(4, 5));
+    alias Result2 = ZipWith!(AliasSeq, Pack!(1, 2, 3), Pack!(4, 5));
     static assert(Result2 == AliasSeq!(1, 4, 2, 5));
 
-    alias Result3 = ZipWith!(AliasSeq, Tuple!(), Tuple!(4, 5));
+    alias Result3 = ZipWith!(AliasSeq, Pack!(), Pack!(4, 5));
     static assert(Result3.length == 0);
 }
 
 /**
  * Holds a typed sequence of template parameters.
  *
- * Different than $(D_PSYMBOL AliasSeq), $(D_PSYMBOL Tuple) doesn't unpack
+ * Different than $(D_PSYMBOL AliasSeq), $(D_PSYMBOL Pack) doesn't unpack
  * its template parameters automatically. Consider:
  *
  * ---
@@ -215,7 +210,7 @@ if (Tuples.length > 0
  * Using $(D_PSYMBOL AliasSeq) template `A` gets 4 parameters instead of 2,
  * because $(D_PSYMBOL AliasSeq) is just an alias for its template parameters.
  *
- * With $(D_PSYMBOL Tuple) it is possible to pass distinguishable
+ * With $(D_PSYMBOL Pack) it is possible to pass distinguishable
  * sequences of parameters to a template. So:
  *
  * ---
@@ -224,14 +219,26 @@ if (Tuples.length > 0
  *  static assert(Args.length == 2);
  * }
  *
- * alias BInstance = B!(Tuple!(int, uint), Tuple!(float, double));
+ * alias BInstance = B!(Pack!(int, uint), Pack!(float, double));
  * ---
  *
  * Params:
- *  Args = Elements of this $(D_PSYMBOL Tuple).
+ *  Args = Elements of this $(D_PSYMBOL Pack).
  *
  * See_Also: $(D_PSYMBOL AliasSeq).
  */
+struct Pack(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;
+}
+
+deprecated("Use Pack instead")
 struct Tuple(Args...)
 {
     /// Elements in this tuple as $(D_PSYMBOL AliasSeq).
@@ -246,9 +253,9 @@ struct Tuple(Args...)
 ///
 @nogc nothrow pure @safe unittest
 {
-    alias A = Tuple!short;
-    alias B = Tuple!(3, 8, 9);
-    alias C = Tuple!(A, B);
+    alias A = Pack!short;
+    alias B = Pack!(3, 8, 9);
+    alias C = Pack!(A, B);
 
     static assert(C.length == 2);
 
@@ -257,7 +264,7 @@ struct Tuple(Args...)
     static assert(B.length == 3);
     static assert(B.Seq == AliasSeq!(3, 8, 9));
 
-    alias D = Tuple!();
+    alias D = Pack!();
     static assert(D.length == 0);
     static assert(is(D.Seq == AliasSeq!()));
 }
@@ -270,7 +277,7 @@ struct Tuple(Args...)
  * for determining if two items are equal.
  *
  * Params:
- *  Args = Elements of this $(D_PSYMBOL Tuple).
+ *  Args = Elements of this $(D_PSYMBOL Set).
  */
 struct Set(Args...)
 {

source/tanya/meta/trait.d

@@ -70,26 +70,6 @@ enum bool isWideString(T) = is(T : const dchar[]) && !isStaticArray!T;
     static assert(!isWideString!(dchar[10]));
 }
 
-deprecated("Use tanya.meta.transform.Smallest instead")
-template Smallest(Args...)
-if (Args.length >= 1)
-{
-    static assert(is(Args[0]), T.stringof ~ " doesn't have .sizeof property");
-
-    static if (Args.length == 1)
-    {
-        alias Smallest = Args[0];
-    }
-    else static if (Smallest!(Args[1 .. $]).sizeof < Args[0].sizeof)
-    {
-        alias Smallest = Smallest!(Args[1 .. $]);
-    }
-    else
-    {
-        alias Smallest = Args[0];
-    }
-}
-
 /**
  * Determines whether $(D_PARAM T) is a complex type.
  *
@@ -178,7 +158,7 @@ enum bool isPolymorphicType(T) = is(T == class) || is(T == interface);
  */
 template hasStaticMember(T, string member)
 {
-    static if (__traits(hasMember, T, member))
+    static if (hasMember!(T, member))
     {
         alias Member = Alias!(__traits(getMember, T, member));
 
@@ -928,26 +908,6 @@ template mostNegative(T)
     static assert(mostNegative!cfloat == -cfloat.max);
 }
 
-deprecated("Use tanya.meta.transform.Largest instead")
-template Largest(Args...)
-if (Args.length >= 1)
-{
-    static assert(is(Args[0]), T.stringof ~ " doesn't have .sizeof property");
-
-    static if (Args.length == 1)
-    {
-        alias Largest = Args[0];
-    }
-    else static if (Largest!(Args[1 .. $]).sizeof > Args[0].sizeof)
-    {
-        alias Largest = Largest!(Args[1 .. $]);
-    }
-    else
-    {
-        alias Largest = Args[0];
-    }
-}
-
 /**
  * Determines whether the type $(D_PARAM T) is copyable.
  *
@@ -1540,7 +1500,6 @@ if (F.length == 1)
  * Returns: $(D_KEYWORD true) if $(D_PARAM T) defines a symbol
  *          $(D_PARAM member), $(D_KEYWORD false) otherwise.
  */
-deprecated("Use __traits(hasMember) instead")
 enum bool hasMember(T, string member) = __traits(hasMember, T, member);
 
 ///

source/tanya/net/iface.d

@@ -0,0 +1,228 @@
+/* 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/. */
+
+/**
+ * Network interfaces.
+ *
+ * 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/net/iface.d,
+ *                 tanya/net/iface.d)
+ */
+module tanya.net.iface;
+
+import tanya.algorithm.comparison;
+import tanya.algorithm.mutation;
+import tanya.container.string;
+import tanya.meta.trait;
+import tanya.meta.transform;
+import tanya.range;
+
+version (TanyaNative)
+{
+    import mir.linux._asm.unistd;
+    import tanya.sys.linux.syscall;
+    import tanya.sys.posix.ioctl;
+    import tanya.sys.posix.net.if_;
+    import tanya.sys.posix.socket;
+}
+else version (Windows)
+{
+    import tanya.sys.windows.ifdef;
+    import tanya.sys.windows.iphlpapi;
+}
+else version (Posix)
+{
+    import core.sys.posix.net.if_;
+}
+
+/**
+ * Converts the name of a network interface to its index.
+ *
+ * If an interface with the name $(D_PARAM name) cannot be found or another
+ * error occurres, returns 0.
+ *
+ * Params:
+ *  name = Interface name.
+ *
+ * Returns: Returns interface index or 0.
+ */
+uint nameToIndex(R)(R name) @trusted
+if (isInputRange!R && is(Unqual!(ElementType!R) == char) && hasLength!R)
+{
+    version (TanyaNative)
+    {
+        if (name.length >= IF_NAMESIZE)
+        {
+            return 0;
+        }
+        ifreq ifreq_ = void;
+
+        copy(name, ifreq_.ifr_name[]);
+        ifreq_.ifr_name[name.length] = '\0';
+
+        auto socket = syscall(AF_INET,
+                              SOCK_DGRAM | SOCK_CLOEXEC,
+                              0,
+                              NR_socket);
+        if (socket <= 0)
+        {
+            return 0;
+        }
+        scope (exit)
+        {
+            syscall(socket, NR_close);
+        }
+        if (syscall(socket,
+                    SIOCGIFINDEX,
+                    cast(ptrdiff_t) &ifreq_,
+                    NR_ioctl) == 0)
+        {
+            return ifreq_.ifr_ifindex;
+        }
+        return 0;
+    }
+    else version (Windows)
+    {
+        if (name.length > IF_MAX_STRING_SIZE)
+        {
+            return 0;
+        }
+        char[IF_MAX_STRING_SIZE + 1] buffer;
+        NET_LUID luid;
+
+        copy(name, buffer[]);
+        buffer[name.length] = '\0';
+
+        if (ConvertInterfaceNameToLuidA(buffer.ptr, &luid) != 0)
+        {
+            return 0;
+        }
+        NET_IFINDEX index;
+        if (ConvertInterfaceLuidToIndex(&luid, &index) == 0)
+        {
+            return index;
+        }
+        return 0;
+    }
+    else version (Posix)
+    {
+        if (name.length >= IF_NAMESIZE)
+        {
+            return 0;
+        }
+        char[IF_NAMESIZE] buffer;
+
+        copy(name, buffer[]);
+        buffer[name.length] = '\0';
+
+        return if_nametoindex(buffer.ptr);
+    }
+}
+
+///
+@nogc nothrow @safe unittest
+{
+    version (linux)
+    {
+        assert(nameToIndex("lo") == 1);
+    }
+    else version (Windows)
+    {
+        assert(nameToIndex("loopback_0") == 1);
+    }
+    else
+    {
+        assert(nameToIndex("lo0") == 1);
+    }
+    assert(nameToIndex("ecafretni") == 0);
+}
+
+/**
+ * Converts the index of a network interface to its name.
+ *
+ * If an interface with the $(D_PARAM index) cannot be found or another
+ * error occurres, returns an empty $(D_PSYMBOL String).
+ *
+ * Params:
+ *  index = Interface index.
+ *
+ * Returns: Returns interface name or an empty $(D_PSYMBOL String).
+ */
+String indexToName(uint index) @nogc nothrow @trusted
+{
+    import tanya.memory.op : findNullTerminated;
+
+    version (TanyaNative)
+    {
+        ifreq ifreq_ = void;
+        ifreq_.ifr_ifindex = index;
+
+        auto socket = syscall(AF_INET,
+                              SOCK_DGRAM | SOCK_CLOEXEC,
+                              0,
+                              NR_socket);
+        if (socket <= 0)
+        {
+            return String();
+        }
+        scope (exit)
+        {
+            syscall(socket, NR_close);
+        }
+        if (syscall(socket,
+                    SIOCGIFNAME,
+                    cast(ptrdiff_t) &ifreq_,
+                    NR_ioctl) == 0)
+        {
+            return String(findNullTerminated(ifreq_.ifr_name));
+        }
+        return String();
+    }
+    else version (Windows)
+    {
+        NET_LUID luid;
+        if (ConvertInterfaceIndexToLuid(index, &luid) != 0)
+        {
+            return String();
+        }
+
+        char[IF_MAX_STRING_SIZE + 1] buffer;
+        if (ConvertInterfaceLuidToNameA(&luid,
+                                        buffer.ptr,
+                                        IF_MAX_STRING_SIZE + 1) != 0)
+        {
+            return String();
+        }
+        return String(findNullTerminated(buffer));
+    }
+    else version (Posix)
+    {
+        char[IF_NAMESIZE] buffer;
+        if (if_indextoname(index, buffer.ptr) is null)
+        {
+            return String();
+        }
+        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

@@ -16,7 +16,7 @@ module tanya.net.inet;
 
 import tanya.meta.trait;
 import tanya.meta.transform;
-import tanya.range.primitive;
+import tanya.range;
 
 /**
  * Represents an unsigned integer as an $(D_KEYWORD ubyte) range.

source/tanya/net/ip.d

@@ -0,0 +1,890 @@
+/* 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/. */
+
+/**
+ * Internet Protocol implementation.
+ *
+ * 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/net/ip.d,
+ *                 tanya/net/ip.d)
+ */
+module tanya.net.ip;
+
+import tanya.algorithm.mutation;
+import tanya.container.string;
+import tanya.conv;
+import tanya.encoding.ascii;
+import tanya.format;
+import tanya.meta.trait;
+import tanya.meta.transform;
+import tanya.net.iface;
+import tanya.net.inet;
+import tanya.range;
+import tanya.typecons;
+
+/**
+ * IPv4 internet address.
+ */
+struct Address4
+{
+    // In network byte order.
+    private uint address;
+
+    version (LittleEndian)
+    {
+        private enum uint loopback_ = 0x0100007fU;
+        enum byte step = 8;
+    }
+    else
+    {
+        private enum uint loopback_ = 0x7f000001U;
+        enum byte step = -8;
+    }
+    private enum uint any_ = 0U;
+    private enum uint broadcast = uint.max;
+
+    /**
+     * Constructs an $(D_PSYMBOL Address4) from an unsigned integer in host
+     * byte order.
+     *
+     * Params:
+     *  address = The address as an unsigned integer in host byte order.
+     */
+    this(uint address) @nogc nothrow pure @safe
+    {
+        copy(NetworkOrder!4(address),
+             (() @trusted => (cast(ubyte*) &this.address)[0 .. 4])());
+    }
+
+    ///
+    @nogc nothrow pure @safe unittest
+    {
+        assert(Address4(0x00202000U).toUInt() == 0x00202000U);
+    }
+
+    /**
+     * Returns object that represents 127.0.0.1.
+     *
+     * Returns: Object that represents the Loopback address.
+     */
+    static Address4 loopback() @nogc nothrow pure @safe
+    {
+        typeof(return) address;
+        address.address = Address4.loopback_;
+        return address;
+    }
+
+    ///
+    @nogc nothrow pure @safe unittest
+    {
+        assert(Address4.loopback().isLoopback());
+    }
+
+    /**
+     * Returns object that represents 0.0.0.0.
+     *
+     * Returns: Object that represents any address.
+     */
+    static Address4 any() @nogc nothrow pure @safe
+    {
+        typeof(return) address;
+        address.address = Address4.any_;
+        return address;
+    }
+
+    ///
+    @nogc nothrow pure @safe unittest
+    {
+        assert(Address4.any().isAny());
+    }
+
+    /**
+     * Loopback address is 127.0.0.1.
+     *
+     * Returns: $(D_KEYWORD true) if this is a loopback address,
+     *          $(D_KEYWORD false) otherwise.
+     */
+    bool isLoopback() const @nogc nothrow pure @safe
+    {
+        return this.address == loopback_;
+    }
+
+    ///
+    @nogc nothrow pure @safe unittest
+    {
+        assert(address4("127.0.0.1").isLoopback());
+    }
+
+    /**
+     * 0.0.0.0 can represent any address. This function checks whether this
+     * address is 0.0.0.0.
+     *
+     * Returns: $(D_KEYWORD true) if this is an unspecified address,
+     *          $(D_KEYWORD false) otherwise.
+     */
+    bool isAny() const @nogc nothrow pure @safe
+    {
+        return this.address == any_;
+    }
+
+    ///
+    @nogc nothrow pure @safe unittest
+    {
+        assert(address4("0.0.0.0").isAny());
+    }
+
+    /**
+     * Broadcast address is 255.255.255.255.
+     *
+     * Returns: $(D_KEYWORD true) if this is a broadcast address,
+     *          $(D_KEYWORD false) otherwise.
+     */
+    bool isBroadcast() const @nogc nothrow pure @safe
+    {
+        return this.address == broadcast;
+    }
+
+    ///
+    @nogc nothrow pure @safe unittest
+    {
+        assert(address4("255.255.255.255").isBroadcast());
+    }
+
+    /**
+     * 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 isUnicast).
+     */
+    bool isMulticast() const @nogc nothrow pure @safe
+    {
+        version (LittleEndian)
+        {
+            enum uint mask = 0xe0;
+        }
+        else
+        {
+            enum uint mask = 0xe0000000U;
+        }
+        return (this.address & mask) == mask;
+    }
+
+    ///
+    @nogc nothrow pure @safe unittest
+    {
+        assert(address4("224.0.0.3").isMulticast());
+    }
+
+    /**
+     * Determines whether this address' destination is a single endpoint.
+     *
+     * Returns: $(D_KEYWORD true) if this is a multicast address,
+     *          $(D_KEYWORD false) otherwise.
+     *
+     * See_Also: $(D_PSYMBOL isMulticast).
+     */
+    bool isUnicast() const @nogc nothrow pure @safe
+    {
+        return !isMulticast();
+    }
+
+    ///
+    @nogc nothrow pure @safe unittest
+    {
+        assert(address4("192.168.0.1").isUnicast());
+    }
+
+    /**
+     * Produces a string containing an IPv4 address in dotted-decimal notation.
+     *
+     * Returns: This address in dotted-decimal notation.
+     */
+    String stringify() const @nogc nothrow pure @safe
+    {
+        const octets = (() @trusted => (cast(ubyte*) &this.address)[0 .. 4])();
+        enum string fmt = "{}.{}.{}.{}";
+        version (LittleEndian)
+        {
+            return format!fmt(octets[0], octets[1], octets[2], octets[3]);
+        }
+        else
+        {
+            return format!fmt(octets[3], octets[2], octets[1], octets[0]);
+        }
+    }
+
+    ///
+    @nogc nothrow pure @safe unittest
+    {
+        const dottedDecimal = "192.168.0.1";
+        const address = address4(dottedDecimal);
+        assert(address.get.stringify() == dottedDecimal);
+    }
+
+    /**
+     * Produces a byte array containing this address in network byte order.
+     *
+     * Returns: This address as raw bytes in network byte order.
+     */
+    ubyte[4] toBytes() const @nogc nothrow pure @safe
+    {
+        ubyte[4] bytes;
+        copy((() @trusted => (cast(ubyte*) &this.address)[0 .. 4])(), bytes[]);
+        return bytes;
+    }
+
+    ///
+    @nogc nothrow pure @safe unittest
+    {
+        const actual = address4("192.168.0.1");
+        const ubyte[4] expected = [192, 168, 0, 1];
+        assert(actual.toBytes() == expected);
+    }
+
+    /**
+     * Converts this address to an unsigned integer in host byte order.
+     *
+     * Returns: This address as an unsigned integer in host byte order.
+     */
+    uint toUInt() const @nogc nothrow pure @safe
+    {
+        alias slice = () @trusted => (cast(ubyte*) &this.address)[0 .. 4];
+        return toHostOrder!uint(slice());
+    }
+
+    ///
+    @nogc nothrow pure @safe unittest
+    {
+        assert(address4("127.0.0.1").toUInt() == 0x7f000001U);
+    }
+}
+
+/**
+ * Parses a string containing an IPv4 address in dotted-decimal notation.
+ *
+ * Params:
+ *  R     = Input range type.
+ *  range = Stringish range containing the address.
+ *
+ * Returns: $(D_PSYMBOL Option) containing the address if the parsing was
+ *          successful, or nothing otherwise.
+ */
+Option!Address4 address4(R)(R range)
+if (isForwardRange!R && is(Unqual!(ElementType!R) == char) && hasLength!R)
+{
+    Address4 result;
+    version (LittleEndian)
+    {
+        ubyte shift;
+        enum ubyte cond = 24;
+    }
+    else
+    {
+        ubyte shift = 24;
+        enum ubyte cond = 0;
+    }
+
+    for (; shift != cond; shift += Address4.step, range.popFront())
+    {
+        if (range.empty || range.front == '.')
+        {
+            return typeof(return)();
+        }
+        result.address |= readIntegral!ubyte(range) << shift;
+        if (range.empty || range.front != '.')
+        {
+            return typeof(return)();
+        }
+    }
+
+    if (range.empty || range.front == '.')
+    {
+        return typeof(return)();
+    }
+    result.address |= readIntegral!ubyte(range) << shift;
+    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.
+ *
+ * Params:
+ *  R     = Input range type.
+ *  range = $(D_KEYWORD ubyte) range containing the address.
+ *
+ * Returns: $(D_PSYMBOL Option) containing the address if the $(D_PARAM range)
+ *          contains exactly 4 bytes, or nothing otherwise.
+ */
+Option!Address4 address4(R)(R range)
+if (isInputRange!R && is(Unqual!(ElementType!R) == ubyte))
+{
+    Address4 result;
+    version (LittleEndian)
+    {
+        ubyte shift;
+    }
+    else
+    {
+        ubyte shift = 24;
+    }
+
+    for (; shift <= 24; shift += Address4.step, range.popFront())
+    {
+        if (range.empty)
+        {
+            return typeof(return)();
+        }
+        result.address |= range.front << shift;
+    }
+
+    return range.empty ? typeof(return)(result) : typeof(return)();
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    {
+        ubyte[4] actual = [127, 0, 0, 1];
+        assert(address4(actual[]).isLoopback());
+    }
+    {
+        ubyte[3] actual = [127, 0, 0];
+        assert(address4(actual[]).isNothing);
+    }
+    {
+        ubyte[5] actual = [127, 0, 0, 0, 1];
+        assert(address4(actual[]).isNothing);
+    }
+}
+
+@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.
+ */
+struct Address6
+{
+    // Raw bytes
+    private ubyte[16] address;
+
+    /// Scope ID.
+    uint scopeID;
+
+    /**
+     * Constructs an $(D_PSYMBOL Address6) from an array containing raw bytes
+     * in network byte order and scope ID.
+     *
+     * Params:
+     *  address = The address as an unsigned integer in host byte order.
+     *  scopeID = Scope ID.
+     */
+    this(ubyte[16] address, uint scopeID = 0) @nogc nothrow pure @safe
+    {
+        copy(address[], this.address[]);
+        this.scopeID = scopeID;
+    }
+
+    ///
+    @nogc nothrow pure @safe unittest
+    {
+        const ubyte[16] expected = [ 0, 1, 0, 2, 0, 3, 0, 4,
+                                     0, 5, 0, 6, 0, 7, 0, 8 ];
+        auto actual = Address6(expected, 1);
+        assert(actual.toBytes() == expected);
+        assert(actual.scopeID == 1);
+    }
+
+    /**
+     * Returns object that represents ::.
+     *
+     * Returns: Object that represents any address.
+     */
+    static Address6 any() @nogc nothrow pure @safe
+    {
+        return Address6();
+    }
+
+    ///
+    @nogc nothrow pure @safe unittest
+    {
+        assert(Address6.any().isAny());
+    }
+
+    /**
+     * Returns object that represents ::1.
+     *
+     * Returns: Object that represents the Loopback address.
+     */
+    static Address6 loopback() @nogc nothrow pure @safe
+    {
+        typeof(return) address;
+        address.address[$ - 1] = 1;
+        return address;
+    }
+
+    ///
+    @nogc nothrow pure @safe unittest
+    {
+        assert(Address6.loopback().isLoopback());
+    }
+
+    /**
+     * :: can represent any address. This function checks whether this
+     * address is ::.
+     *
+     * Returns: $(D_KEYWORD true) if this is an unspecified address,
+     *          $(D_KEYWORD false) otherwise.
+     */
+    bool isAny() const @nogc nothrow pure @safe
+    {
+        return this.address == any.address;
+    }
+
+    ///
+    @nogc nothrow @safe unittest
+    {
+        assert(address6("::").isAny());
+    }
+
+    /**
+     * Loopback address is ::1.
+     *
+     * Returns: $(D_KEYWORD true) if this is a loopback address,
+     *          $(D_KEYWORD false) otherwise.
+     */
+    bool isLoopback() const @nogc nothrow pure @safe
+    {
+        return this.address == loopback.address;
+    }
+
+    ///
+    @nogc nothrow @safe unittest
+    {
+        assert(address6("::1").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 isUnicast).
+     */
+    bool isMulticast() const @nogc nothrow pure @safe
+    {
+        return this.address[0] == 0xff;
+    }
+
+    ///
+    @nogc nothrow @safe unittest
+    {
+        assert(address6("ff00::").isMulticast());
+    }
+
+    /**
+     * Determines whether this address' destination is a single endpoint.
+     *
+     * Returns: $(D_KEYWORD true) if this is a multicast address,
+     *          $(D_KEYWORD false) otherwise.
+     *
+     * See_Also: $(D_PSYMBOL isMulticast).
+     */
+    bool isUnicast() const @nogc nothrow pure @safe
+    {
+        return !isMulticast();
+    }
+
+    ///
+    @nogc nothrow @safe unittest
+    {
+        assert(address6("::1").isUnicast());
+    }
+
+    /**
+     * Determines whether this address is a link-local unicast address.
+     *
+     * Returns: $(D_KEYWORD true) if this is a link-local address,
+     *          $(D_KEYWORD false) otherwise.
+     */
+    bool isLinkLocal() const @nogc nothrow pure @safe
+    {
+        return this.address[0] == 0xfe && (this.address[1] & 0xc0) == 0x80;
+    }
+
+    ///
+    @nogc nothrow @safe unittest
+    {
+        assert(address6("fe80::1").isLinkLocal());
+    }
+
+    /**
+     * Determines whether this address is an Unique Local Address (ULA).
+     *
+     * Returns: $(D_KEYWORD true) if this is an Unique Local Address,
+     *          $(D_KEYWORD false) otherwise.
+     */
+    bool isUniqueLocal() const @nogc nothrow pure @safe
+    {
+        return this.address[0] == 0xfc || this.address[0] == 0xfd;
+    }
+
+    ///
+    @nogc nothrow @safe unittest
+    {
+        assert(address6("fd80:124e:34f3::1").isUniqueLocal());
+    }
+
+    /**
+     * Returns text representation of this address.
+     *
+     * Returns: text representation of this address.
+     */
+    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)
+            {
+                output.insertBack(cast(char) (high + '0'));
+            }
+            else
+            {
+                output.insertBack(cast(char) (high - 10 + 'a'));
+            }
+            if (low < 10)
+            {
+                output.insertBack(cast(char) (low + '0'));
+            }
+            else
+            {
+                output.insertBack(cast(char) (low - 10 + 'a'));
+            }
+            if (i % 2 != 0 && i != (this.address.length - 1))
+            {
+                output.insertBack(':');
+            }
+        }
+
+        return output;
+    }
+
+    ///
+    @nogc nothrow @safe unittest
+    {
+        import tanya.algorithm.comparison : equal;
+
+        assert(equal(address6("1:2:3:4:5:6:7:8").stringify()[],
+               "0001:0002:0003:0004:0005:0006:0007:0008"));
+    }
+
+    /**
+     * Produces a byte array containing this address in network byte order.
+     *
+     * Returns: This address as raw bytes in network byte order.
+     */
+    ubyte[16] toBytes() const @nogc nothrow pure @safe
+    {
+        return this.address;
+    }
+
+    ///
+    @nogc nothrow @safe unittest
+    {
+        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);
+    }
+}
+
+private void write2Bytes(R)(ref R range, ubyte[] address)
+{
+    ushort group = readIntegral!ushort(range, 16);
+    address[0] = cast(ubyte) (group >> 8);
+    address[1] = group & 0xff;
+}
+
+/**
+ * Parses a string containing an IPv6 address.
+ *
+ * This function isn't pure since an IPv6 address can contain interface name
+ * or interface ID (separated from the address by `%`). If an interface name
+ * 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.
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * Returns: $(D_PSYMBOL Option) containing the address if the parsing was
+ *          successful, or nothing otherwise.
+ */
+Option!Address6 address6(R)(R range)
+if (isForwardRange!R && is(Unqual!(ElementType!R) == char) && hasLength!R)
+{
+    if (range.empty)
+    {
+        return typeof(return)();
+    }
+    Address6 result;
+    ubyte[12] tail;
+    size_t i;
+    size_t j;
+
+    // An address begins with a number, not ':'. But there is a special case
+    // if the address begins with '::'.
+    if (range.front == ':')
+    {
+        range.popFront();
+        if (range.empty || range.front != ':')
+        {
+            return typeof(return)();
+        }
+        range.popFront();
+        goto ParseTail;
+    }
+
+    // Parse the address before '::'.
+    // This loop parses the whole address if it doesn't contain '::'.
+    for (; i < 13; i += 2)
+    {
+        write2Bytes(range, result.address[i .. $]);
+        if (range.empty || range.front != ':')
+        {
+            return typeof(return)();
+        }
+        range.popFront();
+        if (range.empty)
+        {
+            return typeof(return)();
+        }
+        if (range.front == ':')
+        {
+            range.popFront();
+            goto ParseTail;
+        }
+    }
+    write2Bytes(range, result.address[14 .. $]);
+
+    if (range.empty)
+    {
+        return typeof(return)(result);
+    }
+    else if (range.front == '%')
+    {
+        goto ParseIface;
+    }
+    else
+    {
+        return typeof(return)();
+    }
+
+ParseTail: // after ::
+    // Normally the address can't end with ':', but a special case is if the
+    // address ends with '::'. So the first iteration of the loop below is
+    // unrolled to check whether the address contains something after '::' at
+    // all.
+    if (range.empty)
+    {
+        return typeof(return)(result); // ends with ::
+    }
+    if (range.front == ':')
+    {
+        return typeof(return)();
+    }
+    write2Bytes(range, tail[j .. $]);
+    if (range.empty)
+    {
+        goto CopyTail;
+    }
+    else if (range.front == '%')
+    {
+        goto ParseIface;
+    }
+    else if (range.front != ':')
+    {
+        return typeof(return)();
+    }
+    range.popFront();
+
+    for (i = 2, j = 2; i <= 11; i += 2, j += 2, range.popFront())
+    {
+        if (range.empty || range.front == ':')
+        {
+            return typeof(return)();
+        }
+        write2Bytes(range, tail[j .. $]);
+
+        if (range.empty)
+        {
+            goto CopyTail;
+        }
+        else if (range.front == '%')
+        {
+            goto ParseIface;
+        }
+        else if (range.front != ':')
+        {
+            return typeof(return)();
+        }
+    }
+
+ParseIface: // Scope name or ID
+    range.popFront();
+    if (range.empty)
+    {
+        return typeof(return)();
+    }
+    else if (isDigit(range.front))
+    {
+        const scopeID = readIntegral!uint(range);
+        if (range.empty)
+        {
+            result.scopeID = scopeID;
+        }
+        else
+        {
+            return typeof(return)();
+        }
+    }
+    else
+    {
+        result.scopeID = nameToIndex(range);
+    }
+
+CopyTail:
+    copy(tail[0 .. j + 2], result.address[$ - j - 2 .. $]);
+    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.
+ *
+ * Params:
+ *  R       = Input range type.
+ *  range   = $(D_KEYWORD ubyte) range containing the address.
+ *  scopeID = Scope ID.
+ *
+ * Returns: $(D_PSYMBOL Option) containing the address if the $(D_PARAM range)
+ *          contains exactly 16 bytes, or nothing otherwise.
+ */
+Option!Address6 address6(R)(R range, uint scopeID = 0)
+if (isInputRange!R && is(Unqual!(ElementType!R) == ubyte))
+{
+    Address6 result;
+    int i;
+
+    for (; i < 16 && !range.empty; ++i, range.popFront())
+    {
+        result.address[i] = range.front;
+    }
+    result.scopeID = scopeID;
+
+    return range.empty && i == 16 ? typeof(return)(result) : typeof(return)();
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    {
+        ubyte[16] actual = [ 1, 2, 3, 4, 5, 6, 7, 8,
+                             9, 10, 11, 12, 13, 14, 15, 16 ];
+        assert(!address6(actual[]).isNothing);
+    }
+    {
+        ubyte[15] actual = [ 1, 2, 3, 4, 5, 6, 7, 8,
+                             9, 10, 11, 12, 13, 14, 15 ];
+        assert(address6(actual[]).isNothing);
+    }
+    {
+        ubyte[17] actual = [ 1, 2, 3, 4, 5, 6, 7, 8, 9,
+                             10, 11, 12, 13, 14, 15, 16, 17 ];
+        assert(address6(actual[]).isNothing);
+    }
+    {
+        assert(address6(cast(ubyte[]) []).isNothing);
+    }
+}

source/tanya/network/socket.d

@@ -112,17 +112,10 @@ else version (Windows)
                                        socket,
                                        socklen_t,
                                        SOL_SOCKET,
+                                       WSAEWOULDBLOCK,
                                        WSAGetLastError;
     import tanya.async.iocp;
     import tanya.sys.windows.def;
-    import tanya.sys.windows.error : ECONNABORTED = WSAECONNABORTED,
-                                     ENOBUFS = WSAENOBUFS,
-                                     EOPNOTSUPP = WSAEOPNOTSUPP,
-                                     EPROTONOSUPPORT = WSAEPROTONOSUPPORT,
-                                     EPROTOTYPE = WSAEPROTOTYPE,
-                                     ESOCKTNOSUPPORT = WSAESOCKTNOSUPPORT,
-                                     ETIMEDOUT = WSAETIMEDOUT,
-                                     EWOULDBLOCK = WSAEWOULDBLOCK;
     public import tanya.sys.windows.winbase;
     public import tanya.sys.windows.winsock2;
 
@@ -505,7 +498,7 @@ struct Linger
      *
      * See_Also: $(D_PSYMBOL time).
      */
-    @property enabled(const bool value) pure nothrow @safe @nogc
+    @property void enabled(const bool value) pure nothrow @safe @nogc
     {
         this.l_onoff = value;
     }
@@ -616,37 +609,6 @@ enum AddressFamily : int
     inet6     = 10,    /// IP version 6.
 }
 
-deprecated("Use tanya.os.error.ErrorCode.ErrorNo instead")
-enum SocketError : int
-{
-    /// Unknown error.
-    unknown                = 0,
-    /// Firewall rules forbid connection.
-    accessDenied           = EPERM,
-    /// A socket operation was attempted on a non-socket.
-    notSocket              = EBADF,
-    /// The network is not available.
-    networkDown            = ECONNABORTED,
-    /// An invalid pointer address was detected by the underlying socket provider.
-    fault                  = EFAULT,
-    /// An invalid argument was supplied to a $(D_PSYMBOL Socket) member.
-    invalidArgument        = EINVAL,
-    /// The limit on the number of open sockets has been reached.
-    tooManyOpenSockets     = ENFILE,
-    /// No free buffer space is available for a Socket operation.
-    noBufferSpaceAvailable = ENOBUFS,
-    /// The address family is not supported by the protocol family.
-    operationNotSupported  = EOPNOTSUPP,
-    /// The protocol is not implemented or has not been configured.
-    protocolNotSupported   = EPROTONOSUPPORT,
-    /// Protocol error.
-    protocolError          = EPROTOTYPE,
-    /// The connection attempt timed out, or the connected host has failed to respond.
-    timedOut               = ETIMEDOUT,
-    /// The support for the specified socket type does not exist in this address family.
-    socketNotSupported     = ESOCKTNOSUPPORT,
-}
-
 /**
  * $(D_PSYMBOL SocketException) should be thrown only if one of the socket functions
  * $(D_PSYMBOL socketError) and sets $(D_PSYMBOL errno), because
@@ -1476,7 +1438,7 @@ bool wouldHaveBlocked() nothrow @trusted @nogc
     else version (Windows)
     {
         return WSAGetLastError() == ERROR_IO_PENDING
-            || WSAGetLastError() == EWOULDBLOCK
+            || WSAGetLastError() == WSAEWOULDBLOCK
             || WSAGetLastError() == ERROR_IO_INCOMPLETE;
     }
 }

source/tanya/range/adapter.d

@@ -18,6 +18,7 @@
  * 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;
@@ -232,63 +233,6 @@ if (isInputRange!R)
     return Take(range, n);
 }
 
-///
-@nogc nothrow pure @safe unittest
-{
-    static struct InfiniteRange
-    {
-        private size_t front_ = 1;
-
-        enum bool empty = false;
-
-        @property size_t front() @nogc nothrow pure @safe
-        {
-            return this.front_;
-        }
-
-        @property void front(size_t i) @nogc nothrow pure @safe
-        {
-            this.front_ = i;
-        }
-
-        void popFront() @nogc nothrow pure @safe
-        {
-            ++this.front_;
-        }
-
-        size_t opIndex(size_t i) @nogc nothrow pure @safe
-        {
-            return this.front_ + i;
-        }
-
-        void opIndexAssign(size_t value, size_t i) @nogc nothrow pure @safe
-        {
-            this.front = i + value;
-        }
-
-        InfiniteRange save() @nogc nothrow pure @safe
-        {
-            return this;
-        }
-    }
-
-    auto t = InfiniteRange().take(3);
-    assert(t.length == 3);
-    assert(t.front == 1);
-    assert(t.back == 3);
-
-    t.popFront();
-    assert(t.front == 2);
-    assert(t.back == 3);
-
-    t.popBack();
-    assert(t.front == 2);
-    assert(t.back == 2);
-
-    t.popFront();
-    assert(t.empty);
-}
-
 /**
  * Takes exactly $(D_PARAM n) elements from $(D_PARAM range).
  *
@@ -316,60 +260,3 @@ if (isInputRange!R)
     }
     return TakeExactly(range, n);
 }
-
-///
-@nogc nothrow pure @safe unittest
-{
-    static struct InfiniteRange
-    {
-        private size_t front_ = 1;
-
-        enum bool empty = false;
-
-        @property size_t front() @nogc nothrow pure @safe
-        {
-            return this.front_;
-        }
-
-        @property void front(size_t i) @nogc nothrow pure @safe
-        {
-            this.front_ = i;
-        }
-
-        void popFront() @nogc nothrow pure @safe
-        {
-            ++this.front_;
-        }
-
-        size_t opIndex(size_t i) @nogc nothrow pure @safe
-        {
-            return this.front_ + i;
-        }
-
-        void opIndexAssign(size_t value, size_t i) @nogc nothrow pure @safe
-        {
-            this.front = i + value;
-        }
-
-        InfiniteRange save() @nogc nothrow pure @safe
-        {
-            return this;
-        }
-    }
-
-    auto t = InfiniteRange().takeExactly(3);
-    assert(t.length == 3);
-    assert(t.front == 1);
-    assert(t.back == 3);
-
-    t.popFront();
-    assert(t.front == 2);
-    assert(t.back == 3);
-
-    t.popBack();
-    assert(t.front == 2);
-    assert(t.back == 2);
-
-    t.popFront();
-    assert(t.empty);
-}

source/tanya/range/primitive.d

@@ -14,8 +14,8 @@
  */
 module tanya.range.primitive;
 
+import tanya.algorithm.comparison;
 import tanya.algorithm.mutation;
-import tanya.math;
 import tanya.meta.trait;
 import tanya.meta.transform;
 import tanya.range.array;
@@ -851,6 +851,8 @@ void put(R, E)(ref R range, auto ref E e)
     }
     else static if (isInputRange!E)
     {
+        pragma(msg, "Putting an input range into an output range is "
+                  ~ "deprecated. Use tanya.algorithm.mutation.copy instead");
         for (; !e.empty; e.popFront())
         {
             put(range, e.front);
@@ -907,17 +909,6 @@ void put(R, E)(ref R range, auto ref E e)
     assert(oc.e == 2);
 }
 
-///
-@nogc nothrow pure @safe unittest
-{
-    int[2] actual;
-    int[2] expected = [2, 3];
-    auto slice = actual[];
-
-    put(slice, expected[]);
-    assert(actual == expected);
-}
-
 /**
  * Determines whether $(D_PARAM R) is an output range for the elemens of type
  * $(D_PARAM E).
@@ -963,7 +954,22 @@ void put(R, E)(ref R range, auto ref E e)
  * Returns: $(D_KEYWORD true) if $(D_PARAM R) is an output range for the
  *          elements of the type $(D_PARAM E), $(D_KEYWORD false) otherwise.
  */
-enum bool isOutputRange(R, E) = is(typeof((ref R r, ref E e) => put(r, e)));
+template isOutputRange(R, E)
+{
+    static if (is(typeof((R r, E e) => put(r, e))))
+    {
+        enum bool isOutputRange = true;
+    }
+    else static if (isInputRange!E)
+    {
+        alias ET = ElementType!E;
+        enum bool isOutputRange = is(typeof((R r, ET e) => put(r, e)));
+    }
+    else
+    {
+        enum bool isOutputRange = false;
+    }
+}
 
 ///
 @nogc nothrow pure @safe unittest

source/tanya/sys/linux/syscall.d

@@ -14,9 +14,15 @@ module tanya.sys.linux.syscall;
 
 version (TanyaNative):
 
+extern ptrdiff_t syscall(ptrdiff_t, ptrdiff_t)
+@nogc nothrow @system;
+
 extern ptrdiff_t syscall(ptrdiff_t, ptrdiff_t, ptrdiff_t)
 @nogc nothrow @system;
 
+extern ptrdiff_t syscall(ptrdiff_t, ptrdiff_t, ptrdiff_t, ptrdiff_t)
+@nogc nothrow @system;
+
 extern ptrdiff_t syscall(ptrdiff_t,
                          ptrdiff_t,
                          ptrdiff_t,
@@ -34,10 +40,18 @@ private template getOverloadMangling(size_t n)
 }
 
 pragma(mangle, getOverloadMangling!0)
-extern ptrdiff_t syscall_(ptrdiff_t, ptrdiff_t, ptrdiff_t)
+extern ptrdiff_t syscall_(ptrdiff_t, ptrdiff_t)
 @nogc nothrow pure @system;
 
 pragma(mangle, getOverloadMangling!1)
+extern ptrdiff_t syscall_(ptrdiff_t, ptrdiff_t, ptrdiff_t)
+@nogc nothrow pure @system;
+
+pragma(mangle, getOverloadMangling!2)
+extern ptrdiff_t syscall_(ptrdiff_t, ptrdiff_t, ptrdiff_t, ptrdiff_t)
+@nogc nothrow pure @system;
+
+pragma(mangle, getOverloadMangling!3)
 extern ptrdiff_t syscall_(ptrdiff_t,
                           ptrdiff_t,
                           ptrdiff_t,

source/tanya/sys/posix/ioctl.d

@@ -0,0 +1,78 @@
+/* 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/. */
+
+/*
+ * 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/sys/posix/ioctl.d,
+ *                 tanya/sys/posix/ioctl.d)
+ */
+module tanya.sys.posix.ioctl;
+
+version (TanyaNative):
+
+enum
+{
+    SIOCADDRT = 0x890B, // Add routing table entry.
+    SIOCDELRT = 0x890C, // Delete routing table entry.
+    SIOCRTMSG = 0x890D, // Call to routing system.
+
+    SIOCGIFNAME = 0x8910, // Get iface name.
+    SIOCSIFLINK = 0x8911, // Set iface channel.
+    SIOCGIFCONF = 0x8912, // Get iface list.
+    SIOCGIFFLAGS = 0x8913, // Get flags.
+    SIOCSIFFLAGS = 0x8914, // Set flags.
+    SIOCGIFADDR = 0x8915, // Get PA address.
+    SIOCSIFADDR = 0x8916, // Set PA address.
+    SIOCGIFDSTADDR = 0x8917, // Get remote PA address.
+    SIOCSIFDSTADDR = 0x8918, // Set remote PA address.
+    SIOCGIFBRDADDR = 0x8919, // Get broadcast PA address.
+    SIOCSIFBRDADDR = 0x891a, // Set broadcast PA address.
+    SIOCGIFNETMASK = 0x891b, // Get network PA mask.
+    SIOCSIFNETMASK = 0x891c, // Set network PA mask.
+    SIOCGIFMETRIC = 0x891d, // Get metric.
+    SIOCSIFMETRIC = 0x891e, // Set metric.
+    SIOCGIFMEM = 0x891f, // Get memory address (BSD).
+    SIOCSIFMEM = 0x8920, // Set memory address (BSD).
+    SIOCGIFMTU = 0x8921, // Get MTU size.
+    SIOCSIFMTU = 0x8922, // Set MTU size.
+    SIOCSIFNAME = 0x8923, // Set interface name.
+    SIOCSIFHWADDR = 0x8924, // Set hardware address.
+    SIOCGIFENCAP = 0x8925, // Get/set encapsulations.
+    SIOCSIFENCAP = 0x8926,
+    SIOCGIFHWADDR = 0x8927, // Get hardware address.
+    SIOCGIFSLAVE = 0x8929, // Driver slaving support.
+    SIOCSIFSLAVE = 0x8930,
+    SIOCADDMULTI = 0x8931, // Multicast address lists.
+    SIOCDELMULTI = 0x8932,
+    SIOCGIFINDEX = 0x8933, // Name -> if_index mapping.
+    SIOGIFINDEX = SIOCGIFINDEX, // Misprint compatibility.
+    SIOCSIFPFLAGS = 0x8934, // Set/get extended flags set.
+    SIOCGIFPFLAGS = 0x8935,
+    SIOCDIFADDR = 0x8936, // Delete PA address.
+    SIOCSIFHWBROADCAST = 0x8937, // Set hardware broadcast address.
+    SIOCGIFCOUNT = 0x8938, // Get number of devices.
+
+    SIOCGIFBR = 0x8940, // Bridging support.
+    SIOCSIFBR = 0x8941, // Set bridging options.
+
+    SIOCGIFTXQLEN = 0x8942, // Get the tx queue length.
+    SIOCSIFTXQLEN = 0x8943, // Set the tx queue length.
+
+    SIOCDARP = 0x8953, // Delete ARP table entry.
+    SIOCGARP = 0x8954, // Get ARP table entry.
+    SIOCSARP = 0x8955, // Set ARP table entry.
+
+    SIOCDRARP = 0x8960, // Delete RARP table entry.
+    SIOCGRARP = 0x8961, // Get RARP table entry.
+    SIOCSRARP = 0x8962, // Set RARP table entry.
+
+    SIOCGIFMAP = 0x8970, // Get device parameters.
+    SIOCSIFMAP = 0x8971, // Set device parameters.
+
+    SIOCADDDLCI = 0x8980, // Create new DLCI device.
+    SIOCDELDLCI = 0x8981, // Delete DLCI device.
+}

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

@@ -0,0 +1,27 @@
+/* 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/. */
+
+/*
+ * 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/sys/posix/net/if_.d,
+ *                 tanya/sys/posix/net/if_.d)
+ */
+module tanya.sys.posix.net.if_;
+
+version (TanyaNative):
+
+enum size_t IF_NAMESIZE = 16;
+
+struct ifreq
+{
+    char[IF_NAMESIZE] ifr_name;
+
+    union
+    {
+        int ifr_ifindex;
+    }
+}

source/tanya/sys/posix/socket.d

@@ -0,0 +1,152 @@
+/* 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/. */
+
+/*
+ * 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/sys/posix/socket.d,
+ *                 tanya/sys/posix/socket.d)
+ */
+module tanya.sys.posix.socket;
+
+version (TanyaNative):
+
+/*
+ * Protocol families.
+ */
+enum
+{
+    PF_UNSPEC = 0, // Unspecified.
+    PF_LOCAL = 1, // Local to host (pipes and file-domain).
+    PF_UNIX = PF_LOCAL, // POSIX name for PF_LOCAL.
+    PF_FILE = PF_LOCAL, // Another non-standard name for PF_LOCAL.
+    PF_INET = 2, // IP protocol family.
+    PF_AX25 = 3, // Amateur Radio AX.25.
+    PF_IPX = 4, // Novell Internet Protocol.
+    PF_APPLETALK = 5, // Appletalk DDP.
+    PF_NETROM = 6, // Amateur radio NetROM.
+    PF_BRIDGE = 7, // Multiprotocol bridge.
+    PF_ATMPVC = 8, // ATM PVCs.
+    PF_X25 = 9, // Reserved for X.25 project.
+    PF_INET6 = 10, // IP version 6.
+    PF_ROSE = 11, // Amateur Radio X.25 PLP.
+    PF_DECnet = 12, // Reserved for DECnet project.
+    PF_NETBEUI = 13, // Reserved for 802.2LLC project.
+    PF_SECURITY = 14, // Security callback pseudo AF.
+    PF_KEY = 15, // PF_KEY key management API.
+    PF_NETLINK = 16, // Kernel user interface device.
+    PF_ROUTE = PF_NETLINK, // Alias to emulate 4.4BSD.
+    PF_PACKET = 17, // Packet family.
+    PF_ASH = 18, // Ash.
+    PF_ECONET = 19, // Acorn Econet.
+    PF_ATMSVC = 20, // ATM SVCs.
+    PF_RDS = 21, // RDS sockets.
+    PF_SNA = 22, // Linux SNA Project.
+    PF_IRDA = 23, // IRDA sockets.
+    PF_PPPOX = 24, // PPPoX sockets.
+    PF_WANPIPE = 25, // Wanpipe API sockets.
+    PF_LLC = 26, // Linux LLC.
+    PF_IB = 27, // Native InfiniBand address.
+    PF_MPLS = 28, // MPLS.
+    PF_CAN = 29, // Controller Area Network.
+    PF_TIPC = 30, // TIPC sockets.
+    PF_BLUETOOTH = 31, // Bluetooth sockets.
+    PF_IUCV = 32, // IUCV sockets.
+    PF_RXRPC = 33, // RxRPC sockets.
+    PF_ISDN = 34, // mISDN sockets.
+    PF_PHONET = 35, // Phonet sockets.
+    PF_IEEE802154 = 36, // IEEE 802.15.4 sockets.
+    PF_CAIF = 37, // CAIF sockets.
+    PF_ALG = 38, // Algorithm sockets.
+    PF_NFC = 39, // NFC sockets.
+    PF_VSOCK = 40, // vSockets.
+    PF_MAX = 41, // For now.
+}
+
+/*
+ * Address families.
+ */
+enum
+{
+    AF_UNSPEC = PF_UNSPEC,
+    AF_LOCAL = PF_LOCAL,
+    AF_UNIX = PF_UNIX,
+    AF_FILE = PF_FILE,
+    AF_INET = PF_INET,
+    AF_AX25 = PF_AX25,
+    AF_IPX = PF_IPX,
+    AF_APPLETALK = PF_APPLETALK,
+    AF_NETROM = PF_NETROM,
+    AF_BRIDGE = PF_BRIDGE,
+    AF_ATMPVC = PF_ATMPVC,
+    AF_X25 = PF_X25,
+    AF_INET6 = PF_INET6,
+    AF_ROSE = PF_ROSE,
+    AF_DECnet = PF_DECnet,
+    AF_NETBEUI = PF_NETBEUI,
+    AF_SECURITY = PF_SECURITY,
+    AF_KEY = PF_KEY,
+    AF_NETLINK = PF_NETLINK,
+    AF_ROUTE = PF_ROUTE,
+    AF_PACKET = PF_PACKET,
+    AF_ASH = PF_ASH,
+    AF_ECONET = PF_ECONET,
+    AF_ATMSVC = PF_ATMSVC,
+    AF_RDS = PF_RDS,
+    AF_SNA = PF_SNA,
+    AF_IRDA = PF_IRDA,
+    AF_PPPOX = PF_PPPOX,
+    AF_WANPIPE = PF_WANPIPE,
+    AF_LLC = PF_LLC,
+    AF_IB = PF_IB,
+    AF_MPLS = PF_MPLS,
+    AF_CAN = PF_CAN,
+    AF_TIPC = PF_TIPC,
+    AF_BLUETOOTH = PF_BLUETOOTH,
+    AF_IUCV = PF_IUCV,
+    AF_RXRPC = PF_RXRPC,
+    AF_ISDN = PF_ISDN,
+    AF_PHONET = PF_PHONET,
+    AF_IEEE802154 = PF_IEEE802154,
+    AF_CAIF = PF_CAIF,
+    AF_ALG = PF_ALG,
+    AF_NFC = PF_NFC,
+    AF_VSOCK = PF_VSOCK,
+    AF_MAX = PF_MAX,
+}
+
+/*
+ * Types of sockets.
+ */
+enum
+{
+    // Sequenced, reliable, connection-based byte streams.
+    SOCK_STREAM = 1,
+    // Connectionless, unreliable datagrams of fixed maximum length.
+    SOCK_DGRAM = 2,
+    // Raw protocol interface.
+    SOCK_RAW = 3,
+    // Reliably-delivered messages.
+    SOCK_RDM = 4,
+    // Sequenced, reliable, connection-based, datagrams of fixed maximum
+    // length.
+    SOCK_SEQPACKET = 5,
+    // Datagram Congestion Control Protocol.
+    SOCK_DCCP = 6,
+    // Linux specific way of getting packets at the dev level. For writing rarp
+    // and other similar things on the user level.
+    SOCK_PACKET = 10,
+}
+
+/*
+ * Flags to be ORed into the type parameter of socket and socketpair and used
+ * for the flags parameter of paccept.
+ */
+enum
+{
+    SOCK_CLOEXEC = 0x80000, // Atomically set close-on-exec flag for the new descriptor(s).
+    SOCK_NONBLOCK = 0x800, // Atomically mark descriptor(s) as non-blocking.
+}

source/tanya/sys/windows/def.d

@@ -30,6 +30,7 @@ version (Windows):
 alias BYTE = ubyte;
 alias TBYTE = wchar; // If Unicode, otherwise char.
 alias CHAR = char; // Signed or unsigned char.
+alias WCHAR = wchar;
 alias TCHAR = wchar; // If Unicode, otherwise char.
 alias SHORT = short;
 alias USHORT = ushort;
@@ -52,6 +53,10 @@ enum HANDLE INVALID_HANDLE_VALUE = cast(HANDLE) -1;
 enum TRUE = 1;
 enum FALSE = 0;
 
+alias PSTR = CHAR*;
+alias PWSTR = WCHAR*;
+alias PTSTR = TCHAR*;
+
 align(1) struct GUID
 {
     uint Data1;

source/tanya/sys/windows/error.d

@@ -1,115 +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/. */
-
-/**
- * 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/sys/windows/error.d,
- *                 tanya/sys/windows/error.d)
- */
- deprecated("Use core.sys.windows.winerror instead")
-module tanya.sys.windows.error;
-
-version (Windows):
-
-private enum WSABASEERR = 10000;
-enum
-{
-    WSAEINTR = WSABASEERR + 4,
-    WSAEBADF = WSABASEERR + 9,
-    WSAEACCES = WSABASEERR + 13,
-    WSAEFAULT = WSABASEERR + 14,
-    WSAEINVAL = WSABASEERR + 22,
-    WSAEMFILE = WSABASEERR + 24,
-
-    WSAEWOULDBLOCK = WSABASEERR + 35,
-    WSAEINPROGRESS = WSABASEERR + 36,
-    WSAEALREADY = WSABASEERR + 37,
-    WSAENOTSOCK = WSABASEERR + 38,
-    WSAEDESTADDRREQ = WSABASEERR + 39,
-    WSAEMSGSIZE = WSABASEERR + 40,
-    WSAEPROTOTYPE = WSABASEERR + 41,
-    WSAENOPROTOOPT = WSABASEERR + 42,
-    WSAEPROTONOSUPPORT = WSABASEERR + 43,
-    WSAESOCKTNOSUPPORT = WSABASEERR + 44,
-    WSAEOPNOTSUPP = WSABASEERR + 45,
-    WSAEPFNOSUPPORT = WSABASEERR + 46,
-    WSAEAFNOSUPPORT = WSABASEERR + 47,
-    WSAEADDRINUSE = WSABASEERR + 48,
-    WSAEADDRNOTAVAIL = WSABASEERR + 49,
-    WSAENETDOWN = WSABASEERR + 50,
-    WSAENETUNREACH = WSABASEERR + 51,
-    WSAENETRESET = WSABASEERR + 52,
-    WSAECONNABORTED = WSABASEERR + 53,
-    WSAECONNRESET = WSABASEERR + 54,
-    WSAENOBUFS = WSABASEERR + 55,
-    WSAEISCONN = WSABASEERR + 56,
-    WSAENOTCONN = WSABASEERR + 57,
-    WSAESHUTDOWN = WSABASEERR + 58,
-    WSAETOOMANYREFS = WSABASEERR + 59,
-    WSAETIMEDOUT = WSABASEERR + 60,
-    WSAECONNREFUSED = WSABASEERR + 61,
-    WSAELOOP = WSABASEERR + 62,
-    WSAENAMETOOLONG = WSABASEERR + 63,
-    WSAEHOSTDOWN = WSABASEERR + 64,
-    WSAEHOSTUNREACH = WSABASEERR + 65,
-    WSAENOTEMPTY = WSABASEERR + 66,
-    WSAEPROCLIM = WSABASEERR + 67,
-    WSAEUSERS = WSABASEERR + 68,
-    WSAEDQUOT = WSABASEERR + 69,
-    WSAESTALE = WSABASEERR + 70,
-    WSAEREMOTE = WSABASEERR + 71,
-
-    WSASYSNOTREADY = WSABASEERR + 91,
-    WSAVERNOTSUPPORTED = WSABASEERR + 92,
-    WSANOTINITIALISED = WSABASEERR + 93,
-    WSAEDISCON = WSABASEERR + 101,
-    WSAENOMORE = WSABASEERR + 102,
-    WSAECANCELLED = WSABASEERR + 103,
-    WSAEINVALIDPROCTABLE = WSABASEERR + 104,
-    WSAEINVALIDPROVIDER = WSABASEERR + 105,
-    WSAEPROVIDERFAILEDINIT = WSABASEERR + 106,
-    WSASYSCALLFAILURE = WSABASEERR + 107,
-    WSASERVICE_NOT_FOUND = WSABASEERR + 108,
-    WSATYPE_NOT_FOUND = WSABASEERR + 109,
-    WSA_E_NO_MORE = WSABASEERR + 110,
-    WSA_E_CANCELLED = WSABASEERR + 111,
-    WSAEREFUSED = WSABASEERR + 112,
-
-    WSAHOST_NOT_FOUND = WSABASEERR + 1001,
-    WSATRY_AGAIN = WSABASEERR + 1002,
-    WSANO_RECOVERY = WSABASEERR + 1003,
-    WSANO_DATA = WSABASEERR + 1004,
-
-    WSA_QOS_RECEIVERS = WSABASEERR + 1005,
-    WSA_QOS_SENDERS = WSABASEERR + 1006,
-    WSA_QOS_NO_SENDERS = WSABASEERR + 1007,
-    WSA_QOS_NO_RECEIVERS = WSABASEERR + 1008,
-    WSA_QOS_REQUEST_CONFIRMED = WSABASEERR + 1009,
-    WSA_QOS_ADMISSION_FAILURE = WSABASEERR + 1010,
-    WSA_QOS_POLICY_FAILURE = WSABASEERR + 1011,
-    WSA_QOS_BAD_STYLE = WSABASEERR + 1012,
-    WSA_QOS_BAD_OBJECT = WSABASEERR + 1013,
-
-    WSA_QOS_TRAFFIC_CTRL_ERROR = WSABASEERR + 1014,
-    WSA_QOS_GENERIC_ERROR = WSABASEERR + 1015,
-    WSA_QOS_ESERVICETYPE = WSABASEERR + 1016,
-    WSA_QOS_EFLOWSPEC = WSABASEERR + 1017,
-    WSA_QOS_EPROVSPECBUF = WSABASEERR + 1018,
-    WSA_QOS_EFILTERSTYLE = WSABASEERR + 1019,
-    WSA_QOS_EFILTERTYPE = WSABASEERR + 1020,
-    WSA_QOS_EFILTERCOUNT = WSABASEERR + 1021,
-    WSA_QOS_EOBJLENGTH = WSABASEERR + 1022,
-    WSA_QOS_EFLOWCOUNT = WSABASEERR + 1023,
-    WSA_QOS_EUNKOWNPSOBJ = WSABASEERR + 1024,
-    WSA_QOS_EPOLICYOBJ = WSABASEERR + 1025,
-    WSA_QOS_EFLOWDESC = WSABASEERR + 1026,
-    WSA_QOS_EPSFLOWSPEC = WSABASEERR + 1027,
-    WSA_QOS_EPSFILTERSPEC = WSABASEERR + 1028,
-    WSA_QOS_ESDMODEOBJ = WSABASEERR + 1029,
-    WSA_QOS_ESHAPERATEOBJ = WSABASEERR + 1030,
-    WSA_QOS_RESERVED_PETYPE = WSABASEERR + 1031,
-}

source/tanya/sys/windows/ifdef.d

@@ -0,0 +1,30 @@
+/* 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/. */
+
+/**
+ * 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/sys/windows/ifdef.d,
+ *                 tanya/sys/windows/ifdef.d)
+ */
+module tanya.sys.windows.ifdef;
+
+version (Windows):
+
+import tanya.sys.windows.def;
+
+union NET_LUID_LH
+{
+    ulong Value;
+    ulong Info;
+}
+
+alias NET_LUID = NET_LUID_LH;
+alias IF_LUID = NET_LUID_LH;
+
+alias NET_IFINDEX = ULONG;
+
+enum size_t IF_MAX_STRING_SIZE = 256;

source/tanya/sys/windows/iphlpapi.d

@@ -0,0 +1,39 @@
+/* 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/. */
+
+/**
+ * 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/sys/windows/iphlpapi.d,
+ *                 tanya/sys/windows/iphlpapi.d)
+ */
+module tanya.sys.windows.iphlpapi;
+
+version (Windows):
+
+import tanya.sys.windows.def;
+import tanya.sys.windows.ifdef;
+
+extern(Windows)
+DWORD ConvertInterfaceNameToLuidA(const(CHAR)* InterfaceName,
+                                  NET_LUID* InterfaceLuid)
+@nogc nothrow @system;
+
+extern(Windows)
+DWORD ConvertInterfaceLuidToIndex(const(NET_LUID)* InterfaceLuid,
+                                  NET_IFINDEX* InterfaceIndex)
+@nogc nothrow @system;
+
+extern(Windows)
+DWORD ConvertInterfaceIndexToLuid(NET_IFINDEX InterfaceIndex,
+                                  NET_LUID* InterfaceLuid)
+@nogc nothrow @system;
+
+extern(Windows)
+DWORD ConvertInterfaceLuidToNameA(const(NET_LUID)* InterfaceLuid,
+                                  PSTR InterfaceName,
+                                  size_t Length)
+@nogc nothrow @system;

source/tanya/sys/windows/package.d

@@ -15,6 +15,7 @@ module tanya.sys.windows;
 version (Windows):
 
 public import tanya.sys.windows.def;
-public import tanya.sys.windows.error;
+public import tanya.sys.windows.ifdef;
+public import tanya.sys.windows.iphlpapi;
 public import tanya.sys.windows.winbase;
 public import tanya.sys.windows.winsock2;

source/tanya/typecons.d

@@ -17,65 +17,10 @@
  */
 module tanya.typecons;
 
+import tanya.algorithm.mutation;
 import tanya.format;
-import tanya.meta.metafunction : AliasSeq, AliasTuple = Tuple, Map;
-
-deprecated("Use tanya.typecons.Tuple instead")
-template Pair(Specs...)
-{
-    template parseSpecs(size_t fieldCount, Specs...)
-    {
-        static if (Specs.length == 0)
-        {
-            alias parseSpecs = AliasSeq!();
-        }
-        else static if (is(Specs[0]) && fieldCount < 2)
-        {
-            static if (is(typeof(Specs[1]) == string))
-            {
-                alias parseSpecs
-                    = AliasSeq!(AliasTuple!(Specs[0], Specs[1]),
-                                parseSpecs!(fieldCount + 1, Specs[2 .. $]));
-            }
-            else
-            {
-                alias parseSpecs
-                    = AliasSeq!(AliasTuple!(Specs[0]),
-                                parseSpecs!(fieldCount + 1, Specs[1 .. $]));
-            }
-        }
-        else
-        {
-            static assert(false, "Invalid argument: " ~ Specs[0].stringof);
-        }
-    }
-
-    alias ChooseType(alias T) = T.Seq[0];
-    alias ParsedSpecs = parseSpecs!(0, Specs);
-
-    static assert(ParsedSpecs.length == 2, "Invalid argument count");
-
-    struct Pair
-    {
-        /// Field types.
-        alias Types = Map!(ChooseType, ParsedSpecs);
-
-        // Create field aliases.
-        static if (ParsedSpecs[0].length == 2)
-        {
-            mixin("alias " ~ ParsedSpecs[0][1] ~ " = expand[0];");
-        }
-        static if (ParsedSpecs[1].length == 2)
-        {
-            mixin("alias " ~ ParsedSpecs[1][1] ~ " = expand[1];");
-        }
-
-        /// Represents the values of the $(D_PSYMBOL Pair) as a list of values.
-        Types expand;
-
-        alias expand this;
-    }
-}
+import tanya.meta.metafunction;
+import tanya.meta.trait;
 
 /**
  * $(D_PSYMBOL Tuple) can store two or more heterogeneous objects.
@@ -104,13 +49,13 @@ template Tuple(Specs...)
             static if (is(typeof(Specs[1]) == string))
             {
                 alias parseSpecs
-                    = AliasSeq!(AliasTuple!(Specs[0], Specs[1]),
+                    = AliasSeq!(Pack!(Specs[0], Specs[1]),
                                 parseSpecs!(fieldCount + 1, Specs[2 .. $]));
             }
             else
             {
                 alias parseSpecs
-                    = AliasSeq!(AliasTuple!(Specs[0]),
+                    = AliasSeq!(Pack!(Specs[0]),
                                 parseSpecs!(fieldCount + 1, Specs[1 .. $]));
             }
         }
@@ -187,3 +132,323 @@ template Tuple(Specs...)
     static assert(!is(Tuple!(int, double, char)));
     static assert(!is(Tuple!(int, "first", double, "second", char, "third")));
 }
+
+/**
+ * $(D_PSYMBOL Option) is a type that contains an optional value.
+ *
+ * Params:
+ *  T = Type of the encapsulated value.
+ */
+struct Option(T)
+{
+    private bool isNothing_ = true;
+    private T value = void;
+
+    /**
+     * Constructs a new option with $(D_PARAM value).
+     *
+     * Params:
+     *  value = Encapsulated value.
+     */
+    this()(ref T value)
+    {
+        this.value = value;
+        this.isNothing_ = false;
+    }
+
+    /// ditto
+    this()(T value) @trusted
+    {
+        moveEmplace(value, this.value);
+        this.isNothing_ = false;
+    }
+
+    /**
+     * Tells if the option is just a value or nothing.
+     *
+     * Returns: $(D_KEYWORD true) if this $(D_PSYMBOL Option) contains a nothing,
+     *          $(D_KEYWORD false) if it contains a value.
+     */
+    @property bool isNothing() const
+    {
+        return this.isNothing_;
+    }
+
+    /**
+     * Returns the encapsulated value.
+     *
+     * Returns: Value encapsulated in this $(D_PSYMBOL Option).
+     *
+     * See_Also: $(D_PSYMBOL or).
+     *
+     * Precondition: `!isNothing`.
+     */
+    @property ref inout(T) get() inout
+    in
+    {
+        assert(!isNothing, "Option is nothing");
+    }
+    do
+    {
+        return this.value;
+    }
+
+    /**
+     * Returns the encapsulated value if available or a default value
+     * otherwise.
+     *
+     * Note that the contained value can be returned by reference only if the
+     * default value is passed by reference as well.
+     *
+     * Params:
+     *  U            = Type of the default value.
+     *  defaultValue = Default value.
+     *
+     * Returns: The value of this $(D_PSYMBOL Option) if available,
+     *          $(D_PARAM defaultValue) otherwise.
+     *
+     * See_Also: $(D_PSYMBOL isNothing), $(D_PSYMBOL get).
+     */
+    @property U or(U)(U defaultValue) inout
+    if (is(U == T) && isCopyable!T)
+    {
+        return isNothing ? defaultValue : this.value;
+    }
+
+    /// ditto
+    @property ref inout(T) or(ref inout(T) defaultValue) inout
+    {
+        return isNothing ? defaultValue : this.value;
+    }
+
+    /**
+     * Casts this $(D_PSYMBOL Option) to $(D_KEYWORD bool).
+     *
+     * An $(D_PSYMBOL Option) is $(D_KEYWORD true) if it contains a value,
+     * ($D_KEYWORD false) if it contains nothing.
+     *
+     * Returns: $(D_KEYWORD true) if this $(D_PSYMBOL Option) contains a value,
+     *          ($D_KEYWORD false) if it contains nothing.
+     */
+    bool opCast(U : bool)()
+    {
+        return !isNothing;
+    }
+
+    /**
+     * Compares this $(D_PSYMBOL Option) with $(D_PARAM that).
+     *
+     * If both objects are options of the same type and they don't contain a
+     * value, they are considered equal. If only one of them contains a value,
+     * they aren't equal. Otherwise, the encapsulated values are compared for
+     * equality.
+     *
+     * If $(D_PARAM U) is a type comparable with the type encapsulated by this
+     * $(D_PSYMBOL Option), the value of this $(D_PSYMBOL Option) is compared
+     * with $(D_PARAM that), this $(D_PSYMBOL Option) must have a value then.
+     *
+     * Params:
+     *  U    = Type of the object to compare with.
+     *  that = Object to compare with.
+     *
+     * Returns: $(D_KEYWORD true) if this $(D_PSYMBOL Option) and
+     *          $(D_PARAM that) are equal, $(D_KEYWORD false) if not.
+     *
+     * Precondition: `!isNothing` if $(D_PARAM U) is equality comparable with
+     *               $(D_PARAM T).
+     */
+    bool opEquals(U)(auto ref const U that) const
+    if (is(U == Option))
+    {
+        if (!isNothing && !that.isNothing)
+        {
+            return this.value == that.value;
+        }
+        return isNothing == that.isNothing;
+    }
+
+    /// ditto
+    bool opEquals(U)(auto ref const U that) const
+    if (ifTestable!(U, a => a == T.init) && !is(U == Option))
+    in
+    {
+        assert(!isNothing);
+    }
+    do
+    {
+        return get == that;
+    }
+
+    /**
+     * Resets this $(D_PSYMBOL Option) and destroys the contained value.
+     *
+     * $(D_PSYMBOL reset) can be safely called on an $(D_PSYMBOL Option) that
+     * doesn't contain any value.
+     */
+    void reset()
+    {
+        static if (hasElaborateDestructor!T)
+        {
+            destroy(this.value);
+        }
+        this.isNothing_ = true;
+    }
+
+    /**
+     * Assigns a new value.
+     *
+     * Params:
+     *  U    = Type of the new value.
+     *  that = New value.
+     *
+     * Returns: $(D_KEYWORD this).
+     */
+    ref typeof(this) opAssign(U)(ref U that)
+    if (is(U : T) && !is(U == Option))
+    {
+        this.value = that;
+        this.isNothing_ = false;
+        return this;
+    }
+
+    /// ditto
+    ref typeof(this) opAssign(U)(U that)
+    if (is(U == T))
+    {
+        move(that, this.value);
+        this.isNothing_ = false;
+        return this;
+    }
+
+    /// ditto
+    ref typeof(this) opAssign(U)(ref U that)
+    if (is(U == Option))
+    {
+        this.value = that;
+        this.isNothing_ = that.isNothing;
+        return this;
+    }
+
+    /// ditto
+    ref typeof(this) opAssign(U)(U that)
+    if (is(U == Option))
+    {
+        move(that.value, this.value);
+        this.isNothing_ = that.isNothing_;
+        return this;
+    }
+
+    alias get this;
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    Option!int option;
+    assert(option.isNothing);
+    assert(option.or(8) == 8);
+    
+    option = 5;
+    assert(!option.isNothing);
+    assert(option.get == 5);
+    assert(option.or(8) == 5);
+
+    option.reset();
+    assert(option.isNothing);
+}
+
+// Assigns a new value
+@nogc nothrow pure @safe unittest
+{
+    {
+        Option!int option = 5;
+        option = 8;
+        assert(!option.isNothing);
+        assert(option == 8);
+    }
+    {
+        Option!int option;
+        const int newValue = 8;
+        assert(option.isNothing);
+        option = newValue;
+        assert(!option.isNothing);
+        assert(option == newValue);
+    }
+    {
+        Option!int option1;
+        Option!int option2 = 5;
+        assert(option1.isNothing);
+        option1 = option2;
+        assert(!option1.isNothing);
+        assert(option1.get == 5);
+    }
+}
+
+// Constructs with a value passed by reference
+@nogc nothrow pure @safe unittest
+{
+    int i = 5;
+    assert(Option!int(i).get == 5);
+}
+
+// Moving
+@nogc nothrow pure @safe unittest
+{
+    static struct NotCopyable
+    {
+        @disable this(this);
+    }
+
+    static assert(is(typeof(Option!NotCopyable(NotCopyable()))));
+    // 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 assert(is(typeof(Option!NotCopyable().or(notCopyable))));
+    }
+    {
+        Option!NotCopyable option;
+        assert(option.isNothing);
+        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
+@nogc nothrow pure @safe unittest
+{
+    assert(Option!bool(false));
+}
+
+// Option can be const
+@nogc nothrow pure @safe unittest
+{
+    assert((const Option!int(5)).get == 5);
+    assert((const Option!int()).or(5) == 5);
+}
+
+// Equality
+@nogc nothrow pure @safe unittest
+{
+    assert(Option!int() == Option!int());
+    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
+@nogc nothrow pure @safe unittest
+{
+    {
+        int i = 5;
+        assert(((ref e) => e)(Option!int().or(i)) == 5);
+    }
+}