[Boost-commit] svn:boost r68744 - in trunk/libs/spirit: example/qi test/qi

Subject: [Boost-commit] svn:boost r68744 - in trunk/libs/spirit: example/qi test/qi
From: joel_at_[hidden]
Date: 2011-02-09 05:44:49

Author: djowel
Date: 2011-02-09 05:44:41 EST (Wed, 09 Feb 2011)
New Revision: 68744
URL: http://svn.boost.org/trac/boost/changeset/68744

Log:
added option to have no predefined terminals
Text files modified: 
   trunk/libs/spirit/example/qi/calc1.cpp    |     6 ++++--                                  
   trunk/libs/spirit/example/qi/calc2.cpp    |     2 +-                                      
   trunk/libs/spirit/test/qi/terminal_ex.cpp |     2 +-                                      
   3 files changed, 6 insertions(+), 4 deletions(-)

Modified: trunk/libs/spirit/example/qi/calc1.cpp
==============================================================================
--- trunk/libs/spirit/example/qi/calc1.cpp	(original)
+++ trunk/libs/spirit/example/qi/calc1.cpp	2011-02-09 05:44:41 EST (Wed, 09 Feb 2011)
@@ -14,6 +14,8 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
+#define BOOST_SPIRIT_NO_PREDEFINED_TERMINALS
+
 #include <boost/config/warning_disable.hpp>
 #include <boost/spirit/include/qi.hpp>
 #include <iostream>
@@ -32,7 +34,7 @@
     {
         calculator() : calculator::base_type(expression)
         {
-            using qi::uint_;
+            qi::uint_type uint_;
 
             expression =
                 term
@@ -71,7 +73,7 @@
     std::cout << "/////////////////////////////////////////////////////////\n\n";
     std::cout << "Type an expression...or [q or Q] to quit\n\n";
 
-    using boost::spirit::ascii::space;
+    boost::spirit::ascii::space_type space;
     typedef std::string::const_iterator iterator_type;
     typedef client::calculator<iterator_type> calculator;
 

Modified: trunk/libs/spirit/example/qi/calc2.cpp
==============================================================================
--- trunk/libs/spirit/example/qi/calc2.cpp	(original)
+++ trunk/libs/spirit/example/qi/calc2.cpp	2011-02-09 05:44:41 EST (Wed, 09 Feb 2011)
@@ -28,7 +28,7 @@
 
     ///////////////////////////////////////////////////////////////////////////////
     //  Semantic actions
-    ///////////////////////////////////////////////////////////////////////////////
+    ////////////////////////////////////////////////////////1///////////////////////
     namespace
     {
         void do_int(int n)  { std::cout << "push " << n << std::endl; }

Modified: trunk/libs/spirit/test/qi/terminal_ex.cpp
==============================================================================
--- trunk/libs/spirit/test/qi/terminal_ex.cpp	(original)
+++ trunk/libs/spirit/test/qi/terminal_ex.cpp	2011-02-09 05:44:41 EST (Wed, 09 Feb 2011)
@@ -19,7 +19,7 @@
 namespace testns
 {
 
-    BOOST_SPIRIT_TERMINAL_EX( ops )
+    BOOST_SPIRIT_TERMINAL_EX( ops, ops_type )
 
 
     ///////////////////////////////////////////////////////////////////////////