Changeset 633 in dev for trunk

Timestamp:

Jun 7, 2008, 9:17:50 AM (16 years ago)

Author:

dai_9181

Message:

[632]を64bit版にマージ。

Location:

trunk/ab5.0/abdev/compiler_x64

Files:

• Compile_ProcOp.cpp (modified) (2 diffs)
• Compile_Var.cpp (modified) (1 diff)
• MakePeHdr.cpp (modified) (2 diffs)
• NumOpe.cpp (modified) (1 diff)

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

@@ -213 +213 @@
     }
 
-    trace_for_sourcecodestep( "★★★ " << pUserProc->GetFullName() << "のコンパイルを開始" );
+    trace_for_sourcecodestep( "★★★ " << FormatEscapeSequenceStringToDefaultString( pUserProc->GetFullName() ) << "のコンパイルを開始" );
 
     pUserProc->CompleteCompile();
@@ -256 +256 @@
     if( !pUserProc->IsAutoGeneration() )
     {
-        cp=pUserProc->GetCodePos();
+        cp=pUserProc->GetSourceCodePosition().GetPos();
         for(;;cp++){
             if(IsCommandDelimitation(basbuf[cp])) break;

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

@@ -559 +559 @@
             }
 
-            int typeDefIndex = compiler.GetObjectModule().meta.GetTypeDefs().GetIndex(
+            const TypeDef *pTypeDef = compiler.GetObjectModule().meta.GetTypeDefs().Find(
                 LexicalAnalyzer::FullNameToSymbol( VarName )
             );
-            if( typeDefIndex != -1 ){
+            if( pTypeDef )
+            {
                 // TypeDef後の型名だったとき
-                lstrcpy( VarName, compiler.GetObjectModule().meta.GetTypeDefs()[typeDefIndex].GetBaseName().c_str() );
+                lstrcpy( VarName, pTypeDef->GetBaseName().c_str() );
             }
 

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

@@ -549 +549 @@
 
             if(!hLib){
-                compiler.errorMessenger.Output(-106,pDllProc->GetDllFileName().c_str(),pDllProc->GetCodePos());
+                compiler.errorMessenger.Output(-106,pDllProc->GetDllFileName().c_str(),pDllProc->GetSourceCodePosition().GetPos());
             }
         }
@@ -556 +556 @@
             if(!GetProcAddress(hLib,pDllProc->GetAlias().c_str())){
                 FreeLibrary(hLib);
-                compiler.errorMessenger.Output(-107,pDllProc->GetAlias(),pDllProc->GetCodePos());
+                compiler.errorMessenger.Output(-107,pDllProc->GetAlias(),pDllProc->GetSourceCodePosition().GetPos());
             }
             FreeLibrary(hLib);

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

@@ -1126 +1126 @@
                         isNothing_stack[sp] = true;
 
-                        type_stack[sp] = DEF_OBJECT;
                         if( baseType.IsObject() ){
+                            type_stack[sp] = DEF_OBJECT;
                             index_stack[sp] = baseType.GetIndex();
                         }
                         else{
-                            index_stack[sp] = (LONG_PTR)compiler.GetObjectModule().meta.GetClasses().GetObjectClassPtr();
+                            type_stack[sp] = baseType.GetBasicType();
+                            index_stack[sp] = baseType.GetIndex();
                         }