[boost] Re: BGL: Shadow Warnings

From: Perry Kundert (perry_at_[hidden])
Date: 2004-06-09 13:04:09

The -Wshadow warnings also affect the "spirit" parser.  Attached is a 
patch that fixes up a number of quite verbose warnings about shadowing 
variables...

David A. Greene wrote:
> Jeremy Siek wrote:
> 
>> Hi David,
<snip>
> 
> The option seems to be a little flaky in that it flags some things
> that I don't think it should, but it's still a good debugging tool.
> 
>> I'm currently extremely busy with school work, so it may take a while
>> for me to get to this. If you want to send me a patch to fix these
>> problems I'd be thankful.
> 
> 
> I feel your pain.  :)  I'll see what I can do, but no guarantees.
> 
>                           -Dave
> 


--- boost_1_31_0-stock/boost/spirit/core/impl/match.ipp	2004-01-19 16:15:55.000000000 -0700
+++ boost_1_31_0/boost/spirit/core/impl/match.ipp	2004-06-09 09:05:20.000000000 -0600
@@ -17,12 +17,12 @@
     : len(-1), val() {}
 
     template <typename T>
-    inline match<T>::match(std::size_t length)
-    : len(length), val() {}
+    inline match<T>::match(std::size_t length_)
+    : len(length_), val() {}
 
     template <typename T>
-    inline match<T>::match(std::size_t length, ctor_param_t val_)
-    : len(length), val(val_) {}
+    inline match<T>::match(std::size_t length_, ctor_param_t val_)
+    : len(length_), val(val_) {}
 
     template <typename T>
     inline bool
@@ -64,11 +64,11 @@
     inline match<nil_t>::match()
     : len(-1) {}
 
-    inline match<nil_t>::match(std::size_t length)
-    : len(length) {}
+    inline match<nil_t>::match(std::size_t length_)
+    : len(length_) {}
 
-    inline match<nil_t>::match(std::size_t length, nil_t)
-    : len(length) {}
+    inline match<nil_t>::match(std::size_t length_, nil_t)
+    : len(length_) {}
 
     inline bool
     match<nil_t>::operator!() const
--- boost_1_31_0-stock/boost/spirit/core/non_terminal/parser_id.hpp	2004-01-19 16:15:55.000000000 -0700
+++ boost_1_31_0/boost/spirit/core/non_terminal/parser_id.hpp	2004-06-09 09:17:33.000000000 -0600
@@ -100,7 +100,7 @@
                 : parser_id(reinterpret_cast<std::size_t>(this)); 
         }
 
-        void set_id(parser_id id) { tag = id; } 
+        void set_id(parser_id id_) { tag = id_; } 
         
     private:
     
--- boost_1_31_0-stock/boost/spirit/core/non_terminal/rule.hpp	2004-01-19 16:15:55.000000000 -0700
+++ boost_1_31_0/boost/spirit/core/non_terminal/rule.hpp	2004-06-09 09:42:46.000000000 -0600
@@ -157,8 +157,8 @@
             return ptr.get();
         }
 
-        rule(abstract_parser_t const* ptr)
-        : ptr(ptr) {}
+        rule(abstract_parser_t const* ptr_)
+        : ptr(ptr_) {}
 
         scoped_ptr<abstract_parser_t> ptr;
     };
