Moved to header

release/4.3a0
dellaert 2014-12-01 11:35:48 +01:00
parent d25636685b
commit 19ea0436db
2 changed files with 43 additions and 39 deletions

View File

@ -161,6 +161,8 @@ public:
};
/* ************************************************************************* */
/// Som basic rules used by all parsers
template<typename ScannerT>
struct basic_rules {
@ -194,6 +196,7 @@ struct basic_rules {
}
};
/* ************************************************************************* */
// http://boost-spirit.com/distrib/spirit_1_8_2/libs/spirit/doc/grammar.html
class TypeGrammar: public classic::grammar<TypeGrammar> {
@ -255,6 +258,46 @@ public:
};
// type_grammar
/* ************************************************************************* */
// http://boost-spirit.com/distrib/spirit_1_8_2/libs/spirit/doc/grammar.html
struct TypeListGrammar: public classic::grammar<TypeListGrammar> {
typedef std::vector<wrap::Qualified> TypeList;
TypeList& result_; ///< successful parse will be placed in here
mutable wrap::Qualified type; // temporary type for use during parsing
TypeGrammar type_g;
/// Construct type grammar and specify where result is placed
TypeListGrammar(TypeList& result) :
result_(result), type_g(type) {
}
/// Definition of type grammar
template<typename ScannerT>
struct definition: basic_rules<ScannerT> {
typedef classic::rule<ScannerT> Rule;
Rule type_p, typeList_p;
definition(TypeListGrammar const& self) {
using namespace classic;
type_p = self.type_g //
[classic::push_back_a(self.result_, self.type)] //
[clear_a(self.type)];
typeList_p = '{' >> !type_p >> *(',' >> type_p) >> '}';
}
Rule const& start() const {
return typeList_p;
}
};
};
// TypeListGrammar
/* ************************************************************************* */
// Needed for other parsers in Argument.h and ReturnType.h
static const bool T = true;

View File

@ -83,45 +83,6 @@ TEST( Type, grammar ) {
actual.clear();
}
/* ************************************************************************* */
// http://boost-spirit.com/distrib/spirit_1_8_2/libs/spirit/doc/grammar.html
struct TypeListGrammar: public classic::grammar<TypeListGrammar> {
typedef std::vector<wrap::Qualified> TypeList;
TypeList& result_; ///< successful parse will be placed in here
mutable wrap::Qualified type; // temporary type for use during parsing
TypeGrammar type_g;
/// Construct type grammar and specify where result is placed
TypeListGrammar(TypeList& result) :
result_(result), type_g(type) {
}
/// Definition of type grammar
template<typename ScannerT>
struct definition: basic_rules<ScannerT> {
typedef classic::rule<ScannerT> Rule;
Rule type_p, typeList_p;
definition(TypeListGrammar const& self) {
using namespace classic;
type_p = self.type_g //
[classic::push_back_a(self.result_, self.type)] //
[clear_a(self.type)];
typeList_p = '{' >> !type_p >> *(',' >> type_p) >> '}';
}
Rule const& start() const {
return typeList_p;
}
};
};
// TypeListGrammar
//******************************************************************************
TEST( TypeList, grammar ) {