Changeset 828 in dev for trunk/ab5.0/abdev/compiler_x86
- Timestamp:
- Mar 19, 2012, 1:59:48 AM (13 years ago)
- Location:
- trunk
- Files:
-
- 4 deleted
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
-
Property svn:mergeinfo
set to
/branches/egtra merged eligible
-
Property svn:mergeinfo
set to
-
trunk/ab5.0/abdev
-
Property svn:ignore
set to
*.opensdf
*.sdf
*.suo
*.user
int
ipch
out
-
Property svn:ignore
set to
-
trunk/ab5.0/abdev/compiler_x86/MakePeHdr.cpp
r750 r828 176 176 compiler.GetObjectModule().meta.GetDelegates() 177 177 ); 178 compiler.GetObjectModule().meta.GetDelegates().Iterator_Init();179 178 180 179 // デリゲートからクラスコードを生成 … … 229 228 ); 230 229 231 // サブルーチン(ユーザー定義、DLL関数)のイテレータの準備232 compiler.GetObjectModule().meta.GetUserProcs().Iterator_Init();233 compiler.GetObjectModule().meta.GetDllProcs().Iterator_Init();234 235 236 230 237 231 /////////////////////////// … … 558 552 } 559 553 } 560 compiler.GetObjectModule().meta.GetDllProcs().Iterator_Reset(); 561 while( compiler.GetObjectModule().meta.GetDllProcs().Iterator_HasNext() ) 562 { 563 const DllProc *pDllProc = compiler.GetObjectModule().meta.GetDllProcs().Iterator_GetNext(); 564 554 foreach(auto pDllProc, compiler.GetObjectModule().meta.GetDllProcs()) 555 { 565 556 if( !pDllProc->IsUsing() ){ 566 557 continue; … … 631 622 //辞書順にサーチ 632 623 temporary[0]=0; 633 compiler.GetObjectModule().meta.GetUserProcs().Iterator_Reset(); 634 while( compiler.GetObjectModule().meta.GetUserProcs().Iterator_HasNext() ) 624 foreach(auto pTempUserProc, compiler.GetObjectModule().meta.GetUserProcs()) 635 625 { 636 UserProc *pTempUserProc = compiler.GetObjectModule().meta.GetUserProcs().Iterator_GetNext();637 626 if(pTempUserProc->IsExport()){ 638 627 if(temporary[0]=='\0'){ … … 723 712 int ImportDllNum=0; 724 713 725 compiler.GetObjectModule().meta.GetDllProcs().Iterator_Reset(); 726 while( compiler.GetObjectModule().meta.GetDllProcs().Iterator_HasNext() ) 727 { 728 const DllProc *pDllProc = compiler.GetObjectModule().meta.GetDllProcs().Iterator_GetNext(); 729 714 foreach (auto const* pDllProc, compiler.GetObjectModule().meta.GetDllProcs()) 715 { 730 716 if( !pDllProc->IsUsing() ){ 731 717 continue; … … 762 748 pImportTable[i].Name=i3+i*0x10; 763 749 764 compiler.GetObjectModule().meta.GetDllProcs().Iterator_Reset(); 765 while( compiler.GetObjectModule().meta.GetDllProcs().Iterator_HasNext() ) 750 foreach (auto const *pDllProc, compiler.GetObjectModule().meta.GetDllProcs()) 766 751 { 767 const DllProc *pDllProc = compiler.GetObjectModule().meta.GetDllProcs().Iterator_GetNext(); 768 769 if( !pDllProc->IsUsing() ){ 752 if (!pDllProc->IsUsing()) 753 { 770 754 continue; 771 755 } 772 773 if( pDllProc->GetDllFileName() == ppDllNames[i] ){756 if (pDllProc->GetDllFileName() == ppDllNames[i]) 757 { 774 758 //ルックアップデータのサイズを追加 775 LookupSize +=sizeof(DWORD);759 LookupSize += sizeof (DWORD); 776 760 } 777 761 } … … 790 774 i3+=ImportDllNum*0x10; 791 775 for(i=0,i5=0;i<ImportDllNum;i++){ 792 compiler.GetObjectModule().meta.GetDllProcs().Iterator_Reset(); 793 while( compiler.GetObjectModule().meta.GetDllProcs().Iterator_HasNext() ) 776 foreach (auto pDllProc, compiler.GetObjectModule().meta.GetDllProcs()) 794 777 { 795 DllProc *pDllProc = compiler.GetObjectModule().meta.GetDllProcs().Iterator_GetNext();796 797 778 if( !pDllProc->IsUsing() ){ 798 779 continue; … … 1075 1056 HintSize; //ヒント名(関数名)テーブル 1076 1057 1077 compiler.GetObjectModule().meta.GetDllProcs().Iterator_Reset(); 1078 while( compiler.GetObjectModule().meta.GetDllProcs().Iterator_HasNext() ) 1058 foreach (auto const* pDllProc, compiler.GetObjectModule().meta.GetDllProcs()) 1079 1059 { 1080 const DllProc *pDllProc = compiler.GetObjectModule().meta.GetDllProcs().Iterator_GetNext();1081 1082 1060 if( !pDllProc->IsUsing() ){ 1083 1061 continue; -
trunk/ab5.0/abdev/compiler_x86/Opcode.h
r702 r828 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 -
trunk/ab5.0/abdev/compiler_x86/manifest.xml
r3 r828 1 1 <?xml version="1.0" encoding="UTF-8" standalone="yes"?> 2 2 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> 3 <assemblyIdentity 4 version="1.0.0.0" 5 processorArchitecture="x86" 6 name="Microsoft.Winweb.BasicCompiler.exe" 7 type="win32" 8 /> 9 <description>Description</description> 10 <dependency> 11 <dependentAssembly> 12 <assemblyIdentity 13 type="win32" 14 name="Microsoft.Windows.Common-Controls" 15 version="6.0.0.0" 16 processorArchitecture="x86" 17 publicKeyToken="6595b64144ccf1df" 18 language="*" 19 /> 20 </dependentAssembly> 21 </dependency> 3 <assemblyIdentity 4 version="1.0.0.0" 5 processorArchitecture="x86" 6 name="Discoversoft.ActiveBasic.BasicCompiler" 7 type="win32"/> 8 <description>BasicCompiler (x86)</description> 22 9 </assembly>
Note:
See TracChangeset
for help on using the changeset viewer.