[Boost-commit] svn:boost r44540 - in trunk: boost/spirit/home/qi/char boost/spirit/home/support libs/spirit/test/qi

From: hartmut.kaiser_at_[hidden]
Date: 2008-04-18 08:35:25

Author: hkaiser
Date: 2008-04-18 08:35:25 EDT (Fri, 18 Apr 2008)
New Revision: 44540
URL: http://svn.boost.org/trac/boost/changeset/44540

Log:
Spirit: changed end parser to be named eoi.
Text files modified: 
   trunk/boost/spirit/home/qi/char/meta_grammar.hpp |     4 ++--                                    
   trunk/boost/spirit/home/qi/char/primitives.hpp   |     6 +++---                                  
   trunk/boost/spirit/home/support/placeholders.hpp |     8 ++++----                                
   trunk/libs/spirit/test/qi/char.cpp               |    12 ++++++------                            
   4 files changed, 15 insertions(+), 15 deletions(-)

Modified: trunk/boost/spirit/home/qi/char/meta_grammar.hpp
==============================================================================
--- trunk/boost/spirit/home/qi/char/meta_grammar.hpp	(original)
+++ trunk/boost/spirit/home/qi/char/meta_grammar.hpp	2008-04-18 08:35:25 EDT (Fri, 18 Apr 2008)
@@ -65,7 +65,7 @@
     struct char_class;
 
     struct eol_director;
-    struct end_director;
+    struct eoi_director;
     
     ///////////////////////////////////////////////////////////////////////////
     struct char_meta_grammar;
@@ -342,7 +342,7 @@
               , char_class<mpl::_>
             >
           , meta_grammar::terminal_rule<qi::domain, tag::eol, eol_director>
-          , meta_grammar::terminal_rule<qi::domain, tag::end, end_director>
+          , meta_grammar::terminal_rule<qi::domain, tag::eoi, eoi_director>
         >
     {};
 

Modified: trunk/boost/spirit/home/qi/char/primitives.hpp
==============================================================================
--- trunk/boost/spirit/home/qi/char/primitives.hpp	(original)
+++ trunk/boost/spirit/home/qi/char/primitives.hpp	2008-04-18 08:35:25 EDT (Fri, 18 Apr 2008)
@@ -57,9 +57,9 @@
     };
     
     ///////////////////////////////////////////////////////////////////////////
-    //  the end_director matches the end of the input
+    //  the eoi_director matches the end of the input
     ///////////////////////////////////////////////////////////////////////////
-    struct end_director
+    struct eoi_director
     {
         template <typename Component, typename Context, typename Iterator>
         struct attribute
@@ -84,7 +84,7 @@
         template <typename Component>
         static std::string what(Component const&)
         {
-            return "end";
+            return "eoi";
         }
     };
     

Modified: trunk/boost/spirit/home/support/placeholders.hpp
==============================================================================
--- trunk/boost/spirit/home/support/placeholders.hpp	(original)
+++ trunk/boost/spirit/home/support/placeholders.hpp	2008-04-18 08:35:25 EDT (Fri, 18 Apr 2008)
@@ -24,7 +24,7 @@
         struct lit {};
         struct wlit {};
         struct eol {};
-        struct end {};
+        struct eoi {};
 
         struct bin {};
         struct oct {};
@@ -83,7 +83,7 @@
     typedef proto::terminal<tag::lit>::type lit_type;
     typedef proto::terminal<tag::wlit>::type wlit_type;
     typedef proto::terminal<tag::eol>::type eol_type;
-    typedef proto::terminal<tag::end>::type end_type;
+    typedef proto::terminal<tag::eoi>::type end_type;
     
     typedef proto::terminal<tag::bin>::type bin_type;
     typedef proto::terminal<tag::oct>::type oct_type;
@@ -141,7 +141,7 @@
     proto::terminal<tag::lit>::type const lit = {{}};
     proto::terminal<tag::wlit>::type const wlit = {{}};
     proto::terminal<tag::eol>::type const eol = {{}};
-    proto::terminal<tag::end>::type const end = {{}};
+    proto::terminal<tag::eoi>::type const eoi = {{}};
     
     proto::terminal<tag::bin>::type const bin = {{}};
     proto::terminal<tag::oct>::type const oct = {{}};
@@ -203,7 +203,7 @@
     inline void silence_unused_warnings__placeholders()
     {
         (void) char_; (void) wchar; (void) lit; (void) wlit;
-        (void) eol; (void) end;
+        (void) eol; (void) eoi;
         (void) bin; (void) oct; (void) hex;
         (void) byte; (void) word; (void) dword; 
         (void) big_word; (void) big_dword; 

Modified: trunk/libs/spirit/test/qi/char.cpp
==============================================================================
--- trunk/libs/spirit/test/qi/char.cpp	(original)
+++ trunk/libs/spirit/test/qi/char.cpp	2008-04-18 08:35:25 EDT (Fri, 18 Apr 2008)
@@ -24,7 +24,7 @@
     using boost::spirit::char_;
     using boost::spirit::wchar;
     using boost::spirit::eol;
-    using boost::spirit::end;
+    using boost::spirit::eoi;
     
     {
         BOOST_TEST(test("x", 'x'));
@@ -139,12 +139,12 @@
         BOOST_TEST(!test(L"   \b", eol, wchar(L' ')));
     }
     
-    {   // end
-        BOOST_TEST(test("", end));
-        BOOST_TEST(!test("a", end));
+    {   // eoi
+        BOOST_TEST(test("", eoi));
+        BOOST_TEST(!test("a", eoi));
 
-        BOOST_TEST(test("   ", end, space));
-        BOOST_TEST(!test("   a", end, space));
+        BOOST_TEST(test("   ", eoi, space));
+        BOOST_TEST(!test("   a", eoi, space));
     }
     
     return boost::report_errors();