Changeset 817 in dev for branches/egtra/ab5.0/abdev/BasicCompiler_Common/include

Timestamp:

Mar 19, 2011, 10:47:28 PM (14 years ago)

Author:

イグトランス (egtra)

Message:

compilerにおいて、各クラスのコピー禁止を明確化、ならびにコピー可能なものにムーブコンストラクタ・ムーブ代入演算子を追加。

Location:

branches/egtra/ab5.0/abdev/BasicCompiler_Common/include

Files:

• BreakPoint.h (modified) (2 diffs)
• CodeGenerator.h (modified) (6 diffs)
• Compiler.h (modified) (1 diff)
• Configuration.h (modified) (1 diff)
• DataTableGenerator.h (modified) (1 diff)
• Debugger.h (modified) (1 diff)
• Enum.h (modified) (4 diffs)
• Linker.h (modified) (1 diff)
• Messenger.h (modified) (3 diffs)
• Program.h (modified) (1 diff)
• logger.h (modified) (1 diff)

branches/egtra/ab5.0/abdev/BasicCompiler_Common/include/BreakPoint.h

@@ -9 +9 @@
     BreakPointsPerFile(const char *lpszFileName,int iLineNum);
 
+    BreakPointsPerFile(BreakPointsPerFile&& y)
+        : filename(std::move(y.filename))
+        , lines(std::move(y.lines))
+    {
+    }
+
+    BreakPointsPerFile(BreakPointsPerFile const& y)
+        : filename(y.filename)
+        , lines(y.lines)
+    {
+    }
+
+    BreakPointsPerFile& operator =(BreakPointsPerFile&& y)
+    {
+        filename = std::move(y.filename);
+        lines = std::move(y.lines);
+        return *this;
+    }
+
+    BreakPointsPerFile& operator =(BreakPointsPerFile const& y)
+    {
+        return *this = std::move(BreakPointsPerFile(y));
+    }
+
     void add(int iLineNum);
     void remove(int iLineNum);
 
     void update( char *nativeCodeBuffer, const SourceLines &sourceLines );
+
 };
 typedef std::vector<BreakPointsPerFile> BreakPointsPerFiles;
@@ -27 +52 @@
 
     char *update( char *nativeCodeBuffer, int SizeOf_CodeSection, const SourceLines &sourceLines );
+
+private:
+    BreakPointManager(BreakPointManager const&);
+    BreakPointManager& operator =(BreakPointManager const&);
 };
 

branches/egtra/ab5.0/abdev/BasicCompiler_Common/include/CodeGenerator.h

@@ -33 +33 @@
         return typeSize;
     }
+
+private:
+    PertialSchedule(PertialSchedule const&);
+    PertialSchedule& operator =(PertialSchedule const&);
 };
 typedef std::vector<const PertialSchedule *> PertialSchedules;
@@ -68 +72 @@
         return sourceCodePos;
     }
+
+private:
+    GotoLabelSchedule(GotoLabelSchedule const&);
+    GotoLabelSchedule& operator =(GotoLabelSchedule const&);
 };
 typedef std::vector<const GotoLabelSchedule *> GotoLabelSchedules;
@@ -90 +98 @@
         , address( nativeCodePos )
     {
+    }
+
+    GotoLabel(GotoLabel&& y)
+        : name(std::move(y.name))
+        , line(std::move(y.line))
+        , address(std::move(y.address))
+    {
+    }
+
+    GotoLabel(GotoLabel const& y)
+        : name(y.name)
+        , line(y.line)
+        , address(y.address)
+    {
+    }
+
+    GotoLabel& operator =(GotoLabel&& y)
+    {
+        name = std::move(y.name);
+        line = std::move(y.line);
+        address = std::move(y.address);
+        return *this;
+    }
+
+    GotoLabel& operator =(GotoLabel const& y)
+    {
+        return *this = std::move(GotoLabel(y));
     }
 };
@@ -147 +182 @@
     void Break();
     void RunScheduleOfBreak();
+
+private:
+    LexicalScope(LexicalScope const&);
+    LexicalScope& operator =(LexicalScope const&);
 };
 
@@ -184 +223 @@
     //Returnステートメント用のデストラクタ呼び出し
     void CallDestructorsOfReturn( int BaseLevel = 0 );
+
+private:
+    LexicalScopes(LexicalScopes const&);
+    LexicalScopes& operator =(LexicalScopes const&);
 };
 
@@ -534 +577 @@
         pNativeCode->Put( c6 );
     }
+
+private:
+    CodeGenerator(CodeGenerator const&);
+    CodeGenerator& operator =(CodeGenerator const&);
 };

branches/egtra/ab5.0/abdev/BasicCompiler_Common/include/Compiler.h

@@ -215 +215 @@
     bool IsCompilingClass();
     const CClass &GetCompilingClass();
+
+private:
+    Compiler(Compiler const&);
+    Compiler& operator =(Compiler const&);
 };
 

branches/egtra/ab5.0/abdev/BasicCompiler_Common/include/Configuration.h

@@ -27 +27 @@
         ar & BOOST_SERIALIZATION_NVP( abdevRootRelativePath );
     }
+
+    Configuration(Configuration const&);
+    Configuration& operator =(Configuration const&);
 };

branches/egtra/ab5.0/abdev/BasicCompiler_Common/include/DataTableGenerator.h

@@ -17 +17 @@
     }
 
