Changeset 768 in dev for trunk

Timestamp:

Dec 30, 2008, 1:56:34 PM (16 years ago)

Author:

dai

Message:

[750]をx64版にマージ

Location:

trunk/ab5.0/abdev/compiler_x64

Files:

• Compile_Object.cpp (modified) (4 diffs)
• Compile_ProcOp.cpp (modified) (3 diffs)
• Compile_Statement.cpp (modified) (2 diffs)
• Compile_Var.cpp (modified) (3 diffs)
• MakePeHdr.cpp (modified) (3 diffs)

trunk/ab5.0/abdev/compiler_x64/Compile_Object.cpp

@@ -104 +104 @@
     {
         std::string tempMessage;
-        BOOST_FOREACH( const CMethod *pMethod, pClass->GetDynamicMethods() ){
+        foreach( const CMethod *pMethod, pClass->GetDynamicMethods() ){
             if(pMethod->IsVirtual()){
                 if(pMethod->IsAbstract()){
@@ -117 +117 @@
 
         // インターフェイスのvtbl
-        BOOST_FOREACH( const ::Interface *pInterface, pClass->GetInterfaces() )
+        foreach( const ::Interface *pInterface, pClass->GetInterfaces() )
         {
-            BOOST_FOREACH( const CMethod *pMethod, pInterface->GetDynamicMethods() ){
+            foreach( const CMethod *pMethod, pInterface->GetDynamicMethods() ){
                 if(pMethod->IsVirtual()){
                     if(pMethod->IsAbstract()){
@@ -256 +256 @@
 
         // 仮想関数になるメソッドに使用チェックをつける
-        BOOST_FOREACH( const CMethod *pMethod, pClass->GetDynamicMethods() )
+        foreach( const CMethod *pMethod, pClass->GetDynamicMethods() )
         {
             if( pMethod->IsVirtual() )
@@ -263 +263 @@
             }
         }
-        BOOST_FOREACH( const ::Interface *pInterface, pClass->GetInterfaces() )
+        foreach( const ::Interface *pInterface, pClass->GetInterfaces() )
         {
-            BOOST_FOREACH( const CMethod *pMethod, pInterface->GetDynamicMethods() )
+            foreach( const CMethod *pMethod, pInterface->GetDynamicMethods() )
             {
                 if( pMethod->IsVirtual() )

trunk/ab5.0/abdev/compiler_x64/Compile_ProcOp.cpp

@@ -66 +66 @@
         const PertialSchedule *pStackFramePertialSchedule = compiler.codeGenerator.op_sub_rsp( 0, true );
 
-        BOOST_FOREACH( Variable *pVar, compiler.GetObjectModule().meta.GetGlobalVars() ){
+        foreach( Variable *pVar, compiler.GetObjectModule().meta.GetGlobalVars() ){
+
+
+
             if(memicmp(pVar->GetName().c_str(),"Static%",7)==0){
                 //コンストラクタ呼び出し
@@ -151 +154 @@
 
         //Goto未知ラベルスケジュールが存在したらエラーにする
-        BOOST_FOREACH( const GotoLabelSchedule *pGotoLabelSchedule, compiler.codeGenerator.gotoLabelSchedules )
+        foreach( const GotoLabelSchedule *pGotoLabelSchedule, compiler.codeGenerator.gotoLabelSchedules )
         {
             if(pGotoLabelSchedule->GetName().size()>0){
@@ -645 +648 @@
 
     //ローカル変数アドレススケジュール
-    BOOST_FOREACH( const PertialSchedule *pPertialSchedule, compiler.codeGenerator.localVarPertialSchedules )
+    foreach( const PertialSchedule *pPertialSchedule, compiler.codeGenerator.localVarPertialSchedules )
     {
         compiler.codeGenerator.opfix_offset( pPertialSchedule, AllLocalVarSize + stackFrameSize );
     }
     compiler.codeGenerator.localVarPertialSchedules.clear();
-    BOOST_FOREACH( Variable *pVar, pUserProc->GetLocalVars() ){
+    foreach( Variable *pVar, pUserProc->GetLocalVars() ){
         //後にデバッグで利用する
         pVar->SetOffsetAddress(

trunk/ab5.0/abdev/compiler_x64/Compile_Statement.cpp

@@ -248 +248 @@
 int GetLabelAddress(char *LabelName,int LineNum){
     if(LabelName){
-        BOOST_FOREACH( const GotoLabel &label, compiler.codeGenerator.gotoLabels )
+        foreach( const GotoLabel &label, compiler.codeGenerator.gotoLabels )
         {
             if( label.name.size() > 0 )
@@ -260 +260 @@
     }
     else{
-        BOOST_FOREACH( const GotoLabel &label, compiler.codeGenerator.gotoLabels )
+        foreach( const GotoLabel &label, compiler.codeGenerator.gotoLabels )
         {
             if( label.name.size() == 0 )

trunk/ab5.0/abdev/compiler_x64/Compile_Var.cpp

@@ -810 +810 @@
 
             int i = 0;
-            BOOST_FOREACH( Member *pMember, objClass.GetDynamicMembers() ){
+            foreach( Member *pMember, objClass.GetDynamicMembers() ){
                 if(InitBuf[i]=='\0'){
                     compiler.errorMessenger.Output(41,0,cp);
@@ -972 +972 @@
 
             int i = 0;
-            BOOST_FOREACH( Member *pMember, objClass.GetDynamicMembers() ){
+            foreach( Member *pMember, objClass.GetDynamicMembers() ){
                 if(InitBuf[i]=='\0'){
                     compiler.errorMessenger.Output(41,0,cp);
@@ -1337 +1337 @@
     }
 
-    BOOST_FOREACH( const Variable *pVar, compiler.GetObjectModule().meta.GetGlobalVars() ){
+    foreach( const Variable *pVar, compiler.GetObjectModule().meta.GetGlobalVars() ){
         if( pVar->GetType().IsObject() || pVar->GetType().IsPointer() || pVar->GetType().IsStruct() ){
             // オブジェクトまたはポインタだったとき

trunk/ab5.0/abdev/compiler_x64/MakePeHdr.cpp

@@ -115 +115 @@
     ActiveBasic::Common::Lexical::ResolveErrors resolveErrors;
     compiler.GetObjectModule().Resolve( resolveErrors );
-    BOOST_FOREACH( const ResolveError &resolveError, resolveErrors )
+    foreach( const ResolveError &resolveError, resolveErrors )
     {
         compiler.errorMessenger.Output( ErrorInfo( 13, resolveError.GetTargetItemName(), -1 ) );
@@ -520 +520 @@
     // 使用するDLL関数のチェック
     ////////////////////////////////
-    BOOST_FOREACH( const Schedule &schedule, compiler.linker.GetNativeCode().GetSchedules() )
+    foreach( const Schedule &schedule, compiler.linker.GetNativeCode().GetSchedules() )
     {
         if( schedule.GetType() == Schedule::DllProc )
@@ -831 +831 @@
     //グローバル変数情報を扱う構造体も初期バッファの有無による配置を行う
     //（デバッグ情報で利用される）
-    BOOST_FOREACH( Variable *pVar, compiler.GetObjectModule().meta.GetGlobalVars() ){
+    foreach( Variable *pVar, compiler.GetObjectModule().meta.GetGlobalVars() ){
         if(pVar->GetOffsetAddress()&0x80000000){
             pVar->SetOffsetAddress(