Changeset 817 in dev for branches/egtra
- Timestamp:
- Mar 19, 2011, 10:47:28 PM (14 years ago)
- Location:
- branches/egtra/ab5.0/abdev
- Files:
-
- 15 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/egtra/ab5.0/abdev/BasicCompiler_Common/NonVolatile.h
r523 r817 39 39 void load(); 40 40 void save(); 41 42 private: 43 CNonVolatile(CNonVolatile const&); 44 CNonVolatile& operator =(CNonVolatile const&); 41 45 }; 42 46 extern CNonVolatile *pobj_nv; -
branches/egtra/ab5.0/abdev/BasicCompiler_Common/include/BreakPoint.h
r743 r817 9 9 BreakPointsPerFile(const char *lpszFileName,int iLineNum); 10 10 11 BreakPointsPerFile(BreakPointsPerFile&& y) 12 : filename(std::move(y.filename)) 13 , lines(std::move(y.lines)) 14 { 15 } 16 17 BreakPointsPerFile(BreakPointsPerFile const& y) 18 : filename(y.filename) 19 , lines(y.lines) 20 { 21 } 22 23 BreakPointsPerFile& operator =(BreakPointsPerFile&& y) 24 { 25 filename = std::move(y.filename); 26 lines = std::move(y.lines); 27 return *this; 28 } 29 30 BreakPointsPerFile& operator =(BreakPointsPerFile const& y) 31 { 32 return *this = std::move(BreakPointsPerFile(y)); 33 } 34 11 35 void add(int iLineNum); 12 36 void remove(int iLineNum); 13 37 14 38 void update( char *nativeCodeBuffer, const SourceLines &sourceLines ); 39 15 40 }; 16 41 typedef std::vector<BreakPointsPerFile> BreakPointsPerFiles; … … 27 52 28 53 char *update( char *nativeCodeBuffer, int SizeOf_CodeSection, const SourceLines &sourceLines ); 54 55 private: 56 BreakPointManager(BreakPointManager const&); 57 BreakPointManager& operator =(BreakPointManager const&); 29 58 }; 30 59 -
branches/egtra/ab5.0/abdev/BasicCompiler_Common/include/CodeGenerator.h
r641 r817 33 33 return typeSize; 34 34 } 35 36 private: 37 PertialSchedule(PertialSchedule const&); 38 PertialSchedule& operator =(PertialSchedule const&); 35 39 }; 36 40 typedef std::vector<const PertialSchedule *> PertialSchedules; … … 68 72 return sourceCodePos; 69 73 } 74 75 private: 76 GotoLabelSchedule(GotoLabelSchedule const&); 77 GotoLabelSchedule& operator =(GotoLabelSchedule const&); 70 78 }; 71 79 typedef std::vector<const GotoLabelSchedule *> GotoLabelSchedules; … … 90 98 , address( nativeCodePos ) 91 99 { 100 } 101 102 GotoLabel(GotoLabel&& y) 103 : name(std::move(y.name)) 104 , line(std::move(y.line)) 105 , address(std::move(y.address)) 106 { 107 } 108 109 GotoLabel(GotoLabel const& y) 110 : name(y.name) 111 , line(y.line) 112 , address(y.address) 113 { 114 } 115 116 GotoLabel& operator =(GotoLabel&& y) 117 { 118 name = std::move(y.name); 119 line = std::move(y.line); 120 address = std::move(y.address); 121 return *this; 122 } 123 124 GotoLabel& operator =(GotoLabel const& y) 125 { 126 return *this = std::move(GotoLabel(y)); 92 127 } 93 128 }; … … 147 182 void Break(); 148 183 void RunScheduleOfBreak(); 184 185 private: 186 LexicalScope(LexicalScope const&); 187 LexicalScope& operator =(LexicalScope const&); 149 188 }; 150 189 … … 184 223 //Returnステートメント用のデストラクタ呼び出し 185 224 void CallDestructorsOfReturn( int BaseLevel = 0 ); 225 226 private: 227 LexicalScopes(LexicalScopes const&); 228 LexicalScopes& operator =(LexicalScopes const&); 186 229 }; 187 230 … … 534 577 pNativeCode->Put( c6 ); 535 578 } 579 580 private: 581 CodeGenerator(CodeGenerator const&); 582 CodeGenerator& operator =(CodeGenerator const&); 536 583 }; -
branches/egtra/ab5.0/abdev/BasicCompiler_Common/include/Compiler.h
r812 r817 215 215 bool IsCompilingClass(); 216 216 const CClass &GetCompilingClass(); 217 218 private: 219 Compiler(Compiler const&); 220 Compiler& operator =(Compiler const&); 217 221 }; 218 222 -
branches/egtra/ab5.0/abdev/BasicCompiler_Common/include/Configuration.h
r477 r817 27 27 ar & BOOST_SERIALIZATION_NVP( abdevRootRelativePath ); 28 28 } 29 30 Configuration(Configuration const&); 31 Configuration& operator =(Configuration const&); 29 32 }; -
branches/egtra/ab5.0/abdev/BasicCompiler_Common/include/DataTableGenerator.h
r589 r817 17 17 } 18 18 19 private: 20 DataTableGenerator(); 21 DataTableGenerator(DataTableGenerator const&); 22 DataTableGenerator& operator =(DataTableGenerator const&); 19 23 }; 20 24 -
branches/egtra/ab5.0/abdev/BasicCompiler_Common/include/Debugger.h
r467 r817 24 24 return isRunning; 25 25 } 26 27 private: 28 Debugger(Debugger const&); 29 Debugger& operator =(Debugger const&); 26 30 }; 27 31 -
branches/egtra/ab5.0/abdev/BasicCompiler_Common/include/Enum.h
r750 r817 6 6 std::string value; 7 7 int sourceIndex; 8 8 9 public: 9 10 EnumMember( const std::string &name, const std::string &value, int sourceIndex ) … … 13 14 { 14 15 } 16 17 EnumMember(EnumMember&& y) 18 : name(std::move(y.name)) 19 , value(std::move(y.value)) 20 , sourceIndex(std::move(y.sourceIndex)) 21 { 22 } 23 24 EnumMember(EnumMember const& y) 25 : name(y.name) 26 , value(y.value) 27 , sourceIndex(y.sourceIndex) 28 { 29 } 30 31 EnumMember& operator =(EnumMember&& y) 32 { 33 name = std::move(y.name); 34 value = std::move(y.value); 35 sourceIndex = std::move(y.sourceIndex); 36 return *this; 37 } 38 39 EnumMember& operator =(EnumMember const& y) 40 { 41 return *this = std::move(EnumMember(y)); 42 } 43 15 44 const std::string &GetName() const 16 45 { … … 39 68 : Symbol( namespaceScopes, name ) 40 69 { 70 } 71 72 EnumInfo(EnumInfo&& y) 73 : Symbol(std::move(y)) 74 , bConst(std::move(y.bConst)) 75 , members(std::move(y.members)) 76 { 77 } 78 79 EnumInfo(EnumInfo const& y) 80 : Symbol(y) 81 , bConst(y.bConst) 82 , members(y.members) 83 { 84 } 85 86 EnumInfo& operator =(EnumInfo&& y) 87 { 88 Symbol::operator =(std::move(y)); 89 bConst = std::move(y.bConst); 90 members = std::move(y.members); 91 return *this; 92 } 93 94 EnumInfo& operator =(EnumInfo const& y) 95 { 96 return *this = std::move(EnumInfo(y)); 41 97 } 42 98 … … 80 136 return NULL; 81 137 }; 138 139 EnumInfoCollection() {} 140 141 private: 142 EnumInfoCollection(EnumInfoCollection const&); 143 EnumInfoCollection& operator =(EnumInfoCollection const&); 82 144 }; -
branches/egtra/ab5.0/abdev/BasicCompiler_Common/include/Linker.h
r357 r817 54 54 // データテーブルをセット 55 55 void SetDataTable( DataTable &dataTable ); 56 57 private: 58 Linker(Linker const&); 59 Linker& operator =(Linker const&); 56 60 }; -
branches/egtra/ab5.0/abdev/BasicCompiler_Common/include/Messenger.h
r812 r817 24 24 { 25 25 } 26 26 27 ErrorInfo( int errorCode, const std::string &keyword, int sourceIndex ); 28 29 ErrorInfo(ErrorInfo&& y) 30 : errorCode(std::move(y.errorCode)) 31 , keyword(std::move(y.keyword)) 32 , sourceFilePath(std::move(y.sourceFilePath)) 33 , sourceLineNum(std::move(y.sourceLineNum)) 34 , errorLineNum(std::move(y.errorLineNum)) 35 { 36 } 37 38 ErrorInfo(ErrorInfo const& y) 39 : errorCode(y.errorCode) 40 , keyword(y.keyword) 41 , sourceFilePath(y.sourceFilePath) 42 , sourceLineNum(y.sourceLineNum) 43 , errorLineNum(y.errorLineNum) 44 { 45 } 46 47 ErrorInfo& operator =(ErrorInfo&& y) 48 { 49 errorCode = std::move(y.errorCode); 50 keyword = std::move(y.keyword); 51 sourceFilePath = std::move(y.sourceFilePath); 52 sourceLineNum = std::move(y.sourceLineNum); 53 errorLineNum = std::move(y.errorLineNum); 54 return *this; 55 } 56 57 ErrorInfo& operator =(ErrorInfo const& y) 58 { 59 return *this = std::move(ErrorInfo(y)); 60 } 27 61 28 62 int GetErrorCode() const … … 63 97 64 98 public: 99 ErrorMessenger() {} 100 65 101 void Output( const ErrorInfo &errorInfo ); 66 102 void Output( int errorCode, const std::string &keyword, int sourceIndex = -1 ); … … 75 111 76 112 void ShowErrorLine( int errorLineNum ); 113 114 private: 115 ErrorMessenger(ErrorMessenger const&); 116 ErrorMessenger& operator =(ErrorMessenger const&); 77 117 }; -
branches/egtra/ab5.0/abdev/BasicCompiler_Common/include/Program.h
r719 r817 96 96 97 97 int GetExitCode() const; 98 99 private: 100 Program(Program const&); 101 Program& operator =(Program const&); 98 102 }; 99 103 -
branches/egtra/ab5.0/abdev/BasicCompiler_Common/include/logger.h
r523 r817 28 28 ar & BOOST_SERIALIZATION_NVP( stopStep ); 29 29 } 30 31 LoggerSetting(LoggerSetting const&); 32 LoggerSetting operator =(LoggerSetting const&); 30 33 }; 31 34 -
branches/egtra/ab5.0/abdev/compiler_x64/Opcode.h
r704 r817 1 1 #pragma once 2 3 #include <array> 2 4 3 5 #include "MachineFixed.h" … … 37 39 , sourceCodePos( sourceCodePos ) 38 40 { 41 } 42 43 WithInfo(WithInfo&& y) 44 : name(std::move(y.name)) 45 , sourceCodePos(std::move(y.sourceCodePos)) 46 { 47 } 48 49 WithInfo(WithInfo const& y) 50 : name(y.name) 51 , sourceCodePos(y.sourceCodePos) 52 { 53 } 54 55 WithInfo& operator =(WithInfo&& y) 56 { 57 name = std::move(y.name); 58 sourceCodePos = std::move(y.sourceCodePos); 59 return *this; 60 } 61 62 WithInfo& operator =(WithInfo const& y) 63 { 64 return *this = std::move(WithInfo(y)); 39 65 } 40 66 }; … … 75 101 76 102 void error_check(void); 103 104 private: 105 StackFrame(StackFrame const&); 106 StackFrame& operator =(StackFrame const&); 77 107 }; 78 108 extern StackFrame *pobj_sf; … … 93 123 void backup(); 94 124 void restore(); 125 126 private: 127 CBlockReg(CBlockReg const&); 128 CBlockReg& operator =(CBlockReg const&); 95 129 }; 96 130 extern CBlockReg *pobj_BlockReg; … … 101 135 102 136 //利用可能なレジスタを列挙する関数 103 void EnumRegister(int *pRegList,int nMaxList,int *array_reg,int *sp,int AnswerReg); 104 105 int array_UseReg[16],sp_UseReg; 106 107 int array_XmmReg[16]; 137 void EnumRegister(int const *pRegList,int nMaxList,int *array_reg,int *sp,int AnswerReg); 138 139 std::array<int, 16> array_UseReg; 140 int sp_UseReg; 141 142 std::array<int, 16> array_XmmReg; 108 143 int sp_XmmReg; 109 144 … … 113 148 CRegister(){}; 114 149 CRegister(int AnswerReg); 150 151 CRegister(CRegister const& y) 152 : array_UseReg(y.array_UseReg) 153 , sp_UseReg(y.sp_UseReg) 154 , array_XmmReg(y.array_XmmReg) 155 , sp_XmmReg(y.sp_XmmReg) 156 , init_sp_reg(y.init_sp_reg) 157 , init_sp_xmm_reg(y.init_sp_xmm_reg) 158 { 159 } 160 161 CRegister& operator =(CRegister const& y) 162 { 163 array_UseReg = y.array_UseReg; 164 sp_UseReg = y.sp_UseReg; 165 array_XmmReg = y.array_XmmReg; 166 sp_XmmReg = y.sp_XmmReg; 167 init_sp_reg = y.init_sp_reg; 168 init_sp_xmm_reg = y.init_sp_xmm_reg; 169 return *this; 170 } 171 115 172 ~CRegister(){}; 116 173 … … 313 370 void BackupParameter(int pi_num); 314 371 void RestoreParameter(int pi_num); 372 373 private: 374 ParamImpl(ParamImpl const&); 375 ParamImpl& operator =(ParamImpl const&); 315 376 }; 316 377 … … 325 386 void lock(int level); 326 387 void unlock(int level); 388 389 private: 390 CDBLockParms(CDBLockParms const&); 391 CDBLockParms& operator =(CDBLockParms const&); 327 392 }; 328 393 -
branches/egtra/ab5.0/abdev/compiler_x64/Register.cpp
r468 r817 112 112 CRegister *pobj_reg; 113 113 114 void CRegister::EnumRegister(int *pRegList,int nMaxList,int *array_reg,int *sp,int AnswerReg){114 void CRegister::EnumRegister(int const* pRegList,int nMaxList,int *array_reg,int *sp,int AnswerReg){ 115 115 int i,i2,sw=0; 116 116 … … 161 161 162 162 EnumRegister( 163 (int *)CalculationRegister,163 CalculationRegister, 164 164 sizeof(CalculationRegister)/sizeof(int), 165 array_UseReg ,165 array_UseReg.data(), 166 166 &sp_UseReg, 167 167 AnswerReg); … … 174 174 175 175 EnumRegister( 176 (int *)CalculationXmmRegister,176 CalculationXmmRegister, 177 177 sizeof(CalculationXmmRegister)/sizeof(int), 178 array_XmmReg ,178 array_XmmReg.data(), 179 179 &sp_XmmReg, 180 180 AnswerReg); -
branches/egtra/ab5.0/abdev/compiler_x86/Opcode.h
r702 r817 37 37 , sourceCodePos( sourceCodePos ) 38 38 { 39 } 40 41 WithInfo(WithInfo&& y) 42 : name(std::move(y.name)) 43 , sourceCodePos(std::move(y.sourceCodePos)) 44 { 45 } 46 47 WithInfo(WithInfo const& y) 48 : name(y.name) 49 , sourceCodePos(y.sourceCodePos) 50 { 51 } 52 53 WithInfo& operator =(WithInfo&& y) 54 { 55 name = std::move(y.name); 56 sourceCodePos = std::move(y.sourceCodePos); 57 return *this; 58 } 59 60 WithInfo& operator =(WithInfo const& y) 61 { 62 return *this = std::move(WithInfo(y)); 39 63 } 40 64 }; … … 210 234 int NewTempParameters( const std::string &procName, const Parameters ¶ms, int SecondParmNum = -1 ); 211 235 void DeleteTempParameters(); 236 237 private: 238 ParamImpl(ParamImpl const&); 239 ParamImpl& operator =(ParamImpl const&); 212 240 }; 213 241
Note:
See TracChangeset
for help on using the changeset viewer.