mirrors/phobos
1
0
Fork 0
mirror of https://github.com/dlang/phobos.git synced 2025-04-27 21:51:40 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

std.getopt: Make private functions safe.

Browse source
This commit is contained in:
Jon Degenhardt 2017-04-25 23:10:40 -07:00
parent 7db922f8a9
commit a976764d54
1 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
std/getopt.d
View file

@ -1080,7 +1080,7 @@ private struct configuration
} }
private bool optMatch(string arg, string optPattern, ref string value, private bool optMatch(string arg, string optPattern, ref string value,
configuration cfg) configuration cfg) @safe
{ {
import std.uni : toUpper; import std.uni : toUpper;
import std.string : indexOf; import std.string : indexOf;
@ -1140,7 +1140,7 @@ private bool optMatch(string arg, string optPattern, ref string value,
return false; return false;
} }
private void setConfig(ref configuration cfg, config option) private void setConfig(ref configuration cfg, config option) @safe
{ {
switch (option) switch (option)
{ {
@ -1341,6 +1341,16 @@ private void setConfig(ref configuration cfg, config option)
catch (MyEx ex) { assert(ex.option == "verbose" && ex.value == "2"); } catch (MyEx ex) { assert(ex.option == "verbose" && ex.value == "2"); }
} }
@safe unittest // @safe std.getopt.config option use
{
long x = 0;
string[] args = ["program", "--inc-x", "--inc-x"];
getopt(args,
std.getopt.config.caseSensitive,
"inc-x", "Add one to x", delegate void() { x++; });
assert(x == 2);
}
@system unittest @system unittest
{ {
// From bugzilla 2142 // From bugzilla 2142
@ -1774,9 +1784,9 @@ void defaultGetoptFormatter(Output)(Output output, string text, Option[] opt)
assert(flag); assert(flag);
} }
@system unittest // Delegates as callbacks @safe unittest // Delegates as callbacks
{ {
alias TwoArgOptionHandler = void delegate(string option, string value); alias TwoArgOptionHandler = void delegate(string option, string value) @safe;
TwoArgOptionHandler makeAddNHandler(ref long dest) TwoArgOptionHandler makeAddNHandler(ref long dest)
{ {