X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FParse.ih;h=fffaec286a94c94e1e77594f1bf8919e3a406087;hb=ecb47e13433d59c79a74a4641a2e68648f142723;hp=1fd7d2dbc9eec399c11522494070a1c96723fd03;hpb=463db052ea9d1c292bfd40301d0dc4963411485e;p=senf.git diff --git a/senf/Utils/Console/Parse.ih b/senf/Utils/Console/Parse.ih index 1fd7d2d..fffaec2 100644 --- a/senf/Utils/Console/Parse.ih +++ b/senf/Utils/Console/Parse.ih @@ -150,10 +150,10 @@ namespace detail { boost_spirit::rule, boost_spirit::rule > { - boost_spirit::rule command, path, argument, word, string, hexstring, token, - punctuation, hexbyte, balanced_tokens, simple_argument, complex_argument, builtin, - skip, statement, relpath, abspath, arguments, group_start, group_close, - statement_end, opt_path; + boost_spirit::rule command, path, argument, word, string, hexstring, + word_or_string, token, punctuation, hexbyte, balanced_tokens, simple_argument, + complex_argument, builtin, skip, statement, relpath, abspath, arguments, + group_start, group_close, statement_end, opt_path; definition(CommandGrammar const & self) { @@ -307,7 +307,7 @@ namespace detail { ; relpath - = ( word [ push_back(path_, token_) ] + = ( word_or_string [ push_back(path_, token_) ] % +ch_p('/') ) >> ( ! (+ch_p('/') ) [ push_back(path_, construct_()) ] ) ; @@ -375,6 +375,11 @@ namespace detail { pos_) ] ; + word_or_string + = word + | string + ; + hexbyte = uint_parser() [ push_back(str_, arg1) ]