Ticket #11824: patch.diff

spirit/home/qi/auxiliary/eoi.hpp

@@ -50 +50 @@
           , Context& /*context*/, Skipper const& skipper
           , Attribute& /*attr*/) const
         {
-            qi::skip_over(first, last, skipper);
-            return first == last;
+            Iterator it = first;
+            qi::skip_over(it, last, skipper);
+            if (it == last)
+            {
+                first = it;
+                return true;
+            }
+            return false;
         }
 
         template <typename Context>

spirit/home/qi/auxiliary/eol.hpp

@@ -50 +50 @@
           , Context& /*context*/, Skipper const& skipper
           , Attribute& /*attr*/) const
         {
-            qi::skip_over(first, last, skipper);
-
             Iterator it = first;
+            
+            qi::skip_over(it, last, skipper);
+
             bool matched = false;
             if (it != last && *it == '\r')  // CR
             {

spirit/home/qi/auxiliary/eps.hpp

@@ -89 +89 @@
           , Context& /*context*/, Skipper const& skipper
           , Attribute& /*attr*/) const
         {
-            qi::skip_over(first, last, skipper);
+            if (predicate)
+                qi::skip_over(first, last, skipper);
             return predicate;
         }
 

spirit/home/qi/binary/binary.hpp

@@ -243 +243 @@
           , Context& /*context*/, Skipper const& skipper
           , Attribute& attr_param) const
         {
-            qi::skip_over(first, last, skipper);
+            Iterator it = first;
+            
+            qi::skip_over(it, last, skipper);
 
             typename attribute<Context, Iterator>::type attr_;
             unsigned char* bytes = reinterpret_cast<unsigned char*>(&attr_);
 
-            Iterator it = first;
             for (unsigned int i = 0; i < sizeof(attr_); ++i)
             {
                 if (it == last)
@@ -289 +290 @@
           , Context& /*context*/, Skipper const& skipper
           , Attribute& attr_param) const
         {
-            qi::skip_over(first, last, skipper);
+            Iterator it = first;
+            
+            qi::skip_over(it, last, skipper);
 
             // Even if the endian types are not pod's (at least not in the
             // definition of C++03) it seems to be safe to assume they are
@@ -309 +312 @@
 
             unsigned char* bytes = reinterpret_cast<unsigned char*>(&attr_);
 
-            Iterator it = first;
             for (unsigned int i = 0; i < sizeof(attr_); ++i)
             {
                 if (it == last || *bytes++ != static_cast<unsigned char>(*it++))

spirit/home/qi/char/char_parser.hpp

@@ -63 +63 @@
         bool parse(Iterator& first, Iterator const& last
           , Context& context, Skipper const& skipper, Attribute& attr_) const
         {
-            qi::skip_over(first, last, skipper);
+            Iterator it = first;
+            
+            qi::skip_over(it, last, skipper);
 
-            if (first != last && this->derived().test(*first, context))
+            if (it != last && this->derived().test(*it, context))
             {
-                spirit::traits::assign_to(*first, attr_);
-                ++first;
+                spirit::traits::assign_to(*it, attr_);
+                ++it;
+                first = it;
                 return true;
             }
             return false;

spirit/home/qi/directive/lexeme.hpp

@@ -61 +61 @@
           , Context& context, Skipper const& skipper
           , Attribute& attr_) const
         {
-            qi::skip_over(first, last, skipper);
-            return subject.parse(first, last, context
-              , detail::unused_skipper<Skipper>(skipper), attr_);
+            Iterator it = first;
+            qi::skip_over(it, last, skipper);
+            if (subject.parse(it, last, context
+              , detail::unused_skipper<Skipper>(skipper), attr_))
+            {
+                first = it;
+                return true;
+            }
+            return false;
         }
         template <typename Iterator, typename Context
           , typename Skipper, typename Attribute>

spirit/home/qi/directive/raw.hpp

@@ -58 +58 @@
         bool parse(Iterator& first, Iterator const& last
           , Context& context, Skipper const& skipper, Attribute& attr_) const
         {
-            qi::skip_over(first, last, skipper);
-            Iterator i = first;
-            if (subject.parse(i, last, context, skipper, unused))
+            Iterator it = first;
+            qi::skip_over(it, last, skipper);
+            Iterator start = it;
+            if (subject.parse(it, last, context, skipper, unused))
             {
-                spirit::traits::assign_to(first, i, attr_);
-                first = i;
+                spirit::traits::assign_to(start, it, attr_);
+                first = it;
                 return true;
             }
             return false;

spirit/home/qi/nonterminal/rule.hpp

@@ -277 +277 @@
         {
             if (f)
             {
+                Iterator it = first;
                 // do a preskip if this is an implied lexeme
                 if (is_same<skipper_type, unused_type>::value)
-                    qi::skip_over(first, last, skipper);
+                    qi::skip_over(it, last, skipper);
 
                 typedef traits::make_attribute<attr_type, Attribute> make_attribute;
 
@@ -301 +302 @@
                 // fourth parameter can't be converted to a required target type
                 // then you are probably trying to use a rule or a grammar with
                 // an incompatible skipper type.
-                if (f(first, last, context, skipper))
+                if (f(it, last, context, skipper))
                 {
                     // do up-stream transformation, this integrates the results
                     // back into the original attribute value, if appropriate
                     traits::post_transform(attr_param, attr_);
+                    first = it;
                     return true;
                 }
 
@@ -323 +325 @@
         {
             if (f)
             {
+                Iterator it = first;
                 // do a preskip if this is an implied lexeme
                 if (is_same<skipper_type, unused_type>::value)
-                    qi::skip_over(first, last, skipper);
+                    qi::skip_over(it, last, skipper);
 
                 typedef traits::make_attribute<attr_type, Attribute> make_attribute;
 
@@ -347 +350 @@
                 // fourth parameter can't be converted to a required target type
                 // then you are probably trying to use a rule or a grammar with
                 // an incompatible skipper type.
-                if (f(first, last, context, skipper))
+                if (f(it, last, context, skipper))
                 {
                     // do up-stream transformation, this integrates the results
                     // back into the original attribute value, if appropriate
                     traits::post_transform(attr_param, attr_);
+                    first = it;
                     return true;
                 }
 

spirit/home/qi/numeric/bool.hpp

@@ -156 +156 @@
           , Attribute& attr_) const
         {
             typedef detail::bool_impl<T, BoolPolicies> extract;
-            qi::skip_over(first, last, skipper);
-            return extract::parse(first, last, attr_, BoolPolicies());
+            Iterator it = first;
+            qi::skip_over(it, last, skipper);
+            if (extract::parse(it, last, attr_, BoolPolicies()))
+            {
+                first = it;
+                return true;
+            }
+            return false;
         }
 
         template <typename Context>
@@ -187 +193 @@
           , Attribute& attr_) const
         {
             typedef detail::bool_impl<T, BoolPolicies> extract;
-            qi::skip_over(first, last, skipper);
-            return extract::parse(first, last, attr_, BoolPolicies(), n_, n_);
+            Iterator it = first;
+            qi::skip_over(it, last, skipper);
+            if (extract::parse(if, last, attr_, BoolPolicies(), n_, n_))
+            {
+                first = it;
+                return true;
+            }
+            return false;
         }
 
         template <typename Context>

spirit/home/qi/numeric/int.hpp

@@ -205 +205 @@
           , Attribute& attr_) const
         {
             typedef extract_int<T, Radix, MinDigits, MaxDigits> extract;
-            qi::skip_over(first, last, skipper);
-            return extract::call(first, last, attr_);
+            Iterator it = first;
+            qi::skip_over(it, last, skipper);
+            if (extract::call(it, last, attr_))
+            {
+                first = it;
+                return true;
+            }
+            return false;
         }
 
         template <typename Context>
@@ -243 +249 @@
           , Attribute& attr_param) const
         {
             typedef extract_int<T, Radix, MinDigits, MaxDigits> extract;
-            qi::skip_over(first, last, skipper);
+            Iterator it = first;
+            qi::skip_over(it, last, skipper);
 
-            Iterator save = first;
             T attr_;
 
-            if (extract::call(first, last, attr_) && (attr_ == n_))
+            if (extract::call(it, last, attr_) && (attr_ == n_))
             {
                 traits::assign_to(attr_, attr_param);
+                first = it;
                 return true;
             }
 
-            first = save;
             return false;
         }
 

spirit/home/qi/numeric/real.hpp

@@ -164 +164 @@
           , T& attr_) const
         {
             typedef detail::real_impl<T, RealPolicies> extract;
-            qi::skip_over(first, last, skipper);
-            return extract::parse(first, last, attr_, RealPolicies());
+            Iterator it = first;
+            qi::skip_over(it, last, skipper);
+            if (extract::parse(it, last, attr_, RealPolicies()))
+            {
+                first = it;
+                return true;
+            }
+            return false;
         }
 
         template <typename Iterator, typename Context
@@ -211 +217 @@
           , Attribute& attr_param) const
         {
             typedef detail::real_impl<T, RealPolicies> extract;
-            qi::skip_over(first, last, skipper);
+            Iterator it = first;
+            qi::skip_over(it, last, skipper);
 
-            Iterator save = first;
             T attr_;
 
-            if (extract::parse(first, last, attr_, RealPolicies()) &&
+            if (extract::parse(it, last, attr_, RealPolicies()) &&
                 (attr_ == n_))
             {
                 traits::assign_to(attr_, attr_param);
+                first = it;
                 return true;
             }
 
-            first = save;
             return false;
         }
 

spirit/home/qi/numeric/uint.hpp

@@ -238 +238 @@
           , Attribute& attr_) const
         {
             typedef extract_uint<T, Radix, MinDigits, MaxDigits> extract;
-            qi::skip_over(first, last, skipper);
-            return extract::call(first, last, attr_);
+            Iterator it = first;
+            qi::skip_over(it, last, skipper);
+            if (extract::call(it, last, attr_))
+            {
+                first = it;
+                return true;
+            }
+            return false;
         }
 
         template <typename Context>
@@ -276 +282 @@
           , Attribute& attr_param) const
         {
             typedef extract_uint<T, Radix, MinDigits, MaxDigits> extract;
-            qi::skip_over(first, last, skipper);
+            Iterator it = first;
+            qi::skip_over(it, last, skipper);
 
-            Iterator save = first;
             T attr_;
 
-            if (extract::call(first, last, attr_) && (attr_ == n_))
+            if (extract::call(it, last, attr_) && (attr_ == n_))
             {
                 traits::assign_to(attr_, attr_param);
+                first = it;
                 return true;
             }
 
-            first = save;
             return false;
         }
 

spirit/home/qi/stream/stream.hpp

@@ -62 +62 @@
         {
             typedef qi::detail::iterator_source<Iterator> source_device;
             typedef boost::iostreams::stream<source_device> instream;
+            
+            Iterator it = first;
 
-            qi::skip_over(first, last, skipper);
+            qi::skip_over(it, last, skipper);
 
-            instream in(first, last);           // copies 'first'
-            in >> attr_;                        // use existing operator>>()
+            instream in(it, last);           // copies 'first'
+            in >> attr_;                     // use existing operator>>()
 
             // advance the iterator if everything is ok
             if (in) {
                 if (!in.eof()) {
                     std::streamsize pos = in.tellg();
-                    std::advance(first, pos);
+                    std::advance(it, pos);
                 } else {
-                    first = last;
+                    it = last;
                 }
+                first = it;
                 return true;
             }
 

spirit/home/qi/string/lit.hpp

@@ -106 +106 @@
         bool parse(Iterator& first, Iterator const& last
           , Context& /*context*/, Skipper const& skipper, Attribute& attr_) const
         {
-            qi::skip_over(first, last, skipper);
-            return detail::string_parse(str, first, last, attr_);
+            Iterator it = first;
+            qi::skip_over(it, last, skipper);
+            if (detail::string_parse(str, first, last, attr_))
+            {
+                first = it;
+                return true;
+            }
+            return false;
         }
 
         template <typename Context>
@@ -165 +171 @@
         bool parse(Iterator& first, Iterator const& last
           , Context& /*context*/, Skipper const& skipper, Attribute& attr_) const
         {
-            qi::skip_over(first, last, skipper);
-            return detail::string_parse(str_lo, str_hi, first, last, attr_);
+            Iterator it = first;
+            qi::skip_over(it, last, skipper);
+            if (detail::string_parse(str_lo, str_hi, first, last, attr_))
+            {
+                first = it;
+                return true;
+            }
+            return false;
         }
 
         template <typename Context>

spirit/home/qi/string/symbols.hpp

@@ -259 +259 @@
         bool parse(Iterator& first, Iterator const& last
           , Context& /*context*/, Skipper const& skipper, Attribute& attr_) const
         {
-            qi::skip_over(first, last, skipper);
+            Iterator it = first;
+            
+            qi::skip_over(it, last, skipper);
 
             if (value_type* val_ptr
-                = lookup->find(first, last, Filter()))
+                = lookup->find(it, last, Filter()))
             {
                 spirit::traits::assign_to(*val_ptr, attr_);
+                first = it;
                 return true;
             }
             return false;

spirit/repository/home/qi/directive/distinct.hpp

@@ -76 +76 @@
         bool parse(Iterator& first, Iterator const& last
           , Context& context, Skipper const& skipper, Attribute& attr) const
         {
-            Iterator iter = first;
+            Iterator it = first;
 
-            spirit::qi::skip_over(iter, last, skipper);
-            if (!subject.parse(iter, last, context
+            spirit::qi::skip_over(it, last, skipper);
+            if (!subject.parse(it, last, context
               , spirit::qi::detail::unused_skipper<Skipper>(skipper), attr))
                 return false;
 
-            Iterator i = iter;
+            Iterator i = it;
             if (tail.parse(i, last, context, unused, unused))
                 return false;
 
-            first = iter;
+            first = it;
             return true;
         }
 

spirit/repository/home/qi/operator/detail/keywords.hpp

@@ -98 +98 @@
                        (!is_distinct<ElementType>::value)
                     || skipper.parse(first,last,unused,unused,unused)
                   ){
-                      spirit::qi::skip_over(first, last, skipper);
-                      return call_subject_unused(fusion::at_c<T::value>(elements), first, last, context, skipper, idx );
+                      Iterator it = first;
+                      spirit::qi::skip_over(it, last, skipper);
+                      if (call_subject_unused(fusion::at_c<T::value>(elements), it, last, context, skipper, idx ))
+                      {
+                          first = it;
+                          return true;
+                      }
+                      return false;
                     }
                 return false;
             }

spirit/repository/home/qi/operator/keywords.hpp

@@ -254 +254 @@
 
             // We have a bool array 'flags' with one flag for each parser as well as a 'counter'
             // array.
-            // The kwd directive sets and increments the counter when a successeful parse occurred
+            // The kwd directive sets and increments the counter when a successful parse occurred
             // as well as the slot of the corresponding parser to true in the flags array as soon
             // the minimum repetition requirement is met and keeps that value to true as long as
             // the maximum repetition requirement is met.
@@ -264 +264 @@
 
             while(true)
             {
-
-                spirit::qi::skip_over(first, last, skipper);
                 Iterator save = first;
+                spirit::qi::skip_over(first, last, skipper);
                 if (string_keywords_inst.parse(first, last,parse_visitor,skipper))
                 {
                     save = first;
@@ -277 +276 @@
                   if(!complex_keywords_inst.parse(complex_function))
                   {
                     first = save;
-                    // Check that we are leaving the keywords parser in a successfull state
+                    // Check that we are leaving the keywords parser in a successful state
                     BOOST_FOREACH(bool &valid,flags)
                     {
                       if(!valid)
@@ -335 +334 @@
 
             // We have a bool array 'flags' with one flag for each parser as well as a 'counter'
             // array.
-            // The kwd directive sets and increments the counter when a successeful parse occurred
+            // The kwd directive sets and increments the counter when a successful parse occurred
             // as well as the slot of the corresponding parser to true in the flags array as soon
             // the minimum repetition requirement is met and keeps that value to true as long as
             // the maximum repetition requirement is met.
@@ -345 +344 @@
 
             while(true)
             {
-                spirit::qi::skip_over(first, last, skipper);
                 Iterator save = first;
+                spirit::qi::skip_over(first, last, skipper);
                 // String keywords pass
                 if (string_keywords_inst.parse(first,last,parse_visitor,no_case_parse_visitor,skipper))
                 {
@@ -358 +357 @@
                   if(!complex_keywords_inst.parse(complex_function))
                   {
                     first = save;
-                    // Check that we are leaving the keywords parser in a successfull state
+                    // Check that we are leaving the keywords parser in a successful state
                     BOOST_FOREACH(bool &valid,flags)
                     {
                       if(!valid)