+private:
+    DataTableGenerator();
+    DataTableGenerator(DataTableGenerator const&);
+    DataTableGenerator& operator =(DataTableGenerator const&);
 };
 

branches/egtra/ab5.0/abdev/BasicCompiler_Common/include/Debugger.h

@@ -24 +24 @@
         return isRunning;
     }
+
+private:
+    Debugger(Debugger const&);
+    Debugger& operator =(Debugger const&);
 };
 

branches/egtra/ab5.0/abdev/BasicCompiler_Common/include/Enum.h

@@ -6 +6 @@
     std::string value;
     int sourceIndex;
+
 public:
     EnumMember( const std::string &name, const std::string &value, int sourceIndex )
@@ -13 +14 @@
     {
     }
+
+    EnumMember(EnumMember&& y)
+        : name(std::move(y.name))
+        , value(std::move(y.value))
+        , sourceIndex(std::move(y.sourceIndex))
+    {
+    }
+
+    EnumMember(EnumMember const& y)
+        : name(y.name)
+        , value(y.value)
+        , sourceIndex(y.sourceIndex)
+    {
+    }
+
+    EnumMember& operator =(EnumMember&& y)
+    {
+        name = std::move(y.name);
+        value = std::move(y.value);
+        sourceIndex = std::move(y.sourceIndex);
+        return *this;
+    }
+
+    EnumMember& operator =(EnumMember const& y)
+    {
+        return *this = std::move(EnumMember(y));
+    }
+
     const std::string &GetName() const
     {
@@ -39 +68 @@
         : Symbol( namespaceScopes, name )
     {
+    }
+
+    EnumInfo(EnumInfo&& y)
+        : Symbol(std::move(y))
+        , bConst(std::move(y.bConst))
+        , members(std::move(y.members))
+    {
+    }
+
+    EnumInfo(EnumInfo const& y)
+        : Symbol(y)
+        , bConst(y.bConst)
+        , members(y.members)
+    {
+    }
+
+    EnumInfo& operator =(EnumInfo&& y)
+    {
+        Symbol::operator =(std::move(y));
+        bConst = std::move(y.bConst);
+        members = std::move(y.members);
+        return *this;
+    }
+
+    EnumInfo& operator =(EnumInfo const& y)
+    {
+        return *this = std::move(EnumInfo(y));
     }
 
@@ -80 +136 @@
         return NULL;
     };
+
+    EnumInfoCollection() {}
+
+private:
+    EnumInfoCollection(EnumInfoCollection const&);
+    EnumInfoCollection& operator =(EnumInfoCollection const&);
 };

branches/egtra/ab5.0/abdev/BasicCompiler_Common/include/Linker.h

@@ -54 +54 @@
     // データテーブルをセット
     void SetDataTable( DataTable &dataTable );
+
+private:
+    Linker(Linker const&);
+    Linker& operator =(Linker const&);
 };

branches/egtra/ab5.0/abdev/BasicCompiler_Common/include/Messenger.h

@@ -24 +24 @@
     {
     }
+
     ErrorInfo( int errorCode, const std::string &keyword, int sourceIndex );
+
+    ErrorInfo(ErrorInfo&& y)
+        : errorCode(std::move(y.errorCode))
+        , keyword(std::move(y.keyword))
+        , sourceFilePath(std::move(y.sourceFilePath))
+        , sourceLineNum(std::move(y.sourceLineNum))
+        , errorLineNum(std::move(y.errorLineNum))
+    {
+    }
+
+    ErrorInfo(ErrorInfo const& y)
+        : errorCode(y.errorCode)
+        , keyword(y.keyword)
+        , sourceFilePath(y.sourceFilePath)
+        , sourceLineNum(y.sourceLineNum)
+        , errorLineNum(y.errorLineNum)
+    {
+    }
+
+    ErrorInfo& operator =(ErrorInfo&& y)
+    {
+        errorCode = std::move(y.errorCode);
+        keyword = std::move(y.keyword);
+        sourceFilePath = std::move(y.sourceFilePath);
+        sourceLineNum = std::move(y.sourceLineNum);
+        errorLineNum = std::move(y.errorLineNum);
+        return *this;
+    }
+
+    ErrorInfo& operator =(ErrorInfo const& y)
+    {
+        return *this = std::move(ErrorInfo(y));
+    }
 
     int GetErrorCode() const
@@ -63 +97 @@
 
 public:
+    ErrorMessenger() {}
+
     void Output( const ErrorInfo &errorInfo );
     void Output( int errorCode, const std::string &keyword, int sourceIndex = -1 );
@@ -75 +111 @@
 
     void ShowErrorLine( int errorLineNum );
+
+private:
+    ErrorMessenger(ErrorMessenger const&);
+    ErrorMessenger& operator =(ErrorMessenger const&);
 };

branches/egtra/ab5.0/abdev/BasicCompiler_Common/include/Program.h

@@ -96 +96 @@
 
     int GetExitCode() const;
+
+private:
+    Program(Program const&);
+    Program& operator =(Program const&);
 };
 

branches/egtra/ab5.0/abdev/BasicCompiler_Common/include/logger.h

@@ -28 +28 @@
         ar & BOOST_SERIALIZATION_NVP( stopStep );
     }
+
+    LoggerSetting(LoggerSetting const&);
+    LoggerSetting operator =(LoggerSetting const&);
 };