14 Commits

33 changed files with 1228 additions and 650 deletions

View File

@ -7,7 +7,7 @@ os:
language: d language: d
d: d:
- dmd-2.076.0 - dmd-2.076.1
- dmd-2.075.1 - dmd-2.075.1
- dmd-2.074.1 - dmd-2.074.1
@ -22,7 +22,7 @@ addons:
- gcc-multilib - gcc-multilib
before_script: before_script:
- if [ "$PS1" = '(dmd-2.076.0)' ]; then - if [ "$PS1" = '(dmd-2.076.1)' ]; then
export UNITTEST="unittest-cov"; export UNITTEST="unittest-cov";
fi fi

View File

@ -1,3 +1,4 @@
# Contributing # Contributing
Tanya is a project in active development, therefore any help is appreciated. Thank you for considering contributing Tanya is a project in active development, therefore any help is appreciated. Thank you for considering contributing
@ -7,9 +8,9 @@ These guidelines describe ways to get started.
## Ways to get involved ## Ways to get involved
* **Reporting a problem**: [Report](https://issues.caraus.io/projects/tanya/issues) bugs and usage problems you * **Reporting a problem**: [Report](https://github.com/caraus-ecms/tanya/issues) bugs and usage problems you
encounter. encounter.
* **Fixing issues**: [The bug tracker](https://issues.caraus.io/projects/tanya/issues) contains a list of issues you * **Fixing issues**: [The bug tracker](https://github.com/caraus-ecms/tanya/issues) contains a list of issues you
can work on. can work on.
* **Documentation**: You can improve API documentation by correcting grammar errors, completing existing texts and * **Documentation**: You can improve API documentation by correcting grammar errors, completing existing texts and
writing new ones, or providing usage examples. writing new ones, or providing usage examples.
@ -21,21 +22,14 @@ and implement this.
## Opening an issue ## Opening an issue
If you have found a bug, an error, have some question, or suggestion, open in issue. I'll try to answer as soon If you have found a bug, an error, have some question, or suggestion,
as I can. Tanya uses an external [Open an issue](https://github.com/caraus-ecms/tanya/issues). I'll try to answer as soon as I can. There is also a
[bug tracker](https://issues.caraus.io/projects/tanya/issues). You should list of open issues that mirror the current development process and progress. If you're looking for a challenge, just
[register](https://issues.caraus.io/account/register) before you can report your issue. There is also a list
of open issues that mirror the current development process and progress. If you're looking for a challenge, just
pick an issue you are interested in and start working on it. Fill free to comment on the issue to get more pick an issue you are interested in and start working on it. Fill free to comment on the issue to get more
information. information.
Some issues have a category assigned to them. Such issues belong mostly to a larger part of the library that is You can also look at the [milestones](https://github.com/Dlackware/gnome/milestones) to see what is planned for a
currently in development. The category specifies then the git branch development happens on. The remaining issues specific release.
can be fixed directly in master.
In the [roadmap](https://issues.caraus.io/projects/tanya/roadmap) you can find a list of issues that are planned
to be fixed till a specific release. Version numbers refer to the versions in the
[git repository](https://github.com/caraus-ecms/tanya/releases).
## Contribution process ## Contribution process
@ -44,7 +38,7 @@ to be fixed till a specific release. Version numbers refer to the versions in th
I accept GitHub pull requests. Creating a pull request is like sending a patch with the suggested change. I accept GitHub pull requests. Creating a pull request is like sending a patch with the suggested change.
First you have to [fork](https://guides.github.com/activities/forking/) the repository. Clone your fork locally First you have to [fork](https://guides.github.com/activities/forking/) the repository. Clone your fork locally
with `git clone` and create a new branch where you want to work, for example: with `git clone` and create a new branch where you want to work. For example:
```shell ```shell
git checkout -b bugfix-x git checkout -b bugfix-x
@ -61,32 +55,53 @@ described on GitHub to finish the process. See
[Using Pull Requests](https://help.github.com/articles/about-pull-requests/) for more information. [Using Pull Requests](https://help.github.com/articles/about-pull-requests/) for more information.
Please ensure that your fork is even with the upstream (original) repository. If not, you have to rebase your branch Please ensure that your fork is even with the upstream (original) repository. If not, you have to rebase your branch
on upstream/master before submitting a pull request. See https://help.github.com/articles/syncing-a-fork/ for a on upstream/master before submitting the pull request. See [Syncing a fork](https://help.github.com/articles/syncing-a-fork/) for a
step-by-step guide. step-by-step guide.
### Fixing a bug ### Fixing a bug
Add an unittest that demonstrates the bug along with a short description: Add a unit test that demonstrates the bug along with a short description or link to the original bug.
```d
// Issue ###: https://issues.caraus.io/issues/###.
private unittest
{
}
```
### Adding new features ### Adding new features
* Use Ddoc to document the feature. * Use Ddoc to document the feature.
* Add some unittests that prevent new bugs and demonstrate how the feature is supposed to work. * Add some unit tests to prevent bugs.
* [Documented D unit tests](https://dlang.org/spec/ddoc.html#using_ddoc_to_generate_examples) go into the documentation and can be used as an usage
example. These tests should be readable and not complicated since they demonstrate how the feature is supposed to work.
* More advanced tests should be put into a separate not documented unittest block.
### Writing unit tests
```d
///
unittest
{
// A documented unit test has three slashes in front of it.
}
// Issue ##: https://github.com/caraus-ecms/tanya/issues/##.
unittest
{
// Not documented unit test may still have a description.
}
```
### Style guide ### Style guide
Make sure your changes follow [The D Style](https://dlang.org/dstyle.html) (including Make sure your changes follow [The D Style](https://dlang.org/dstyle.html) (including
[Additional Requirements for Phobos](https://dlang.org/dstyle.html#phobos). [Additional Requirements for Phobos](https://dlang.org/dstyle.html#phobos)).
You can also use [dscanner](https://github.com/dlang-community/D-Scanner) to test the new code against the
most guidlines. The root of this repository contains
[dscanner.ini](https://github.com/caraus-ecms/tanya/blob/master/dscanner.ini), configuration file with settings for an
automatic style check. Just go to the top-level directory and issue (this assumes `dscanner` is installed in your
system):
```shell
dscanner --styleCheck source
```
## Questions and suggestions ## Questions and suggestions
* [Open an issue](https://issues.caraus.io/projects/tanya/issues) * [Open an issue](https://github.com/caraus-ecms/tanya/issues)
* [Send an email](mailto:info@caraus.de) * [Send an email](mailto:info@caraus.de)

View File

@ -27,7 +27,10 @@ Tanya consists of the following packages and (top-level) modules:
* `async`: Event loop (epoll, kqueue and IOCP). * `async`: Event loop (epoll, kqueue and IOCP).
* `container`: Queue, Array, Singly and doubly linked lists, Buffers, UTF-8 * `container`: Queue, Array, Singly and doubly linked lists, Buffers, UTF-8
string, Hash set. string, Hash set.
* `conv`: This module provides functions for converting between different
types.
* `encoding`: This package provides tools to work with text encodings. * `encoding`: This package provides tools to work with text encodings.
* `exception`: Common exceptions and errors.
* `format`: Formatting and conversion functions. * `format`: Formatting and conversion functions.
* `math`: Arbitrary precision integer and a set of functions. * `math`: Arbitrary precision integer and a set of functions.
* `memory`: Tools for manual memory management (allocators, smart pointers). * `memory`: Tools for manual memory management (allocators, smart pointers).
@ -41,6 +44,7 @@ After finishing the new socket implementation will land in the `net` package and
`network` will be deprecated. `network` will be deprecated.
* `os`: Platform-independent interfaces to operating system functionality. * `os`: Platform-independent interfaces to operating system functionality.
* `range`: Generic functions and templates for D ranges. * `range`: Generic functions and templates for D ranges.
* `test`: Test suite for unittest-blocks.
* `typecons`: Templates that allow to build new types based on the available * `typecons`: Templates that allow to build new types based on the available
ones. ones.
@ -145,7 +149,7 @@ There are more containers in the `tanya.container` package.
| DMD | GCC | | DMD | GCC |
|:-------:|:--------------:| |:-------:|:--------------:|
| 2.076.0 | *gdc-5* branch | | 2.076.1 | *gdc-5* branch |
| 2.075.1 | | | 2.075.1 | |
| 2.074.1 | | | 2.074.1 | |

View File

@ -4,10 +4,10 @@ os: Visual Studio 2015
environment: environment:
matrix: matrix:
- DC: dmd - DC: dmd
DVersion: 2.076.0 DVersion: 2.076.1
arch: x64 arch: x64
- DC: dmd - DC: dmd
DVersion: 2.076.0 DVersion: 2.076.1
arch: x86 arch: x86
- DC: dmd - DC: dmd
DVersion: 2.075.1 DVersion: 2.075.1

View File

@ -5,9 +5,10 @@ rule archive
command = ar rcs $out $in command = ar rcs $out $in
build abs.o: gas x64/linux/math/abs.S build abs.o: gas x64/linux/math/abs.S
build log.o: gas x64/linux/math/log.S
build cmp.o: gas x64/linux/memory/cmp.S build cmp.o: gas x64/linux/memory/cmp.S
build fill.o: gas x64/linux/memory/fill.S build fill.o: gas x64/linux/memory/fill.S
build copy.o: gas x64/linux/memory/copy.S build copy.o: gas x64/linux/memory/copy.S
build syscall.o: gas x64/linux/syscall.S build syscall.o: gas x64/linux/syscall.S
build tanya.a: archive syscall.o copy.o fill.o cmp.o abs.o build tanya.a: archive syscall.o copy.o fill.o cmp.o log.o abs.o

48
arch/x64/linux/math/log.S Normal file
View File

@ -0,0 +1,48 @@
.text
// logl.
.globl _D5tanya4math8nbtheory2lnFNaNbNiNfeZe
.type _D5tanya4math8nbtheory2lnFNaNbNiNfeZe, @function
_D5tanya4math8nbtheory2lnFNaNbNiNfeZe:
fldln2 // Put lb(e) onto the FPU stack
fldt 8(%rsp) // Put the argument onto the FPU stack
fyl2x // %st1 * lb(%st0)
ret
// log.
.globl _D5tanya4math8nbtheory2lnFNaNbNiNfdZd
.type _D5tanya4math8nbtheory2lnFNaNbNiNfdZd, @function
_D5tanya4math8nbtheory2lnFNaNbNiNfdZd:
movsd %xmm0, -8(%rsp) // Put the argument onto the stack
fldln2 // Put lb(e) onto the FPU stack
fldl -8(%rsp) // Put a double onto the FPU stack
fyl2x // %st1 * lb(%st0)
// The result is on the FPU stack, but returned in %xmm0
fstpl -8(%rsp)
movsd -8(%rsp), %xmm0
ret
// logf.
.globl _D5tanya4math8nbtheory2lnFNaNbNiNffZf
.type _D5tanya4math8nbtheory2lnFNaNbNiNffZf, @function
_D5tanya4math8nbtheory2lnFNaNbNiNffZf:
movss %xmm0, -4(%rsp) // Put the argument onto the stack
fldln2 // Put lb(e) onto the FPU stack
flds -4(%rsp) // Put a float onto the FPU stack
fyl2x // %st1 * lb(%st0)
// The result is on the FPU stack, but returned in %xmm0
fstps -4(%rsp)
movss -4(%rsp), %xmm0
ret

View File

@ -74,7 +74,7 @@ lambda_return_check="skip-unittest"
; Check for auto function without return statement ; Check for auto function without return statement
auto_function_check="skip-unittest" auto_function_check="skip-unittest"
; Check for sortedness of imports ; Check for sortedness of imports
imports_sortedness="disabled" imports_sortedness="skip-unittest"
; Check for explicitly annotated unittests ; Check for explicitly annotated unittests
explicitly_annotated_unittests="disabled" explicitly_annotated_unittests="disabled"
; Check for useless usage of the final attribute ; Check for useless usage of the final attribute

View File

@ -19,20 +19,20 @@ version (D_Ddoc)
} }
else version (linux): else version (linux):
import core.stdc.errno;
public import core.sys.linux.epoll; public import core.sys.linux.epoll;
import tanya.async.protocol; import core.sys.posix.unistd;
import core.time;
import std.algorithm.comparison;
import tanya.async.event.selector; import tanya.async.event.selector;
import tanya.async.loop; import tanya.async.loop;
import tanya.async.protocol;
import tanya.async.transport; import tanya.async.transport;
import tanya.async.watcher; import tanya.async.watcher;
import tanya.container.array; import tanya.container.array;
import tanya.memory; import tanya.memory;
import tanya.memory.mmappool; import tanya.memory.mmappool;
import tanya.network.socket; import tanya.network.socket;
import core.stdc.errno;
import core.sys.posix.unistd;
import core.time;
import std.algorithm.comparison;
extern (C) nothrow @nogc extern (C) nothrow @nogc
{ {

View File

@ -19,17 +19,17 @@ version (D_Ddoc)
} }
else version (Windows): else version (Windows):
import tanya.container.buffer; import core.sys.windows.mswsock;
import core.sys.windows.winsock2;
import tanya.async.loop; import tanya.async.loop;
import tanya.async.protocol; import tanya.async.protocol;
import tanya.async.transport; import tanya.async.transport;
import tanya.async.watcher; import tanya.async.watcher;
import tanya.container.buffer;
import tanya.memory; import tanya.memory;
import tanya.memory.mmappool; import tanya.memory.mmappool;
import tanya.network.socket; import tanya.network.socket;
import tanya.sys.windows.winbase; import tanya.sys.windows.winbase;
import core.sys.windows.mswsock;
import core.sys.windows.winsock2;
/** /**
* Transport for stream sockets. * Transport for stream sockets.
@ -386,4 +386,4 @@ final class IOCPLoop : Loop
assert(false, "Unknown event"); assert(false, "Unknown event");
} }
} }
} }

View File

@ -23,8 +23,8 @@ import tanya.async.loop;
import tanya.async.protocol; import tanya.async.protocol;
import tanya.async.transport; import tanya.async.transport;
import tanya.async.watcher; import tanya.async.watcher;
import tanya.container.buffer;
import tanya.container.array; import tanya.container.array;
import tanya.container.buffer;
import tanya.memory; import tanya.memory;
import tanya.memory.mmappool; import tanya.memory.mmappool;
import tanya.network.socket; import tanya.network.socket;

View File

@ -18,8 +18,8 @@
*/ */
module tanya.async.protocol; module tanya.async.protocol;
import tanya.network.socket;
import tanya.async.transport; import tanya.async.transport;
import tanya.network.socket;
/** /**
* Common protocol interface. * Common protocol interface.

View File

@ -14,8 +14,8 @@
*/ */
module tanya.async.watcher; module tanya.async.watcher;
import std.functional;
import std.exception; import std.exception;
import std.functional;
import tanya.async.loop; import tanya.async.loop;
import tanya.async.protocol; import tanya.async.protocol;
import tanya.async.transport; import tanya.async.transport;

View File

@ -15,11 +15,10 @@
module tanya.container.array; module tanya.container.array;
import core.checkedint; import core.checkedint;
import core.exception;
import std.algorithm.comparison; import std.algorithm.comparison;
import std.algorithm.mutation; import std.algorithm.mutation;
import std.conv;
import std.meta; import std.meta;
import tanya.exception;
import tanya.memory; import tanya.memory;
import tanya.meta.trait; import tanya.meta.trait;
import tanya.meta.transform; import tanya.meta.transform;
@ -501,7 +500,7 @@ struct Array(T)
buf = allocator.allocate(byteSize); buf = allocator.allocate(byteSize);
if (buf is null) if (buf is null)
{ {
onOutOfMemoryErrorNoGC(); onOutOfMemoryError();
} }
scope (failure) scope (failure)
{ {
@ -708,9 +707,12 @@ struct Array(T)
size_t insertBack(R)(ref R el) @trusted size_t insertBack(R)(ref R el) @trusted
if (isImplicitlyConvertible!(R, T)) if (isImplicitlyConvertible!(R, T))
{ {
reserve(this.length_ + 1); this.length = this.length + 1;
emplace(this.data + this.length_, el); scope (failure)
++this.length_; {
this.length = this.length - 1;
}
opIndex(this.length - 1) = el;
return 1; return 1;
} }

View File

@ -16,10 +16,10 @@ module tanya.container;
public import tanya.container.array; public import tanya.container.array;
public import tanya.container.buffer; public import tanya.container.buffer;
public import tanya.container.set;
public import tanya.container.list; public import tanya.container.list;
public import tanya.container.string;
public import tanya.container.queue; public import tanya.container.queue;
public import tanya.container.set;
public import tanya.container.string;
/** /**
* Thrown if $(D_PSYMBOL Set) cannot insert a new element because the container * Thrown if $(D_PSYMBOL Set) cannot insert a new element because the container

View File

@ -14,9 +14,9 @@
*/ */
module tanya.container.queue; module tanya.container.queue;
import core.exception;
import std.algorithm.mutation; import std.algorithm.mutation;
import tanya.container.entry; import tanya.container.entry;
import tanya.exception;
import tanya.memory; import tanya.memory;
import tanya.meta.trait; import tanya.meta.trait;
@ -201,7 +201,7 @@ struct Queue(T)
{ {
int result; int result;
for (size_t i = 0; !empty; ++i) for (size_t i; !empty; ++i)
{ {
auto e = dequeue(); auto e = dequeue();
if ((result = dg(i, e)) != 0) if ((result = dg(i, e)) != 0)

View File

@ -437,7 +437,7 @@ struct Set(T)
InsertStatus status = insertInUnusedBucket(value); InsertStatus status = insertInUnusedBucket(value);
for (; !status; status = insertInUnusedBucket(value)) for (; !status; status = insertInUnusedBucket(value))
{ {
if ((this.primes.length - 1) == this.lengthIndex) if (this.primes.length == (this.lengthIndex + 1))
{ {
throw make!HashContainerFullException(defaultAllocator, throw make!HashContainerFullException(defaultAllocator,
"Set is full"); "Set is full");

View File

@ -26,16 +26,20 @@
*/ */
module tanya.container.string; module tanya.container.string;
import core.exception;
import std.algorithm.comparison; import std.algorithm.comparison;
import std.algorithm.mutation; import std.algorithm.mutation;
import std.algorithm.searching; import std.algorithm.searching;
import std.range : isInfinite, isInputRange, ElementEncodingType, hasLength, static import std.range;
popFrontN, empty;
import tanya.memory; import tanya.memory;
import tanya.meta.trait; import tanya.meta.trait;
import tanya.meta.transform; import tanya.meta.transform;
import tanya.range.array; import tanya.range.array;
import tanya.range.primitive;
version (unittest)
{
import tanya.test.assertion;
}
/** /**
* Thrown on encoding errors. * Thrown on encoding errors.
@ -292,21 +296,21 @@ if (is(Unqual!E == char))
body body
{ {
ubyte units; ubyte units;
if ((*begin & 0x80) == 0) if ((*begin & 0xf0) == 0xf0)
{ {
units = 1; units = 4;
}
else if ((*begin & 0xc0) == 0xc0)
{
units = 2;
} }
else if ((*begin & 0xe0) == 0xe0) else if ((*begin & 0xe0) == 0xe0)
{ {
units = 3; units = 3;
} }
else if ((*begin & 0xf0) == 0xf0) else if ((*begin & 0xc0) == 0xc0)
{ {
units = 4; units = 2;
}
else if ((*begin & 0x80) == 0)
{
units = 1;
} }
if (units == 0 || this.begin + units > this.end) if (units == 0 || this.begin + units > this.end)
{ {
@ -355,21 +359,21 @@ struct String
this(S)(const S str, shared Allocator allocator = defaultAllocator) this(S)(const S str, shared Allocator allocator = defaultAllocator)
if (!isInfinite!S if (!isInfinite!S
&& isInputRange!S && isInputRange!S
&& isSomeChar!(ElementEncodingType!S)) && isSomeChar!(ElementType!S))
{ {
this(allocator); this(allocator);
insertBack(str); insertBack(str);
} }
/// ///
@safe @nogc unittest @nogc pure @safe unittest
{ {
auto s = String("\u10437"w); auto s = String("\u10437"w);
assert(s == "\u10437"); assert(s == "\u10437");
} }
/// ///
@safe @nogc unittest @nogc pure @safe unittest
{ {
auto s = String("Отказаться от вина - в этом страшная вина."d); auto s = String("Отказаться от вина - в этом страшная вина."d);
assert(s == "Отказаться от вина - в этом страшная вина."); assert(s == "Отказаться от вина - в этом страшная вина.");
@ -393,8 +397,7 @@ struct String
* *
* Precondition: $(D_INLINECODE allocator is null). * Precondition: $(D_INLINECODE allocator is null).
*/ */
this(S)(S init, shared Allocator allocator = defaultAllocator) this(S)(S init, shared Allocator allocator = defaultAllocator) @trusted
nothrow @trusted @nogc
if (is(S == String)) if (is(S == String))
{ {
this(allocator); this(allocator);
@ -418,8 +421,7 @@ struct String
} }
/// ditto /// ditto
this(S)(ref S init, shared Allocator allocator = defaultAllocator) this(S)(ref S init, shared Allocator allocator = defaultAllocator) @trusted
nothrow @trusted @nogc
if (is(Unqual!S == String)) if (is(Unqual!S == String))
{ {
this(allocator); this(allocator);
@ -429,7 +431,7 @@ struct String
} }
/// ditto /// ditto
this(shared Allocator allocator) pure nothrow @safe @nogc this(shared Allocator allocator) @nogc nothrow pure @safe
in in
{ {
assert(allocator !is null); assert(allocator !is null);
@ -479,7 +481,7 @@ struct String
} }
/// ///
@safe @nogc unittest @nogc pure @safe unittest
{ {
{ {
auto s = String(1, 'О'); auto s = String(1, 'О');
@ -495,22 +497,30 @@ struct String
} }
} }
@safe @nogc unittest @nogc pure @safe unittest
{ {
auto s = String(0, 'K'); auto s = String(0, 'K');
assert(s.length == 0); assert(s.length == 0);
} }
this(this) @nogc nothrow pure @trusted
{
auto buf = this.data[0 .. this.length_];
this.length_ = capacity_ = 0;
this.data = null;
insertBack(buf);
}
/** /**
* Destroys the string. * Destroys the string.
*/ */
~this() nothrow @trusted @nogc ~this() @nogc nothrow pure @trusted
{ {
allocator.resize(this.data[0 .. this.capacity_], 0); allocator.resize(this.data[0 .. this.capacity_], 0);
} }
private void write4Bytes(ref const dchar src) private void write4Bytes(ref const dchar src)
pure nothrow @trusted @nogc @nogc nothrow pure @trusted
in in
{ {
assert(capacity - length >= 4); assert(capacity - length >= 4);
@ -571,7 +581,7 @@ struct String
* *
* Throws: $(D_PSYMBOL UTFException). * Throws: $(D_PSYMBOL UTFException).
*/ */
size_t insertBack(const char chr) @trusted @nogc size_t insertBack(const char chr) @nogc pure @trusted
{ {
if ((chr & 0x80) != 0) if ((chr & 0x80) != 0)
{ {
@ -586,7 +596,7 @@ struct String
} }
/// ditto /// ditto
size_t insertBack(const wchar chr) @trusted @nogc size_t insertBack(const wchar chr) @nogc pure @trusted
{ {
reserve(length + 3); reserve(length + 3);
@ -599,29 +609,14 @@ struct String
} }
// Allocates enough space for 3-byte character. // Allocates enough space for 3-byte character.
private @safe @nogc unittest @nogc pure @safe unittest
{ {
String s; String s;
s.insertBack('\u8100'); s.insertBack('\u8100');
} }
private @safe @nogc unittest
{
UTFException exception;
try
{
auto s = String(1, cast(wchar) 0xd900);
}
catch (UTFException e)
{
exception = e;
}
assert(exception !is null);
defaultAllocator.dispose(exception);
}
/// ditto /// ditto
size_t insertBack(const dchar chr) @trusted @nogc size_t insertBack(const dchar chr) @nogc pure @trusted
{ {
reserve(length + dchar.sizeof); reserve(length + dchar.sizeof);
@ -641,19 +636,10 @@ struct String
} }
} }
private @safe @nogc unittest @nogc pure @safe unittest
{ {
UTFException exception; assertThrown!UTFException(() => String(1, cast(dchar) 0xd900));
try assertThrown!UTFException(() => String(1, cast(wchar) 0xd900));
{
auto s = String(1, cast(dchar) 0xd900);
}
catch (UTFException e)
{
exception = e;
}
assert(exception !is null);
defaultAllocator.dispose(exception);
} }
/** /**
@ -670,7 +656,7 @@ struct String
size_t insertBack(R)(R str) @trusted size_t insertBack(R)(R str) @trusted
if (!isInfinite!R if (!isInfinite!R
&& isInputRange!R && isInputRange!R
&& is(Unqual!(ElementEncodingType!R) == char)) && is(Unqual!(ElementType!R) == char))
{ {
size_t size; size_t size;
static if (hasLength!R || isNarrowString!R) static if (hasLength!R || isNarrowString!R)
@ -734,7 +720,7 @@ struct String
size_t insertBack(R)(R str) @trusted size_t insertBack(R)(R str) @trusted
if (!isInfinite!R if (!isInfinite!R
&& isInputRange!R && isInputRange!R
&& is(Unqual!(ElementEncodingType!R) == wchar)) && is(Unqual!(ElementType!R) == wchar))
{ {
static if (hasLength!R || isNarrowString!R) static if (hasLength!R || isNarrowString!R)
{ {
@ -771,7 +757,7 @@ struct String
} }
dchar d = (range[0] - 0xd800) | ((range[1] - 0xdc00) >> 10); dchar d = (range[0] - 0xd800) | ((range[1] - 0xdc00) >> 10);
range.popFrontN(2); std.range.popFrontN(range, 2);
} }
else else
{ {
@ -800,7 +786,7 @@ struct String
size_t insertBack(R)(R str) @trusted size_t insertBack(R)(R str) @trusted
if (!isInfinite!R if (!isInfinite!R
&& isInputRange!R && isInputRange!R
&& is(Unqual!(ElementEncodingType!R) == dchar)) && is(Unqual!(ElementType!R) == dchar))
{ {
static if (hasLength!R || isSomeString!R) static if (hasLength!R || isSomeString!R)
{ {
@ -828,7 +814,7 @@ struct String
* Params: * Params:
* size = Desired size in bytes. * size = Desired size in bytes.
*/ */
void reserve(const size_t size) nothrow @trusted @nogc void reserve(const size_t size) @nogc nothrow pure @trusted
{ {
if (this.capacity_ >= size) if (this.capacity_ >= size)
{ {
@ -840,7 +826,7 @@ struct String
} }
/// ///
@nogc @safe unittest @nogc pure @safe unittest
{ {
String s; String s;
assert(s.capacity == 0); assert(s.capacity == 0);
@ -864,7 +850,7 @@ struct String
* Params: * Params:
* size = Desired size. * size = Desired size.
*/ */
void shrink(const size_t size) nothrow @trusted @nogc void shrink(const size_t size) @nogc nothrow pure @trusted
{ {
if (this.capacity_ <= size) if (this.capacity_ <= size)
{ {
@ -881,7 +867,7 @@ struct String
} }
/// ///
@nogc @safe unittest @nogc pure @safe unittest
{ {
auto s = String("Die Alten lasen laut."); auto s = String("Die Alten lasen laut.");
assert(s.capacity == 21); assert(s.capacity == 21);
@ -900,13 +886,13 @@ struct String
/** /**
* Returns: String capacity in bytes. * Returns: String capacity in bytes.
*/ */
@property size_t capacity() const pure nothrow @safe @nogc @property size_t capacity() const @nogc nothrow pure @safe
{ {
return this.capacity_; return this.capacity_;
} }
/// ///
@safe @nogc unittest @nogc pure @safe unittest
{ {
auto s = String("In allem Schreiben ist Schamlosigkeit."); auto s = String("In allem Schreiben ist Schamlosigkeit.");
assert(s.capacity == 38); assert(s.capacity == 38);
@ -928,7 +914,7 @@ struct String
*/ */
ByCodeUnit!char opSliceAssign(R)(ByCodeUnit!R value, ByCodeUnit!char opSliceAssign(R)(ByCodeUnit!R value,
const size_t i, const size_t i,
const size_t j) @trusted const size_t j)
if (is(Unqual!R == char)) if (is(Unqual!R == char))
in in
{ {
@ -947,7 +933,7 @@ struct String
ByCodeUnit!char opSliceAssign(const char[] value, ByCodeUnit!char opSliceAssign(const char[] value,
const size_t i, const size_t i,
const size_t j) const size_t j)
pure nothrow @trusted @nogc @nogc nothrow pure @trusted
in in
{ {
assert(i <= j); assert(i <= j);
@ -963,7 +949,7 @@ struct String
ByCodeUnit!char opSliceAssign(const char value, ByCodeUnit!char opSliceAssign(const char value,
const size_t i, const size_t i,
const size_t j) const size_t j)
pure nothrow @trusted @nogc @nogc nothrow pure @trusted
in in
{ {
assert(i <= j); assert(i <= j);
@ -985,13 +971,13 @@ struct String
* *
* Returns: The array representing the string. * Returns: The array representing the string.
*/ */
inout(char)[] get() inout pure nothrow @trusted @nogc inout(char)[] get() inout @nogc nothrow pure @trusted
{ {
return this.data[0 .. this.length_]; return this.data[0 .. this.length_];
} }
/// ///
nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
auto s = String("Char array."); auto s = String("Char array.");
assert(s.get().length == 11); assert(s.get().length == 11);
@ -1003,7 +989,7 @@ struct String
* *
* Returns: Null-terminated string. * Returns: Null-terminated string.
*/ */
const(char)* toStringz() nothrow @nogc const(char)* toStringz() @nogc nothrow pure
{ {
reserve(length + 1); reserve(length + 1);
this.data[length] = '\0'; this.data[length] = '\0';
@ -1011,7 +997,7 @@ struct String
} }
/// ///
@nogc unittest @nogc pure unittest
{ {
auto s = String("C string."); auto s = String("C string.");
assert(s.toStringz()[0] == 'C'); assert(s.toStringz()[0] == 'C');
@ -1021,7 +1007,7 @@ struct String
/** /**
* Returns: The number of code units that are required to encode the string. * Returns: The number of code units that are required to encode the string.
*/ */
@property size_t length() const pure nothrow @safe @nogc @property size_t length() const @nogc nothrow pure @safe
{ {
return this.length_; return this.length_;
} }
@ -1030,7 +1016,7 @@ struct String
alias opDollar = length; alias opDollar = length;
/// ///
@safe @nogc unittest @nogc pure @safe unittest
{ {
auto s = String("Piscis primuin a capite foetat."); auto s = String("Piscis primuin a capite foetat.");
assert(s.length == 31); assert(s.length == 31);
@ -1045,7 +1031,7 @@ struct String
* *
* Precondition: $(D_INLINECODE length > pos). * Precondition: $(D_INLINECODE length > pos).
*/ */
ref inout(char) opIndex(const size_t pos) inout pure nothrow @trusted @nogc ref inout(char) opIndex(const size_t pos) inout @nogc nothrow pure @trusted
in in
{ {
assert(length > pos); assert(length > pos);
@ -1056,7 +1042,7 @@ struct String
} }
/// ///
@safe @nogc unittest @nogc pure @safe unittest
{ {
auto s = String("Alea iacta est."); auto s = String("Alea iacta est.");
assert(s[0] == 'A'); assert(s[0] == 'A');
@ -1067,7 +1053,7 @@ struct String
* Returns: Random access range that iterates over the string by bytes, in * Returns: Random access range that iterates over the string by bytes, in
* forward order. * forward order.
*/ */
ByCodeUnit!char opIndex() pure nothrow @trusted @nogc ByCodeUnit!char opIndex() @nogc nothrow pure @trusted
{ {
return typeof(return)(this, this.data, this.data + length); return typeof(return)(this, this.data, this.data + length);
} }
@ -1079,7 +1065,7 @@ struct String
} }
/// ///
@safe @nogc unittest @nogc pure @safe unittest
{ {
auto s = String("Plutarchus"); auto s = String("Plutarchus");
auto r = s[]; auto r = s[];
@ -1097,30 +1083,41 @@ struct String
assert(r.length == 8); assert(r.length == 8);
} }
///
@nogc pure @safe unittest
{
auto s = const String("Was ich vermag, soll gern geschehen. Goethe");
auto r1 = s[];
assert(r1.front == 'W');
auto r2 = r1[];
r1.popFront();
assert(r1.front == 'a');
assert(r2.front == 'W');
}
/** /**
* Returns: Forward range that iterates over the string by code points. * Returns: Forward range that iterates over the string by code points.
*/ */
ByCodePoint!char byCodePoint() pure nothrow @trusted @nogc ByCodePoint!char byCodePoint() @nogc nothrow pure @trusted
{ {
return typeof(return)(this, this.data, this.data + length); return typeof(return)(this, this.data, this.data + length);
} }
/// ditto /// ditto
ByCodePoint!(const char) byCodePoint() const pure nothrow @trusted @nogc ByCodePoint!(const char) byCodePoint() const @nogc nothrow pure @trusted
{ {
return typeof(return)(this, this.data, this.data + length); return typeof(return)(this, this.data, this.data + length);
} }
/// ///
@safe @nogc unittest @nogc pure @safe unittest
{ {
auto s = String("Высоцкий"); auto s = String("Мне есть, что спеть, представ перед Всевышним.");
auto cp = s.byCodePoint(); auto cp = s.byCodePoint();
assert(cp.front == 'В'); assert(cp.front == 'М');
cp.popFront(); cp.popFront();
assert(cp.front == 'ы'); assert(cp.front == 'н');
cp.popFront();
assert(cp.front == 'с');
s = String("€"); s = String("€");
cp = s.byCodePoint(); cp = s.byCodePoint();
@ -1133,16 +1130,37 @@ struct String
assert(s.length == 4); assert(s.length == 4);
} }
///
@nogc pure @safe unittest
{
auto s = const String("Высоцкий");
auto cp1 = s.byCodePoint();
assert(cp1.front == 'В');
auto cp2 = cp1[];
cp1.popFront();
assert(cp1.front == 'ы');
assert(cp2.front == 'В');
cp2 = cp1.save();
cp1.popFront();
assert(cp1.front == 'с');
assert(cp2.front == 'ы');
}
/** /**
* Returns: $(D_KEYWORD true) if the string is empty. * Returns whether the string is empty.
*
* Returns: $(D_KEYWORD true) if the string is empty, $(D_KEYWORD false)
* otherwise.
*/ */
@property bool empty() const pure nothrow @safe @nogc @property bool empty() const @nogc nothrow pure @safe
{ {
return length == 0; return length == 0;
} }
/// ///
@safe @nogc unittest @nogc pure @safe unittest
{ {
String s; String s;
assert(s.empty); assert(s.empty);
@ -1162,7 +1180,7 @@ struct String
* Precondition: $(D_INLINECODE i <= j && j <= length). * Precondition: $(D_INLINECODE i <= j && j <= length).
*/ */
ByCodeUnit!char opSlice(const size_t i, const size_t j) ByCodeUnit!char opSlice(const size_t i, const size_t j)
pure nothrow @trusted @nogc @nogc nothrow pure @trusted
in in
{ {
assert(i <= j); assert(i <= j);
@ -1175,7 +1193,7 @@ struct String
/// ditto /// ditto
ByCodeUnit!(const char) opSlice(const size_t i, const size_t j) ByCodeUnit!(const char) opSlice(const size_t i, const size_t j)
const pure nothrow @trusted @nogc const @nogc nothrow pure @trusted
in in
{ {
assert(i <= j); assert(i <= j);
@ -1187,7 +1205,7 @@ struct String
} }
/// ///
@safe @nogc unittest @nogc pure @safe unittest
{ {
auto s = String("Vladimir Soloviev"); auto s = String("Vladimir Soloviev");
auto r = s[9 .. $]; auto r = s[9 .. $];
@ -1251,7 +1269,7 @@ struct String
} }
/// ///
@safe @nogc unittest @nogc pure @safe unittest
{ {
auto s = String("Черная, потом пропахшая выть!"); auto s = String("Черная, потом пропахшая выть!");
s = String("Как мне тебя не ласкать, не любить?"); s = String("Как мне тебя не ласкать, не любить?");
@ -1268,10 +1286,10 @@ struct String
* *
* Throws: $(D_PSYMBOL UTFException). * Throws: $(D_PSYMBOL UTFException).
*/ */
ref String opAssign(S)(S that) nothrow ref String opAssign(S)(S that)
if (!isInfinite!S if (!isInfinite!S
&& isInputRange!S && isInputRange!S
&& isSomeChar!(ElementEncodingType!S)) && isSomeChar!(ElementType!S))
{ {
this.length_ = 0; this.length_ = 0;
insertBack(that); insertBack(that);
@ -1279,7 +1297,7 @@ struct String
} }
/// ///
@safe @nogc unittest @nogc pure @safe unittest
{ {
auto s = String("Оловом светится лужная голь..."); auto s = String("Оловом светится лужная голь...");
s = "Грустная песня, ты - русская боль."; s = "Грустная песня, ты - русская боль.";
@ -1324,7 +1342,7 @@ struct String
} }
/// ///
@safe @nogc unittest @nogc pure @safe unittest
{ {
assert(String("Голубая кофта.") < String("Синие глаза.")); assert(String("Голубая кофта.") < String("Синие глаза."));
assert(String("Никакой я правды") < String("милой не сказал")[]); assert(String("Никакой я правды") < String("милой не сказал")[]);
@ -1377,7 +1395,7 @@ struct String
} }
/// ///
@safe @nogc unittest @nogc pure @safe unittest
{ {
assert(String("Милая спросила:") != String("Крутит ли метель?")); assert(String("Милая спросила:") != String("Крутит ли метель?"));
assert(String("Затопить бы печку,") != String("постелить постель.")[]); assert(String("Затопить бы печку,") != String("постелить постель.")[]);
@ -1404,13 +1422,13 @@ struct String
* Precondition: $(D_INLINECODE length > pos). * Precondition: $(D_INLINECODE length > pos).
*/ */
ref char opIndexAssign(const char value, const size_t pos) ref char opIndexAssign(const char value, const size_t pos)
pure nothrow @safe @nogc @nogc nothrow pure @safe
{ {
return opIndex(pos) = value; return opIndex(pos) = value;
} }
/// ///
@safe @nogc unittest @nogc pure @safe unittest
{ {
auto s = String("alea iacta est."); auto s = String("alea iacta est.");
@ -1435,7 +1453,7 @@ struct String
return opSliceAssign(value, 0, length); return opSliceAssign(value, 0, length);
} }
private unittest @nogc pure @safe unittest
{ {
auto s1 = String("Buttercup"); auto s1 = String("Buttercup");
auto s2 = String("Cap"); auto s2 = String("Cap");
@ -1444,12 +1462,12 @@ struct String
} }
/// ditto /// ditto
ByCodeUnit!char opIndexAssign(const char value) pure nothrow @safe @nogc ByCodeUnit!char opIndexAssign(const char value) @nogc nothrow pure @safe
{ {
return opSliceAssign(value, 0, length); return opSliceAssign(value, 0, length);
} }
private unittest @nogc pure @safe unittest
{ {
auto s1 = String("Wow"); auto s1 = String("Wow");
s1[] = 'a'; s1[] = 'a';
@ -1457,12 +1475,12 @@ struct String
} }
/// ditto /// ditto
ByCodeUnit!char opIndexAssign(const char[] value) pure nothrow @safe @nogc ByCodeUnit!char opIndexAssign(const char[] value) @nogc nothrow pure @safe
{ {
return opSliceAssign(value, 0, length); return opSliceAssign(value, 0, length);
} }
private unittest @nogc pure @safe unittest
{ {
auto s1 = String("ö"); auto s1 = String("ö");
s1[] = "oe"; s1[] = "oe";
@ -1498,7 +1516,7 @@ struct String
} }
/// ///
@nogc @safe unittest @nogc pure @safe unittest
{ {
auto s = String("Из пословицы слова не выкинешь."); auto s = String("Из пословицы слова не выкинешь.");
@ -1507,7 +1525,7 @@ struct String
assert(s.length == 38); assert(s.length == 38);
auto byCodePoint = s.byCodePoint(); auto byCodePoint = s.byCodePoint();
byCodePoint.popFrontN(8); std.range.popFrontN(byCodePoint, 8);
assert(s.remove(byCodePoint).count == 0); assert(s.remove(byCodePoint).count == 0);
assert(s == "Из слова"); assert(s == "Из слова");
@ -1534,7 +1552,7 @@ struct String
size_t insertAfter(T, R)(R r, T el) @trusted size_t insertAfter(T, R)(R r, T el) @trusted
if ((isSomeChar!T || (!isInfinite!T if ((isSomeChar!T || (!isInfinite!T
&& isInputRange!T && isInputRange!T
&& isSomeChar!(ElementEncodingType!T))) && isSomeChar!(ElementType!T)))
&& (is(R == ByCodeUnit!char) || is(R == ByCodePoint!char))) && (is(R == ByCodeUnit!char) || is(R == ByCodePoint!char)))
in in
{ {
@ -1552,7 +1570,7 @@ struct String
} }
/// ///
@safe @nogc unittest @nogc pure @safe unittest
{ {
auto s = String("Казнить нельзя помиловать."); auto s = String("Казнить нельзя помиловать.");
s.insertAfter(s[0 .. 27], ","); s.insertAfter(s[0 .. 27], ",");
@ -1567,7 +1585,7 @@ struct String
size_t insertBefore(T, R)(R r, T el) @trusted size_t insertBefore(T, R)(R r, T el) @trusted
if ((isSomeChar!T || (!isInfinite!T if ((isSomeChar!T || (!isInfinite!T
&& isInputRange!T && isInputRange!T
&& isSomeChar!(ElementEncodingType!T))) && isSomeChar!(ElementType!T)))
&& (is(R == ByCodeUnit!char) || is(R == ByCodePoint!char))) && (is(R == ByCodeUnit!char) || is(R == ByCodePoint!char)))
in in
{ {
@ -1581,7 +1599,7 @@ struct String
} }
/// ///
@safe @nogc unittest @nogc pure @safe unittest
{ {
auto s = String("Казнить нельзя помиловать."); auto s = String("Казнить нельзя помиловать.");
s.insertBefore(s[27 .. $], ","); s.insertBefore(s[27 .. $], ",");
@ -1594,3 +1612,67 @@ struct String
mixin DefaultAllocator; mixin DefaultAllocator;
} }
// Postblit works.
@nogc pure @safe unittest
{
void internFunc(String arg)
{
}
void middleFunc(S...)(S args)
{
foreach (arg; args)
{
internFunc(arg);
}
}
void topFunc(String args)
{
middleFunc(args);
}
topFunc(String("asdf"));
}
// Const range produces mutable ranges.
@nogc pure @safe unittest
{
auto s = const String("И снизу лед, и сверху - маюсь между.");
{
const constRange = s[];
auto fromConstRange = constRange[];
fromConstRange.popFront();
assert(fromConstRange.front == s[1]);
fromConstRange = constRange[0 .. $];
fromConstRange.popFront();
assert(fromConstRange.front == s[1]);
assert(constRange.get() is s.get());
}
{
const constRange = s.byCodePoint();
auto fromConstRange = constRange[];
fromConstRange.popFront();
assert(fromConstRange.front == ' ');
}
}
// Can pop multibyte characters.
@nogc pure @safe unittest
{
auto s = String("\U00024B62\U00002260");
auto range = s.byCodePoint();
range.popFront();
assert(!range.empty);
range.popFront();
assert(range.empty);
range = s.byCodePoint();
range.popFront();
s[$ - 3] = 0xf0;
assertThrown!UTFException(&(range.popFront));
}

235
source/tanya/conv.d Normal file
View File

@ -0,0 +1,235 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/**
* This module provides functions for converting between different types.
*
* Copyright: Eugene Wissner 2017.
* 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/conv.d,
* tanya/conv.d)
*/
module tanya.conv;
import tanya.memory;
import tanya.memory.op;
import tanya.meta.trait;
/**
* Constructs a new object of type $(D_PARAM T) in $(D_PARAM memory) with the
* given arguments.
*
* If $(D_PARAM T) is a $(D_KEYWORD class), emplace returns a class reference
* of type $(D_PARAM T), otherwise a pointer to the constructed object is
* returned.
*
* If $(D_PARAM T) is a nested class inside another class, $(D_PARAM outer)
* should be an instance of the outer class.
*
* $(D_PARAM args) are arguments for the constructor of $(D_PARAM T). If
* $(D_PARAM T) isn't an aggregate type and doesn't have a constructor,
* $(D_PARAM memory) can be initialized to `args[0]` if `Args.length == 1`,
* `Args[0]` should be implicitly convertible to $(D_PARAM T) then.
*
* Params:
* T = Constructed type.
* U = Type of the outer class if $(D_PARAM T) is a nested class.
* Args = Types of the constructor arguments if $(D_PARAM T) has a constructor
* or the type of the initial value.
* outer = Outer class instance if $(D_PARAM T) is a nested class.
* args = Constructor arguments if $(D_PARAM T) has a constructor or the
* initial value.
*
* Returns: New instance of type $(D_PARAM T) constructed in $(D_PARAM memory).
*
* Precondition: `memory.length == stateSize!T`.
* Postcondition: $(D_PARAM memory) and the result point to the same memory.
*/
T emplace(T, U, Args...)(void[] memory, U outer, auto ref Args args)
if (!isAbstractClass!T && isInnerClass!T && is(typeof(T.outer) == U))
in
{
assert(memory.length >= stateSize!T);
}
out (result)
{
assert(memory.ptr is (() @trusted => cast(void*) result)());
}
body
{
copy(typeid(T).initializer, memory);
auto result = (() @trusted => cast(T) memory.ptr)();
result.outer = outer;
static if (is(typeof(result.__ctor(args))))
{
result.__ctor(args);
}
return result;
}
/// ditto
T emplace(T, Args...)(void[] memory, auto ref Args args)
if (is(T == class) && !isAbstractClass!T && !isInnerClass!T)
in
{
assert(memory.length == stateSize!T);
}
out (result)
{
assert(memory.ptr is (() @trusted => cast(void*) result)());
}body
{
copy(typeid(T).initializer, memory);
auto result = (() @trusted => cast(T) memory.ptr)();
static if (is(typeof(result.__ctor(args))))
{
result.__ctor(args);
}
return result;
}
///
@nogc nothrow pure @safe unittest
{
import tanya.memory : stateSize;
class C
{
int i = 5;
class Inner
{
int i;
this(int param) pure nothrow @safe @nogc
{
this.i = param;
}
}
}
ubyte[stateSize!C] memory1;
ubyte[stateSize!(C.Inner)] memory2;
auto c = emplace!C(memory1);
assert(c.i == 5);
auto inner = emplace!(C.Inner)(memory2, c, 8);
assert(c.i == 5);
assert(inner.i == 8);
assert(inner.outer is c);
}
/// ditto
T* emplace(T, Args...)(void[] memory, auto ref Args args)
if (!isAggregateType!T && (Args.length <= 1))
in
{
assert(memory.length >= T.sizeof);
}
out (result)
{
assert(memory.ptr is result);
}
body
{
auto result = (() @trusted => cast(T*) memory.ptr)();
static if (Args.length == 1)
{
*result = T(args[0]);
}
else
{
*result = T.init;
}
return result;
}
/// ditto
T* emplace(T, Args...)(void[] memory, auto ref Args args)
if (!isPolymorphicType!T && isAggregateType!T)
in
{
assert(memory.length >= T.sizeof);
}
out (result)
{
assert(memory.ptr is result);
}
body
{
auto result = (() @trusted => cast(T*) memory.ptr)();
static if (!hasElaborateAssign!T && isAssignable!T)
{
*result = T.init;
}
else
{
static const T init = T.init;
copy((cast(void*) &init)[0 .. T.sizeof], memory);
}
static if (Args.length == 0)
{
static assert(is(typeof({ static T t; })),
"Default constructor is disabled");
}
else static if (is(typeof(T(args))))
{
*result = T(args);
}
else static if (is(typeof(result.__ctor(args))))
{
result.__ctor(args);
}
else
{
static assert(false,
"Unable to construct value with the given arguments");
}
return result;
}
///
@nogc nothrow pure @safe unittest
{
ubyte[4] memory;
auto i = emplace!int(memory);
static assert(is(typeof(i) == int*));
assert(*i == 0);
i = emplace!int(memory, 5);
assert(*i == 5);
static struct S
{
int i;
@disable this();
@disable this(this);
this(int i) @nogc nothrow pure @safe
{
this.i = i;
}
}
auto s = emplace!S(memory, 8);
static assert(is(typeof(s) == S*));
assert(s.i == 8);
}
// Handles "Cannot access frame pointer" error.
@nogc nothrow pure @safe unittest
{
struct F
{
~this() @nogc nothrow pure @safe
{
}
}
static assert(is(typeof(emplace!F((void[]).init))));
}

View File

@ -21,7 +21,7 @@ import tanya.meta.trait;
const string fullHexDigits = "0123456789ABCDEFabcdef"; /// 0..9A..Fa..f. const string fullHexDigits = "0123456789ABCDEFabcdef"; /// 0..9A..Fa..f.
const string hexDigits = "0123456789ABCDEF"; /// 0..9A..F. const string hexDigits = "0123456789ABCDEF"; /// 0..9A..F.
const string lowerHexDigits = "0123456789ABCDEF"; /// 0..9a..f. const string lowerHexDigits = "0123456789abcdef"; /// 0..9a..f.
const string digits = "0123456789"; /// 0..9. const string digits = "0123456789"; /// 0..9.
const string octalDigits = "01234567"; /// 0..7. const string octalDigits = "01234567"; /// 0..7.

66
source/tanya/exception.d Normal file
View File

@ -0,0 +1,66 @@
/* 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/. */
/**
* Common exceptions and errors.
*
* Copyright: Eugene Wissner 2017.
* License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
* Mozilla Public License, v. 2.0).
* Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
* Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/exception.d,
* tanya/exception.d)
*/
module tanya.exception;
import tanya.conv;
import tanya.memory;
/**
* Error thrown if memory allocation fails.
*/
final class OutOfMemoryError : Error
{
/**
* Constructs new error.
*
* Params:
* msg = The message for the exception.
* file = The file where the exception occurred.
* line = The line number where the exception occurred.
* next = The previous exception in the chain of exceptions, if any.
*/
this(string msg = "Out of memory",
string file = __FILE__,
size_t line = __LINE__,
Throwable next = null) @nogc nothrow pure @safe
{
super(msg, file, line, next);
}
/// ditto
this(string msg,
Throwable next,
string file = __FILE__,
size_t line = __LINE__) @nogc nothrow pure @safe
{
super(msg, file, line, next);
}
}
/**
* Allocates $(D_PSYMBOL OutOfMemoryError) in a static storage and throws it.
*
* Params:
* msg = Custom error message.
*
* Throws: $(D_PSYMBOL OutOfMemoryError).
*/
void onOutOfMemoryError(string msg = "Out of memory")
@nogc nothrow pure @trusted
{
static ubyte[stateSize!OutOfMemoryError] memory;
alias PureType = OutOfMemoryError function(string) @nogc nothrow pure;
throw (cast(PureType) () => emplace!OutOfMemoryError(memory))(msg);
}

View File

@ -17,6 +17,15 @@ module tanya.math.nbtheory;
import tanya.math.mp; import tanya.math.mp;
import tanya.meta.trait; import tanya.meta.trait;
version (TanyaNative)
{
}
else
{
import core.math : fabs;
import std.math : log;
}
/** /**
* Calculates the absolute value of a number. * Calculates the absolute value of a number.
* *
@ -57,21 +66,19 @@ version (D_Ddoc)
I abs(I)(I x) I abs(I)(I x)
if (isFloatingPoint!I); if (isFloatingPoint!I);
} }
else version (TanyaPhobos) else version (TanyaNative)
{
extern I abs(I)(I number) pure nothrow @safe @nogc
if (isFloatingPoint!I);
}
else
{ {
import core.math;
I abs(I)(I x) I abs(I)(I x)
if (isFloatingPoint!I) if (isFloatingPoint!I)
{ {
return fabs(cast(real) x); return fabs(cast(real) x);
} }
} }
else
{
extern I abs(I)(I number) pure nothrow @safe @nogc
if (isFloatingPoint!I);
}
/// ///
pure nothrow @safe @nogc unittest pure nothrow @safe @nogc unittest
@ -103,3 +110,56 @@ I abs(I : Integer)(I x)
x.sign = Sign.positive; x.sign = Sign.positive;
return x; return x;
} }
version (D_Ddoc)
{
/**
* Calculates natural logarithm of $(D_PARAM x).
*
* Params:
* x = Argument.
*
* Returns: Natural logarithm of $(D_PARAM x).
*/
float ln(float x) pure nothrow @safe @nogc;
/// ditto
double ln(double x) pure nothrow @safe @nogc;
/// ditto
real ln(real x) pure nothrow @safe @nogc;
}
else version (TanyaNative)
{
extern float ln(float x) pure nothrow @safe @nogc;
extern double ln(double x) pure nothrow @safe @nogc;
extern real ln(real x) pure nothrow @safe @nogc;
}
else
{
float ln(float x) pure nothrow @safe @nogc
{
return log(x);
}
double ln(double x) pure nothrow @safe @nogc
{
return log(x);
}
alias ln = log;
}
///
pure nothrow @safe @nogc unittest
{
import tanya.math;
assert(isNaN(ln(-7.389f)));
assert(isNaN(ln(-7.389)));
assert(isNaN(ln(-7.389L)));
assert(isInfinity(ln(0.0f)));
assert(isInfinity(ln(0.0)));
assert(isInfinity(ln(0.0L)));
assert(ln(1.0f) == 0.0f);
assert(ln(1.0) == 0.0);
assert(ln(1.0L) == 0.0L);
}

View File

@ -300,7 +300,7 @@ class Entropy
// Perform second SHA-512 on entropy // Perform second SHA-512 on entropy
output = sha512Of(output); output = sha512Of(output);
for (ubyte i = 0; i < sourceCount; ++i) for (ubyte i; i < sourceCount; ++i)
{ {
sources[i].size = 0; sources[i].size = 0;
} }

View File

@ -20,8 +20,11 @@ import tanya.memory.op;
version (Posix) version (Posix)
{ {
import core.sys.posix.sys.mman : PROT_READ, PROT_WRITE, MAP_PRIVATE, import core.sys.posix.sys.mman : MAP_ANON,
MAP_ANON, MAP_FAILED; MAP_FAILED,
MAP_PRIVATE,
PROT_READ,
PROT_WRITE;
import core.sys.posix.unistd; import core.sys.posix.unistd;
extern(C) extern(C)

View File

@ -14,14 +14,14 @@
*/ */
module tanya.memory; module tanya.memory;
import core.exception;
import std.algorithm.iteration; import std.algorithm.iteration;
import std.algorithm.mutation; import std.algorithm.mutation;
import std.conv; import tanya.conv;
import tanya.exception;
public import tanya.memory.allocator; public import tanya.memory.allocator;
import tanya.memory.mmappool; import tanya.memory.mmappool;
import tanya.range.primitive;
import tanya.meta.trait; import tanya.meta.trait;
import tanya.range.primitive;
/** /**
* The mixin generates common methods for classes and structs using * The mixin generates common methods for classes and structs using
@ -141,21 +141,54 @@ body
* Returns the size in bytes of the state that needs to be allocated to hold an * Returns the size in bytes of the state that needs to be allocated to hold an
* object of type $(D_PARAM T). * object of type $(D_PARAM T).
* *
* There is a difference between the `.sizeof`-property and
* $(D_PSYMBOL stateSize) if $(D_PARAM T) is a class or an interface.
* `T.sizeof` is constant on the given architecture then and is the same as
* `size_t.sizeof` and `ptrdiff_t.sizeof`. This is because classes and
* interfaces are reference types and `.sizeof` returns the size of the
* reference which is the same as the size of a pointer. $(D_PSYMBOL stateSize)
* returns the size of the instance itself.
*
* The size of a dynamic array is `size_t.sizeof * 2` since a dynamic array
* stores its length and a data pointer. The size of the static arrays is
* calculated differently since they are value types. It is the array length
* multiplied by the element size.
*
* `stateSize!void` is `1` since $(D_KEYWORD void) is mostly used as a synonym
* for $(D_KEYWORD byte)/$(D_KEYWORD ubyte) in `void*`.
*
* Params: * Params:
* T = Object type. * T = Object type.
*
* Returns: Size of an instance of type $(D_PARAM T).
*/ */
template stateSize(T) template stateSize(T)
{ {
static if (is(T == class) || is(T == interface)) static if (isPolymorphicType!T)
{ {
enum stateSize = __traits(classInstanceSize, T); enum size_t stateSize = __traits(classInstanceSize, T);
} }
else else
{ {
enum stateSize = T.sizeof; enum size_t stateSize = T.sizeof;
} }
} }
///
@nogc nothrow pure @safe unittest
{
static assert(stateSize!int == 4);
static assert(stateSize!bool == 1);
static assert(stateSize!(int[]) == (size_t.sizeof * 2));
static assert(stateSize!(short[3]) == 6);
static struct Empty
{
}
static assert(stateSize!Empty == 1);
static assert(stateSize!void == 1);
}
/** /**
* Params: * Params:
* size = Raw size. * size = Raw size.
@ -196,14 +229,14 @@ package(tanya) T[] resize(T)(shared Allocator allocator,
} }
else else
{ {
onOutOfMemoryErrorNoGC(); onOutOfMemoryError();
} }
} }
void[] buf = array; void[] buf = array;
if (!allocator.reallocate(buf, length * T.sizeof)) if (!allocator.reallocate(buf, length * T.sizeof))
{ {
onOutOfMemoryErrorNoGC(); onOutOfMemoryError();
} }
// Casting from void[] is unsafe, but we know we cast to the original type. // Casting from void[] is unsafe, but we know we cast to the original type.
array = cast(T[]) buf; array = cast(T[]) buf;
@ -420,9 +453,7 @@ body
{ {
() @trusted { allocator.deallocate(mem); }(); () @trusted { allocator.deallocate(mem); }();
} }
return emplace!T(mem[0 .. stateSize!T], args);
auto ptr = (() @trusted => (cast(T*) mem[0 .. stateSize!T].ptr))();
return emplace!T(ptr, args);
} }
/// ///

View File

@ -6,7 +6,13 @@
* Smart pointers. * Smart pointers.
* *
* A smart pointer is an object that wraps a raw pointer or a reference * A smart pointer is an object that wraps a raw pointer or a reference
* (class, array) to manage its lifetime. * (class, dynamic array) to manage its lifetime.
*
* This module provides two kinds of lifetime management strategies:
* $(UL
* $(LI Reference counting)
* $(LI Unique ownership)
* )
* *
* Copyright: Eugene Wissner 2016-2017. * Copyright: Eugene Wissner 2016-2017.
* License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/, * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
@ -17,17 +23,17 @@
*/ */
module tanya.memory.smartref; module tanya.memory.smartref;
import core.exception;
import std.algorithm.comparison; import std.algorithm.comparison;
import std.algorithm.mutation; import std.algorithm.mutation;
import std.conv; import tanya.conv;
import tanya.exception;
import tanya.memory; import tanya.memory;
import tanya.meta.trait; import tanya.meta.trait;
import tanya.range.primitive; import tanya.range.primitive;
private template Payload(T) private template Payload(T)
{ {
static if (is(T == class) || is(T == interface) || isArray!T) static if (isPolymorphicType!T || isArray!T)
{ {
alias Payload = T; alias Payload = T;
} }
@ -202,13 +208,6 @@ struct RefCounted(T)
return this; return this;
} }
private @nogc unittest
{
auto rc = defaultAllocator.refCounted!int(5);
rc = defaultAllocator.make!int(7);
assert(*rc == 7);
}
/// ditto /// ditto
ref typeof(this) opAssign(typeof(null)) ref typeof(this) opAssign(typeof(null))
{ {
@ -229,14 +228,6 @@ struct RefCounted(T)
return this; return this;
} }
private @nogc unittest
{
RefCounted!int rc;
assert(!rc.isInitialized);
rc = null;
assert(!rc.isInitialized);
}
/// ditto /// ditto
ref typeof(this) opAssign(typeof(this) rhs) ref typeof(this) opAssign(typeof(this) rhs)
{ {
@ -308,7 +299,7 @@ struct RefCounted(T)
} }
/// ///
unittest @nogc @system unittest
{ {
auto rc = RefCounted!int(defaultAllocator.make!int(5), defaultAllocator); auto rc = RefCounted!int(defaultAllocator.make!int(5), defaultAllocator);
auto val = rc.get(); auto val = rc.get();
@ -324,7 +315,22 @@ unittest
assert(*rc.storage.payload == 9); assert(*rc.storage.payload == 9);
} }
private @nogc unittest @nogc @system unittest
{
auto rc = defaultAllocator.refCounted!int(5);
rc = defaultAllocator.make!int(7);
assert(*rc == 7);
}
@nogc @system unittest
{
RefCounted!int rc;
assert(!rc.isInitialized);
rc = null;
assert(!rc.isInitialized);
}
@nogc @system unittest
{ {
auto rc = defaultAllocator.refCounted!int(5); auto rc = defaultAllocator.refCounted!int(5);
@ -340,7 +346,7 @@ private @nogc unittest
assert(*rc == 5); assert(*rc == 5);
} }
private @nogc unittest @nogc @system unittest
{ {
RefCounted!int rc; RefCounted!int rc;
@ -355,7 +361,7 @@ private @nogc unittest
assert(rc.count == 0); assert(rc.count == 0);
} }
private unittest @nogc @system unittest
{ {
RefCounted!int rc1, rc2; RefCounted!int rc1, rc2;
static assert(is(typeof(rc1 = rc2))); static assert(is(typeof(rc1 = rc2)));
@ -389,7 +395,7 @@ version (unittest)
} }
} }
private @nogc unittest @nogc @system unittest
{ {
uint destroyed; uint destroyed;
auto a = defaultAllocator.make!A(destroyed); auto a = defaultAllocator.make!A(destroyed);
@ -399,7 +405,7 @@ private @nogc unittest
auto rc = RefCounted!A(a, defaultAllocator); auto rc = RefCounted!A(a, defaultAllocator);
assert(rc.count == 1); assert(rc.count == 1);
void func(RefCounted!A rc) @nogc void func(RefCounted!A rc) @nogc @system
{ {
assert(rc.count == 2); assert(rc.count == 2);
} }
@ -415,14 +421,14 @@ private @nogc unittest
assert(rc.count == 1); assert(rc.count == 1);
} }
private @nogc unittest @nogc @system unittest
{ {
auto rc = RefCounted!int(defaultAllocator); auto rc = RefCounted!int(defaultAllocator);
assert(!rc.isInitialized); assert(!rc.isInitialized);
assert(rc.allocator is defaultAllocator); assert(rc.allocator is defaultAllocator);
} }
private @nogc unittest @nogc @system unittest
{ {
auto rc = defaultAllocator.refCounted!int(5); auto rc = defaultAllocator.refCounted!int(5);
assert(rc.count == 1); assert(rc.count == 1);
@ -444,7 +450,7 @@ private @nogc unittest
assert(rc.count == 0); assert(rc.count == 0);
} }
private unittest @nogc @system unittest
{ {
auto rc = defaultAllocator.refCounted!int(5); auto rc = defaultAllocator.refCounted!int(5);
assert(*rc == 5); assert(*rc == 5);
@ -460,7 +466,7 @@ private unittest
assert(*rc == 5); assert(*rc == 5);
} }
private unittest @nogc nothrow pure @safe unittest
{ {
static assert(is(typeof(RefCounted!int.storage.payload) == int*)); static assert(is(typeof(RefCounted!int.storage.payload) == int*));
static assert(is(typeof(RefCounted!A.storage.payload) == A)); static assert(is(typeof(RefCounted!A.storage.payload) == A));
@ -511,17 +517,9 @@ body
{ {
() @trusted { allocator.deallocate(mem); }(); () @trusted { allocator.deallocate(mem); }();
} }
rc.storage = emplace!((RefCounted!T.Storage))(mem[0 .. storageSize]); rc.storage = emplace!(RefCounted!T.Storage)(mem[0 .. storageSize]);
rc.storage.payload = emplace!T(mem[storageSize .. $], args);
static if (is(T == class))
{
rc.storage.payload = emplace!T(mem[storageSize .. $], args);
}
else
{
auto ptr = (() @trusted => (cast(T*) mem[storageSize .. $].ptr))();
rc.storage.payload = emplace!T(ptr, args);
}
rc.deleter = &unifiedDeleter!(Payload!T); rc.deleter = &unifiedDeleter!(Payload!T);
return rc; return rc;
} }
@ -554,7 +552,7 @@ body
} }
/// ///
unittest @nogc @system unittest
{ {
auto rc = defaultAllocator.refCounted!int(5); auto rc = defaultAllocator.refCounted!int(5);
assert(rc.count == 1); assert(rc.count == 1);
@ -575,7 +573,7 @@ unittest
assert(rc.count == 1); assert(rc.count == 1);
} }
private @nogc unittest @nogc @system unittest
{ {
struct E struct E
{ {
@ -597,13 +595,13 @@ private @nogc unittest
} }
} }
private @nogc unittest @nogc @system unittest
{ {
auto rc = defaultAllocator.refCounted!(int[])(5); auto rc = defaultAllocator.refCounted!(int[])(5);
assert(rc.length == 5); assert(rc.length == 5);
} }
private @nogc unittest @nogc @system unittest
{ {
auto p1 = defaultAllocator.make!int(5); auto p1 = defaultAllocator.make!int(5);
auto p2 = p1; auto p2 = p1;
@ -611,13 +609,13 @@ private @nogc unittest
assert(rc.get() is p2); assert(rc.get() is p2);
} }
private @nogc unittest @nogc @system unittest
{ {
static bool destroyed = false; static bool destroyed = false;
struct F static struct F
{ {
~this() @nogc ~this() @nogc nothrow @safe
{ {
destroyed = true; destroyed = true;
} }
@ -723,7 +721,7 @@ struct Unique(T)
} }
/// ///
@nogc unittest @nogc nothrow pure @system unittest
{ {
auto rc = defaultAllocator.unique!int(5); auto rc = defaultAllocator.unique!int(5);
rc = defaultAllocator.make!int(7); rc = defaultAllocator.make!int(7);
@ -770,7 +768,7 @@ struct Unique(T)
} }
/// ///
@nogc unittest @nogc nothrow pure @system unittest
{ {
Unique!int u; Unique!int u;
assert(!u.isInitialized); assert(!u.isInitialized);
@ -789,7 +787,7 @@ struct Unique(T)
} }
/// ///
@nogc unittest @nogc nothrow pure @system unittest
{ {
auto u = defaultAllocator.unique!int(5); auto u = defaultAllocator.unique!int(5);
assert(u.isInitialized); assert(u.isInitialized);
@ -804,7 +802,7 @@ struct Unique(T)
} }
/// ///
@nogc unittest @nogc nothrow pure @system unittest
{ {
auto p = defaultAllocator.make!int(5); auto p = defaultAllocator.make!int(5);
auto s = Unique!int(p, defaultAllocator); auto s = Unique!int(p, defaultAllocator);
@ -812,13 +810,13 @@ struct Unique(T)
} }
/// ///
@nogc unittest @nogc nothrow @system unittest
{ {
static bool destroyed = false; static bool destroyed = false;
struct F static struct F
{ {
~this() @nogc ~this() @nogc nothrow @safe
{ {
destroyed = true; destroyed = true;
} }
@ -885,13 +883,13 @@ body
return Unique!T(payload, allocator); return Unique!T(payload, allocator);
} }
private unittest @nogc nothrow pure @safe unittest
{ {
static assert(is(typeof(defaultAllocator.unique!B(5)))); static assert(is(typeof(defaultAllocator.unique!B(5))));
static assert(is(typeof(defaultAllocator.unique!(int[])(5)))); static assert(is(typeof(defaultAllocator.unique!(int[])(5))));
} }
private unittest @nogc nothrow pure @system unittest
{ {
auto s = defaultAllocator.unique!int(5); auto s = defaultAllocator.unique!int(5);
assert(*s == 5); assert(*s == 5);
@ -900,7 +898,7 @@ private unittest
assert(s is null); assert(s is null);
} }
private unittest @nogc nothrow pure @system unittest
{ {
auto s = defaultAllocator.unique!int(5); auto s = defaultAllocator.unique!int(5);
assert(*s == 5); assert(*s == 5);
@ -909,7 +907,7 @@ private unittest
assert(*s == 4); assert(*s == 4);
} }
private @nogc unittest @nogc nothrow pure @system unittest
{ {
auto p1 = defaultAllocator.make!int(5); auto p1 = defaultAllocator.make!int(5);
auto p2 = p1; auto p2 = p1;
@ -918,7 +916,7 @@ private @nogc unittest
assert(rc.get() is p2); assert(rc.get() is p2);
} }
private @nogc unittest @nogc nothrow pure @system unittest
{ {
auto rc = Unique!int(defaultAllocator); auto rc = Unique!int(defaultAllocator);
assert(rc.allocator is defaultAllocator); assert(rc.allocator is defaultAllocator);

View File

@ -19,6 +19,7 @@
module tanya.meta.metafunction; module tanya.meta.metafunction;
import tanya.meta.trait; import tanya.meta.trait;
import tanya.meta.transform;
/** /**
* Finds the minimum value in $(D_PARAM Args) according to $(D_PARAM pred). * Finds the minimum value in $(D_PARAM Args) according to $(D_PARAM pred).
@ -60,7 +61,7 @@ if (Args.length > 0 && isTemplate!pred)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
enum bool cmp(alias T, alias U) = T < U; enum bool cmp(alias T, alias U) = T < U;
static assert(Min!(cmp, 8, 4, 5, 3, 13) == 3); static assert(Min!(cmp, 8, 4, 5, 3, 13) == 3);
@ -107,7 +108,7 @@ if (Args.length > 0 && isTemplate!pred)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
enum bool cmp(alias T, alias U) = T < U; enum bool cmp(alias T, alias U) = T < U;
static assert(Max!(cmp, 8, 4, 5, 3, 13) == 13); static assert(Max!(cmp, 8, 4, 5, 3, 13) == 13);
@ -179,7 +180,7 @@ if (Tuples.length > 0
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
alias Result1 = ZipWith!(AliasSeq, alias Result1 = ZipWith!(AliasSeq,
Tuple!(1, 2), Tuple!(1, 2),
@ -241,7 +242,7 @@ template Tuple(Args...)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
alias A = Tuple!(short); alias A = Tuple!(short);
alias B = Tuple!(3, 8, 9); alias B = Tuple!(3, 8, 9);
@ -279,7 +280,7 @@ template Set(Args...)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
alias S1 = Set!(int, 5, 5, int, 4); alias S1 = Set!(int, 5, 5, int, 4);
static assert(S1.length == 3); static assert(S1.length == 3);
@ -314,7 +315,7 @@ if (allSatisfy!(ApplyLeft!(isInstanceOf, Set), Sets))
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
alias S1 = Set!(2, 5, 8, 4); alias S1 = Set!(2, 5, 8, 4);
alias S2 = Set!(3, 8, 4, 1); alias S2 = Set!(3, 8, 4, 1);
@ -367,7 +368,7 @@ if (allSatisfy!(ApplyLeft!(isInstanceOf, Set), Sets))
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
alias S1 = Set!(2, 5, 8, 4); alias S1 = Set!(2, 5, 8, 4);
alias S2 = Set!(3, 8, 4, 1); alias S2 = Set!(3, 8, 4, 1);
@ -414,7 +415,7 @@ if (isInstanceOf!(Set, S1) && isInstanceOf!(Set, S2))
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
alias S1 = Set!(2, 5, 8, 4); alias S1 = Set!(2, 5, 8, 4);
alias S2 = Set!(3, 8, 4, 1); alias S2 = Set!(3, 8, 4, 1);
@ -457,7 +458,7 @@ if (Args.length == 2 && isTemplate!cmp)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
enum bool boolCmp(T, U) = T.sizeof < U.sizeof; enum bool boolCmp(T, U) = T.sizeof < U.sizeof;
static assert(isLessEqual!(boolCmp, byte, int)); static assert(isLessEqual!(boolCmp, byte, int));
@ -504,7 +505,7 @@ if (Args.length == 2 && isTemplate!cmp)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
enum bool boolCmp(T, U) = T.sizeof < U.sizeof; enum bool boolCmp(T, U) = T.sizeof < U.sizeof;
static assert(!isGreaterEqual!(boolCmp, byte, int)); static assert(!isGreaterEqual!(boolCmp, byte, int));
@ -551,7 +552,7 @@ if (Args.length == 2 && isTemplate!cmp)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
enum bool boolCmp(T, U) = T.sizeof < U.sizeof; enum bool boolCmp(T, U) = T.sizeof < U.sizeof;
static assert(isLess!(boolCmp, byte, int)); static assert(isLess!(boolCmp, byte, int));
@ -598,7 +599,7 @@ if (Args.length == 2 && isTemplate!cmp)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
enum bool boolCmp(T, U) = T.sizeof < U.sizeof; enum bool boolCmp(T, U) = T.sizeof < U.sizeof;
static assert(!isGreater!(boolCmp, byte, int)); static assert(!isGreater!(boolCmp, byte, int));
@ -643,7 +644,7 @@ if (Args.length == 2)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(isEqual!(int, int)); static assert(isEqual!(int, int));
static assert(isEqual!(8, 8)); static assert(isEqual!(8, 8));
@ -673,7 +674,7 @@ if (Args.length == 2)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(!isNotEqual!(int, int)); static assert(!isNotEqual!(int, int));
static assert(isNotEqual!(5, int)); static assert(isNotEqual!(5, int));
@ -692,7 +693,7 @@ pure nothrow @safe @nogc unittest
alias Instantiate(alias T, Args...) = T!Args; alias Instantiate(alias T, Args...) = T!Args;
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
template Template(T) template Template(T)
{ {
@ -707,38 +708,6 @@ pure nothrow @safe @nogc unittest
static assert(is(Instance2 == float)); static assert(is(Instance2 == float));
} }
version (TanyaPhobos)
{
public import std.meta : Alias,
AliasSeq,
aliasSeqOf,
Erase,
EraseAll,
Filter,
NoDuplicates,
DerivedToFront,
MostDerived,
Repeat,
Replace,
ReplaceAll,
Reverse,
Map = staticMap,
Sort = staticSort,
allSatisfy,
anySatisfy,
staticIndexOf,
templateAnd,
templateNot,
templateOr,
isSorted = staticIsSorted,
ApplyLeft,
ApplyRight;
}
else:
import tanya.meta.trait;
import tanya.meta.transform;
/** /**
* Creates an alias for $(D_PARAM T). * Creates an alias for $(D_PARAM T).
* *
@ -769,7 +738,7 @@ alias Alias(alias T) = T;
alias Alias(T) = T; alias Alias(T) = T;
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(is(Alias!int)); static assert(is(Alias!int));
@ -800,7 +769,7 @@ pure nothrow @safe @nogc unittest
alias AliasSeq(Args...) = Args; alias AliasSeq(Args...) = Args;
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(is(typeof({ alias T = AliasSeq!(short, 5); }))); static assert(is(typeof({ alias T = AliasSeq!(short, 5); })));
static assert(is(typeof({ alias T = AliasSeq!(int, short, 5); }))); static assert(is(typeof({ alias T = AliasSeq!(int, short, 5); })));
@ -848,7 +817,7 @@ if (isTemplate!F)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(allSatisfy!(isSigned, int, short, byte, long)); static assert(allSatisfy!(isSigned, int, short, byte, long));
static assert(!allSatisfy!(isUnsigned, uint, ushort, float, ulong)); static assert(!allSatisfy!(isUnsigned, uint, ushort, float, ulong));
@ -886,7 +855,7 @@ if (isTemplate!F)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(anySatisfy!(isSigned, int, short, byte, long)); static assert(anySatisfy!(isSigned, int, short, byte, long));
static assert(anySatisfy!(isUnsigned, uint, ushort, float, ulong)); static assert(anySatisfy!(isUnsigned, uint, ushort, float, ulong));
@ -916,8 +885,8 @@ if (Args.length > 0)
* `-1` is returned if $(D_PARAM T) is not found. * `-1` is returned if $(D_PARAM T) is not found.
* *
* Params: * Params:
* T = The type to search for. * T = The item to search for.
* L = Type list. * L = Symbol sequence.
* *
* Returns: The index of the first occurrence of $(D_PARAM T) in $(D_PARAM L). * Returns: The index of the first occurrence of $(D_PARAM T) in $(D_PARAM L).
*/ */
@ -933,7 +902,7 @@ template staticIndexOf(alias T, L...)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(staticIndexOf!(int) == -1); static assert(staticIndexOf!(int) == -1);
static assert(staticIndexOf!(int, int) == 0); static assert(staticIndexOf!(int, int) == 0);
@ -941,6 +910,37 @@ pure nothrow @safe @nogc unittest
static assert(staticIndexOf!(3, () {}, uint, 5, 3) == 3); static assert(staticIndexOf!(3, () {}, uint, 5, 3) == 3);
} }
/**
* Looks for $(D_PARAM T) in $(D_PARAM L) and returns $(D_KEYWORD true) if it
* could be found and $(D_KEYWORD false) otherwise.
*
* Params:
* T = The item to search for.
* L = Symbol sequence.
*
* Returns: $(D_KEYWORD true) if $(D_PARAM T) can be found in $(D_PARAM L),
* $(D_KEYWORD false) otherwise.
*/
template canFind(T, L...)
{
enum bool canFind = indexOf!(0, AliasSeq!(T, L)) != -1;
}
/// ditto
template canFind(alias T, L...)
{
enum bool canFind = indexOf!(0, AliasSeq!(T, L)) != -1;
}
///
@nogc nothrow pure @safe unittest
{
static assert(!canFind!(int));
static assert(canFind!(int, int));
static assert(canFind!(int, float, double, int, real));
static assert(canFind!(3, () {}, uint, 5, 3));
}
/** /**
* Combines multiple templates with logical AND. So $(D_PSYMBOL templateAnd) * Combines multiple templates with logical AND. So $(D_PSYMBOL templateAnd)
* evaluates to $(D_INLINECODE Preds[0] && Preds[1] && Preds[2]) and so on. * evaluates to $(D_INLINECODE Preds[0] && Preds[1] && Preds[2]) and so on.
@ -973,7 +973,7 @@ if (allSatisfy!(isTemplate, Preds))
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
alias isMutableInt = templateAnd!(isIntegral, isMutable); alias isMutableInt = templateAnd!(isIntegral, isMutable);
static assert(isMutableInt!int); static assert(isMutableInt!int);
@ -1021,7 +1021,7 @@ if (allSatisfy!(isTemplate, Preds))
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
alias isMutableOrInt = templateOr!(isIntegral, isMutable); alias isMutableOrInt = templateOr!(isIntegral, isMutable);
static assert(isMutableOrInt!int); static assert(isMutableOrInt!int);
@ -1051,7 +1051,7 @@ if (isTemplate!pred)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
alias isNotIntegral = templateNot!isIntegral; alias isNotIntegral = templateNot!isIntegral;
static assert(!isNotIntegral!int); static assert(!isNotIntegral!int);
@ -1095,7 +1095,7 @@ if (isTemplate!cmp)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
enum cmp(T, U) = T.sizeof < U.sizeof; enum cmp(T, U) = T.sizeof < U.sizeof;
static assert(isSorted!(cmp)); static assert(isSorted!(cmp));
@ -1104,7 +1104,7 @@ pure nothrow @safe @nogc unittest
static assert(!isSorted!(cmp, long, byte, ubyte, short, uint)); static assert(!isSorted!(cmp, long, byte, ubyte, short, uint));
} }
private pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
enum cmp(int x, int y) = x - y; enum cmp(int x, int y) = x - y;
static assert(isSorted!(cmp)); static assert(isSorted!(cmp));
@ -1116,7 +1116,7 @@ private pure nothrow @safe @nogc unittest
static assert(isSorted!(cmp, 32, 32)); static assert(isSorted!(cmp, 32, 32));
} }
private pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
enum cmp(int x, int y) = x < y; enum cmp(int x, int y) = x < y;
static assert(isSorted!(cmp)); static assert(isSorted!(cmp));
@ -1142,7 +1142,7 @@ template ApplyLeft(alias T, Args...)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
alias allAreIntegral = ApplyLeft!(allSatisfy, isIntegral); alias allAreIntegral = ApplyLeft!(allSatisfy, isIntegral);
static assert(allAreIntegral!(int, uint)); static assert(allAreIntegral!(int, uint));
@ -1163,7 +1163,7 @@ template ApplyRight(alias T, Args...)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
alias intIs = ApplyRight!(allSatisfy, int); alias intIs = ApplyRight!(allSatisfy, int);
static assert(intIs!(isIntegral)); static assert(intIs!(isIntegral));
@ -1191,7 +1191,7 @@ if (n > 0)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(is(Repeat!(1, uint, int) == AliasSeq!(uint, int))); static assert(is(Repeat!(1, uint, int) == AliasSeq!(uint, int)));
static assert(is(Repeat!(2, uint, int) == AliasSeq!(uint, int, uint, int))); static assert(is(Repeat!(2, uint, int) == AliasSeq!(uint, int, uint, int)));
@ -1249,7 +1249,7 @@ template Replace(alias T, alias U, L...)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(is(Replace!(int, uint, int) == AliasSeq!(uint))); static assert(is(Replace!(int, uint, int) == AliasSeq!(uint)));
static assert(is(Replace!(int, uint, short, int, int, ushort) static assert(is(Replace!(int, uint, short, int, int, ushort)
@ -1312,7 +1312,7 @@ template ReplaceAll(alias T, alias U, L...)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(is(ReplaceAll!(int, uint, int) == AliasSeq!(uint))); static assert(is(ReplaceAll!(int, uint, int) == AliasSeq!(uint)));
static assert(is(ReplaceAll!(int, uint, short, int, int, ushort) static assert(is(ReplaceAll!(int, uint, short, int, int, ushort)
@ -1340,7 +1340,7 @@ template Reverse(L...)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(is(Reverse!(byte, short, int) == AliasSeq!(int, short, byte))); static assert(is(Reverse!(byte, short, int) == AliasSeq!(int, short, byte)));
} }
@ -1368,7 +1368,7 @@ if (isTemplate!F)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(is(Map!(Unqual, const int, immutable short) static assert(is(Map!(Unqual, const int, immutable short)
== AliasSeq!(int, short))); == AliasSeq!(int, short)));
@ -1429,14 +1429,14 @@ if (isTemplate!cmp)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
enum cmp(T, U) = T.sizeof < U.sizeof; enum cmp(T, U) = T.sizeof < U.sizeof;
static assert(is(Sort!(cmp, long, short, byte, int) static assert(is(Sort!(cmp, long, short, byte, int)
== AliasSeq!(byte, short, int, long))); == AliasSeq!(byte, short, int, long)));
} }
private pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
enum cmp(int T, int U) = T - U; enum cmp(int T, int U) = T - U;
static assert(Sort!(cmp, 5, 17, 9, 12, 2, 10, 14) static assert(Sort!(cmp, 5, 17, 9, 12, 2, 10, 14)
@ -1460,7 +1460,7 @@ template DerivedToFront(L...)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
class A class A
{ {
@ -1501,7 +1501,7 @@ template MostDerived(T, L...)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
class A class A
{ {
@ -1554,7 +1554,7 @@ template Erase(alias T, L...)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(is(Erase!(int, short, int, int, uint) == AliasSeq!(short, int, uint))); static assert(is(Erase!(int, short, int, int, uint) == AliasSeq!(short, int, uint)));
static assert(is(Erase!(int, short, uint) == AliasSeq!(short, uint))); static assert(is(Erase!(int, short, uint) == AliasSeq!(short, uint)));
@ -1597,7 +1597,7 @@ template EraseAll(alias T, L...)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(is(EraseAll!(int, short, int, int, uint) == AliasSeq!(short, uint))); static assert(is(EraseAll!(int, short, int, int, uint) == AliasSeq!(short, uint)));
static assert(is(EraseAll!(int, short, uint) == AliasSeq!(short, uint))); static assert(is(EraseAll!(int, short, uint) == AliasSeq!(short, uint)));
@ -1632,7 +1632,7 @@ template Filter(alias pred, L...)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(is(Filter!(isIntegral, real, int, bool, uint) == AliasSeq!(int, uint))); static assert(is(Filter!(isIntegral, real, int, bool, uint) == AliasSeq!(int, uint)));
} }
@ -1659,7 +1659,7 @@ template NoDuplicates(L...)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
alias Types = AliasSeq!(int, uint, int, short, short, uint); alias Types = AliasSeq!(int, uint, int, short, short, uint);
static assert(is(NoDuplicates!Types == AliasSeq!(int, uint, short))); static assert(is(NoDuplicates!Types == AliasSeq!(int, uint, short)));
@ -1702,7 +1702,7 @@ template aliasSeqOf(alias range)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(aliasSeqOf!([0, 1, 2, 3]) == AliasSeq!(0, 1, 2, 3)); static assert(aliasSeqOf!([0, 1, 2, 3]) == AliasSeq!(0, 1, 2, 3));
} }
@ -1735,7 +1735,7 @@ if (n > 0)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(Stride!(3, 1, 2, 3, 4, 5, 6, 7, 8) == AliasSeq!(1, 4, 7)); static assert(Stride!(3, 1, 2, 3, 4, 5, 6, 7, 8) == AliasSeq!(1, 4, 7));
static assert(Stride!(2, 1, 2, 3) == AliasSeq!(1, 3)); static assert(Stride!(2, 1, 2, 3) == AliasSeq!(1, 3));
@ -1770,7 +1770,7 @@ if (T.length == 2)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(is(Select!(true, int, float) == int)); static assert(is(Select!(true, int, float) == int));
static assert(is(Select!(false, int, float) == float)); static assert(is(Select!(false, int, float) == float));

View File

@ -45,7 +45,7 @@ import tanya.meta.transform;
enum bool isWideString(T) = is(T : const dchar[]) && !isStaticArray!T; enum bool isWideString(T) = is(T : const dchar[]) && !isStaticArray!T;
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(isWideString!(dchar[])); static assert(isWideString!(dchar[]));
static assert(!isWideString!(char[])); static assert(!isWideString!(char[]));
@ -101,7 +101,7 @@ if (Args.length >= 1)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(is(Smallest!(int, ushort, uint, short) == ushort)); static assert(is(Smallest!(int, ushort, uint, short) == ushort));
static assert(is(Smallest!(short) == short)); static assert(is(Smallest!(short) == short));
@ -136,7 +136,7 @@ enum bool isComplex(T) = is(Unqual!(OriginalType!T) == cfloat)
|| is(Unqual!(OriginalType!T) == ireal); || is(Unqual!(OriginalType!T) == ireal);
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(isComplex!cfloat); static assert(isComplex!cfloat);
static assert(isComplex!ifloat); static assert(isComplex!ifloat);
@ -163,7 +163,7 @@ pure nothrow @safe @nogc unittest
enum bool isPOD(T) = __traits(isPOD, T); enum bool isPOD(T) = __traits(isPOD, T);
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
struct S1 struct S1
{ {
@ -199,7 +199,7 @@ pure nothrow @safe @nogc unittest
enum size_t sizeOf(T) = T.sizeof; enum size_t sizeOf(T) = T.sizeof;
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(sizeOf!(bool function()) == size_t.sizeof); static assert(sizeOf!(bool function()) == size_t.sizeof);
static assert(sizeOf!bool == 1); static assert(sizeOf!bool == 1);
@ -220,7 +220,7 @@ pure nothrow @safe @nogc unittest
enum size_t alignOf(T) = T.alignof; enum size_t alignOf(T) = T.alignof;
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(alignOf!bool == bool.alignof); static assert(alignOf!bool == bool.alignof);
static assert(is(typeof(alignOf!bool) == typeof(bool.alignof))); static assert(is(typeof(alignOf!bool) == typeof(bool.alignof)));
@ -243,7 +243,7 @@ if (Args.length == 2)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(isSame!("string", "string")); static assert(isSame!("string", "string"));
static assert(!isSame!(string, immutable(char)[])); static assert(!isSame!(string, immutable(char)[]));
@ -266,7 +266,7 @@ pure nothrow @safe @nogc unittest
enum bool isTemplate(alias T) = __traits(isTemplate, T); enum bool isTemplate(alias T) = __traits(isTemplate, T);
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
struct S(T) struct S(T)
{ {
@ -275,38 +275,37 @@ pure nothrow @safe @nogc unittest
static assert(!isTemplate!(S!int)); static assert(!isTemplate!(S!int));
} }
/** deprecated("Use is(T == interface) instead")
* Determine whether $(D_PARAM T) is an interface.
*
* Params:
* T = A type.
*
* Returns: $(D_KEYWORD true) if $(D_PARAM T) is an interface,
* $(D_KEYWORD false) otherwise.
*/
enum bool isInterface(T) = is(T == interface); enum bool isInterface(T) = is(T == interface);
/** deprecated("Use is(T == class) instead")
* Determine whether $(D_PARAM T) is a class.
*
* Params:
* T = A type.
*
* Returns: $(D_KEYWORD true) if $(D_PARAM T) is a class
* $(D_KEYWORD false) otherwise.
*/
enum bool isClass(T) = is(T == class); enum bool isClass(T) = is(T == class);
deprecated("Use is(T == struct) instead")
enum bool isStruct(T) = is(T == struct);
/** /**
* Determine whether $(D_PARAM T) is a struct. * Determines whether $(D_PARAM T) is a polymorphic type, i.e. a
* $(D_KEYWORD class) or an $(D_KEYWORD interface).
* *
* Params: * Params:
* T = A type. * T = A type.
* *
* Returns: $(D_KEYWORD true) if $(D_PARAM T) is a struct, * Returns: $(D_KEYWORD true) if $(D_PARAM T) is a $(D_KEYWORD class) or an
* $(D_KEYWORD false) otherwise. * $(D_KEYWORD interface), $(D_KEYWORD false) otherwise.
*/ */
enum bool isStruct(T) = is(T == struct); enum bool isPolymorphicType(T) = is(T == class) || is(T == interface);
///
@nogc nothrow pure @safe unittest
{
interface I
{
}
static assert(isPolymorphicType!Object);
static assert(isPolymorphicType!I);
static assert(!isPolymorphicType!short);
}
/** /**
* Params: * Params:
@ -339,7 +338,7 @@ template hasStaticMember(T, string member)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
struct S struct S
{ {
@ -360,70 +359,6 @@ pure nothrow @safe @nogc unittest
static assert(hasStaticMember!(S, "member5")); static assert(hasStaticMember!(S, "member5"));
} }
version (TanyaPhobos)
{
public import std.traits : isFloatingPoint,
isSigned,
isUnsigned,
isIntegral,
isNumeric,
isBoolean,
isSomeChar,
isScalarType,
isBasicType,
isPointer,
isArray,
isStaticArray,
isDynamicArray,
isAssociativeArray,
isBuiltinType,
isAggregateType,
getUDAs,
isNarrowString,
isSomeString,
mostNegative,
Largest,
isCopyable,
isAbstractClass,
isFinalClass,
isAbstractFunction,
isFinalFunction,
isFunctionPointer,
isDelegate,
isFunction,
isSomeFunction,
isCallable,
hasMember,
isMutable,
isNested,
isNestedFunction,
mangledName,
isInstanceOf,
isImplicitlyConvertible,
BaseTypeTuple,
TransitiveBaseTypeTuple,
BaseClassesTuple,
InterfacesTuple,
isAssignable,
TemplateArgsOf,
Parameters,
ParameterIdentifierTuple,
functionAttributes,
ParameterDefaults,
hasElaborateDestructor,
hasElaborateCopyConstructor,
hasElaborateAssign,
EnumMembers,
classInstanceAlignment,
ifTestable,
FunctionTypeOf,
ReturnType,
TemplateOf,
isTypeTuple,
isExpressions;
}
else:
/** /**
* Determines whether $(D_PARAM T) is a floating point type. * Determines whether $(D_PARAM T) is a floating point type.
* *
@ -445,7 +380,7 @@ enum bool isFloatingPoint(T) = is(Unqual!(OriginalType!T) == double)
|| is(Unqual!(OriginalType!T) == real); || is(Unqual!(OriginalType!T) == real);
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(isFloatingPoint!float); static assert(isFloatingPoint!float);
static assert(isFloatingPoint!double); static assert(isFloatingPoint!double);
@ -485,7 +420,7 @@ enum bool isSigned(T) = is(Unqual!(OriginalType!T) == byte)
|| isFloatingPoint!T; || isFloatingPoint!T;
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(isSigned!byte); static assert(isSigned!byte);
static assert(isSigned!short); static assert(isSigned!short);
@ -526,7 +461,7 @@ enum bool isUnsigned(T) = is(Unqual!(OriginalType!T) == ubyte)
|| is(Unqual!(OriginalType!T) == ulong); || is(Unqual!(OriginalType!T) == ulong);
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(isUnsigned!ubyte); static assert(isUnsigned!ubyte);
static assert(isUnsigned!ushort); static assert(isUnsigned!ushort);
@ -570,7 +505,7 @@ enum bool isIntegral(T) = isUnsigned!T
|| is(Unqual!(OriginalType!T) == long); || is(Unqual!(OriginalType!T) == long);
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(isIntegral!ubyte); static assert(isIntegral!ubyte);
static assert(isIntegral!byte); static assert(isIntegral!byte);
@ -594,7 +529,7 @@ pure nothrow @safe @nogc unittest
enum bool isNumeric(T) = isIntegral!T || isFloatingPoint!T || isComplex!T; enum bool isNumeric(T) = isIntegral!T || isFloatingPoint!T || isComplex!T;
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
alias F = float; alias F = float;
static assert(isNumeric!F); static assert(isNumeric!F);
@ -615,7 +550,7 @@ pure nothrow @safe @nogc unittest
enum bool isBoolean(T) = is(Unqual!(OriginalType!T) == bool); enum bool isBoolean(T) = is(Unqual!(OriginalType!T) == bool);
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(isBoolean!bool); static assert(isBoolean!bool);
static assert(isBoolean!(shared const bool)); static assert(isBoolean!(shared const bool));
@ -668,7 +603,7 @@ enum bool isSomeChar(T) = is(Unqual!(OriginalType!T) == char)
|| is(Unqual!(OriginalType!T) == dchar); || is(Unqual!(OriginalType!T) == dchar);
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(isSomeChar!char); static assert(isSomeChar!char);
static assert(isSomeChar!wchar); static assert(isSomeChar!wchar);
@ -700,7 +635,7 @@ pure nothrow @safe @nogc unittest
enum bool isScalarType(T) = isNumeric!T || isBoolean!T || isSomeChar!T; enum bool isScalarType(T) = isNumeric!T || isBoolean!T || isSomeChar!T;
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(isScalarType!int); static assert(isScalarType!int);
static assert(!isScalarType!(int[])); static assert(!isScalarType!(int[]));
@ -722,10 +657,14 @@ pure nothrow @safe @nogc unittest
enum bool isBasicType(T) = isScalarType!T || is(T : void); enum bool isBasicType(T) = isScalarType!T || is(T : void);
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
struct S; static struct S
class C; {
}
class C
{
}
enum E : int enum E : int
{ {
i = 0, i = 0,
@ -761,7 +700,7 @@ template isPointer(T)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(isPointer!(bool*)); static assert(isPointer!(bool*));
static assert(isPointer!(const bool*)); static assert(isPointer!(const bool*));
@ -794,7 +733,7 @@ template isArray(T)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(isArray!(bool[])); static assert(isArray!(bool[]));
static assert(isArray!(const bool[])); static assert(isArray!(const bool[]));
@ -828,7 +767,7 @@ template isStaticArray(T)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(isStaticArray!(bool[8])); static assert(isStaticArray!(bool[8]));
static assert(isStaticArray!(const bool[8])); static assert(isStaticArray!(const bool[8]));
@ -852,7 +791,7 @@ pure nothrow @safe @nogc unittest
enum bool isDynamicArray(T) = isArray!T && !isStaticArray!T; enum bool isDynamicArray(T) = isArray!T && !isStaticArray!T;
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(isDynamicArray!(bool[])); static assert(isDynamicArray!(bool[]));
static assert(isDynamicArray!(const bool[])); static assert(isDynamicArray!(const bool[]));
@ -886,7 +825,7 @@ template isAssociativeArray(T)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(isAssociativeArray!(bool[string])); static assert(isAssociativeArray!(bool[string]));
static assert(isAssociativeArray!(const bool[string])); static assert(isAssociativeArray!(const bool[string]));
@ -916,7 +855,7 @@ enum bool isBuiltinType(T) = isBasicType!T
|| isAssociativeArray!T; || isAssociativeArray!T;
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(isBuiltinType!int); static assert(isBuiltinType!int);
static assert(isBuiltinType!(int[])); static assert(isBuiltinType!(int[]));
@ -948,7 +887,7 @@ enum bool isAggregateType(T) = is(T == struct)
|| is(T == union); || is(T == union);
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
struct S; struct S;
class C; class C;
@ -990,7 +929,7 @@ enum bool isNarrowString(T) = (is(T : const char[]) || is (T : const wchar[]))
&& !isStaticArray!T; && !isStaticArray!T;
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(isNarrowString!(char[])); static assert(isNarrowString!(char[]));
static assert(isNarrowString!(wchar[])); static assert(isNarrowString!(wchar[]));
@ -1039,7 +978,7 @@ pure nothrow @safe @nogc unittest
enum bool isSomeString(T) = isNarrowString!T || isWideString!T; enum bool isSomeString(T) = isNarrowString!T || isWideString!T;
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(isSomeString!(dchar[])); static assert(isSomeString!(dchar[]));
static assert(isSomeString!(char[])); static assert(isSomeString!(char[]));
@ -1097,7 +1036,7 @@ template mostNegative(T)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(mostNegative!char == char.min); static assert(mostNegative!char == char.min);
static assert(mostNegative!wchar == wchar.min); static assert(mostNegative!wchar == wchar.min);
@ -1146,7 +1085,7 @@ if (Args.length >= 1)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(is(Largest!(int, short, uint) == int)); static assert(is(Largest!(int, short, uint) == int));
static assert(is(Largest!(short) == short)); static assert(is(Largest!(short) == short));
@ -1170,7 +1109,7 @@ pure nothrow @safe @nogc unittest
enum bool isCopyable(T) = is(typeof({ T s1 = T.init; T s2 = s1; })); enum bool isCopyable(T) = is(typeof({ T s1 = T.init; T s2 = s1; }));
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
struct S1 struct S1
{ {
@ -1219,7 +1158,7 @@ pure nothrow @safe @nogc unittest
enum bool isAbstractClass(T) = __traits(isAbstractClass, T); enum bool isAbstractClass(T) = __traits(isAbstractClass, T);
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
class A class A
{ {
@ -1262,17 +1201,27 @@ private enum bool isType(T) = true;
enum bool isTypeTuple(Args...) = allSatisfy!(isType, Args); enum bool isTypeTuple(Args...) = allSatisfy!(isType, Args);
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(isTypeTuple!(int, uint, Object)); static assert(isTypeTuple!(int, uint, Object));
static assert(isTypeTuple!()); static assert(isTypeTuple!());
static assert(!isTypeTuple!(int, 8, Object)); static assert(!isTypeTuple!(int, 8, Object));
static assert(!isTypeTuple!(5, 8, 2)); static assert(!isTypeTuple!(5, 8, 2));
class C; class C
enum E : bool; {
union U; }
struct T(); enum E : bool
{
t,
f,
}
union U
{
}
struct T()
{
}
static assert(isTypeTuple!C); static assert(isTypeTuple!C);
static assert(isTypeTuple!E); static assert(isTypeTuple!E);
@ -1325,7 +1274,7 @@ template isExpressions(Args...)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(isExpressions!(5, 8, 2)); static assert(isExpressions!(5, 8, 2));
static assert(isExpressions!()); static assert(isExpressions!());
@ -1352,7 +1301,7 @@ pure nothrow @safe @nogc unittest
enum bool isFinalClass(T) = __traits(isFinalClass, T); enum bool isFinalClass(T) = __traits(isFinalClass, T);
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
final class A final class A
{ {
@ -1379,7 +1328,7 @@ pure nothrow @safe @nogc unittest
enum bool isAbstractFunction(alias F) = __traits(isAbstractFunction, F); enum bool isAbstractFunction(alias F) = __traits(isAbstractFunction, F);
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
class A class A
{ {
@ -1416,7 +1365,7 @@ pure nothrow @safe @nogc unittest
enum bool isFinalFunction(alias F) = __traits(isFinalFunction, F); enum bool isFinalFunction(alias F) = __traits(isFinalFunction, F);
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
class A class A
{ {
@ -1464,7 +1413,7 @@ if (F.length == 1)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(isFunctionPointer!(void function())); static assert(isFunctionPointer!(void function()));
static assert(!isFunctionPointer!(void delegate())); static assert(!isFunctionPointer!(void delegate()));
@ -1521,7 +1470,7 @@ if (F.length == 1)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(isDelegate!(void delegate())); static assert(isDelegate!(void delegate()));
static assert(!isDelegate!(void function())); static assert(!isDelegate!(void function()));
@ -1582,7 +1531,7 @@ if (F.length == 1)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(!isFunction!(void function())); static assert(!isFunction!(void function()));
static assert(!isFunction!(() {})); static assert(!isFunction!(() {}));
@ -1631,7 +1580,7 @@ if (F.length == 1)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(isSomeFunction!(void function())); static assert(isSomeFunction!(void function()));
static assert(isSomeFunction!(() {})); static assert(isSomeFunction!(() {}));
@ -1678,7 +1627,7 @@ if (F.length == 1)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
struct S struct S
{ {
@ -1703,7 +1652,7 @@ pure nothrow @safe @nogc unittest
static assert(!isCallable!I); static assert(!isCallable!I);
} }
private pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
struct S struct S
{ {
@ -1728,7 +1677,7 @@ private pure nothrow @safe @nogc unittest
enum bool hasMember(T, string member) = __traits(hasMember, T, member); enum bool hasMember(T, string member) = __traits(hasMember, T, member);
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
struct S struct S
{ {
@ -1783,7 +1732,7 @@ template isMutable(T)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
struct S struct S
{ {
@ -1848,7 +1797,7 @@ pure nothrow @safe unittest
enum bool isNestedFunction(alias F) = __traits(isNested, F); enum bool isNestedFunction(alias F) = __traits(isNested, F);
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
void func() void func()
{ {
@ -1885,13 +1834,13 @@ if (isCallable!F)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(is(FunctionTypeOf!(void function()) == function)); static assert(is(FunctionTypeOf!(void function()) == function));
static assert(is(FunctionTypeOf!(() {}) == function)); static assert(is(FunctionTypeOf!(() {}) == function));
} }
private pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(is(FunctionTypeOf!(void delegate()) == function)); static assert(is(FunctionTypeOf!(void delegate()) == function));
@ -1934,7 +1883,7 @@ private pure nothrow @safe @nogc unittest
static assert(is(FunctionTypeOf!S == function)); static assert(is(FunctionTypeOf!S == function));
} }
private pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
struct S2 struct S2
{ {
@ -1968,7 +1917,7 @@ if (isCallable!F)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(is(ReturnType!(int delegate()) == int)); static assert(is(ReturnType!(int delegate()) == int));
static assert(is(ReturnType!(bool function()) == bool)); static assert(is(ReturnType!(bool function()) == bool));
@ -1985,7 +1934,7 @@ pure nothrow @safe @nogc unittest
alias TemplateOf(alias T : Base!Args, alias Base, Args...) = Base; alias TemplateOf(alias T : Base!Args, alias Base, Args...) = Base;
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
struct S(T) struct S(T)
{ {
@ -2041,7 +1990,7 @@ template isInstanceOf(alias T, alias I)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
struct S(T) struct S(T)
{ {
@ -2071,7 +2020,7 @@ pure nothrow @safe @nogc unittest
enum bool isImplicitlyConvertible(From, To) = is(From : To); enum bool isImplicitlyConvertible(From, To) = is(From : To);
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(isImplicitlyConvertible!(const(byte), byte)); static assert(isImplicitlyConvertible!(const(byte), byte));
static assert(isImplicitlyConvertible!(byte, char)); static assert(isImplicitlyConvertible!(byte, char));
@ -2107,7 +2056,7 @@ if (is(T == class) || (is(T == interface)))
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
interface I1 interface I1
{ {
@ -2164,7 +2113,7 @@ if (is(T == class) || is(T == interface))
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
interface I1 interface I1
{ {
@ -2214,7 +2163,7 @@ if (is(T == class))
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
interface I1 interface I1
{ {
@ -2250,7 +2199,7 @@ if (is(T == class) || is(T == interface))
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
interface I1 interface I1
{ {
@ -2300,7 +2249,7 @@ template isAssignable(Lhs, Rhs = Lhs)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
struct S1 struct S1
{ {
@ -2341,7 +2290,7 @@ pure nothrow @safe @nogc unittest
alias TemplateArgsOf(alias T : Base!Args, alias Base, Args...) = Args; alias TemplateArgsOf(alias T : Base!Args, alias Base, Args...) = Args;
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
template T(A, B) template T(A, B)
{ {
@ -2371,7 +2320,7 @@ if (isCallable!F)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
int func(Object, uint[]); int func(Object, uint[]);
static assert(is(Parameters!func == AliasSeq!(Object, uint[]))); static assert(is(Parameters!func == AliasSeq!(Object, uint[])));
@ -2392,7 +2341,7 @@ if (isCallable!F)
{ {
static if (is(FunctionTypeOf!F Params == __parameters)) static if (is(FunctionTypeOf!F Params == __parameters))
{ {
enum string[] Impl() string[] Impl()
{ {
string[] tuple; string[] tuple;
@ -2419,7 +2368,7 @@ if (isCallable!F)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
int func(ref Object stuff, uint[] = null, scope uint k = 1); int func(ref Object stuff, uint[] = null, scope uint k = 1);
alias P = ParameterIdentifierTuple!func; alias P = ParameterIdentifierTuple!func;
@ -2463,7 +2412,7 @@ enum FunctionAttribute : uint
template functionAttributes(F...) template functionAttributes(F...)
if (isCallable!F) if (isCallable!F)
{ {
enum uint Impl() uint Impl()
{ {
uint attrs = FunctionAttribute.none; uint attrs = FunctionAttribute.none;
foreach (a; __traits(getFunctionAttributes, F[0])) foreach (a; __traits(getFunctionAttributes, F[0]))
@ -2531,7 +2480,7 @@ if (isCallable!F)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
@property ref int func1() pure nothrow @safe @nogc shared scope; @property ref int func1() pure nothrow @safe @nogc shared scope;
static assert((functionAttributes!func1 & FunctionAttribute.pure_) static assert((functionAttributes!func1 & FunctionAttribute.pure_)
@ -2599,7 +2548,7 @@ if (isCallable!F)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
void func1(int k, uint b = 5, int[] = [1, 2]); void func1(int k, uint b = 5, int[] = [1, 2]);
alias Defaults = ParameterDefaults!func1; alias Defaults = ParameterDefaults!func1;
@ -2638,7 +2587,7 @@ template hasElaborateDestructor(T)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
class C class C
{ {
@ -2704,7 +2653,7 @@ template hasElaborateCopyConstructor(T)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(!hasElaborateCopyConstructor!int); static assert(!hasElaborateCopyConstructor!int);
@ -2766,7 +2715,7 @@ template hasElaborateAssign(T)
} }
} }
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(!hasElaborateAssign!int); static assert(!hasElaborateAssign!int);
@ -2866,7 +2815,7 @@ if (is(T == class))
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
class C1 class C1
{ {
@ -2909,7 +2858,7 @@ template ifTestable(T, alias pred = a => a)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(ifTestable!int); static assert(ifTestable!int);
@ -2983,7 +2932,7 @@ template getUDAs(alias symbol, alias attr)
alias getUDAs(alias symbol) = AliasSeq!(__traits(getAttributes, symbol)); alias getUDAs(alias symbol) = AliasSeq!(__traits(getAttributes, symbol));
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
struct Attr struct Attr
{ {
@ -3038,7 +2987,7 @@ template hasUDA(alias symbol, alias attr)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
struct Attr1 struct Attr1
{ {
@ -3050,3 +2999,59 @@ pure nothrow @safe @nogc unittest
static assert(hasUDA!(a, Attr1)); static assert(hasUDA!(a, Attr1));
static assert(!hasUDA!(a, Attr2)); static assert(!hasUDA!(a, Attr2));
} }
/**
* Tests whether $(D_PARAM T) is an inner class, i.e. a class nested inside
* another class.
*
* All inner classes get `outer` propery automatically generated, which points
* to its parent class, though it can be explicitly defined to be something
* different. If $(D_PARAM T) does this, $(D_PSYMBOL isInnerClass)
* evaluates to $(D_KEYWORD false).
*
* Params:
* T = Class to be tested.
*
* Returns $(D_KEYWORD true) if $(D_PARAM T) is an inner class,
* $(D_KEYWORD false) otherwise.
*/
template isInnerClass(T)
{
static if (is(T == class) && is(typeof(T.outer) == class))
{
enum bool isInnerClass = !canFind!("outer", __traits(allMembers, T));
}
else
{
enum bool isInnerClass = false;
}
}
///
@nogc nothrow pure @safe unittest
{
class A
{
}
class O
{
class I
{
}
class Fake
{
bool outer;
}
}
static assert(!isInnerClass!(O));
static assert(isInnerClass!(O.I));
static assert(!isInnerClass!(O.Fake));
}
@nogc nothrow pure @safe unittest
{
class RefCountedStore(T)
{
}
static assert(!isInnerClass!(RefCountedStore!int));
}

View File

@ -18,28 +18,6 @@
*/ */
module tanya.meta.transform; module tanya.meta.transform;
version (TanyaPhobos)
{
public import std.traits : Unqual,
OriginalType,
CopyConstness,
CopyTypeQualifiers,
Unsigned,
Signed,
PointerTarget,
KeyType,
ValueType,
Promoted,
InoutOf,
ConstOf,
SharedOf,
SharedInoutOf,
SharedConstOf,
ImmutableOf,
QualifierOf;
}
else:
import tanya.meta.trait; import tanya.meta.trait;
/** /**
@ -82,7 +60,7 @@ template Unqual(T)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(is(Unqual!bool == bool)); static assert(is(Unqual!bool == bool));
static assert(is(Unqual!(immutable bool) == bool)); static assert(is(Unqual!(immutable bool) == bool));
@ -117,7 +95,7 @@ template OriginalType(T)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
enum E1 : const(int) enum E1 : const(int)
{ {
@ -188,7 +166,7 @@ template CopyConstness(From, To)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(is(CopyConstness!(int, char) == char)); static assert(is(CopyConstness!(int, char) == char));
static assert(is(CopyConstness!(const int, char) == const char)); static assert(is(CopyConstness!(const int, char) == const char));
@ -267,7 +245,7 @@ template CopyTypeQualifiers(From, To)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(is(CopyTypeQualifiers!(int, char) == char)); static assert(is(CopyTypeQualifiers!(int, char) == char));
static assert(is(CopyTypeQualifiers!(const int, char) == const char)); static assert(is(CopyTypeQualifiers!(const int, char) == const char));
@ -319,7 +297,7 @@ if (isIntegral!T)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(is(Unsigned!byte == ubyte)); static assert(is(Unsigned!byte == ubyte));
static assert(is(Unsigned!short == ushort)); static assert(is(Unsigned!short == ushort));
@ -372,7 +350,7 @@ if (isIntegral!T)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(is(Signed!ubyte == byte)); static assert(is(Signed!ubyte == byte));
static assert(is(Signed!ushort == short)); static assert(is(Signed!ushort == short));
@ -408,7 +386,7 @@ template PointerTarget(T)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(is(PointerTarget!(bool*) == bool)); static assert(is(PointerTarget!(bool*) == bool));
static assert(is(PointerTarget!(const bool*) == const bool)); static assert(is(PointerTarget!(const bool*) == const bool));
@ -435,7 +413,7 @@ template KeyType(T)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(is(KeyType!(int[string]) == string)); static assert(is(KeyType!(int[string]) == string));
static assert(!is(KeyType!(int[15]))); static assert(!is(KeyType!(int[15])));
@ -460,7 +438,7 @@ template ValueType(T)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(is(ValueType!(int[string]) == int)); static assert(is(ValueType!(int[string]) == int));
static assert(!is(ValueType!(int[15]))); static assert(!is(ValueType!(int[15])));
@ -482,7 +460,7 @@ if (isScalarType!T)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(is(Promoted!bool == int)); static assert(is(Promoted!bool == int));
static assert(is(Promoted!byte == int)); static assert(is(Promoted!byte == int));
@ -508,7 +486,7 @@ pure nothrow @safe @nogc unittest
alias InoutOf(T) = inout(T); alias InoutOf(T) = inout(T);
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(is(InoutOf!int == inout int)); static assert(is(InoutOf!int == inout int));
} }
@ -524,7 +502,7 @@ pure nothrow @safe @nogc unittest
alias ConstOf(T) = const(T); alias ConstOf(T) = const(T);
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(is(ConstOf!int == const int)); static assert(is(ConstOf!int == const int));
} }
@ -540,7 +518,7 @@ pure nothrow @safe @nogc unittest
alias SharedOf(T) = shared(T); alias SharedOf(T) = shared(T);
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(is(SharedOf!int == shared int)); static assert(is(SharedOf!int == shared int));
} }
@ -556,7 +534,7 @@ pure nothrow @safe @nogc unittest
alias SharedInoutOf(T) = shared(inout T); alias SharedInoutOf(T) = shared(inout T);
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(is(SharedInoutOf!int == shared inout int)); static assert(is(SharedInoutOf!int == shared inout int));
} }
@ -572,7 +550,7 @@ pure nothrow @safe @nogc unittest
alias SharedConstOf(T) = shared(const T); alias SharedConstOf(T) = shared(const T);
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(is(SharedConstOf!int == shared const int)); static assert(is(SharedConstOf!int == shared const int));
} }
@ -588,7 +566,7 @@ pure nothrow @safe @nogc unittest
alias ImmutableOf(T) = immutable(T); alias ImmutableOf(T) = immutable(T);
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(is(ImmutableOf!int == immutable int)); static assert(is(ImmutableOf!int == immutable int));
} }
@ -604,7 +582,7 @@ pure nothrow @safe @nogc unittest
alias InoutConstOf(T) = inout(const T); alias InoutConstOf(T) = inout(const T);
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(is(InoutConstOf!int == inout const int)); static assert(is(InoutConstOf!int == inout const int));
} }
@ -620,7 +598,7 @@ pure nothrow @safe @nogc unittest
alias SharedInoutConstOf(T) = shared(inout const T); alias SharedInoutConstOf(T) = shared(inout const T);
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
static assert(is(SharedInoutConstOf!int == shared inout const int)); static assert(is(SharedInoutConstOf!int == shared inout const int));
} }
@ -675,7 +653,7 @@ template QualifierOf(T)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
alias MutableOf = QualifierOf!int; alias MutableOf = QualifierOf!int;
static assert(is(MutableOf!uint == uint)); static assert(is(MutableOf!uint == uint));
@ -729,7 +707,7 @@ if (isExpressions!T || isTemplate!T)
} }
/// ///
pure nothrow @safe @nogc unittest @nogc nothrow pure @safe unittest
{ {
struct S(T) struct S(T)
{ {

View File

@ -17,6 +17,11 @@ module tanya.net.uri;
import tanya.encoding.ascii; import tanya.encoding.ascii;
import tanya.memory; import tanya.memory;
version (unittest)
{
import tanya.test.assertion;
}
/** /**
* Thrown if an invalid URI was specified. * Thrown if an invalid URI was specified.
*/ */
@ -324,7 +329,7 @@ struct URL
} }
/// ///
@nogc unittest @nogc pure @system unittest
{ {
auto u = URL("example.org"); auto u = URL("example.org");
assert(u.path == "example.org"); assert(u.path == "example.org");
@ -377,7 +382,7 @@ struct URL
assert(u.fragment == "fragment"); assert(u.fragment == "fragment");
} }
private @nogc unittest @nogc pure @system unittest
{ {
auto u = URL("127.0.0.1"); auto u = URL("127.0.0.1");
assert(u.path == "127.0.0.1"); assert(u.path == "127.0.0.1");
@ -446,83 +451,17 @@ private @nogc unittest
assert(u.path == "h_tp:asdf"); assert(u.path == "h_tp:asdf");
} }
private @nogc unittest @nogc pure @system unittest
{ {
URIException exception; assertThrown!URIException(() => URL("http://:80"));
try assertThrown!URIException(() => URL(":80"));
{ assertThrown!URIException(() => URL("http://u1:p1@u2:p2@example.org"));
auto u = URL("http://:80"); assertThrown!URIException(() => URL("http://blah.com:port"));
} assertThrown!URIException(() => URL("http://blah.com:66000"));
catch (URIException e)
{
exception = e;
}
assert(exception !is null);
defaultAllocator.dispose(exception);
}
private @nogc unittest
{
URIException exception;
try
{
auto u = URL(":80");
}
catch (URIException e)
{
exception = e;
}
assert(exception !is null);
defaultAllocator.dispose(exception);
}
private @nogc unittest
{
URIException exception;
try
{
auto u = URL("http://user1:pass1@user2:pass2@example.org");
}
catch (URIException e)
{
exception = e;
}
assert(exception !is null);
defaultAllocator.dispose(exception);
}
private @nogc unittest
{
URIException exception;
try
{
auto u = URL("http://blah.com:port");
}
catch (URIException e)
{
exception = e;
}
assert(exception !is null);
defaultAllocator.dispose(exception);
}
private @nogc unittest
{
URIException exception;
try
{
auto u = URL("http://blah.com:66000");
}
catch (URIException e)
{
exception = e;
}
assert(exception !is null);
defaultAllocator.dispose(exception);
} }
// Issue 254: https://issues.caraus.io/issues/254. // Issue 254: https://issues.caraus.io/issues/254.
private @system @nogc unittest @nogc pure @system unittest
{ {
auto u = URL("ftp://"); auto u = URL("ftp://");
assert(u.scheme == "ftp"); assert(u.scheme == "ftp");
@ -554,13 +493,13 @@ if (T == "scheme"
} }
/// ditto /// ditto
URL parseURL(const char[] source) @nogc URL parseURL(const char[] source) @nogc pure
{ {
return URL(source); return URL(source);
} }
/// ///
@nogc unittest @nogc pure @system unittest
{ {
auto u = parseURL("http://example.org:5326"); auto u = parseURL("http://example.org:5326");
assert(u.scheme == parseURL!"scheme"("http://example.org:5326")); assert(u.scheme == parseURL!"scheme"("http://example.org:5326"));

View File

@ -17,7 +17,7 @@ module tanya.network.socket;
import core.stdc.errno; import core.stdc.errno;
import core.time; import core.time;
import std.algorithm.comparison; import std.algorithm.comparison;
public import std.socket : SocketOptionLevel, SocketOption; public import std.socket : SocketOption, SocketOptionLevel;
import std.traits; import std.traits;
import std.typecons; import std.typecons;
import tanya.memory; import tanya.memory;
@ -44,50 +44,50 @@ version (Posix)
} }
else version (Windows) else version (Windows)
{ {
import core.sys.windows.winbase : GetModuleHandle, import core.sys.windows.winbase : ERROR_IO_INCOMPLETE,
GetProcAddress,
ERROR_IO_PENDING, ERROR_IO_PENDING,
ERROR_IO_INCOMPLETE; GetModuleHandle,
import core.sys.windows.winsock2 : sockaddr, GetProcAddress;
import core.sys.windows.winsock2 : accept,
addrinfo,
bind,
closesocket,
FIONBIO,
freeaddrinfo, freeaddrinfo,
getaddrinfo, getaddrinfo,
SD_RECEIVE, getsockopt,
SD_SEND, ioctlsocket,
SD_BOTH, listen,
MSG_DONTROUTE,
MSG_OOB, MSG_OOB,
MSG_PEEK, MSG_PEEK,
MSG_DONTROUTE, recv,
socklen_t, SD_BOTH,
SD_RECEIVE,
SD_SEND,
send,
setsockopt,
shutdown,
SOCKADDR, SOCKADDR,
SOCKADDR_STORAGE, sockaddr,
addrinfo,
sockaddr_in, sockaddr_in,
sockaddr_in6, sockaddr_in6,
shutdown, SOCKADDR_STORAGE,
closesocket,
listen,
socket, socket,
bind, socklen_t,
accept,
WSAGetLastError,
recv,
send,
getsockopt,
setsockopt,
ioctlsocket,
FIONBIO,
SOL_SOCKET, SOL_SOCKET,
SO_TYPE; SO_TYPE,
WSAGetLastError;
import tanya.async.iocp; import tanya.async.iocp;
import tanya.sys.windows.error : EWOULDBLOCK = WSAEWOULDBLOCK, import tanya.sys.windows.def;
ECONNABORTED = WSAECONNABORTED, import tanya.sys.windows.error : ECONNABORTED = WSAECONNABORTED,
ENOBUFS = WSAENOBUFS, ENOBUFS = WSAENOBUFS,
EOPNOTSUPP = WSAEOPNOTSUPP, EOPNOTSUPP = WSAEOPNOTSUPP,
EPROTONOSUPPORT = WSAEPROTONOSUPPORT, EPROTONOSUPPORT = WSAEPROTONOSUPPORT,
EPROTOTYPE = WSAEPROTOTYPE, EPROTOTYPE = WSAEPROTOTYPE,
ESOCKTNOSUPPORT = WSAESOCKTNOSUPPORT,
ETIMEDOUT = WSAETIMEDOUT, ETIMEDOUT = WSAETIMEDOUT,
ESOCKTNOSUPPORT = WSAESOCKTNOSUPPORT; EWOULDBLOCK = WSAEWOULDBLOCK;
import tanya.sys.windows.def;
public import tanya.sys.windows.winbase; public import tanya.sys.windows.winbase;
public import tanya.sys.windows.winsock2; public import tanya.sys.windows.winsock2;
@ -1461,4 +1461,4 @@ private @property int lastError() nothrow @safe @nogc
{ {
return errno; return errno;
} }
} }

View File

@ -15,6 +15,7 @@
module tanya.range.primitive; module tanya.range.primitive;
import tanya.meta.trait; import tanya.meta.trait;
import tanya.meta.transform;
/** /**
* Returns the element type of the range $(D_PARAM R). * Returns the element type of the range $(D_PARAM R).
@ -287,18 +288,6 @@ pure nothrow @safe @nogc unittest
static assert(hasSlicing!D); static assert(hasSlicing!D);
} }
version (TanyaPhobos)
{
public import std.range.primitives : isInputRange,
isForwardRange,
isBidirectionalRange,
isRandomAccessRange,
isInfinite;
}
else:
import tanya.meta.transform;
version (unittest) version (unittest)
{ {
mixin template InputRangeStub() mixin template InputRangeStub()

View File

@ -0,0 +1,105 @@
/* 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/. */
/**
* Additional assertions.
*
* This module provides functions that assert whether a given expression
* satisfies some complex condition, that can't be tested with
* $(D_KEYWORD assert) in a single line. Internally all the functions
* just evaluate the expression and call $(D_KEYWORD assert).
*
* The functions can cause segmentation fault if the module is compiled
* in production mode and the condition fails.
*
* Copyright: Eugene Wissner 2017.
* License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
* Mozilla Public License, v. 2.0).
* Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
* Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/test/assertion.d,
* tanya/test/assertion.d)
*/
module tanya.test.assertion;
import tanya.memory;
import tanya.meta.trait;
/**
* Asserts whether the function $(D_PARAM expr) throws an exception of type
* $(D_PARAM E). If it does, the exception is catched and properly destroyed.
* If it doesn't, an assertion error is thrown. If the exception doesn't match
* $(D_PARAM E) type, it isn't catched and escapes.
*
* Params:
* E = Expected exception type.
* T = Throwing function type.
* Args = Argument types of the throwing function.
* expr = Throwing function.
* args = Arguments for $(D_PARAM expr).
*/
void assertThrown(E : Exception, T, Args...)(T expr, auto ref Args args)
if (isSomeFunction!T)
{
try
{
cast(void) expr(args);
assert(false, "Expected exception not thrown");
}
catch (E exception)
{
defaultAllocator.dispose(exception);
}
}
///
@nogc nothrow pure @safe unittest
{
// If you want to test that an expression throws, you can wrap it into an
// arrow function.
static struct CtorThrows
{
this(int i) @nogc pure @safe
{
throw defaultAllocator.make!Exception();
}
}
assertThrown!Exception(() => CtorThrows(8));
}
/**
* Asserts that the function $(D_PARAM expr) doesn't throw.
*
* If it does, the thrown exception is catched, properly destroyed and an
* assertion error is thrown instead.
*
* Params:
* T = Tested function type.
* Args = Argument types of $(D_PARAM expr).
* expr = Tested function.
* args = Arguments for $(D_PARAM expr).
*/
void assertNotThrown(T, Args...)(T expr, auto ref Args args)
if (isSomeFunction!T)
{
try
{
cast(void) expr(args);
}
catch (Exception exception)
{
defaultAllocator.dispose(exception);
assert(false, "Unexpected exception thrown");
}
}
///
@nogc nothrow pure @safe unittest
{
// If you want to test that an expression doesn't throw, you can wrap it
// into an arrow function.
static struct S
{
}
assertNotThrown(() => S());
}

View File

@ -0,0 +1,17 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/**
* Test suite for $(D_KEYWORD unittest)-blocks.
*
* Copyright: Eugene Wissner 2017.
* License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
* Mozilla Public License, v. 2.0).
* Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
* Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/test/package.d,
* tanya/test/package.d)
*/
module tanya.test;
public import tanya.test.assertion;