Changeset 349 in dev for trunk/abdev/BasicCompiler64/Compile_Object.cpp

Timestamp:

Oct 13, 2007, 11:45:58 AM (17 years ago)

Author:

dai_9181

Message:

インターフェイス実装中…

File:

• trunk/abdev/BasicCompiler64/Compile_Object.cpp (modified) (6 diffs)

trunk/abdev/BasicCompiler64/Compile_Object.cpp

@@ -90 +90 @@
     }
 }
-void Operator_New( const CClass &classObj, const char *objectSizeStr, const char *parameter, const Type &baseType ){
-    int typeSize = classObj.GetSize();
-
-    if(classObj.IsAbstract()){
+void Operator_New( const CClass &objClass, const char *objectSizeStr, const char *parameter, const Type &baseType )
+{
+    const CClass *pClass = &objClass;
+    int typeSize = pClass->GetSize();
+
+    if( pClass->IsInterface() )
+    {
+        pClass = compiler.GetObjectModule().meta.GetClasses().GetInterfaceInfoClassPtr();
+    }
+
+    if( pClass->IsAbstract() ){
         //抽象クラスだったとき
-        SetError(125,classObj.GetName().c_str(),cp);
+        SetError(125,pClass->GetName().c_str(),cp);
     }
 
@@ -177 +184 @@
 
 
-    const CMethod *method = classObj.GetDestructorMethod();
+    const CMethod *method = pClass->GetDestructorMethod();
     if( method == NULL ) return;
 
@@ -201 +208 @@
 
     //仮想関数テーブルを初期化
-    if( classObj.IsExistVirtualFunctions()
-        && !classObj.IsAbstract() )
+    if( pClass->IsExistVirtualFunctions()
+        && !pClass->IsAbstract() )
     {
         // mov rcx,vtblAddress
-        compiler.codeGenerator.op_mov_RV_vtbl( REG_RCX, &classObj );
+        compiler.codeGenerator.op_mov_RV_vtbl( REG_RCX, pClass );
 
         //mov qword ptr[rax],rcx
@@ -212 +219 @@
 
         // 仮想関数になるメソッドに使用チェックをつける
-        BOOST_FOREACH( const CMethod *pMethod, classObj.GetDynamicMethods() )
+        BOOST_FOREACH( const CMethod *pMethod, pClass->GetDynamicMethods() )
         {
             if( pMethod->IsVirtual() )
@@ -219 +226 @@
             }
         }
-        BOOST_FOREACH( const ::Interface *pInterface, classObj.GetInterfaces() )
+        BOOST_FOREACH( const ::Interface *pInterface, pClass->GetInterfaces() )
         {
             BOOST_FOREACH( const CMethod *pMethod, pInterface->GetDynamicMethods() )
@@ -238 +245 @@
     ////////////////////////////
 
-    _call_constructor(&classObj,parameter,typeSize,bSomeObjects);
+    _call_constructor(pClass,parameter,typeSize,bSomeObjects);