X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FParse.ih;h=baedd181448ad155798c903ff3ddb9c2869bd195;hb=4101c2b818ec67e7469ebb44f030eed2185c4ab0;hp=3af920fe1c39746e57637d2517264d9e1caa7e77;hpb=26610f603ebdd465307b9621f532c1fe19fd5571;p=senf.git diff --git a/senf/Utils/Console/Parse.ih b/senf/Utils/Console/Parse.ih index 3af920f..baedd18 100644 --- a/senf/Utils/Console/Parse.ih +++ b/senf/Utils/Console/Parse.ih @@ -1,6 +1,6 @@ // $Id$ // -// Copyright (C) 2008 +// Copyright (C) 2008 // Fraunhofer Institute for Open Communication Systems (FOKUS) // Competence Center NETwork research (NET), St. Augustin, GERMANY // Stefan Bund @@ -29,33 +29,48 @@ // Custom includes #include #include -#include -#include -#include -#include + +#if HAVE_BOOST_SPIRIT_INCLUDE_CLASSIC_HPP +# include +# include +# include +# include +#else +# include +# include +# include +# include +#endif + #include -///////////////////////////////ih.p//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// namespace senf { namespace console { namespace detail { +#if HAVE_BOOST_SPIRIT_INCLUDE_CLASSIC_HPP + namespace boost_spirit = ::boost::spirit::classic; +#else + namespace boost_spirit = ::boost::spirit; +#endif + #ifndef DOXYGEN - struct FilePositionWithIndex - : public boost::spirit::file_position + struct FilePositionWithIndex + : public boost_spirit::file_position { int index; - + FilePositionWithIndex(std::string const & file_ = std::string(), int line_ = 1, int column_ = 1, int index_ = 0) - : boost::spirit::file_position (file_, line_, column_), index (index_) + : boost_spirit::file_position (file_, line_, column_), index (index_) {} bool operator==(const FilePositionWithIndex & fp) const { - return boost::spirit::file_position::operator==(fp) && index == fp.index; + return boost_spirit::file_position::operator==(fp) && index == fp.index; } }; @@ -67,18 +82,18 @@ namespace detail { ::phoenix::function const positionOf; - /////////////////////////////////////////////////////////////////////////// + //-///////////////////////////////////////////////////////////////////////////////////////////// // Grammar template - struct CommandGrammar : boost::spirit::grammar > + struct CommandGrammar : boost_spirit::grammar > { - /////////////////////////////////////////////////////////////////////////// + //-///////////////////////////////////////////////////////////////////////////////////////// // Start rules enum { CommandParser, SkipParser, ArgumentsParser, PathParser }; - /////////////////////////////////////////////////////////////////////////// + //-///////////////////////////////////////////////////////////////////////////////////////// // The parse context (variables needed while parsing) typedef Token::TokenType TokenType; @@ -93,27 +108,27 @@ namespace detail { Context & context; - /////////////////////////////////////////////////////////////////////////// + //-///////////////////////////////////////////////////////////////////////////////////////// // Configuration bool incremental; - /////////////////////////////////////////////////////////////////////////// + //-///////////////////////////////////////////////////////////////////////////////////////// // Dispatching semantic actions ParseDispatcher & dispatcher; - ////////////////////////////////////////////////////////////////////////// + //-///////////////////////////////////////////////////////////////////////////////////////// // charachter sets - - static boost::spirit::chset<> special_p; - static boost::spirit::chset<> punctuation_p; - static boost::spirit::chset<> space_p; - static boost::spirit::chset<> invalid_p; - static boost::spirit::chset<> word_p; - static boost::spirit::distinct_parser<> keyword_p; - - /////////////////////////////////////////////////////////////////////////// + + static boost_spirit::chset<> special_p; + static boost_spirit::chset<> punctuation_p; + static boost_spirit::chset<> space_p; + static boost_spirit::chset<> invalid_p; + static boost_spirit::chset<> word_p; + static boost_spirit::distinct_parser<> keyword_p; + + //-///////////////////////////////////////////////////////////////////////////////////////// // Errors enum Errors { @@ -123,26 +138,26 @@ namespace detail { QuoteExpected }; - /////////////////////////////////////////////////////////////////////////// + //-///////////////////////////////////////////////////////////////////////////////////////// - CommandGrammar(ParseDispatcher & d, Context & c) + CommandGrammar(ParseDispatcher & d, Context & c) : context(c), incremental(false), dispatcher(d) {} template - struct definition - : public boost::spirit::grammar_def< boost::spirit::rule, - boost::spirit::rule, - boost::spirit::rule, - boost::spirit::rule > + struct definition + : public boost_spirit::grammar_def< boost_spirit::rule, + boost_spirit::rule, + 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) { - using namespace boost::spirit; + using namespace boost_spirit; using namespace ::phoenix; using namespace senf::phoenix; typedef ParseDispatcher PD; @@ -159,7 +174,7 @@ namespace detail { assertion closing_paren_expected (ClosingParenExpected); assertion quote_expected (QuoteExpected); - /////////////////////////////////////////////////////////////////// + //-///////////////////////////////////////////////////////////////////////////////// // Spirit grammar // // Syntax summary: @@ -176,7 +191,7 @@ namespace detail { // 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 @@ -197,7 +212,7 @@ namespace detail { // // More info is in the Boost.Spirit documentation - command + command = builtin >> end_of_statement_expected(statement_end) | group_close | ch_p(';') // Ignore empty commands @@ -207,14 +222,14 @@ namespace detail { statement = path_expected(path) [ bind(&PD::beginCommand)(d_, path_) ] >> arguments - >> end_of_statement_expected( + >> end_of_statement_expected( ( group_start | statement_end ) [ bind(&PD::endCommand)(d_) ] ) ; builtin - = self.keyword_p("cd") + = self.keyword_p("cd") >> path_expected(path) >> eps_p [ bind(&PD::builtin_cd)(d_, path_) ] | self.keyword_p("ls") @@ -248,24 +263,24 @@ namespace detail { = simple_argument [ bind(&PD::pushToken)(d_, token_) ] | balanced_tokens ; - + simple_argument // All these return their value in context.token = string | hexstring | word ; - + string // Returns value in context.token = eps_p [ pos_ = positionOf(arg1) ][ clear(str_) ] >> lexeme_d [ ch_p('"') - >> * ( ( lex_escape_ch_p[ ch_ = arg1 ] - - '"' + >> * ( ( lex_escape_ch_p[ ch_ = arg1 ] + - '"' ) [ str_ += ch_ ] ) >> quote_expected(ch_p('"')) - [ token_ = construct_(Token::BasicString, + [ token_ = construct_(Token::BasicString, str_, pos_) ] ] @@ -280,7 +295,7 @@ namespace detail { str_, pos_) ] ; - + opt_path = ! path [ bind(&PD::beginCommand)(d_, path_) ] [ bind(&PD::endCommand)(d_) ] @@ -292,18 +307,18 @@ namespace detail { ; relpath - = ( word [ push_back(path_, token_) ] - % ch_p('/') ) - >> ( ! ch_p('/') [ push_back(path_, construct_()) ] ) + = ( word_or_string [ push_back(path_, token_) ] + % +ch_p('/') ) + >> ( ! (+ch_p('/') ) [ push_back(path_, construct_()) ] ) ; abspath - = ch_p('/') [ push_back(path_, construct_()) ] + = (+ch_p('/')) [ push_back(path_, construct_()) ] >> ( relpath | eps_p [ push_back(path_, construct_()) ] ) ; - balanced_tokens + balanced_tokens = eps_p [ pos_ = positionOf(arg1) ] >> ch_p('(') [ token_ = construct_( Token::ArgumentGroupOpen, @@ -355,11 +370,16 @@ namespace detail { (+ self.word_p) [ str_ = construct_(arg1, arg2) ] ] >> eps_p [ token_ = construct_( - Token::Word, + Token::Word, str_, pos_) ] ; + word_or_string + = word + | string + ; + hexbyte = uint_parser() [ push_back(str_, arg1) ] @@ -370,7 +390,7 @@ namespace detail { ch_p(';') ] .else_p [ - ch_p(';') + ch_p(';') | end_p ] ; @@ -379,7 +399,7 @@ namespace detail { = self.space_p | comment_p('#') ; - /////////////////////////////////////////////////////////////////// + //-///////////////////////////////////////////////////////////////////////////////// start_parsers( command, // CommandParser @@ -410,24 +430,24 @@ namespace detail { }; }; - template boost::spirit::chset<> CommandGrammar::special_p ( + template boost_spirit::chset<> CommandGrammar::special_p ( "/(){};\""); - template boost::spirit::chset<> CommandGrammar::punctuation_p ( + template boost_spirit::chset<> CommandGrammar::punctuation_p ( ",="); - template boost::spirit::chset<> CommandGrammar::space_p ( + template boost_spirit::chset<> CommandGrammar::space_p ( " \t\n\r"); - template boost::spirit::chset<> CommandGrammar::invalid_p ( - (boost::spirit::chset<>('\0') | boost::spirit::chset<>("\x01-\x20")) - space_p ); - template boost::spirit::chset<> CommandGrammar::word_p ( - boost::spirit::anychar_p - special_p - punctuation_p - space_p - invalid_p); - template boost::spirit::distinct_parser<> CommandGrammar::keyword_p ( - word_p | boost::spirit::ch_p('/')); + template boost_spirit::chset<> CommandGrammar::invalid_p ( + (boost_spirit::chset<>('\0') | boost_spirit::chset<>("\x01-\x20")) - space_p ); + template boost_spirit::chset<> CommandGrammar::word_p ( + boost_spirit::anychar_p - special_p - punctuation_p - space_p - invalid_p); + template boost_spirit::distinct_parser<> CommandGrammar::keyword_p ( + word_p | boost_spirit::ch_p('/')); #endif }}} -///////////////////////////////ih.e//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// #endif