Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
Actor Framework
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cpp-libs
Actor Framework
Commits
9a90d969
Commit
9a90d969
authored
Sep 09, 2014
by
Dominik Charousset
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix bug in options parser
parent
ab400a9f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
79 additions
and
82 deletions
+79
-82
libcaf_core/cppa/opt.hpp
libcaf_core/cppa/opt.hpp
+17
-28
libcaf_core/cppa/opt_impls.hpp
libcaf_core/cppa/opt_impls.hpp
+62
-54
No files found.
libcaf_core/cppa/opt.hpp
View file @
9a90d969
...
...
@@ -67,6 +67,10 @@ detail::add_arg_functor<T> add_arg(std::vector<T>& storage) {
return
{
storage
};
}
/**
* Right-hand side of a match expression for a program option
* reading a boolean flag.
*/
inline
std
::
function
<
void
()
>
set_flag
(
bool
&
storage
)
{
return
[
&
]
{
storage
=
true
;
};
}
...
...
@@ -98,8 +102,7 @@ using opt_rvalue_builder =
using
opt0_rvalue_builder
=
decltype
(
on
(
std
::
string
{})
||
on
(
std
::
string
{}));
/**
* Left-hand side of a match expression for a program option with
* one argument.
* Left-hand side of a match expression for a program option with one argument.
*/
inline
opt_rvalue_builder
on_opt1
(
char
short_opt
,
std
::
string
long_opt
,
...
...
@@ -115,22 +118,8 @@ inline opt_rvalue_builder on_opt1(char short_opt,
const
char
short_flag_arr
[]
=
{
'-'
,
short_opt
,
'\0'
};
const
char
*
lhs_str
=
short_flag_arr
;
std
::
string
prefix
=
"--"
;
prefix
+=
long_opt
;
prefix
+=
std
::
move
(
long_opt
)
;
prefix
+=
"="
;
std
::
function
<
optional
<
std
::
string
>
(
const
std
::
string
&
)
>
kvp
=
[
prefix
](
const
std
::
string
&
input
)
->
optional
<
std
::
string
>
{
if
(
std
::
equal
(
std
::
begin
(
prefix
),
std
::
end
(
prefix
),
std
::
begin
(
input
)))
{
return
input
.
substr
(
prefix
.
size
());
}
else
if
(
std
::
equal
(
std
::
begin
(
prefix
)
+
1
,
std
::
end
(
prefix
),
std
::
begin
(
input
)))
{
return
input
.
substr
(
prefix
.
size
()
-
1
);
}
return
none
;
};
std
::
vector
<
std
::
string
>
opts
;
opts
.
push_back
(
lhs_str
);
opts
.
push_back
(
"--"
+
long_opt
);
opts
.
push_back
(
"-"
+
long_opt
);
return
on
(
extract_longopt_arg
(
prefix
))
||
on
(
lhs_str
,
val
<
std
::
string
>
);
}
...
...
@@ -138,19 +127,19 @@ inline opt_rvalue_builder on_opt1(char short_opt,
* Left-hand side of a match expression for a program option with no argument.
*/
inline
opt0_rvalue_builder
on_opt0
(
char
short_opt
,
std
::
string
long_opt
,
options_description
*
desc
=
nullptr
,
std
::
string
help_text
=
""
,
std
::
string
help_group
=
"general options"
)
{
std
::
string
long_opt
,
options_description
*
desc
=
nullptr
,
std
::
string
help_text
=
""
,
std
::
string
help_group
=
"general options"
)
{
if
(
desc
)
{
option_info
oinf
{
help_text
,
0
};
(
*
desc
)[
help_group
].
insert
(
std
::
make_pair
(
std
::
make_pair
(
short_opt
,
long_opt
),
std
::
move
(
oinf
)));
(
*
desc
)[
help_group
].
insert
(
std
::
make_pair
(
std
::
make_pair
(
short_opt
,
long_opt
),
std
::
move
(
oinf
)));
}
const
char
short_flag_arr
[]
=
{
'-'
,
short_opt
,
'\0'
};
std
::
string
short_opt_string
=
short_flag_arr
;
return
on
(
long_opt
)
||
on
(
short_opt_string
);
return
on
(
"--"
+
long_opt
)
||
on
(
short_opt_string
);
}
/**
...
...
@@ -162,7 +151,7 @@ std::function<void()> print_desc(options_description* desc,
if
(
!
desc
)
return
;
if
(
desc
->
empty
())
{
out
<<
"please use '-h' or '--help' for a list "
"of available program options
\n
"
;
"of available program options
\n
"
;
}
for
(
auto
&
opt_group
:
*
desc
)
{
out
<<
opt_group
.
first
<<
":
\n
"
;
...
...
@@ -197,8 +186,8 @@ std::function<void()> print_desc(options_description* desc,
* and then calls `exit(exit_reason).
*/
inline
std
::
function
<
void
()
>
print_desc_and_exit
(
options_description
*
desc
,
std
::
ostream
&
out
=
std
::
cout
,
int
exit_reason
=
0
)
{
std
::
ostream
&
out
=
std
::
cout
,
int
exit_reason
=
0
)
{
auto
fun
=
print_desc
(
desc
,
out
);
return
[
=
]
{
fun
();
...
...
libcaf_core/cppa/opt_impls.hpp
View file @
9a90d969
...
...
@@ -49,89 +49,94 @@ struct conv_arg_impl<std::string> {
static
inline
result_type
_
(
const
std
::
string
&
arg
)
{
return
arg
;
}
};
template
<
bool
>
class
opt1_rvalue_builder
;
template
<
class
T
>
struct
conv_arg_impl
<
optional
<
T
>>
{
using
result_type
=
optional
<
T
>
;
static
inline
result_type
_
(
const
std
::
string
&
arg
)
{
return
conv_arg_impl
<
T
>::
_
(
arg
);
}
};
template
<
bool
>
class
opt1_rvalue_builder
;
template
<
class
T
>
struct
rd_arg_storage
:
ref_counted
{
T
&
storage
;
bool
set
;
std
::
string
arg_name
;
rd_arg_storage
(
T
&
r
)
:
storage
(
r
),
set
(
false
)
{
}
rd_arg_storage
(
T
&
r
)
:
storage
(
r
),
set
(
false
)
{
// nop
}
};
template
<
class
T
>
class
rd_arg_functor
{
template
<
bool
>
friend
class
opt1_rvalue_builder
;
public:
template
<
bool
>
friend
class
opt1_rvalue_builder
;
using
storage_type
=
rd_arg_storage
<
T
>
;
public:
rd_arg_functor
(
const
rd_arg_functor
&
)
=
default
;
rd_arg_functor
(
T
&
storage
)
:
m_storage
(
new
storage_type
(
storage
))
{
}
rd_arg_functor
(
T
&
storage
)
:
m_storage
(
new
storage_type
(
storage
))
{
// nop
}
bool
operator
()(
const
std
::
string
&
arg
)
const
{
if
(
m_storage
->
set
)
{
std
::
cerr
<<
"*** error: "
<<
m_storage
->
arg_name
<<
" previously set to "
<<
m_storage
->
storage
<<
std
::
endl
;
<<
" already defined"
<<
std
::
endl
;
return
false
;
}
else
{
auto
opt
=
conv_arg_impl
<
T
>::
_
(
arg
);
if
(
opt
)
{
m_storage
->
storage
=
*
opt
;
m_storage
->
set
=
true
;
return
true
;
}
else
{
std
::
cerr
<<
"*** error: cannot convert
\"
"
<<
arg
<<
"
\"
to "
<<
detail
::
demangle
(
typeid
(
T
).
name
())
<<
" [option:
\"
"
<<
m_storage
->
arg_name
<<
"
\"
]"
<<
std
::
endl
;
}
auto
opt
=
conv_arg_impl
<
T
>::
_
(
arg
);
if
(
!
opt
)
{
std
::
cerr
<<
"*** error: cannot convert
\"
"
<<
arg
<<
"
\"
to "
<<
detail
::
demangle
(
typeid
(
T
).
name
())
<<
" [option:
\"
"
<<
m_storage
->
arg_name
<<
"
\"
]"
<<
std
::
endl
;
return
false
;
}
return
false
;
m_storage
->
storage
=
*
opt
;
m_storage
->
set
=
true
;
return
true
;
}
private:
intrusive_ptr
<
storage_type
>
m_storage
;
};
template
<
class
T
>
class
add_arg_functor
{
template
<
bool
>
friend
class
opt1_rvalue_builder
;
public:
template
<
bool
>
friend
class
opt1_rvalue_builder
;
using
value_type
=
std
::
vector
<
T
>
;
using
storage_type
=
rd_arg_storage
<
value_type
>
;
add_arg_functor
(
const
add_arg_functor
&
)
=
default
;
add_arg_functor
(
value_type
&
storage
)
:
m_storage
(
new
storage_type
(
storage
))
{
}
add_arg_functor
(
value_type
&
storage
)
:
m_storage
(
new
storage_type
(
storage
))
{
// nop
}
bool
operator
()(
const
std
::
string
&
arg
)
const
{
auto
opt
=
conv_arg_impl
<
T
>::
_
(
arg
);
if
(
opt
)
{
m_storage
->
storage
.
push_back
(
*
opt
);
return
true
;
if
(
!
opt
)
{
std
::
cerr
<<
"*** error: cannot convert
\"
"
<<
arg
<<
"
\"
to "
<<
detail
::
demangle
(
typeid
(
T
))
<<
" [option:
\"
"
<<
m_storage
->
arg_name
<<
"
\"
]"
<<
std
::
endl
;
return
false
;
}
std
::
cerr
<<
"*** error: cannot convert
\"
"
<<
arg
<<
"
\"
to "
<<
detail
::
demangle
(
typeid
(
T
))
<<
" [option:
\"
"
<<
m_storage
->
arg_name
<<
"
\"
]"
<<
std
::
endl
;
return
false
;
m_storage
->
storage
.
push_back
(
*
opt
);
return
true
;
}
private:
intrusive_ptr
<
storage_type
>
m_storage
;
};
template
<
class
T
>
...
...
@@ -147,9 +152,7 @@ using opt0_rvalue_builder = decltype(on<std::string>());
template
<
bool
HasShortOpt
=
true
>
class
opt1_rvalue_builder
{
public:
using
left_type
=
decltype
(
on
<
std
::
string
,
std
::
string
>
());
using
right_type
=
...
...
@@ -157,45 +160,50 @@ class opt1_rvalue_builder {
template
<
class
Left
,
typename
Right
>
opt1_rvalue_builder
(
char
sopt
,
std
::
string
lopt
,
Left
&&
lhs
,
Right
&&
rhs
)
:
m_short
(
sopt
),
m_long
(
std
::
move
(
lopt
))
,
m_left
(
std
::
forward
<
Left
>
(
lhs
)),
m_right
(
std
::
forward
<
Right
>
(
rhs
))
{
}
:
m_short
(
sopt
),
m_long
(
std
::
move
(
lopt
)),
m_left
(
std
::
forward
<
Left
>
(
lhs
)),
m_right
(
std
::
forward
<
Right
>
(
rhs
))
{
// nop
}
template
<
class
Expr
>
auto
operator
>>
(
Expr
expr
)
->
decltype
((
*
(
static_cast
<
left_type
*>
(
nullptr
))
>>
expr
).
or_else
(
*
(
static_cast
<
right_type
*>
(
nullptr
))
>>
expr
))
const
{
*
(
static_cast
<
right_type
*>
(
nullptr
))
>>
expr
))
const
{
inject_arg_name
(
expr
);
return
(
m_left
>>
expr
).
or_else
(
m_right
>>
expr
);
}
private:
template
<
class
T
>
inline
void
inject_arg_name
(
rd_arg_functor
<
T
>&
expr
)
{
void
inject_arg_name
(
rd_arg_functor
<
T
>&
expr
)
{
expr
.
m_storage
->
arg_name
=
m_long
;
}
template
<
class
T
>
inline
void
inject_arg_name
(
const
T
&
)
{
}
void
inject_arg_name
(
const
T
&
)
{
// using opts without rd_arg() or similar functor
}
char
m_short
;
std
::
string
m_long
;
left_type
m_left
;
right_type
m_right
;
};
template
<
>
class
opt1_rvalue_builder
<
false
>
{
public:
using
sub_type
=
decltype
(
on
(
std
::
function
<
optional
<
std
::
string
>
(
const
std
::
string
&
)
>
()));
template
<
class
SubType
>
opt1_rvalue_builder
(
std
::
string
lopt
,
SubType
&&
sub
)
:
m_long
(
std
::
move
(
lopt
)),
m_sub
(
std
::
forward
<
SubType
>
(
sub
))
{
}
:
m_long
(
std
::
move
(
lopt
)),
m_sub
(
std
::
forward
<
SubType
>
(
sub
))
{
// nop
}
template
<
class
Expr
>
auto
operator
>>
(
Expr
expr
)
...
...
@@ -205,18 +213,18 @@ class opt1_rvalue_builder<false> {
}
private:
template
<
class
T
>
inline
void
inject_arg_name
(
rd_arg_functor
<
T
>&
expr
)
{
expr
.
m_storage
->
arg_name
=
m_long
;
}
template
<
class
T
>
inline
void
inject_arg_name
(
const
T
&
)
{
}
inline
void
inject_arg_name
(
const
T
&
)
{
// using opts without rd_arg() or similar functor
}
std
::
string
m_long
;
sub_type
m_sub
;
};
}
// namespace detail
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment