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

Timestamp:

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

Author:

dai_9181

Message:

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

Location:

trunk/abdev/BasicCompiler_Common/src

Files:

• BoostSerializationSupport.cpp (modified) (1 diff)
• Class.cpp (modified) (3 diffs)
• Method.cpp (modified) (1 diff)
• Procedure.cpp (modified) (3 diffs)

trunk/abdev/BasicCompiler_Common/src/BoostSerializationSupport.cpp

@@ -34 +34 @@
 
 #include <BoostSerializationSupport.h>
+#include <Hashmap.h>
 #include <Compiler.h>
 

trunk/abdev/BasicCompiler_Common/src/Class.cpp

@@ -573 +573 @@
 
     //関数ハッシュへ登録
-    UserProc *pUserProc = compiler.GetObjectModule().meta.GetUserProcs().Add( NamespaceScopes(), NamespaceScopesCollection(), buffer,nowLine,isVirtual,pobj_c, (bStatic!=0) );
+    char interfaceName[VN_SIZE] = "";
+    UserProc *pUserProc = compiler.GetObjectModule().meta.GetUserProcs().AddUserProc( NamespaceScopes(), NamespaceScopesCollection(), buffer,nowLine,isVirtual,pobj_c, (bStatic!=0), interfaceName );
     if(!pUserProc) return;
 
@@ -657 +658 @@
         BOOST_FOREACH( ::Interface *pInterface, pobj_c->GetInterfaces() )
         {
+            if( interfaceName[0] )
+            {
+                if( pInterface->GetClass().GetName() != interfaceName )
+                {
+                    // 指定されたインターフェイス名と整合しないとき
+                    continue;
+                }
+            }
+
             CMethod *pMethodForOverride = pInterface->GetDynamicMethods().FindForOverride( pUserProc );
             if( pMethodForOverride )
@@ -665 +675 @@
             }
         }
+    }
+
+    if( interfaceName[0] )
+    {
+        SetError(139,interfaceName,nowLine);
     }
 

trunk/abdev/BasicCompiler_Common/src/Method.cpp

@@ -77 +77 @@
     BOOST_FOREACH( CMethod *pMethod, methods )
     {
-        if( pMethod->GetUserProc().IsEqualForOverride( pUserProc ) )
+        if( !pMethod->IsNotUse() && pMethod->GetUserProc().IsEqualForOverride( pUserProc ) )
         {
             return pMethod;

trunk/abdev/BasicCompiler_Common/src/Procedure.cpp

@@ -451 +451 @@
     return true;
 }
-UserProc *UserProcs::Add( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, char *buffer,int nowLine,bool isVirtual,CClass *pobj_c, bool isStatic)
+UserProc *UserProcs::AddUserProc( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, char *buffer,int nowLine,bool isVirtual,CClass *pobj_c, bool isStatic, char *interfaceName )
 {
     int i2,i3;
@@ -545 +545 @@
             temporary[i2]=buffer[i];
         }
+
+        char parentName[VN_SIZE], memberName[VN_SIZE];
+        ReferenceKind refKind;
+        if( SplitMemberName( temporary, parentName, memberName, refKind ) )
+        {
+            if( pobj_c )
+            {
+                if( interfaceName )
+                {
+                    lstrcpy( interfaceName, parentName );
+                }
+                else
+                {
+                    SetError();
+                    return NULL;
+                }
+
+                char dummyMemberName[VN_SIZE];
+                if( SplitMemberName( memberName, parentName, dummyMemberName, refKind ) )
+                {
+                    SetError(69,temporary,nowLine);
+                    return NULL;
+                }
+            }
+            else
+            {
+                SetError(68,temporary,nowLine);
+                return NULL;
+            }
+
+            lstrcpy( temporary, memberName );
+        }
     }
 
@@ -573 +605 @@
         // すべての関数・メソッドをコンパイルする
         pUserProc->Using();
+    }
+
+    // 親インターフェイスをセット
+    if( interfaceName && interfaceName[0] )
+    {
+        ::Interface *pTargetInterface = NULL;
+        BOOST_FOREACH( ::Interface *pInterface, pobj_c->GetInterfaces() )
+        {
+            if( pInterface->GetClass().GetName() == interfaceName )
+            {
+                pTargetInterface = pInterface;
+                break;
+            }
+        }
+        pUserProc->SetInterface( pTargetInterface );
     }