Skip to content

Add explicit return types in std.regex #5963

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dhasenan wants to merge 1 commit into from
Closed

Add explicit return types in std.regex #5963

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions std/regex/package.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ public alias StaticRegex = Regex;

Throws: $(D RegexException) if there were any errors during compilation.
+/
@trusted public auto regex(S)(S[] patterns, const(char)[] flags="")
@trusted public Regex!(BasicElementOf!S) regex(S)(S[] patterns, const(char)[] flags="")
if (isSomeString!(S))
{
import std.array : appender;
Expand Down Expand Up @@ -393,7 +393,7 @@ if (isSomeString!(S))
}

///ditto
@trusted public auto regex(S)(S pattern, const(char)[] flags="")
@trusted public Regex!(BasicElementOf!S) regex(S)(S pattern, const(char)[] flags="")
if (isSomeString!(S))
{
return regex([pattern], flags);
Expand All @@ -413,7 +413,7 @@ if (isSomeString!(S))
assert(m.front[1] == "12");
}

public auto regexImpl(S)(S pattern, const(char)[] flags="")
public Regex!(BasicElementOf!S) regexImpl(S)(S pattern, const(char)[] flags="")
if (isSomeString!(S))
{
import std.regex.internal.parser : Parser, CodeGen;
Expand Down Expand Up @@ -764,7 +764,7 @@ public:
assert(m.empty);
---
+/
@property auto front()
@property inout(Captures!R) front() inout
{
return _captures;
}
Expand Down Expand Up @@ -799,10 +799,10 @@ public:
T opCast(T:bool)(){ return !empty; }

/// Same as .front, provided for compatibility with original std.regex.
@property auto captures() inout { return _captures; }
@property inout(Captures!R) captures() inout { return _captures; }
}

private @trusted auto matchOnce(RegEx, R)(R input, const RegEx prog)
private @trusted Captures!R matchOnce(RegEx, R)(R input, const RegEx prog)
{
alias Char = BasicElementOf!R;
auto factory = prog.factory is null ? defaultFactory!Char(prog) : prog.factory;
Expand All @@ -813,7 +813,7 @@ private @trusted auto matchOnce(RegEx, R)(R input, const RegEx prog)
return captures;
}

private auto matchMany(RegEx, R)(R input, RegEx re) @safe
private RegexMatch!R matchMany(RegEx, R)(R input, RegEx re) @safe
{
return RegexMatch!R(input, re.withFlags(re.flags | RegexOption.global));
}
Expand Down Expand Up @@ -914,17 +914,17 @@ if (isSomeString!R && isRegexFor!(RegEx, R))
Returns: a $(D RegexMatch) object holding engine state after first match.
+/

public auto match(R, RegEx)(R input, RegEx re)
public RegexMatch!(Unqual!R) match(R, RegEx)(R input, RegEx re)
if (isSomeString!R && isRegexFor!(RegEx,R))
{
return RegexMatch!(Unqual!(typeof(input)))(input, re);
return RegexMatch!(Unqual!R)(input, re);
}

///ditto
public auto match(R, String)(R input, String re)
public RegexMatch!(Unqual!R) match(R, String)(R input, String re)
if (isSomeString!R && isSomeString!String)
{
return RegexMatch!(Unqual!(typeof(input)))(input, regex(re));
return RegexMatch!(Unqual!R)(input, regex(re));
}

/++
Expand All @@ -945,21 +945,21 @@ if (isSomeString!R && isSomeString!String)
$(LREF Captures) containing the extent of a match together with all submatches
if there was a match, otherwise an empty $(LREF Captures) object.
+/
public auto matchFirst(R, RegEx)(R input, RegEx re)
public RegexMatch!R matchFirst(R, RegEx)(R input, RegEx re)
if (isSomeString!R && isRegexFor!(RegEx, R))
{
return matchOnce(input, re);
}

///ditto
public auto matchFirst(R, String)(R input, String re)
public RegexMatch!R matchFirst(R, String)(R input, String re)
if (isSomeString!R && isSomeString!String)
{
return matchOnce(input, regex(re));
}

///ditto
public auto matchFirst(R, String)(R input, String[] re...)
public RegexMatch!R matchFirst(R, String)(R input, String[] re...)
if (isSomeString!R && isSomeString!String)
{
return matchOnce(input, regex(re));
Expand Down Expand Up @@ -1066,14 +1066,14 @@ if (isSomeString!R && isSomeString!String)
state after first match.

+/
public auto bmatch(R, RegEx)(R input, RegEx re)
public RegexMatch!(Unqual!R) bmatch(R, RegEx)(R input, RegEx re)
if (isSomeString!R && isRegexFor!(RegEx, R))
{
return RegexMatch!(Unqual!(typeof(input)))(input, re);
}

///ditto
public auto bmatch(R, String)(R input, String re)
public RegexMatch!(Unqual!R) bmatch(R, String)(R input, String re)
if (isSomeString!R && isSomeString!String)
{
return RegexMatch!(Unqual!(typeof(input)))(input, regex(re));
Expand Down