Changeset 271 in dev
- Timestamp:
- Aug 10, 2007, 3:16:42 AM (17 years ago)
- Location:
- trunk/abdev
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/abdev/BasicCompiler32/MakePeHdr.cpp
r269 r271 141 141 if( compiler.IsDll() ) bUse_ExportSection=1; 142 142 else bUse_ExportSection=0; 143 144 145 // 静的リンク 146 compiler.StaticLink( compiler.staticLibraries ); 143 147 144 148 -
trunk/abdev/BasicCompiler_Common/Intermediate_Step1.cpp
r270 r271 254 254 compiler.staticLibraryFilePaths.push_back( temporary ); 255 255 256 ObjectModule *pStaticLibrary = new ObjectModule(); 257 pStaticLibrary->ReadText( temporary ); 258 compiler.staticLibraries.push_back( pStaticLibrary ); 256 compiler.staticLibraries.push_back( new ObjectModule() ); 257 compiler.staticLibraries.back()->ReadText( temporary ); 259 258 260 259 for(;;i2++){ -
trunk/abdev/BasicCompiler_Common/include/Const.h
r254 r271 26 26 27 27 public: 28 29 28 CConst( const NamespaceScopes &namespaceScopes, const std::string &name, const Type &newType, _int64 i64data) 30 29 : Symbol( namespaceScopes, name ) -
trunk/abdev/BasicCompiler_Common/include/Procedure.h
r270 r271 58 58 59 59 public: 60 bool isTargetObjectModule;61 60 Procedure( const NamespaceScopes &namespaceScopes, const string &name, Kind kind, bool isCdecl ) 62 61 : Symbol( namespaceScopes, name ) … … 65 64 , isUsing( false ) 66 65 , codePos( -1 ) 67 , isTargetObjectModule( true )68 66 { 69 67 } 70 68 Procedure() 71 : isTargetObjectModule( true )72 69 { 73 70 } … … 553 550 } 554 551 555 virtual int Add( const string &typeExpression ); 556 virtual void Clear(); 557 }; 552 int Add( const string &typeExpression ); 553 void Clear(); 554 void PullOutAll() 555 { 556 clear(); 557 } 558 }; -
trunk/abdev/BasicCompiler_Common/include/Symbol.h
r215 r271 41 41 42 42 public: 43 bool isTargetObjectModule; 43 44 Symbol( const NamespaceScopes &namespaceScopes, const string &name ) 44 45 : namespaceScopes( namespaceScopes ) 45 46 , name( name ) 47 , isTargetObjectModule( true ) 46 48 { 47 49 } … … 51 53 : namespaceScopes( symbol.namespaceScopes ) 52 54 , name( symbol.name ) 55 , isTargetObjectModule( true ) 53 56 { 54 57 } 55 58 Symbol() 59 : isTargetObjectModule( true ) 56 60 { 57 61 } -
trunk/abdev/BasicCompiler_Common/include/Type.h
r215 r271 182 182 183 183 public: 184 bool isTargetObjectModule; 184 185 BlittableType( const Type &basicType, CClass *pClass ) 185 186 : basicType( basicType ) 186 187 , pClass( pClass ) 188 , isTargetObjectModule( true ) 187 189 { 188 190 } 189 191 BlittableType() 192 : isTargetObjectModule( true ) 190 193 { 191 194 } -
trunk/abdev/BasicCompiler_Common/include/Variable.h
r206 r271 217 217 Variables(){} 218 218 ~Variables(){ 219 clear();220 } 221 222 void clear(){219 Clear(); 220 } 221 222 void Clear(){ 223 223 for( int i=0; i<(int)this->size(); i++ ){ 224 224 delete (*this)[i]; 225 225 } 226 226 227 vector<Variable *>::clear(); 227 clear(); 228 } 229 void PullOutAll() 230 { 231 clear(); 228 232 } 229 233 -
trunk/abdev/BasicCompiler_Common/src/Meta.cpp
r270 r271 35 35 36 36 // クラス 37 meta.GetClasses().Iterator_Reset(); 38 while( meta.GetClasses().Iterator_HasNext() ) 39 { 40 CClass *pClass = meta.GetClasses().Iterator_GetNext(); 41 pClass->isTargetObjectModule = false; 42 this->GetClasses().Put( pClass ); 43 } 44 meta.GetClasses().PullOutAll(); 37 45 38 46 // グローバル変数 47 BOOST_FOREACH( Variable *pVar, meta.globalVars ) 48 { 49 pVar->isTargetObjectModule = false; 50 this->globalVars.push_back( pVar ); 51 } 52 meta.globalVars.PullOutAll(); 39 53 40 54 // グローバル定数 55 meta.GetGlobalConsts().Iterator_Reset(); 56 while( meta.GetGlobalConsts().Iterator_HasNext() ) 57 { 58 CConst *pConst = meta.GetGlobalConsts().Iterator_GetNext(); 59 pConst->isTargetObjectModule = false; 60 this->GetGlobalConsts().Put( pConst ); 61 } 62 meta.GetGlobalConsts().PullOutAll(); 41 63 42 64 // グローバル定数マクロ 65 meta.GetGlobalConstMacros().Iterator_Reset(); 66 while( meta.GetGlobalConstMacros().Iterator_HasNext() ) 67 { 68 ConstMacro *pConstMacro = meta.GetGlobalConstMacros().Iterator_GetNext(); 69 pConstMacro->isTargetObjectModule = false; 70 this->GetGlobalConstMacros().Put( pConstMacro ); 71 } 72 meta.GetGlobalConstMacros().PullOutAll(); 43 73 44 74 // blittable型 75 BOOST_FOREACH( BlittableType &blittableType, meta.blittableTypes ) 76 { 77 blittableType.isTargetObjectModule = false; 78 this->blittableTypes.push_back( blittableType ); 79 } 80 meta.blittableTypes.clear(); 45 81 46 82 // TypeDef 83 BOOST_FOREACH( TypeDef &typeDef, meta.typeDefs ) 84 { 85 typeDef.isTargetObjectModule = false; 86 this->typeDefs.push_back( typeDef ); 87 } 88 meta.typeDefs.clear(); 47 89 48 90 // 関数ポインタ 91 BOOST_FOREACH( ProcPointer *pProcPointer, meta.procPointers ) 92 { 93 pProcPointer->isTargetObjectModule = false; 94 this->procPointers.push_back( pProcPointer ); 95 } 96 meta.procPointers.PullOutAll(); 49 97 } -
trunk/abdev/BasicCompiler_Common/src/Symbol.cpp
r208 r271 8 8 9 9 Symbol::Symbol( const char *fullName ) 10 : isTargetObjectModule( true ) 10 11 { 11 12 char areaName[VN_SIZE] = ""; //オブジェクト変数 … … 17 18 } 18 19 Symbol::Symbol( const string &fullName ) 20 : isTargetObjectModule( true ) 19 21 { 20 22 char areaName[VN_SIZE] = ""; //オブジェクト変数
Note:
See TracChangeset
for help on using the changeset viewer.