Changeset 810 in dev for branches/egtra/ab5.0/abdev/ab_common/include/Lexical/Source.h

Timestamp:

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

Author:

イグトランス (egtra)

Message:

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

File:

• branches/egtra/ab5.0/abdev/ab_common/include/Lexical/Source.h (modified) (5 diffs)

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;
     }