Changeset 828 in dev for trunk/ab5.0/abdev/ab_common/include/Lexical/Source.h

Timestamp:

Mar 19, 2012, 1:59:48 AM (12 years ago)

Author:

イグトランス (egtra)

Message:

egtraブランチの内容をマージ。

Location:

trunk

Files:

• . (modified) (1 prop)
• ab5.0/abdev (modified) (1 prop)
• ab5.0/abdev/ab_common/include/Lexical/Source.h (modified) (7 diffs)

trunk/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& operator =(Text&& y)
+    {
+        SwapImpl(*this, y);
+        return *this;
+    }
+    Text& operator =(Text const& y)
+    {
+        return *this = std::move(Text(y));
+    }
     ~Text(){
         free( buffer );
@@ -100 +137 @@
     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 +236 @@
     {
     }
+    BasicSource(BasicSource&& basicSource)
+        : Text(std::move(basicSource))
+        , includedFilesRelation(std::move(basicSource.includedFilesRelation))
+    {
+    }
     BasicSource( const std::string &source )
     {
@@ -230 +279 @@
     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;
     }
 
@@ -262 +318 @@
         ar & boost::serialization::make_nvp("vector_BasicSource", boost::serialization::base_object<std::vector<BasicSource>>(*this));
     }
+
+public:
+    BasicSources() {}
+    BasicSources(BasicSources&& y) : std::vector<BasicSource>(std::move(y)) {}
+    BasicSources(BasicSources const& y) : std::vector<BasicSource>(y) {}
+    BasicSources operator =(BasicSources&& y)
+    {
+        std::vector<BasicSource>::operator =(std::move(y));
+        return *this;
+    }
+    BasicSources operator =(BasicSources const& y)
+    {
+        return *this = std::move(BasicSources(y));
+    }
 };
 
@@ -289 +359 @@
     {
     }
+    SourceCodePosition(SourceCodePosition const& y)
+        : relationalObjectModuleIndex(y.relationalObjectModuleIndex)
+        , pos(y.pos)
+    {
+    }
+
+    SourceCodePosition& operator =(SourceCodePosition const& y)
+    {
+        relationalObjectModuleIndex = y.relationalObjectModuleIndex;
+        pos = y.pos;
+        return *this;
+    }
 
     int GetRelationalObjectModuleIndex() const;