[openvrml-commit] openvrml/src/libopenvrml/openvrml browser.cpp, 1.184, 1.185

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv680/src/libopenvrml/openvrml

Modified Files:
	browser.cpp 
Log Message:
Avoid redundantly parsing the string in uri's copy constructor and assignment operator.

Index: browser.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/browser.cpp,v
retrieving revision 1.184
retrieving revision 1.185
diff -C2 -d -r1.184 -r1.185
*** browser.cpp	26 Jul 2006 15:56:40 -0000	1.184
--- browser.cpp	27 Jul 2006 00:32:37 -0000	1.185
***************
*** 3631,3634 ****
--- 3631,3636 ----
          operator std::string() const OPENVRML_THROW1(std::bad_alloc);
  
+         void swap(uri & id) OPENVRML_NOTHROW;
+ 
          const std::string scheme() const OPENVRML_THROW1(std::bad_alloc);
          const std::string scheme_specific_part() const
***************
*** 3685,3723 ****
  
      uri::uri(const uri & id) OPENVRML_THROW1(std::bad_alloc):
!         str_(id.str_)
!     {
!         using std::string;
!         using namespace boost::spirit;
! 
!         actions a(*this);
!         uri_grammar<actions> g(a);
! 
!         string::const_iterator begin = this->str_.begin();
!         string::const_iterator end = this->str_.end();
! 
!         if (!parse(begin, end, g, space_p).full) {
!             assert(false); // We started with a uri; it had better be valid.
!         }
!     }
  
      uri & uri::operator=(const uri & id) OPENVRML_THROW1(std::bad_alloc)
      {
!         using std::string;
!         using namespace boost::spirit;
! 
!         if (&id == this) { return *this; }
! 
!         this->str_ = id.str_;
! 
!         actions a(*this);
!         uri_grammar<actions> g(a);
! 
!         string::const_iterator begin = this->str_.begin();
!         string::const_iterator end = this->str_.end();
! 
!         if (!parse(begin, end, g, space_p).full) {
!             assert(false); // We started with a uri; it had better be valid.
!         }
! 
          return *this;
      }
--- 3687,3735 ----
  
      uri::uri(const uri & id) OPENVRML_THROW1(std::bad_alloc):
!         str_(id.str_),
!         scheme_begin(this->str_.begin() + std::distance(id.str_.begin(),
!                                                         id.scheme_begin)),
!         scheme_end(this->str_.begin() + std::distance(id.str_.begin(),
!                                                       id.scheme_end)),
!         scheme_specific_part_begin(
!             this->str_.begin() + std::distance(id.str_.begin(),
!                                                id.scheme_specific_part_begin)),
!         scheme_specific_part_end(
!             this->str_.begin() + std::distance(id.str_.begin(),
!                                                id.scheme_specific_part_end)),
!         authority_begin(this->str_.begin()
!                         + std::distance(id.str_.begin(), id.authority_begin)),
!         authority_end(this->str_.begin() + std::distance(id.str_.begin(),
!                                                          id.authority_end)),
!         userinfo_begin(this->str_.begin() + std::distance(id.str_.begin(),
!                                                           id.userinfo_begin)),
!         userinfo_end(this->str_.begin() + std::distance(id.str_.begin(),
!                                                         id.userinfo_end)),
!         host_begin(this->str_.begin() + std::distance(id.str_.begin(),
!                                                       id.host_begin)),
!         host_end(this->str_.begin() + std::distance(id.str_.begin(),
!                                                     id.host_end)),
!         port_begin(this->str_.begin() + std::distance(id.str_.begin(),
!                                                       id.port_begin)),
!         port_end(this->str_.begin() + std::distance(id.str_.begin(),
!                                                     id.port_end)),
!         path_begin(this->str_.begin() + std::distance(id.str_.begin(),
!                                                       id.path_begin)),
!         path_end(this->str_.begin() + std::distance(id.str_.begin(),
!                                                     id.path_end)),
!         query_begin(this->str_.begin() + std::distance(id.str_.begin(),
!                                                        id.query_begin)),
!         query_end(this->str_.begin() + std::distance(id.str_.begin(),
!                                                      id.query_end)),
!         fragment_begin(this->str_.begin() + std::distance(id.str_.begin(),
!                                                           id.fragment_begin)),
!         fragment_end(this->str_.begin() + std::distance(id.str_.begin(),
!                                                         id.fragment_end))
!     {}
  
      uri & uri::operator=(const uri & id) OPENVRML_THROW1(std::bad_alloc)
      {
!         uri temp(id);
!         this->swap(temp);
          return *this;
      }
***************
*** 3728,3731 ****
--- 3740,3767 ----
      }
  
+     void uri::swap(uri & id) OPENVRML_NOTHROW
+     {
+         using std::swap;
+         swap(this->str_, id.str_);
+         swap(this->scheme_begin, id.scheme_begin);
+         swap(this->scheme_end, id.scheme_end);
+         swap(this->scheme_specific_part_begin, id.scheme_specific_part_begin);
+         swap(this->scheme_specific_part_end, id.scheme_specific_part_end);
+         swap(this->authority_begin, id.authority_begin);
+         swap(this->authority_end, id.authority_end);
+         swap(this->userinfo_begin, id.userinfo_begin);
+         swap(this->userinfo_end, id.userinfo_end);
+         swap(this->host_begin, id.host_begin);
+         swap(this->host_end, id.host_end);
+         swap(this->port_begin, id.port_begin);
+         swap(this->port_end, id.port_end);
+         swap(this->path_begin, id.path_begin);
+         swap(this->path_end, id.path_end);
+         swap(this->query_begin, id.query_begin);
+         swap(this->query_end, id.query_end);
+         swap(this->fragment_begin, id.fragment_begin);
+         swap(this->fragment_end, id.fragment_end);
+     }
+ 
      const std::string uri::scheme() const OPENVRML_THROW1(std::bad_alloc)
      {