[Boost-commit] svn:boost r65250 - in trunk/boost/spirit/home/classic: . attribute dynamic/impl utility

Subject: [Boost-commit] svn:boost r65250 - in trunk/boost/spirit/home/classic: . attribute dynamic/impl utility
From: hartmut.kaiser_at_[hidden]
Date: 2010-09-04 09:19:12

Author: hkaiser
Date: 2010-09-04 09:19:11 EDT (Sat, 04 Sep 2010)
New Revision: 65250
URL: http://svn.boost.org/trac/boost/changeset/65250

Log:
Spirit: More disambiguation of Phoenix types in Spirit.Classic
Text files modified: 
   trunk/boost/spirit/home/classic/attribute.hpp           |     2 +-                                      
   trunk/boost/spirit/home/classic/attribute/closure.hpp   |    24 ++++++++++++------------                
   trunk/boost/spirit/home/classic/dynamic/impl/select.ipp |     4 ++--                                    
   trunk/boost/spirit/home/classic/dynamic/impl/switch.ipp |     8 ++++----                                
   trunk/boost/spirit/home/classic/utility/grammar_def.hpp |     6 +++---                                  
   5 files changed, 22 insertions(+), 22 deletions(-)

Modified: trunk/boost/spirit/home/classic/attribute.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/attribute.hpp	(original)
+++ trunk/boost/spirit/home/classic/attribute.hpp	2010-09-04 09:19:11 EDT (Sat, 04 Sep 2010)
@@ -27,7 +27,7 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 #if !defined(PHOENIX_LIMIT)
-#define PHOENIX_LIMIT 3
+#define PHOENIX_LIMIT 6
 #endif // !defined(PHOENIX_LIMIT)
 
 ///////////////////////////////////////////////////////////////////////////////

Modified: trunk/boost/spirit/home/classic/attribute/closure.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/attribute/closure.hpp	(original)
+++ trunk/boost/spirit/home/classic/attribute/closure.hpp	2010-09-04 09:19:11 EDT (Sat, 04 Sep 2010)
@@ -81,7 +81,7 @@
 
         template <typename ResultT, typename ParserT, typename ScannerT>
         ResultT& post_parse(ResultT& hit, ParserT const&, ScannerT const&)
-        { hit.value(frame[phoenix::tuple_index<0>()]); return hit; }
+        { hit.value(frame[::phoenix::tuple_index<0>()]); return hit; }
 
     private:
 
@@ -121,7 +121,7 @@
 
         template <typename ResultT, typename ParserT, typename ScannerT>
         ResultT& post_parse(ResultT& hit, ParserT const&, ScannerT const&)
-        { hit.value(frame[phoenix::tuple_index<0>()]); return hit; }
+        { hit.value(frame[::phoenix::tuple_index<0>()]); return hit; }
 
     private:
 
@@ -1046,14 +1046,14 @@
 
     template <typename BaseT>
     inline f_chseq<
-        ::phoenix::actor<container_begin<phoenix::actor<BaseT> > >,
-        ::phoenix::actor<container_end<phoenix::actor<BaseT> > >
+        ::phoenix::actor<container_begin<::phoenix::actor<BaseT> > >,
+        ::phoenix::actor<container_end<::phoenix::actor<BaseT> > >
     >
