Changeset 729 in dev for trunk

Timestamp:

Aug 21, 2008, 11:04:52 PM (16 years ago)

Author:

dai

Message:

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

Location:

trunk/ab5.0/abdev/compiler_x64

Files:

• Compile_Object.cpp (modified) (1 diff)
• Compile_ProcOp.cpp (modified) (1 diff)

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

@@ -101 +101 @@
     int typeSize = pClass->GetSize();
 
-    if( pClass->IsAbstract() ){
+    if(pClass->IsAbstract())
+    {
+        std::string tempMessage;
+        BOOST_FOREACH( const CMethod *pMethod, pClass->GetDynamicMethods() ){
+            if(pMethod->IsVirtual()){
+                if(pMethod->IsAbstract()){
+                    if( !tempMessage.empty() )
+                    {
+                        tempMessage += ", ";
+                    }
+                    tempMessage += pMethod->GetUserProc().GetName();
+                }
+            }
+        }
+
+        // インターフェイスのvtbl
+        BOOST_FOREACH( const ::Interface *pInterface, pClass->GetInterfaces() )
+        {
+            BOOST_FOREACH( const CMethod *pMethod, pInterface->GetDynamicMethods() ){
+                if(pMethod->IsVirtual()){
+                    if(pMethod->IsAbstract()){
+                        if( !tempMessage.empty() )
+                        {
+                            tempMessage += ", ";
+                        }
+                        tempMessage += pMethod->GetUserProc().GetName();
+                    }
+                }
+            }
+        }
+
         //抽象クラスだったとき
-        compiler.errorMessenger.Output(125,pClass->GetName().c_str(),cp);
+        compiler.errorMessenger.Output(-1,"\"%s\" は抽象クラスです。インスタンス化することはできません（抽象メソッド … " + tempMessage + "）。",cp);
     }
 

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

@@ -176 +176 @@
         sprintf( temporary,
             "Return New %s(ObjPtr( This ),Get_LONG_PTR( (Get_LONG_PTR( ObjPtr(This)+SizeOf(VoidPtr) ) + SizeOf(LONG_PTR)*%d) As VoidPtr ) As VoidPtr )",
-            userProc.ReturnType().GetClass().GetFullName().c_str(),
+            compiler.TypeToString( userProc.ReturnType() ).c_str(),
             vtblMasterListIndex
         );