// $Id$
//
-// Copyright (C) 2008
+// Copyright (C) 2008
// Fraunhofer Institute for Open Communication Systems (FOKUS)
// Competence Center NETwork research (NET), St. Augustin, GERMANY
// Stefan Bund <g0dil@berlios.de>
// Custom includes
#include <vector>
#include <senf/config.hh>
-#include <boost/spirit.hpp>
-#include <boost/spirit/utility/grammar_def.hpp>
-#include <boost/spirit/dynamic.hpp>
-#include <boost/spirit/phoenix.hpp>
+
+#if HAVE_BOOST_SPIRIT_INCLUDE_CLASSIC_HPP
+# include <boost/spirit/include/classic.hpp>
+# include <boost/spirit/include/classic_grammar_def.hpp>
+# include <boost/spirit/include/classic_dynamic.hpp>
+# include <boost/spirit/include/phoenix1.hpp>
+#else
+# include <boost/spirit.hpp>
+# include <boost/spirit/utility/grammar_def.hpp>
+# include <boost/spirit/dynamic.hpp>
+# include <boost/spirit/phoenix.hpp>
+#endif
+
#include <senf/Utils/Phoenix.hh>
-///////////////////////////////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;
}
};
::phoenix::function<PositionOf> const positionOf;
- ///////////////////////////////////////////////////////////////////////////
+ //-/////////////////////////////////////////////////////////////////////////////////////////////
// Grammar
template <class ParseDispatcher>
- struct CommandGrammar : boost::spirit::grammar<CommandGrammar<ParseDispatcher> >
+ struct CommandGrammar : boost_spirit::grammar<CommandGrammar<ParseDispatcher> >
{
- ///////////////////////////////////////////////////////////////////////////
+ //-/////////////////////////////////////////////////////////////////////////////////////////
// Start rules
enum { CommandParser, SkipParser, ArgumentsParser, PathParser };
- ///////////////////////////////////////////////////////////////////////////
+ //-/////////////////////////////////////////////////////////////////////////////////////////
// The parse context (variables needed while parsing)
typedef Token::TokenType TokenType;
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 {
QuoteExpected
};
- ///////////////////////////////////////////////////////////////////////////
+ //-/////////////////////////////////////////////////////////////////////////////////////////
- CommandGrammar(ParseDispatcher & d, Context & c)
+ CommandGrammar(ParseDispatcher & d, Context & c)
: context(c), incremental(false), dispatcher(d) {}
template <class Scanner>
- struct definition
- : public boost::spirit::grammar_def< boost::spirit::rule<Scanner>,
- boost::spirit::rule<Scanner>,
- boost::spirit::rule<Scanner>,
- boost::spirit::rule<Scanner> >
+ struct definition
+ : public boost_spirit::grammar_def< boost_spirit::rule<Scanner>,
+ boost_spirit::rule<Scanner>,
+ boost_spirit::rule<Scanner>,
+ boost_spirit::rule<Scanner> >
{
- boost::spirit::rule<Scanner> 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<Scanner> 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;
assertion<Errors> closing_paren_expected (ClosingParenExpected);
assertion<Errors> quote_expected (QuoteExpected);
- ///////////////////////////////////////////////////////////////////
+ //-/////////////////////////////////////////////////////////////////////////////////
// Spirit grammar
//
// Syntax summary:
// 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
//
// More info is in the Boost.Spirit documentation
- command
+ command
= builtin >> end_of_statement_expected(statement_end)
| group_close
| ch_p(';') // Ignore empty commands
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")
= 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>(Token::BasicString,
+ [ token_ = construct_<Token>(Token::BasicString,
str_,
pos_) ]
]
str_,
pos_) ]
;
-
+
opt_path
= ! path [ bind(&PD::beginCommand)(d_, path_) ]
[ bind(&PD::endCommand)(d_) ]
;
relpath
- = ( word [ push_back(path_, token_) ]
- % ch_p('/') )
- >> ( ! ch_p('/') [ push_back(path_, construct_<Token>()) ] )
+ = ( word_or_string [ push_back(path_, token_) ]
+ % +ch_p('/') )
+ >> ( ! (+ch_p('/') ) [ push_back(path_, construct_<Token>()) ] )
;
abspath
- = ch_p('/') [ push_back(path_, construct_<Token>()) ]
+ = (+ch_p('/')) [ push_back(path_, construct_<Token>()) ]
>> ( relpath
| eps_p [ push_back(path_, construct_<Token>()) ] )
;
- balanced_tokens
+ balanced_tokens
= eps_p [ pos_ = positionOf(arg1) ]
>> ch_p('(') [ token_ = construct_<Token>(
Token::ArgumentGroupOpen,
(+ self.word_p) [ str_ = construct_<std::string>(arg1, arg2) ]
]
>> eps_p [ token_ = construct_<Token>(
- Token::Word,
+ Token::Word,
str_,
pos_) ]
;
+ word_or_string
+ = word
+ | string
+ ;
+
hexbyte
= uint_parser<char, 16, 2, 2>()
[ push_back(str_, arg1) ]
ch_p(';')
]
.else_p [
- ch_p(';')
+ ch_p(';')
| end_p
]
;
= self.space_p | comment_p('#')
;
- ///////////////////////////////////////////////////////////////////
+ //-/////////////////////////////////////////////////////////////////////////////////
start_parsers(
command, // CommandParser
};
};
- template <class PD> boost::spirit::chset<> CommandGrammar<PD>::special_p (
+ template <class PD> boost_spirit::chset<> CommandGrammar<PD>::special_p (
"/(){};\"");
- template <class PD> boost::spirit::chset<> CommandGrammar<PD>::punctuation_p (
+ template <class PD> boost_spirit::chset<> CommandGrammar<PD>::punctuation_p (
",=");
- template <class PD> boost::spirit::chset<> CommandGrammar<PD>::space_p (
+ template <class PD> boost_spirit::chset<> CommandGrammar<PD>::space_p (
" \t\n\r");
- template <class PD> boost::spirit::chset<> CommandGrammar<PD>::invalid_p (
- (boost::spirit::chset<>('\0') | boost::spirit::chset<>("\x01-\x20")) - space_p );
- template <class PD> boost::spirit::chset<> CommandGrammar<PD>::word_p (
- boost::spirit::anychar_p - special_p - punctuation_p - space_p - invalid_p);
- template <class PD> boost::spirit::distinct_parser<> CommandGrammar<PD>::keyword_p (
- word_p | boost::spirit::ch_p('/'));
+ template <class PD> boost_spirit::chset<> CommandGrammar<PD>::invalid_p (
+ (boost_spirit::chset<>('\0') | boost_spirit::chset<>("\x01-\x20")) - space_p );
+ template <class PD> boost_spirit::chset<> CommandGrammar<PD>::word_p (
+ boost_spirit::anychar_p - special_p - punctuation_p - space_p - invalid_p);
+ template <class PD> boost_spirit::distinct_parser<> CommandGrammar<PD>::keyword_p (
+ word_p | boost_spirit::ch_p('/'));
#endif
}}}
-///////////////////////////////ih.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
#endif
\f
projects / senf.git / blobdiff