Subject: [Boost-commit] svn:boost r61265 - in trunk/libs/spirit/example/scheme: input qi test/parse_qiexpr
From: hartmut.kaiser_at_[hidden]
Date: 2010-04-13 21:50:40
Author: hkaiser
Date: 2010-04-13 21:50:38 EDT (Tue, 13 Apr 2010)
New Revision: 61265
URL: http://svn.boost.org/trac/boost/changeset/61265
Log:
Spirit: Moving Qi related scheme stuff into separate subdirectory
Added:
trunk/libs/spirit/example/scheme/qi/
trunk/libs/spirit/example/scheme/qi/parse_qiexpr.hpp (contents, props changed)
trunk/libs/spirit/example/scheme/qi/parse_qiexpr_impl.hpp (contents, props changed)
trunk/libs/spirit/example/scheme/qi/qiexpr_parser.hpp (contents, props changed)
Removed:
trunk/libs/spirit/example/scheme/input/parse_qiexpr.hpp
trunk/libs/spirit/example/scheme/input/parse_qiexpr_impl.hpp
trunk/libs/spirit/example/scheme/input/qiexpr.hpp
Text files modified:
trunk/libs/spirit/example/scheme/test/parse_qiexpr/parse_qi_test.cpp | 2 +-
trunk/libs/spirit/example/scheme/test/parse_qiexpr/parse_qiexpr.cpp | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
Deleted: trunk/libs/spirit/example/scheme/input/parse_qiexpr.hpp
==============================================================================
--- trunk/libs/spirit/example/scheme/input/parse_qiexpr.hpp 2010-04-13 21:50:38 EDT (Tue, 13 Apr 2010)
+++ (empty file)
@@ -1,19 +0,0 @@
-// Copyright (c) 2001-2010 Hartmut Kaiser
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#if !defined(BOOST_SPIRIT_PARSE_QIEXPR)
-#define BOOST_SPIRIT_PARSE_QIEXPR
-
-#include "../utree.hpp"
-
-namespace scheme { namespace input
-{
- template <typename String>
- bool parse_qiexpr(String const& str, utree& result);
-}}
-
-#endif
-
-
Deleted: trunk/libs/spirit/example/scheme/input/parse_qiexpr_impl.hpp
==============================================================================
--- trunk/libs/spirit/example/scheme/input/parse_qiexpr_impl.hpp 2010-04-13 21:50:38 EDT (Tue, 13 Apr 2010)
+++ (empty file)
@@ -1,35 +0,0 @@
-// Copyright (c) 2001-2010 Hartmut Kaiser
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#if !defined(BOOST_SPIRIT_PARSE_QIEXPR_IMPL)
-#define BOOST_SPIRIT_PARSE_QIEXPR_IMPL
-
-#include <iostream>
-#include <boost/spirit/include/support_istream_iterator.hpp>
-#include <boost/spirit/include/qi_parse.hpp>
-
-#include "../input/qiexpr.hpp"
-#include "../input/parse_qiexpr.hpp"
-
-namespace scheme { namespace input
-{
- ///////////////////////////////////////////////////////////////////////////
- template <typename String>
- bool parse_qiexpr(String const& str, utree& result)
- {
- typedef typename String::const_iterator iterator_type;
-
- scheme::input::qiexpr<iterator_type> p;
- scheme::input::qiexpr_white_space<iterator_type> ws;
-
- iterator_type begin = str.begin();
- iterator_type end = str.end();
- return phrase_parse(begin, end, p, ws, result) && begin == end;
- }
-}}
-
-#endif
-
-
Deleted: trunk/libs/spirit/example/scheme/input/qiexpr.hpp
==============================================================================
--- trunk/libs/spirit/example/scheme/input/qiexpr.hpp 2010-04-13 21:50:38 EDT (Tue, 13 Apr 2010)
+++ (empty file)
@@ -1,332 +0,0 @@
-// Copyright (c) 2001-2010 Hartmut Kaiser
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#if !defined(BOOST_SPIRIT_QIEXPR)
-#define BOOST_SPIRIT_QIEXPR
-
-#include <string>
-
-#include <boost/cstdint.hpp>
-#include <boost/detail/iterator.hpp>
-#include <boost/spirit/include/qi.hpp>
-#include <boost/spirit/include/phoenix_core.hpp>
-#include <boost/spirit/include/phoenix_stl.hpp>
-#include <boost/spirit/include/phoenix_statement.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
-
-#include "../utree.hpp"
-#include "../detail/utree_detail3.hpp"
-#include "../utree_operators.hpp"
-#include "string.hpp"
-
-namespace boost { namespace spirit { namespace traits
-{
- void print_attribute(std::ostream& out, scheme::utree const& val);
-}}}
-
-///////////////////////////////////////////////////////////////////////////////
-namespace scheme { namespace input
-{
- using boost::spirit::ascii::space;
- using boost::spirit::qi::grammar;
- using boost::spirit::qi::rule;
- using boost::spirit::qi::symbols;
- using boost::spirit::qi::eol;
- using boost::spirit::qi::_val;
- using boost::spirit::qi::_1;
- using boost::spirit::qi::_2;
- using boost::phoenix::push_back;
- using boost::phoenix::function;
-
- ///////////////////////////////////////////////////////////////////////////
- template <typename Iterator>
- struct qiexpr_white_space : grammar<Iterator>
- {
- qiexpr_white_space() : qiexpr_white_space::base_type(start)
- {
- start =
- space // tab/space/cr/lf
- | "//" >> *(char_ - eol) >> eol // comments
- | "/*" >> *(char_ - "*/") >> "*/"
- ;
- }
-
- rule<Iterator> start;
- };
-
- namespace detail
- {
- ///////////////////////////////////////////////////////////////////////
- // return true if the utree instance represents a list whose first
- // element is a symbol node equal to the second argument
- inline bool is_list_node(utree const& u, utf8_symbol const& symbol)
- {
- if (u.which() != utree_type::list_type)
- return false;
- return u.front() == symbol;
- }
-
- inline bool is_list_node(utree const& u, utree const& symbol)
- {
- if (u.which() != utree_type::list_type)
- return false;
- if (symbol.which() == utree_type::list_type)
- return u.front() == symbol.front();
- return u.front() == symbol;
- }
-
- ///////////////////////////////////////////////////////////////////////
- // ensure the given utree instance represents a list whose first
- // element is the symbol this function object has been constructed from
- struct make_list_node
- {
- template <typename T1, typename T2 = nil, typename T3 = nil>
- struct result { typedef void type; };
-
- explicit make_list_node(char const* symbol_)
- : symbol(symbol_)
- {}
-
- // If called with one parameter the given node needs to be
- // converted into a list whose first element is the symbol.
- //
- // i.e:
- // lit: ("abc") --> (lit "abc")
- void operator()(utree& u) const
- {
- u.push_front(symbol);
- }
-
- // If called with two parameters we ensure the given node is a
- // (new) list whose first element is the symbol and we append the
- // given element to that list.
- //
- // i.e.:
- // >>: (char_), (char_ "abc") --> (>> (char_) (char_ "abc"))
- // >>: (>> (char_ "a")), (char_) --> (>> (char_ "a") (char_))
- void operator()(utree& val, utree const& element) const
- {
- if (!is_list_node(val, symbol)) {
- utree u;
- u.push_back(symbol);
- if (val.which() != utree_type::nil_type)
- u.push_back(val);
- val = u;
- }
- val.push_back(element);
- }
-
- void operator()(utree& val, utree const& element, utree const& sym) const
- {
- if (!is_list_node(val, sym)) {
- utree u;
- u.push_back(sym);
- if (val.which() != utree_type::nil_type)
- u.push_back(val);
- val = u;
- }
- val.push_back(element);
- }
-
- utf8_symbol symbol;
- };
- }
-
- ///////////////////////////////////////////////////////////////////////////
- // a list of names for all supported parser primitives taking no parameters
- static char const* const primitives0[] =
- {
- // character parsers
- "char_"
- , "alnum", "alpha", "blank", "cntrl", "digit", "graph", "print", "punct"
- , "space", "xdigit"
- , "lower", "upper"
-
- // numerics
- , "long_long", "long_", "int_", "short_"
- , "ulong_long", "ulong_", "uint_", "ushort_"
- , "bin", "oct", "hex"
- , "bool_", "true_", "false_"
- , "long_double", "double_", "float_"
-
- // binary
- , "qword", "dword", "word", "byte_"
- , "little_qword", "little_dword", "little_word"
- , "big_qword", "big_dword", "big_word"
-
- // auxiliary
- , "eol", "eoi", "eps"
- , 0
- };
-
- // a list of names for all supported parser primitives taking 1 parameter
- static char const* const primitives1[] =
- {
- // character parsers
- "char_", "lit", "string"
- , 0
- };
-
- // a list of names for all supported parser primitives taking 2 parameter
- static char const* const primitives2[] =
- {
- "char_"
- , 0
- };
-
- // a list of names for all supported parser directives taking 0 parameter
- static char const* const directives0[] =
- {
- // manage skip parser
- "lexeme", "skip", "no_skip"
-
- // case management
- , "no_case"
-
- // auxiliary
- , "omit", "raw"
-
- // encoding
- , "ascii", "standard", "standard_wide", "iso8859_1", "unicode"
- , 0
- };
-
- ///////////////////////////////////////////////////////////////////////////
- template <typename Iterator>
- struct qiexpr : grammar<Iterator, qiexpr_white_space<Iterator>, utree()>
- {
- typedef typename boost::detail::iterator_traits<Iterator>::value_type
- char_type;
-
- qiexpr() : qiexpr::base_type(start)
- {
- typedef function<detail::make_list_node> make_list_type;
-
- make_list_type make_directive = detail::make_list_node("");
-
- make_list_type make_sequence = detail::make_list_node(">>");
- make_list_type make_permutation = detail::make_list_node("^");
- make_list_type make_alternative = detail::make_list_node("|");
-
- make_list_type make_kleene = detail::make_list_node("*");
- make_list_type make_plus = detail::make_list_node("+");
- make_list_type make_optional = detail::make_list_node("-");
- make_list_type make_and_pred = detail::make_list_node("&");
- make_list_type make_not_pred = detail::make_list_node("!");
-
- make_list_type make_literal = detail::make_list_node("lit");
-
- start = -alternative;
-
- // A | B
- alternative =
- permutation [ _val = _1 ]
- >> *( '|' >> permutation [ make_alternative(_val, _1) ] )
- ;
-
- // A ^ B
- permutation =
- sequence [ _val = _1 ]
- >> *( "^" >> sequence [ make_permutation(_val, _1) ] )
- ;
-
- // A >> B
- sequence =
- unary_term [ _val = _1 ]
- >> *( ">>" >> unary_term [ make_sequence(_val, _1) ] )
- ;
-
- // unary operators
- unary_term =
- '*' >> term [ make_kleene(_val, _1) ]
- | '+' >> term [ make_plus(_val, _1) ]
- | '-' >> term [ make_optional(_val, _1) ]
- | '&' >> term [ make_and_pred(_val, _1) ]
- | '!' >> term [ make_not_pred(_val, _1) ]
- | term [ _val = _1 ]
- ;
-
- // A, (A)
- term =
- primitive
- | directive
- | '(' >> alternative >> ')'
- ;
-
- // any parser directive
- directive =
- (directive0 >> '[' >> alternative >> ']')
- [
- make_directive(_val, _2, _1)
- ]
- ;
-
- // any primitive parser
- primitive %=
- primitive2 >> '(' >> literal >> ',' >> literal >> ')'
- | primitive1 >> '(' >> literal >> ')'
- | primitive0 // taking no parameter
- | literal [ make_literal(_val) ]
- ;
-
- // a literal (either 'x' or "abc")
- literal =
- string_lit [ push_back(_val, _1) ]
- | string_lit.char_lit [ push_back(_val, _1) ]
- ;
-
- // fill the symbol tables with all known primitive parser names
- for (char const* const* p = primitives0; *p; ++p)
- {
- utree u;
- u.push_back(utf8_symbol(*p));
- primitive0.add(*p, u);
- }
-
- for (char const* const* p = primitives1; *p; ++p)
- {
- utree u;
- u.push_back(utf8_symbol(*p));
- primitive1.add(*p, u);
- }
-
- for (char const* const* p = primitives2; *p; ++p)
- {
- utree u;
- u.push_back(utf8_symbol(*p));
- primitive2.add(*p, u);
- }
-
- for (char const* const* p = directives0; *p; ++p)
- {
- utree u = utree(utf8_symbol(*p));
- directive0.add(*p, u);
- }
-
-#if defined(BOOST_SPIRIT_DEBUG)
- start.name("name"); debug(start);
- directive.name("directive"); debug(directive);
- primitive.name("primitive"); debug(primitive);
- unary_term.name("unary_term"); debug(unary_term);
- term.name("term"); debug(term);
- literal.name("literal"); debug(literal);
- alternative.name("alternative"); debug(alternative);
- permutation.name("permutation"); debug(permutation);
- sequence.name("sequence"); debug(sequence);
-#endif
- }
-
- typedef rule<Iterator, qiexpr_white_space<Iterator>, utree()> rule_type;
-
- rule_type start, directive, primitive, unary_term, term, literal;
- rule_type alternative, permutation, sequence;
-
- symbols<char_type, utree> directive0, directive1;
- symbols<char_type, utree> primitive0, primitive1, primitive2;
- scheme::input::string<Iterator> string_lit;
- };
-}}
-
-#endif
Added: trunk/libs/spirit/example/scheme/qi/parse_qiexpr.hpp
==============================================================================
--- (empty file)
+++ trunk/libs/spirit/example/scheme/qi/parse_qiexpr.hpp 2010-04-13 21:50:38 EDT (Tue, 13 Apr 2010)
@@ -0,0 +1,19 @@
+// Copyright (c) 2001-2010 Hartmut Kaiser
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+#if !defined(BOOST_SPIRIT_PARSE_QIEXPR)
+#define BOOST_SPIRIT_PARSE_QIEXPR
+
+#include "../utree.hpp"
+
+namespace scheme { namespace input
+{
+ template <typename String>
+ bool parse_qiexpr(String const& str, utree& result);
+}}
+
+#endif
+
+
Added: trunk/libs/spirit/example/scheme/qi/parse_qiexpr_impl.hpp
==============================================================================
--- (empty file)
+++ trunk/libs/spirit/example/scheme/qi/parse_qiexpr_impl.hpp 2010-04-13 21:50:38 EDT (Tue, 13 Apr 2010)
@@ -0,0 +1,35 @@
+// Copyright (c) 2001-2010 Hartmut Kaiser
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+#if !defined(BOOST_SPIRIT_PARSE_QIEXPR_IMPL)
+#define BOOST_SPIRIT_PARSE_QIEXPR_IMPL
+
+#include <iostream>
+#include <boost/spirit/include/support_istream_iterator.hpp>
+#include <boost/spirit/include/qi_parse.hpp>
+
+#include "../qi/qiexpr_parser.hpp"
+#include "../qi/parse_qiexpr.hpp"
+
+namespace scheme { namespace input
+{
+ ///////////////////////////////////////////////////////////////////////////
+ template <typename String>
+ bool parse_qiexpr(String const& str, utree& result)
+ {
+ typedef typename String::const_iterator iterator_type;
+
+ scheme::input::qiexpr<iterator_type> p;
+ scheme::input::qiexpr_white_space<iterator_type> ws;
+
+ iterator_type begin = str.begin();
+ iterator_type end = str.end();
+ return phrase_parse(begin, end, p, ws, result) && begin == end;
+ }
+}}
+
+#endif
+
+
Added: trunk/libs/spirit/example/scheme/qi/qiexpr_parser.hpp
==============================================================================
--- (empty file)
+++ trunk/libs/spirit/example/scheme/qi/qiexpr_parser.hpp 2010-04-13 21:50:38 EDT (Tue, 13 Apr 2010)
@@ -0,0 +1,332 @@
+// Copyright (c) 2001-2010 Hartmut Kaiser
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+#if !defined(BOOST_SPIRIT_QIEXPR)
+#define BOOST_SPIRIT_QIEXPR
+
+#include <string>
+
+#include <boost/cstdint.hpp>
+#include <boost/detail/iterator.hpp>
+#include <boost/spirit/include/qi.hpp>
+#include <boost/spirit/include/phoenix_core.hpp>
+#include <boost/spirit/include/phoenix_stl.hpp>
+#include <boost/spirit/include/phoenix_statement.hpp>
+#include <boost/spirit/include/phoenix_operator.hpp>
+
+#include "../utree.hpp"
+#include "../detail/utree_detail3.hpp"
+#include "../utree_operators.hpp"
+#include "../input/string.hpp"
+
+namespace boost { namespace spirit { namespace traits
+{
+ void print_attribute(std::ostream& out, scheme::utree const& val);
+}}}
+
+///////////////////////////////////////////////////////////////////////////////
+namespace scheme { namespace input
+{
+ using boost::spirit::ascii::space;
+ using boost::spirit::qi::grammar;
+ using boost::spirit::qi::rule;
+ using boost::spirit::qi::symbols;
+ using boost::spirit::qi::eol;
+ using boost::spirit::qi::_val;
+ using boost::spirit::qi::_1;
+ using boost::spirit::qi::_2;
+ using boost::phoenix::push_back;
+ using boost::phoenix::function;
+
+ ///////////////////////////////////////////////////////////////////////////
+ template <typename Iterator>
+ struct qiexpr_white_space : grammar<Iterator>
+ {
+ qiexpr_white_space() : qiexpr_white_space::base_type(start)
+ {
+ start =
+ space // tab/space/cr/lf
+ | "//" >> *(char_ - eol) >> eol // comments
+ | "/*" >> *(char_ - "*/") >> "*/"
+ ;
+ }
+
+ rule<Iterator> start;
+ };
+
+ namespace detail
+ {
+ ///////////////////////////////////////////////////////////////////////
+ // return true if the utree instance represents a list whose first
+ // element is a symbol node equal to the second argument
+ inline bool is_list_node(utree const& u, utf8_symbol const& symbol)
+ {
+ if (u.which() != utree_type::list_type)
+ return false;
+ return u.front() == symbol;
+ }
+
+ inline bool is_list_node(utree const& u, utree const& symbol)
+ {
+ if (u.which() != utree_type::list_type)
+ return false;
+ if (symbol.which() == utree_type::list_type)
+ return u.front() == symbol.front();
+ return u.front() == symbol;
+ }
+
+ ///////////////////////////////////////////////////////////////////////
+ // ensure the given utree instance represents a list whose first
+ // element is the symbol this function object has been constructed from
+ struct make_list_node
+ {
+ template <typename T1, typename T2 = nil, typename T3 = nil>
+ struct result { typedef void type; };
+
+ explicit make_list_node(char const* symbol_)
+ : symbol(symbol_)
+ {}
+
+ // If called with one parameter the given node needs to be
+ // converted into a list whose first element is the symbol.
+ //
+ // i.e:
+ // lit: ("abc") --> (lit "abc")
+ void operator()(utree& u) const
+ {
+ u.push_front(symbol);
+ }
+
+ // If called with two parameters we ensure the given node is a
+ // (new) list whose first element is the symbol and we append the
+ // given element to that list.
+ //
+ // i.e.:
+ // >>: (char_), (char_ "abc") --> (>> (char_) (char_ "abc"))
+ // >>: (>> (char_ "a")), (char_) --> (>> (char_ "a") (char_))
+ void operator()(utree& val, utree const& element) const
+ {
+ if (!is_list_node(val, symbol)) {
+ utree u;
+ u.push_back(symbol);
+ if (val.which() != utree_type::nil_type)
+ u.push_back(val);
+ val = u;
+ }
+ val.push_back(element);
+ }
+
+ void operator()(utree& val, utree const& element, utree const& sym) const
+ {
+ if (!is_list_node(val, sym)) {
+ utree u;
+ u.push_back(sym);
+ if (val.which() != utree_type::nil_type)
+ u.push_back(val);
+ val = u;
+ }
+ val.push_back(element);
+ }
+
+ utf8_symbol symbol;
+ };
+ }
+
+ ///////////////////////////////////////////////////////////////////////////
+ // a list of names for all supported parser primitives taking no parameters
+ static char const* const primitives0[] =
+ {
+ // character parsers
+ "char_"
+ , "alnum", "alpha", "blank", "cntrl", "digit", "graph", "print", "punct"
+ , "space", "xdigit"
+ , "lower", "upper"
+
+ // numerics
+ , "long_long", "long_", "int_", "short_"
+ , "ulong_long", "ulong_", "uint_", "ushort_"
+ , "bin", "oct", "hex"
+ , "bool_", "true_", "false_"
+ , "long_double", "double_", "float_"
+
+ // binary
+ , "qword", "dword", "word", "byte_"
+ , "little_qword", "little_dword", "little_word"
+ , "big_qword", "big_dword", "big_word"
+
+ // auxiliary
+ , "eol", "eoi", "eps"
+ , 0
+ };
+
+ // a list of names for all supported parser primitives taking 1 parameter
+ static char const* const primitives1[] =
+ {
+ // character parsers
+ "char_", "lit", "string"
+ , 0
+ };
+
+ // a list of names for all supported parser primitives taking 2 parameter
+ static char const* const primitives2[] =
+ {
+ "char_"
+ , 0
+ };
+
+ // a list of names for all supported parser directives taking 0 parameter
+ static char const* const directives0[] =
+ {
+ // manage skip parser
+ "lexeme", "skip", "no_skip"
+
+ // case management
+ , "no_case"
+
+ // auxiliary
+ , "omit", "raw"
+
+ // encoding
+ , "ascii", "standard", "standard_wide", "iso8859_1", "unicode"
+ , 0
+ };
+
+ ///////////////////////////////////////////////////////////////////////////
+ template <typename Iterator>
+ struct qiexpr : grammar<Iterator, qiexpr_white_space<Iterator>, utree()>
+ {
+ typedef typename boost::detail::iterator_traits<Iterator>::value_type
+ char_type;
+
+ qiexpr() : qiexpr::base_type(start)
+ {
+ typedef function<detail::make_list_node> make_list_type;
+
+ make_list_type make_directive = detail::make_list_node("");
+
+ make_list_type make_sequence = detail::make_list_node(">>");
+ make_list_type make_permutation = detail::make_list_node("^");
+ make_list_type make_alternative = detail::make_list_node("|");
+
+ make_list_type make_kleene = detail::make_list_node("*");
+ make_list_type make_plus = detail::make_list_node("+");
+ make_list_type make_optional = detail::make_list_node("-");
+ make_list_type make_and_pred = detail::make_list_node("&");
+ make_list_type make_not_pred = detail::make_list_node("!");
+
+ make_list_type make_literal = detail::make_list_node("lit");
+
+ start = -alternative;
+
+ // A | B
+ alternative =
+ permutation [ _val = _1 ]
+ >> *( '|' >> permutation [ make_alternative(_val, _1) ] )
+ ;
+
+ // A ^ B
+ permutation =
+ sequence [ _val = _1 ]
+ >> *( "^" >> sequence [ make_permutation(_val, _1) ] )
+ ;
+
+ // A >> B
+ sequence =
+ unary_term [ _val = _1 ]
+ >> *( ">>" >> unary_term [ make_sequence(_val, _1) ] )
+ ;
+
+ // unary operators
+ unary_term =
+ '*' >> term [ make_kleene(_val, _1) ]
+ | '+' >> term [ make_plus(_val, _1) ]
+ | '-' >> term [ make_optional(_val, _1) ]
+ | '&' >> term [ make_and_pred(_val, _1) ]
+ | '!' >> term [ make_not_pred(_val, _1) ]
+ | term [ _val = _1 ]
+ ;
+
+ // A, (A)
+ term =
+ primitive
+ | directive
+ | '(' >> alternative >> ')'
+ ;
+
+ // any parser directive
+ directive =
+ (directive0 >> '[' >> alternative >> ']')
+ [
+ make_directive(_val, _2, _1)
+ ]
+ ;
+
+ // any primitive parser
+ primitive %=
+ primitive2 >> '(' >> literal >> ',' >> literal >> ')'
+ | primitive1 >> '(' >> literal >> ')'
+ | primitive0 // taking no parameter
+ | literal [ make_literal(_val) ]
+ ;
+
+ // a literal (either 'x' or "abc")
+ literal =
+ string_lit [ push_back(_val, _1) ]
+ | string_lit.char_lit [ push_back(_val, _1) ]
+ ;
+
+ // fill the symbol tables with all known primitive parser names
+ for (char const* const* p = primitives0; *p; ++p)
+ {
+ utree u;
+ u.push_back(utf8_symbol(*p));
+ primitive0.add(*p, u);
+ }
+
+ for (char const* const* p = primitives1; *p; ++p)
+ {
+ utree u;
+ u.push_back(utf8_symbol(*p));
+ primitive1.add(*p, u);
+ }
+
+ for (char const* const* p = primitives2; *p; ++p)
+ {
+ utree u;
+ u.push_back(utf8_symbol(*p));
+ primitive2.add(*p, u);
+ }
+
+ for (char const* const* p = directives0; *p; ++p)
+ {
+ utree u = utree(utf8_symbol(*p));
+ directive0.add(*p, u);
+ }
+
+#if defined(BOOST_SPIRIT_DEBUG)
+ start.name("name"); debug(start);
+ directive.name("directive"); debug(directive);
+ primitive.name("primitive"); debug(primitive);
+ unary_term.name("unary_term"); debug(unary_term);
+ term.name("term"); debug(term);
+ literal.name("literal"); debug(literal);
+ alternative.name("alternative"); debug(alternative);
+ permutation.name("permutation"); debug(permutation);
+ sequence.name("sequence"); debug(sequence);
+#endif
+ }
+
+ typedef rule<Iterator, qiexpr_white_space<Iterator>, utree()> rule_type;
+
+ rule_type start, directive, primitive, unary_term, term, literal;
+ rule_type alternative, permutation, sequence;
+
+ symbols<char_type, utree> directive0, directive1;
+ symbols<char_type, utree> primitive0, primitive1, primitive2;
+ scheme::input::string<Iterator> string_lit;
+ };
+}}
+
+#endif
Modified: trunk/libs/spirit/example/scheme/test/parse_qiexpr/parse_qi_test.cpp
==============================================================================
--- trunk/libs/spirit/example/scheme/test/parse_qiexpr/parse_qi_test.cpp (original)
+++ trunk/libs/spirit/example/scheme/test/parse_qiexpr/parse_qi_test.cpp 2010-04-13 21:50:38 EDT (Tue, 13 Apr 2010)
@@ -12,7 +12,7 @@
#include <iterator>
#include "../../utree.hpp"
-#include "../../input/parse_qiexpr.hpp"
+#include "../../qi/parse_qiexpr.hpp"
#include "../../output/generate_sexpr.hpp"
///////////////////////////////////////////////////////////////////////////////
Modified: trunk/libs/spirit/example/scheme/test/parse_qiexpr/parse_qiexpr.cpp
==============================================================================
--- trunk/libs/spirit/example/scheme/test/parse_qiexpr/parse_qiexpr.cpp (original)
+++ trunk/libs/spirit/example/scheme/test/parse_qiexpr/parse_qiexpr.cpp 2010-04-13 21:50:38 EDT (Tue, 13 Apr 2010)
@@ -5,8 +5,8 @@
#include <fstream>
-#include "../../input/parse_qiexpr.hpp"
-#include "../../input/parse_qiexpr_impl.hpp"
+#include "../../qi/parse_qiexpr.hpp"
+#include "../../qi/parse_qiexpr_impl.hpp"
// explicit template instantiation for the function parse_sexpr
namespace scheme { namespace input