Ticket #2304: spirit.patch
File spirit.patch, 9.2 KB (added by , 14 years ago) |
---|
-
boost/spirit/home/classic/core/impl/match.ipp
19 19 : len(-1), val() {} 20 20 21 21 template <typename T> 22 inline match<T>::match(std::size_t length )23 : len(length ), val() {}22 inline match<T>::match(std::size_t length_) 23 : len(length_), val() {} 24 24 25 25 template <typename T> 26 inline match<T>::match(std::size_t length , ctor_param_t val_)27 : len(length ), val(val_) {}26 inline match<T>::match(std::size_t length_, ctor_param_t val_) 27 : len(length_), val(val_) {} 28 28 29 29 template <typename T> 30 30 inline bool … … 66 66 inline match<nil_t>::match() 67 67 : len(-1) {} 68 68 69 inline match<nil_t>::match(std::size_t length )70 : len(length ) {}69 inline match<nil_t>::match(std::size_t length_) 70 : len(length_) {} 71 71 72 inline match<nil_t>::match(std::size_t length , nil_t)73 : len(length ) {}72 inline match<nil_t>::match(std::size_t length_, nil_t) 73 : len(length_) {} 74 74 75 75 inline bool 76 76 match<nil_t>::operator!() const -
boost/spirit/home/classic/core/non_terminal/impl/rule.ipp
226 226 template <typename ParserT, typename ScannerT, typename AttrT> 227 227 struct concrete_parser : abstract_parser<ScannerT, AttrT> 228 228 { 229 concrete_parser(ParserT const& p ) : p(p) {}229 concrete_parser(ParserT const& p_) : p(p_) {} 230 230 virtual ~concrete_parser() {} 231 231 232 232 virtual typename match_result<ScannerT, AttrT>::type -
boost/spirit/home/classic/core/non_terminal/subrule.hpp
148 148 subrule_list< 149 149 subrule_parser<ID, DefT, ContextT>, 150 150 RestT> > 151 operator,(subrule_parser<ID, DefT, ContextT> const& rhs )151 operator,(subrule_parser<ID, DefT, ContextT> const& rhs_) 152 152 { 153 153 return subrule_list< 154 154 FirstT, … … 158 158 first, 159 159 subrule_list< 160 160 subrule_parser<ID, DefT, ContextT>, 161 RestT>(rhs , rest));161 RestT>(rhs_, rest)); 162 162 } 163 163 164 164 FirstT first; … … 258 258 parse_main(ScannerT const& scan) const 259 259 { 260 260 typedef typename parser_result<self_t, ScannerT>::type result_t; 261 result_t result ;261 result_t result_; 262 262 impl::parse_subrule<result_t, ScannerT, ID>:: 263 do_(result , scan);264 return result ;263 do_(result_, scan); 264 return result_; 265 265 } 266 266 267 267 template <typename ScannerT> -
boost/spirit/home/classic/core/non_terminal/rule.hpp
159 159 return ptr.get(); 160 160 } 161 161 162 rule(abstract_parser_t* ptr )163 : ptr(ptr ) {}162 rule(abstract_parser_t* ptr_) 163 : ptr(ptr_) {} 164 164 165 rule(abstract_parser_t const* ptr )166 : ptr(ptr ) {}165 rule(abstract_parser_t const* ptr_) 166 : ptr(ptr_) {} 167 167 168 168 scoped_ptr<abstract_parser_t> ptr; 169 169 }; -
boost/spirit/home/classic/core/non_terminal/parser_id.hpp
106 106 : parser_id(reinterpret_cast<std::size_t>(this)); 107 107 } 108 108 109 void set_id(parser_id id ) { tag = id; }109 void set_id(parser_id id_) { tag = id_; } 110 110 111 111 private: 112 112 -
boost/spirit/home/classic/error_handling/exceptions.hpp
126 126 typedef unary<ParserT, parser<self_t> > base_t; 127 127 typedef unary_parser_category parser_category_t; 128 128 129 assertive_parser(ParserT const& parser, ErrorDescrT descriptor )130 : base_t(parser), descriptor(descriptor ) {}129 assertive_parser(ParserT const& parser, ErrorDescrT descriptor_) 130 : base_t(parser), descriptor(descriptor_) {} 131 131 132 132 template <typename ScannerT> 133 133 struct result -
boost/spirit/home/classic/tree/common.hpp
555 555 {} 556 556 557 557 explicit 558 tree_match(std::size_t length )559 : match<T>(length ), trees()558 tree_match(std::size_t length_) 559 : match<T>(length_), trees() 560 560 {} 561 561 562 tree_match(std::size_t length , parse_node_t const& n)563 : match<T>(length ), trees()562 tree_match(std::size_t length_, parse_node_t const& n) 563 : match<T>(length_), trees() 564 564 { 565 565 trees.push_back(node_t(n)); 566 566 } 567 567 568 tree_match(std::size_t length , param_type val, parse_node_t const& n)569 : match<T>(length , val), trees()568 tree_match(std::size_t length_, param_type val, parse_node_t const& n) 569 : match<T>(length_, val), trees() 570 570 { 571 571 #if !defined(BOOST_SPIRIT_USE_LIST_FOR_TREES) 572 572 trees.reserve(10); // this is more or less an arbitrary number... … … 575 575 } 576 576 577 577 // attention, these constructors will change the second parameter! 578 tree_match(std::size_t length , container_t& c)579 : match<T>(length ), trees()578 tree_match(std::size_t length_, container_t& c) 579 : match<T>(length_), trees() 580 580 { 581 581 impl::cp_swap(trees, c); 582 582 } 583 583 584 tree_match(std::size_t length , param_type val, container_t& c)585 : match<T>(length , val), trees()584 tree_match(std::size_t length_, param_type val, container_t& c) 585 : match<T>(length_, val), trees() 586 586 { 587 587 impl::cp_swap(trees, c); 588 588 } -
boost/spirit/home/classic/phoenix/actor.hpp
340 340 template <typename BaseT> 341 341 template <typename A> 342 342 inline typename actor_result<BaseT, tuple<A&> >::type 343 actor<BaseT>::operator()(A& a ) const343 actor<BaseT>::operator()(A& a_) const 344 344 { 345 return BaseT::eval(tuple<A&>(a ));345 return BaseT::eval(tuple<A&>(a_)); 346 346 } 347 347 348 348 ////////////////////////////////// 349 349 template <typename BaseT> 350 350 template <typename A, typename B> 351 351 inline typename actor_result<BaseT, tuple<A&, B&> >::type 352 actor<BaseT>::operator()(A& a , B& b) const352 actor<BaseT>::operator()(A& a_, B& b_) const 353 353 { 354 return BaseT::eval(tuple<A&, B&>(a , b));354 return BaseT::eval(tuple<A&, B&>(a_, b_)); 355 355 } 356 356 357 357 ////////////////////////////////// 358 358 template <typename BaseT> 359 359 template <typename A, typename B, typename C> 360 360 inline typename actor_result<BaseT, tuple<A&, B&, C&> >::type 361 actor<BaseT>::operator()(A& a , B& b, C& c) const361 actor<BaseT>::operator()(A& a_, B& b_, C& c_) const 362 362 { 363 return BaseT::eval(tuple<A&, B&, C&>(a , b, c));363 return BaseT::eval(tuple<A&, B&, C&>(a_, b_, c_)); 364 364 } 365 365 366 366 #if PHOENIX_LIMIT > 3 … … 368 368 template <typename BaseT> 369 369 template <typename A, typename B, typename C, typename D> 370 370 inline typename actor_result<BaseT, tuple<A&, B&, C&, D&> >::type 371 actor<BaseT>::operator()(A& a , B& b, C& c, D& d) const371 actor<BaseT>::operator()(A& a_, B& b_, C& c_, D& d_) const 372 372 { 373 return BaseT::eval(tuple<A&, B&, C&, D&>(a , b, c, d));373 return BaseT::eval(tuple<A&, B&, C&, D&>(a_, b_, c_, d_)); 374 374 } 375 375 376 376 ////////////////////////////////// 377 377 template <typename BaseT> 378 378 template <typename A, typename B, typename C, typename D, typename E> 379 379 inline typename actor_result<BaseT, tuple<A&, B&, C&, D&, E&> >::type 380 actor<BaseT>::operator()(A& a , B& b, C& c, D& d, E& e) const380 actor<BaseT>::operator()(A& a_, B& b_, C& c_, D& d_, E& e_) const 381 381 { 382 return BaseT::eval(tuple<A&, B&, C&, D&, E&>(a , b, c, d, e));382 return BaseT::eval(tuple<A&, B&, C&, D&, E&>(a_, b_, c_, d_, e_)); 383 383 } 384 384 385 385 ////////////////////////////////// … … 391 391 tuple<A&, B&, C&, D&, E&, F&> 392 392 >::type 393 393 actor<BaseT>::operator()( 394 A& a , B& b, C& c, D& d, E& e, F& f394 A& a_, B& b_, C& c_, D& d_, E& e_, F& f_ 395 395 ) const 396 396 { 397 397 return BaseT::eval( 398 398 tuple<A&, B&, C&, D&, E&, F&> 399 (a , b, c, d, e, f)399 (a_, b_, c_, d_, e_, f_) 400 400 ); 401 401 } 402 402