[Boost-commit] svn:boost r57737 - in trunk/libs/spirit: doc example/qi

Subject: [Boost-commit] svn:boost r57737 - in trunk/libs/spirit: doc example/qi
From: joel_at_[hidden]
Date: 2009-11-18 02:44:39

Author: djowel
Date: 2009-11-18 02:44:38 EST (Wed, 18 Nov 2009)
New Revision: 57737
URL: http://svn.boost.org/trac/boost/changeset/57737

Log:
tweaks
Text files modified: 
   trunk/libs/spirit/doc/acknowledgments.qbk |     9 ++++++---                               
   trunk/libs/spirit/example/qi/Jamfile      |     3 +++                                     
   trunk/libs/spirit/example/qi/typeof.cpp   |    10 ++++++----                              
   3 files changed, 15 insertions(+), 7 deletions(-)

Modified: trunk/libs/spirit/doc/acknowledgments.qbk
==============================================================================
--- trunk/libs/spirit/doc/acknowledgments.qbk	(original)
+++ trunk/libs/spirit/doc/acknowledgments.qbk	2009-11-18 02:44:38 EST (Wed, 18 Nov 2009)
@@ -34,6 +34,9 @@
 version of this documentation together with Andreas Haberstroh. Chris
 did a lot especially at the last minute when we are about to release.
 
+[*Michael Caisse] also for last minute editing work on the 2.1 release
+documentation.
+
 [*Tobias Schwinger] for proposing expectation points and GCC port of an
 early version.
 
@@ -65,9 +68,9 @@
 participating in the discussions, being early adopters of pre-release
 versions of Spirit2 from the very start and helping out in various tasks
 such as helping with support, bug tracking, benchmarking and testing,
-etc. The list include: [*Michael Caisse], [*Larry Evans], [*Richard
-Webb], [*Martin Wille], [*Dan Marsden], [*Cedric Venet], [*Allan
-Odgaard], [*Matthias Vallentin], [*Justinas V.D.], [*Darid Tromer].
+etc. The list include: [*Larry Evans], [*Richard Webb], [*Martin Wille],
+[*Dan Marsden], [*Cedric Venet], [*Allan Odgaard], [*Matthias
+Vallentin], [*Justinas V.D.], [*Darid Tromer].
 
 [*Joao Abecasis] for his early support and involvement in Spirit2
 development and for disturbing my peace every once in a while for a

Modified: trunk/libs/spirit/example/qi/Jamfile
==============================================================================
--- trunk/libs/spirit/example/qi/Jamfile	(original)
+++ trunk/libs/spirit/example/qi/Jamfile	2009-11-18 02:44:38 EST (Wed, 18 Nov 2009)
@@ -61,3 +61,6 @@
     mini_c/mini_cd.cpp
     ;
 
+exe nabialek : nabialek.cpp ;
+exe typeof : typeof.cpp ;
+

Modified: trunk/libs/spirit/example/qi/typeof.cpp
==============================================================================
--- trunk/libs/spirit/example/qi/typeof.cpp	(original)
+++ trunk/libs/spirit/example/qi/typeof.cpp	2009-11-18 02:44:38 EST (Wed, 18 Nov 2009)
@@ -17,9 +17,7 @@
 #define BOOST_SPIRIT_AUTO(domain_, name, expr)                                  \
     typedef BOOST_TYPEOF(expr) name##expr_type;                                 \
     BOOST_SPIRIT_ASSERT_MATCH(boost::spirit::domain_::domain, name##expr_type); \
-    boost::spirit::result_of::compile<                                          \
-        boost::spirit::domain_::domain, name##expr_type>::type                  \
-        name = boost::spirit::compile<boost::spirit::domain_::domain>(expr);    \
+    BOOST_AUTO(name, boost::proto::deep_copy(expr));                            \
     //
 
 int
@@ -28,9 +26,13 @@
     using boost::spirit::ascii::space;
     using boost::spirit::ascii::char_;
     using boost::spirit::qi::parse;
+    using boost::spirit::qi::lit;
     typedef std::string::const_iterator iterator_type;
     
-    BOOST_SPIRIT_AUTO(qi, comment, "/*" >> *(char_ - "*/") >> "*/");
+    BOOST_SPIRIT_AUTO(qi, comment_pre, lit("/*"));
+    BOOST_SPIRIT_AUTO(qi, comment_mid, char_ - "*/");
+    BOOST_SPIRIT_AUTO(qi, comment_post, lit("*/"));
+    BOOST_SPIRIT_AUTO(qi, comment, comment_pre >> *comment_mid >> comment_post);
 
     std::string str = "/*This is a comment*/";
     std::string::const_iterator iter = str.begin();