X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Console%2FParse.ih;h=9a62aa7e525dc1bc6fcb0fab23620b37367fe736;hb=fe92380af7b511d398290e4ab0c535025006b57b;hp=3c5a1fcfb8b0b3d534e62f61ad9e9016e0175a0b;hpb=d620e7ff9b68377ea20ca266c23cc3f05781868c;p=senf.git diff --git a/Console/Parse.ih b/Console/Parse.ih index 3c5a1fc..9a62aa7 100644 --- a/Console/Parse.ih +++ b/Console/Parse.ih @@ -42,6 +42,11 @@ namespace senf { namespace console { namespace detail { +#ifndef DOXYGEN + + /////////////////////////////////////////////////////////////////////////// + // append_a + struct append_action { template @@ -56,16 +61,15 @@ namespace detail { template inline boost::spirit::ref_value_actor append_a(T & ref) - { - return boost::spirit::ref_value_actor(ref); - } + { return boost::spirit::ref_value_actor(ref); } template inline boost::spirit::ref_const_ref_actor append_a(T & ref, Value const & value) - { - return boost::spirit::ref_const_ref_actor(ref, value); - } + { return boost::spirit::ref_const_ref_actor(ref, value); } + + /////////////////////////////////////////////////////////////////////////// + // Grammar template struct CommandGrammar : boost::spirit::grammar > @@ -126,7 +130,7 @@ namespace detail { { boost::spirit::rule command, path, argument, word, string, hexstring, token, punctuation, hexbyte, balanced_tokens, simple_argument, complex_argument, builtin, - skip, commands, block, statement; + skip, commands, block, statement, relpath, abspath; boost::spirit::chset<> special_p, punctuation_p, space_p, invalid_p, word_p; boost::spirit::distinct_parser<> keyword_p; @@ -136,7 +140,8 @@ namespace detail { special_p ("/(){};"), // Characters which are returned as punctuation tokens - punctuation_p (",="), + // (only allowed within '()') + punctuation_p (",=/{};"), // Whitespace characters space_p (" \t\n\r"), @@ -157,13 +162,50 @@ namespace detail { using namespace boost::spirit; typedef ParseDispatcher PD; + /////////////////////////////////////////////////////////////////// + // Spirit grammar + // + // Syntax summary: + // This is EBNF with some minor tweaks to accommodate C++ syntax + // + // * and + like EBNF but they precede their argument + // >> is followed by + // ! optional + // a % b match any number of a's separated by b + // a - b match a but not b + // + // Beside this, we use some special parsers (ch_p, eps_p, confix_p, lex_escape_ch_p, + // keyword_p, comment_p) and directives (lexeme_d), however, the parser should be + // quite readable. + // + // ch_p match character + // eps_p always matches nothing (to attach unconditional actions) + // confix_p(a,b,c) match b, preceded by a and terminated by c. Used to parse + // string literals and comments + // lex_escape_ch_p match a lex style escape char. This is like a C++ style + // literal string escape char, however \x will be replaced by 'x' + // for any char 'x' if it has no special meaning. + // keyword_p match a delimited keyword + // comment_p(a,b) match comment starting with a and terminated with b. b + // defaults to end-of-line + // + // lexeme_d don't skip whitespace (as defined by the skip parser) + // + // Aligned to the right at column 50 are semantic actions. + // + // For clarity, I have used 'ch_p' explicitly throughout even though it is optional + // in most cases. + // + // More info is in the Boost.Spirit documentation + commands = * command ; command - = builtin + = builtin >> (ch_p(';') | end_p) | path >> ( block | statement ) + | ch_p(';') // Ignore empty commands ; builtin @@ -171,11 +213,16 @@ namespace detail { >> path >> eps_p [ self.dispatch(&PD::builtin_cd, boost::ref(self.context.path)) ] - | keyword_p("ls") + | keyword_p("ls") >> ! path >> eps_p [ self.dispatch(&PD::builtin_ls, boost::ref(self.context.path)) ] | keyword_p("exit") [ self.dispatch(&PD::builtin_exit) ] + + | keyword_p("help") + >> ! path + >> eps_p [ self.dispatch(&PD::builtin_help, + boost::ref(self.context.path)) ] ; block @@ -232,12 +279,21 @@ namespace detail { path // Returns value in context.path = eps_p [ clear_a(self.context.path) ] - >> ( ! ch_p('/') [ push_back_a(self.context.path, "") ] ) - >> ( word [ push_back_a(self.context.path) ] + >> relpath | abspath + ; + + relpath + = ( word [ push_back_a(self.context.path) ] % ch_p('/') ) >> ( ! ch_p('/') [ push_back_a(self.context.path,"") ] ) ; + abspath + = ch_p('/') [ push_back_a(self.context.path, "") ] + >> ( relpath + | eps_p [ push_back_a(self.context.path, "") ] ) + ; + balanced_tokens = ch_p('(') [ self.dispatch(&PD::pushPunctuation, "(") ] >> * token @@ -269,6 +325,13 @@ namespace detail { = space_p | comment_p('#') ; + /////////////////////////////////////////////////////////////////// + + start_parsers( + commands, // CommandParser + skip // SkipParser + ); + BOOST_SPIRIT_DEBUG_TRACE_RULE(command,1); BOOST_SPIRIT_DEBUG_TRACE_RULE(path,1); BOOST_SPIRIT_DEBUG_TRACE_RULE(argument,1); @@ -282,16 +345,19 @@ namespace detail { BOOST_SPIRIT_DEBUG_TRACE_RULE(simple_argument,1); BOOST_SPIRIT_DEBUG_TRACE_RULE(complex_argument,1); BOOST_SPIRIT_DEBUG_TRACE_RULE(builtin,1); - - start_parsers( - commands, // CommandParser - skip // SkipParser - ); - + BOOST_SPIRIT_DEBUG_TRACE_RULE(commands,1); + BOOST_SPIRIT_DEBUG_TRACE_RULE(block,1); + BOOST_SPIRIT_DEBUG_TRACE_RULE(statement,1); + BOOST_SPIRIT_DEBUG_TRACE_RULE(relpath,1); + BOOST_SPIRIT_DEBUG_TRACE_RULE(abspath,1); } }; }; + + +#endif + }}} ///////////////////////////////ih.e////////////////////////////////////////