Changeset 810 in dev for branches/egtra

Timestamp:

Feb 14, 2011, 12:58:25 AM (14 years ago)

Author:

イグトランス (egtra)

Message:

ムーブコンストラクタ・ムーブ代入演算子の導入

Location:

branches/egtra/ab5.0/abdev/ab_common

Files:

• include/Lexical/Namespace.h (modified) (5 diffs)
• include/Lexical/Source.h (modified) (5 diffs)
• include/Lexical/Symbol.h (modified) (1 diff)
• src/Lexical/Namespace.cpp (modified) (2 diffs)

branches/egtra/ab5.0/abdev/ab_common/include/Lexical/Namespace.h

@@ -7 +7 @@
 class NamespaceScopes : public std::vector<std::string>
 {
+    typedef std::vector<std::string> Base;
     // XMLシリアライズ用
 private:
@@ -17 +18 @@
 
 public:
-    NamespaceScopes(){}
+    NamespaceScopes() {}
+    NamespaceScopes(NamespaceScopes const& y)
+        : Base(y)
+    {
+    }
+    NamespaceScopes(NamespaceScopes&& y)
+        : Base(std::move(y))
+    {
+    }
     NamespaceScopes( const std::string &namespaceStr );
     NamespaceScopes( NamespaceScopes::const_iterator first, NamespaceScopes::const_iterator last )
-        : std::vector<std::string>( first, last )
+        : Base(first, last)
     {
     }
     ~NamespaceScopes(){}
 
-    NamespaceScopes operator+ ( const NamespaceScopes &namespaceScopes ) const;
-
     void append( const NamespaceScopes &namespaceScopes )
     {
         insert( end(), namespaceScopes.begin(), namespaceScopes.end() );
+    }
+
+    NamespaceScopes& operator +=(const NamespaceScopes &namespaceScopes)
+    {
+        append(namespaceScopes);
+        return *this;
     }
 
@@ -77 +90 @@
 };
 
+NamespaceScopes operator +(const NamespaceScopes &lhs, const NamespaceScopes &rhs);
+
 inline bool operator ==( const NamespaceScopes &lhs, const NamespaceScopes &rhs )
 {
@@ -84 +99 @@
 class NamespaceScopesCollection : public std::vector<NamespaceScopes>
 {
+    typedef std::vector<NamespaceScopes> Base;
     // XMLシリアライズ用
 private:
@@ -93 +109 @@
 
 public:
+    NamespaceScopesCollection() : Base() {}
+    NamespaceScopesCollection(NamespaceScopesCollection&& y) : Base(std::move(y)) {}
+    NamespaceScopesCollection(NamespaceScopesCollection const& y) : Base(y) {}
+    NamespaceScopesCollection& operator =(NamespaceScopesCollection&& y)
+    {
+        Base::operator =(std::move(y));
+        return *this;
+    }
+    NamespaceScopesCollection& operator =(NamespaceScopesCollection const& y)
+    {
+        return operator =(NamespaceScopesCollection(y));
+    }
     bool IsExist( const NamespaceScopes &namespaceScopes ) const
     {

branches/egtra/ab5.0/abdev/ab_common/include/Lexical/Source.h

@@ -21 +21 @@
     {
     }
+    IncludedFilesRelation(IncludedFilesRelation const& y)
+        : filePaths(y.filePaths)
+        , lineFileNumbers(y.lineFileNumbers)
+    {
+    }
+    IncludedFilesRelation(IncludedFilesRelation&& y)
+        : filePaths(std::move(y.filePaths))
+        , lineFileNumbers(std::move(y.lineFileNumbers))
+    {
+    }
     ~IncludedFilesRelation()
     {
+    }
+    IncludedFilesRelation& operator =(IncludedFilesRelation&& y)
+    {
+        filePaths = std::move(y.filePaths);
+        lineFileNumbers = std::move(y.lineFileNumbers);
+        return *this;
+    }
+
+    IncludedFilesRelation& operator =(IncludedFilesRelation const& y)
+    {
+        return *this = std::move(IncludedFilesRelation(y));
     }
 
@@ -76 +97 @@
         buffer[length] = 0;
     }
+    Text(Text&& text)
+        : length( text.length )
+    {
+        buffer = text.buffer;
+        text.buffer = static_cast<char*>(calloc(1, 1));
+        text.length = 0;
+    }
     ~Text(){
         free( buffer );
@@ -100 +128 @@
     static void SlideString(char *buffer, int slide){
         memmove(buffer+slide, buffer, strlen(buffer)+1);
+    }
+
+protected:
+    static void SwapImpl(Text& lhs, Text& rhs)
+    {
+        std::swap(lhs.buffer, rhs.buffer);
+        std::swap(lhs.length, rhs.length);
     }
 };
@@ -192 +227 @@
     {
     }
+    BasicSource(BasicSource&& basicSource)
+        : Text(std::move(basicSource))
+        , includedFilesRelation(std::move(basicSource.includedFilesRelation))
+    {
+    }
     BasicSource( const std::string &source )
     {
@@ -230 +270 @@
     bool GetLineInfo( int sourceCodePos, int &line, std::string &fileName ) const;
 
-    void operator = ( const BasicSource &source ){
+    BasicSource& operator =(const BasicSource &source)
+    {
         Realloc( source.length );
         strcpy( buffer, source.buffer );
+        return *this;
+    }
+    BasicSource& operator =(BasicSource&& source)
+    {
+        Text::SwapImpl(*this, source);
+        return *this;
     }
 

branches/egtra/ab5.0/abdev/ab_common/include/Lexical/Symbol.h

@@ -48 +48 @@
     {
     }
+    Symbol(Symbol&& symbol)
+        : namespaceScopes(std::move(symbol.namespaceScopes))
+        , name(std::move(symbol.name))
+    {
+    }
     Symbol()
     {
+    }
+    Symbol& operator =(Symbol&& symbol)
+    {
+        namespaceScopes = std::move(symbol.namespaceScopes);
+        name = std::move(symbol.name);
+        return *this;
+    }
+    Symbol& operator =(Symbol const& symbol)
+    {
+        return *this = Symbol(symbol);
     }
 

branches/egtra/ab5.0/abdev/ab_common/src/Lexical/Namespace.cpp

@@ -16 +16 @@
         std::string tempName = namespaceStr.substr( i, i2-i );
 
-        push_back( tempName );
+        push_back(std::move(tempName));
 
         if( i2 == std::string::npos ){
@@ -26 +26 @@
 }
 
-NamespaceScopes NamespaceScopes::operator+ ( const NamespaceScopes &namespaceScopes ) const
+NamespaceScopes ActiveBasic::Common::Lexical::operator +(const NamespaceScopes &lhs, const NamespaceScopes &rhs)
 {
-    NamespaceScopes result;
-    result.reserve( this->size() + namespaceScopes.size() );
-    result = *this;
-    result.append( namespaceScopes );
-    return result;
+    return NamespaceScopes(lhs) += rhs;
 }