Changeset 353 in dev for trunk/abdev/BasicCompiler_Common/include/Procedure.h

Timestamp:

Oct 21, 2007, 3:37:31 PM (16 years ago)

Author:

dai_9181

Message:

インターフェイス実装周りの仕様整備

File:

• trunk/abdev/BasicCompiler_Common/include/Procedure.h (modified) (7 diffs)

trunk/abdev/BasicCompiler_Common/include/Procedure.h

@@ -13 +13 @@
 
 class CClass;
+class Interface;
 class CMethod;
 
@@ -122 +123 @@
     // 親クラスと対応するメソッド
     const CClass *pParentClass;
+    const Interface *pInterface;
     CMethod *pMethod;
 
@@ -160 +162 @@
         ar & BOOST_SERIALIZATION_NVP( importedNamespaces );
         ar & boost::serialization::make_nvp("pParentClass", const_cast<CClass *&>(pParentClass) );
+        ar & boost::serialization::make_nvp("pInterface", const_cast<Interface *&>(pInterface) );
         ar & BOOST_SERIALIZATION_NVP( pMethod );
         ar & BOOST_SERIALIZATION_NVP( isMacro );
@@ -182 +185 @@
         , importedNamespaces( importedNamespaces )
         , pParentClass( NULL )
+        , pInterface( NULL )
         , pMethod( NULL )
         , isMacro( isMacro )
@@ -211 +215 @@
     {
         if( this->GetParentClassPtr() == pUserProc->GetParentClassPtr() // 親クラスが等しい
+            && this->pInterface == pUserProc->pInterface                // インターフェイスが等しい
             && pUserProc->IsEqualSymbol( *this )                        // 名前空間及び名前が等しい
             && this->Params().Equals( pUserProc->Params() )             // パラメータが等しい
@@ -358 +363 @@
         return ( pParentClass == NULL );
     }
+    void SetInterface( const Interface *pInterface )
+    {
+        this->pInterface = pInterface;
+    }
     void SetMethod( CMethod *pMethod ){
         this->pMethod = pMethod;
@@ -417 +426 @@
     bool Insert( UserProc *pUserProc, int nowLine );
 
-    UserProc *Add( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, char *buffer,int nowLine,bool isVirtual,CClass *pobj_c, bool isStatic);
+    UserProc *AddUserProc( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, char *buffer,int nowLine,bool isVirtual,CClass *pobj_c, bool isStatic, char *interfaceName = NULL );
 
     void EnumGlobalProcs( const char *simpleName, const char *localName, std::vector<const UserProc *> &subs );