Skip to content

Commit

Permalink
@safety bags for utfMatchers
Browse files Browse the repository at this point in the history 
Granularity is horribly high. Auto-inference for templates has the
downside that it, leaves no explanations or reasons for failure.
  • Loading branch information
@DmitryOlshansky
DmitryOlshansky committed Mar 8, 2014
1 parent c264bd6 commit 1e771c0
Showing 1 changed file with 23 additions and 23 deletions.
46 changes: 23 additions & 23 deletions std/uni.d
View file
Expand Up @@ -4460,7 +4460,7 @@ public struct MatcherConcept
assert(false);
}
///
public unittest
@safe public unittest
{
string truth = "2² = 4";
auto m = utfMatcher!char(unicode.Number);
Expand Down Expand Up @@ -4496,7 +4496,7 @@ public struct MatcherConcept
}

///
public unittest
@safe public unittest
{
auto m = utfMatcher!char(unicode.Number);
string square = "2²";
Expand Down Expand Up @@ -4646,7 +4646,7 @@ template Utf8Matcher()
}
enum dispatch = genDispatch();

public bool match(Range)(ref Range inp) const pure
public bool match(Range)(ref Range inp) const pure @trusted
if(isRandomAccessRange!Range && is(ElementType!Range : char))
{
enum mode = Mode.skipOnMatch;
Expand All @@ -4661,7 +4661,7 @@ template Utf8Matcher()

static if(Sizes.length == 4) // can skip iff can detect all encodings
{
public bool skip(Range)(ref Range inp) const pure
public bool skip(Range)(ref Range inp) const pure @trusted
if(isRandomAccessRange!Range && is(ElementType!Range : char))
{
enum mode = Mode.alwaysSkip;
Expand All @@ -4675,7 +4675,7 @@ template Utf8Matcher()
}
}

public bool test(Range)(ref Range inp) const pure
public bool test(Range)(ref Range inp) const pure @trusted
if(isRandomAccessRange!Range && is(ElementType!Range : char))
{
enum mode = Mode.neverSkip;
Expand All @@ -4687,19 +4687,19 @@ template Utf8Matcher()
return mixin(dispatch);
}

bool match(C)(ref C[] str) const pure
bool match(C)(ref C[] str) const pure @trusted
if(isSomeChar!C)
{
return fwdStr!"match"(str);
}

bool skip(C)(ref C[] str) const pure
bool skip(C)(ref C[] str) const pure @trusted
if(isSomeChar!C)
{
return fwdStr!"skip"(str);
}

bool test(C)(ref C[] str) const pure
bool test(C)(ref C[] str) const pure @trusted
if(isSomeChar!C)
{
return fwdStr!"test"(str);
Expand All @@ -4720,12 +4720,12 @@ template Utf8Matcher()
//static disptach helper UTF size ==> table
alias tab(int i) = tables[i - 1];

public @property auto subMatcher(SizesToPick...)()
public @property auto subMatcher(SizesToPick...)() @trusted
{
return CherryPick!(Impl, SizesToPick)(&this);
}

bool lookup(int size, Mode mode, Range)(ref Range inp) const pure
bool lookup(int size, Mode mode, Range)(ref Range inp) const pure @trusted
{
import std.typecons;
if(inp.length < size)
Expand Down Expand Up @@ -4822,7 +4822,7 @@ template Utf16Matcher()
//sizeFlags, lookupUni and ascii
mixin template DefMatcher()
{
public bool match(Range)(ref Range inp) const pure
public bool match(Range)(ref Range inp) const pure @trusted
if(isRandomAccessRange!Range && is(ElementType!Range : wchar))
{
enum mode = Mode.skipOnMatch;
Expand All @@ -4837,7 +4837,7 @@ template Utf16Matcher()

static if(Sizes.length == 2)
{
public bool skip(Range)(ref Range inp) const pure
public bool skip(Range)(ref Range inp) const pure @trusted
if(isRandomAccessRange!Range && is(ElementType!Range : wchar))
{
enum mode = Mode.alwaysSkip;
Expand All @@ -4851,7 +4851,7 @@ template Utf16Matcher()
}
}

public bool test(Range)(ref Range inp) const pure
public bool test(Range)(ref Range inp) const pure @trusted
if(isRandomAccessRange!Range && is(ElementType!Range : wchar))
{
enum mode = Mode.neverSkip;
Expand All @@ -4863,19 +4863,19 @@ template Utf16Matcher()
return lookupUni!mode(inp);
}

bool match(C)(ref C[] str) const pure
bool match(C)(ref C[] str) const pure @trusted
if(isSomeChar!C)
{
return fwdStr!"match"(str);
}

bool skip(C)(ref C[] str) const pure
bool skip(C)(ref C[] str) const pure @trusted
if(isSomeChar!C)
{
return fwdStr!"skip"(str);
}

bool test(C)(ref C[] str) const pure
bool test(C)(ref C[] str) const pure @trusted
if(isSomeChar!C)
{
return fwdStr!"test"(str);
Expand Down Expand Up @@ -4906,7 +4906,7 @@ template Utf16Matcher()
}
mixin DefMatcher;

public @property auto subMatcher(SizesToPick...)()
public @property auto subMatcher(SizesToPick...)() @trusted
{
return CherryPick!(Impl, SizesToPick)(&this);
}
Expand Down Expand Up @@ -4976,12 +4976,12 @@ template Utf16Matcher()
}
}

private auto utf8Matcher(Set)(Set set)
private auto utf8Matcher(Set)(Set set) @trusted
{
return Utf8Matcher!().build(set);
}

private auto utf16Matcher(Set)(Set set)
private auto utf16Matcher(Set)(Set set) @trusted
{
return Utf16Matcher!().build(set);
}
Expand All @@ -4993,7 +4993,7 @@ private auto utf16Matcher(Set)(Set set)
See $(LREF MatcherConcept) for API outline.
*/
public auto utfMatcher(Char, Set)(Set set)
public auto utfMatcher(Char, Set)(Set set) @trusted
if(isCodepointSet!Set)
{
static if(is(Char : char))
Expand All @@ -5009,7 +5009,7 @@ public auto utfMatcher(Char, Set)(Set set)


//a range of code units, packed with index to speed up forward iteration
package auto decoder(C)(C[] s, size_t offset=0)
package auto decoder(C)(C[] s, size_t offset=0) @trusted
if(is(C : wchar) || is(C : char))
{
static struct Decoder
Expand Down Expand Up @@ -5062,7 +5062,7 @@ package auto units(C)(C[] s)
return Units(s);
}

unittest
@safe unittest
{
import std.range;
string rs = "hi! ﾈемног砀 текста";
Expand Down Expand Up @@ -5118,7 +5118,7 @@ unittest
assert(codec.idx == i);
}

unittest
@safe unittest
{
static bool testAll(Matcher, Range)(ref Matcher m, ref Range r)
{
Expand Down

0 comments on commit 1e771c0

Please sign in to comment.