Changeset 350 in dev for trunk/abdev/BasicCompiler_Common/src

Timestamp:

Oct 14, 2007, 9:41:03 PM (17 years ago)

Author:

dai_9181

Message:

インターフェイスを実装

Location:

trunk/abdev/BasicCompiler_Common/src

Files:

• Class.cpp (modified) (10 diffs)
• Procedure.cpp (modified) (1 diff)
• Type.cpp (modified) (3 diffs)

trunk/abdev/BasicCompiler_Common/src/Class.cpp

@@ -449 +449 @@
     interfaces.push_back( new ::Interface( &interfaceClass ) );
 
+    // キャストメソッドを追加（内部コードは自動生成すること）
+    {
+        // Function Operator() As ITest
+
+        char temporary[1024];
+        sprintf(temporary,"%c%c%c%c()%c%c%s",
+            1, ESC_FUNCTION,
+            1, ESC_OPERATOR,
+            1, ESC_AS,
+            interfaceClass.GetName().c_str()
+        );
+
+        this->AddMethod(this,
+            Prototype::Public,
+            0,
+            false,          // isConst
+            false,          // isAbstract
+            false,          // isVirtual
+            false,          // isOverride
+            true,           // isAutoGeneration
+            temporary,
+            -1
+        );
+    }
+
     return true;
 }
@@ -505 +530 @@
 
 void CClass::AddMethod(CClass *pobj_c, Prototype::Accessibility accessibility, BOOL bStatic, bool isConst, bool isAbstract,
-                         bool isVirtual, bool isOverride, char *buffer, int nowLine){
+                         bool isVirtual, bool isOverride, bool isAutoGeneration, char *buffer, int nowLine){
     int i,i2;
     char temporary[VN_SIZE];
@@ -522 +547 @@
     UserProc *pUserProc = compiler.GetObjectModule().meta.GetUserProcs().Add( NamespaceScopes(), NamespaceScopesCollection(), buffer,nowLine,isVirtual,pobj_c, (bStatic!=0) );
     if(!pUserProc) return;
+
+    if( isAutoGeneration )
+    {
+        // コード自動生成
+        pUserProc->ThisIsAutoGenerationProc();
+    }
 
 
@@ -665 +696 @@
 }
 
-void CClass::EnumDynamicMethodsOfInterfaceMethods( const char *methodName, std::vector<const UserProc *> &subs ) const
+void CClass::EnumDynamicMethodsOrInterfaceMethods( const char *methodName, std::vector<const UserProc *> &subs ) const
 {
     // 動的メソッド
@@ -676 +707 @@
     }
 }
-const CMethod *CClass::GetDynamicMethodOfInterfaceMethod( const UserProc *pUserProc ) const
+const CMethod *CClass::GetDynamicMethodOrInterfaceMethod( const UserProc *pUserProc ) const
 {
     // 動的メソッド
@@ -687 +718 @@
         {
             result = pInterface->GetDynamicMethods().GetMethodPtr( pUserProc );
+            if( result )
+            {
+                return result;
+            }
         }
     }
@@ -854 +889 @@
     SetError();
     return;
+}
+int CClass::GetVtblMasterListIndex( const CClass *pClass ) const
+{
+    int result = 0;
+
+    BOOST_FOREACH( const ::Interface *pInterface, interfaces )
+    {
+        result++;
+        
+        if( &pInterface->GetClass() == pClass )
+        {
+            return result;
+        }
+    }
+
+    SetError();
+    return 0;
 }
 long CClass::GetVtblMasterListOffset() const
@@ -1428 +1480 @@
                 pobj_c->AddMethod(pobj_c,
                     Prototype::Public,  //Publicアクセス権
-                    0,                  //Static指定なし
-                    false,              //Constではない
-                    1,                  //Abstract
-                    1,                  //Virtual
-                    0,
+                    0,                  // bStatic
+                    false,              // isConst
+                    true,               // isAbstract
+                    true,               // isVirtual
+                    false,              // isOverride
+                    false,              // isAutoGeneration
                     temporary,
                     sub_address
@@ -1719 +1772 @@
                         isVirtual,
                         isOverride,
+                        false,
                         temporary,
                         sub_address);
@@ -1946 +2000 @@
         }
 
-        pCompilingMethod = pParentClass->GetDynamicMethodOfInterfaceMethod( pUserProc );
+        pCompilingMethod = pParentClass->GetDynamicMethodOrInterfaceMethod( pUserProc );
         if( !pCompilingMethod ){
             pCompilingMethod = pParentClass->GetStaticMethods().GetMethodPtr( pUserProc );

trunk/abdev/BasicCompiler_Common/src/Procedure.cpp

@@ -24 +24 @@
 
     return GetName();
+}
+bool UserProc::IsCastOperator() const
+{
+    if( GetName()[0] == 1 && GetName()[1] == ESC_OPERATOR && GetName()[2] == CALC_AS )
+    {
+        return true;
+    }
+    return false;
 }
 const NamespaceScopes &UserProc::GetNamespaceScopes() const

trunk/abdev/BasicCompiler_Common/src/Type.cpp

@@ -211 +211 @@
     if( IsObject() )
     {
-        if( GetClass().IsInterface() ){
-            // vtblOffsetのサイズを含める
-            return PTR_SIZE*2;
-        }
         return PTR_SIZE;
     }
@@ -298 +294 @@
 bool Type::IsPointer( int basicType )
 {
+    if( basicType == DEF_NON )
+    {
+        return false;
+    }
+
     if(PTR_LEVEL( basicType )|| basicType == DEF_PTR_VOID || basicType == DEF_PTR_PROC
         || ( basicType & FLAG_PTR ) ){
@@ -448 +449 @@
     return ( IsObject() && GetClass().IsDelegate() );
 }
+bool Type::IsInterface() const
+{
+    return ( IsObject() && GetClass().IsInterface() );
+}
+
 
 bool Type::HasMember() const