--- boost_1_31_0-stock/boost/spirit/core/non_terminal/impl/rule.ipp	2004-01-19 16:15:55.000000000 -0700
+++ boost_1_31_0/boost/spirit/core/non_terminal/impl/rule.ipp	2004-06-09 09:43:51.000000000 -0600
@@ -224,7 +224,7 @@
         template <typename ParserT, typename ScannerT, typename AttrT>
         struct concrete_parser : abstract_parser<ScannerT, AttrT>
         {
-            concrete_parser(ParserT const& p) : p(p) {}
+            concrete_parser(ParserT const& p_) : p(p_) {}
             virtual ~concrete_parser() {}
 
             virtual typename match_result<ScannerT, AttrT>::type
--- boost_1_31_0-stock/boost/spirit/core/scanner/scanner.hpp	2004-01-19 16:15:56.000000000 -0700
+++ boost_1_31_0/boost/spirit/core/scanner/scanner.hpp	2004-06-09 09:44:41.000000000 -0600
@@ -240,22 +240,22 @@
         bool
         at_end() const
         {
-            typedef typename PoliciesT::iteration_policy_t iteration_policy_t;
-            return iteration_policy_t::at_end(*this);
+            typedef typename PoliciesT::iteration_policy_t iteration_policy_t_;
+            return iteration_policy_t_::at_end(*this);
         }
 
         value_t
         operator*() const
         {
-            typedef typename PoliciesT::iteration_policy_t iteration_policy_t;
-            return iteration_policy_t::filter(iteration_policy_t::get(*this));
+            typedef typename PoliciesT::iteration_policy_t iteration_policy_t_;
+            return iteration_policy_t_::filter(iteration_policy_t_::get(*this));
         }
 
         scanner const&
         operator++() const
         {
-            typedef typename PoliciesT::iteration_policy_t iteration_policy_t;
-            iteration_policy_t::advance(*this);
+            typedef typename PoliciesT::iteration_policy_t iteration_policy_t_;
+            iteration_policy_t_::advance(*this);
             return *this;
         }
 
--- boost_1_31_0-stock/boost/spirit/dynamic/stored_rule.hpp	2004-01-19 16:15:56.000000000 -0700
+++ boost_1_31_0/boost/spirit/dynamic/stored_rule.hpp	2004-06-09 09:45:53.000000000 -0600
@@ -109,8 +109,8 @@
     private:
 #endif
 
-        stored_rule(shared_ptr<abstract_parser_t> const& ptr)
-        : ptr(ptr) {}
+        stored_rule(shared_ptr<abstract_parser_t> const& ptr_)
+        : ptr(ptr_) {}
 
         shared_ptr<abstract_parser_t> ptr;
     };
--- boost_1_31_0-stock/boost/spirit/core/non_terminal/subrule.hpp	2004-01-19 16:15:55.000000000 -0700
+++ boost_1_31_0/boost/spirit/core/non_terminal/subrule.hpp	2004-06-09 09:48:16.000000000 -0600
@@ -209,7 +209,7 @@
             subrule_list<
                 subrule_parser<ID2, DefT2, ContextT2>,
                 nil_t> >
-        operator,(subrule_parser<ID2, DefT2, ContextT2> const& rhs) const
+        operator,(subrule_parser<ID2, DefT2, ContextT2> const& rhs_) const
         {
             return subrule_list<
                 self_t,
@@ -219,7 +219,7 @@
                         *this,
                         subrule_list<
                             subrule_parser<ID2, DefT2, ContextT2>, nil_t>(
-                                rhs, nil_t()));
+                                rhs_, nil_t()));
         }
 
         typename DefT::embed_t rhs;
@@ -257,10 +257,10 @@
         parse_main(ScannerT const& scan) const
         {
             typedef typename parser_result<self_t, ScannerT>::type result_t;
-            result_t result;
+            result_t result_;
             impl::parse_subrule<result_t, ScannerT, ID>::
-                do_(result, scan);
-            return result;
+                do_(result_, scan);
+            return result_;
         }
 
         template <typename ScannerT>
--- boost_1_31_0-stock/boost/spirit/symbols/symbols.hpp	2004-01-19 16:15:57.000000000 -0700
+++ boost_1_31_0/boost/spirit/symbols/symbols.hpp	2004-06-09 09:49:14.000000000 -0600
@@ -114,13 +114,13 @@
     {
         typedef typename ScannerT::iterator_t iterator_t;
         iterator_t first = scan.first;
-        typename SetT::search_info result = SetT::find(scan);
+        typename SetT::search_info result_ = SetT::find(scan);
 
-        if (result.data)
+        if (result_.data)
             return scan.
                 create_match(
-                    result.length,
-                    symbol_ref_t(*result.data),
+                    result_.length,
+                    symbol_ref_t(*result_.data),
                     first,
                     scan.first);
         else