-    f_chseq_p(phoenix::actor<BaseT> const& a)
+    f_chseq_p(::phoenix::actor<BaseT> const& a)
     {
-        typedef ::phoenix::actor<container_begin<phoenix::actor<BaseT> > >
+        typedef ::phoenix::actor<container_begin<::phoenix::actor<BaseT> > >
             container_begin_t;
-        typedef ::phoenix::actor<container_end<phoenix::actor<BaseT> > >
+        typedef ::phoenix::actor<container_end<::phoenix::actor<BaseT> > >
             container_end_t;
         typedef f_chseq<container_begin_t, container_end_t> result_t;
 
@@ -1062,14 +1062,14 @@
 
     template <typename BaseT>
     inline f_strlit<
-        ::phoenix::actor<container_begin<phoenix::actor<BaseT> > >,
-        ::phoenix::actor<container_end<phoenix::actor<BaseT> > >
+        ::phoenix::actor<container_begin<::phoenix::actor<BaseT> > >,
+        ::phoenix::actor<container_end<::phoenix::actor<BaseT> > >
     >
-    f_str_p(phoenix::actor<BaseT> const& a)
+    f_str_p(::phoenix::actor<BaseT> const& a)
     {
-        typedef ::phoenix::actor<container_begin<phoenix::actor<BaseT> > >
+        typedef ::phoenix::actor<container_begin<::phoenix::actor<BaseT> > >
             container_begin_t;
-        typedef ::phoenix::actor<container_end<phoenix::actor<BaseT> > >
+        typedef ::phoenix::actor<container_end<::phoenix::actor<BaseT> > >
             container_end_t;
         typedef f_strlit<container_begin_t, container_end_t> result_t;
 

Modified: trunk/boost/spirit/home/classic/dynamic/impl/select.ipp
==============================================================================
--- trunk/boost/spirit/home/classic/dynamic/impl/select.ipp	(original)
+++ trunk/boost/spirit/home/classic/dynamic/impl/select.ipp	2010-09-04 09:19:11 EDT (Sat, 04 Sep 2010)
@@ -73,7 +73,7 @@
         typedef typename parser_result<parser_t, ScannerT>::type    result_t;
     
     iterator_t save(scan.first);
-    result_t result(t[phoenix::tuple_index<index>()].parse(scan));
+    result_t result(t[::phoenix::tuple_index<index>()].parse(scan));
 
         if (result) {
             return scan.create_match(result.length(), TupleT::length - N, 
@@ -99,7 +99,7 @@
         typedef typename parser_result<parser_t, ScannerT>::type    result_t;
         
     iterator_t save(scan.first);
-    result_t result(t[phoenix::tuple_index<index>()].parse(scan));
+    result_t result(t[::phoenix::tuple_index<index>()].parse(scan));
 
         if (result) {
             return scan.create_match(result.length(), TupleT::length - 1, 

Modified: trunk/boost/spirit/home/classic/dynamic/impl/switch.ipp
==============================================================================
--- trunk/boost/spirit/home/classic/dynamic/impl/switch.ipp	(original)
+++ trunk/boost/spirit/home/classic/dynamic/impl/switch.ipp	2010-09-04 09:19:11 EDT (Sat, 04 Sep 2010)
@@ -523,12 +523,12 @@
 };
 
 template <typename ActorT>
-struct make_cond_functor<phoenix::actor<ActorT> > {
+struct make_cond_functor<::phoenix::actor<ActorT> > {
 
-    static cond_actor<phoenix::actor<ActorT> >
-    do_(phoenix::actor<ActorT> const &actor)
+    static cond_actor<::phoenix::actor<ActorT> >
+    do_(::phoenix::actor<ActorT> const &actor)
     {
-        return cond_actor<phoenix::actor<ActorT> >(actor);
+        return cond_actor<::phoenix::actor<ActorT> >(actor);
     }
 };
 

Modified: trunk/boost/spirit/home/classic/utility/grammar_def.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/utility/grammar_def.hpp	(original)
+++ trunk/boost/spirit/home/classic/utility/grammar_def.hpp	2010-09-04 09:19:11 EDT (Sat, 04 Sep 2010)
@@ -97,7 +97,7 @@
     struct assign_zero_to_tuple_member {
 
         template <typename TupleT>
-        static void do_(TupleT &t) { t[phoenix::tuple_index<N>()] = 0; }
+        static void do_(TupleT &t) { t[::phoenix::tuple_index<N>()] = 0; }
     };
 
     template <int N>
@@ -289,9 +289,9 @@
     //  Another reason may be, that there is a count mismatch between
     //  the number of template parameters to the grammar_def<> class and the
     //  number of parameters used while calling start_parsers().
-        BOOST_SPIRIT_ASSERT(0 != t[phoenix::tuple_index<N>()]);
+        BOOST_SPIRIT_ASSERT(0 != t[::phoenix::tuple_index<N>()]);
 
-        return t[phoenix::tuple_index<N>()];
+        return t[::phoenix::tuple_index<N>()];
     }
 
 private: