Changeset 378 in dev for trunk/abdev/BasicCompiler_Common/src/Class.cpp

Timestamp:

Dec 16, 2007, 11:44:29 PM (16 years ago)

Author:

dai_9181

Message:

 

File:

• trunk/abdev/BasicCompiler_Common/src/Class.cpp (modified) (3 diffs)

trunk/abdev/BasicCompiler_Common/src/Class.cpp

@@ -50 +50 @@
 }
 
+std::string Interface::GetFullNameWithActualGenericTypeParameters() const
+{
+    std::string interfaceName = this->GetClass().GetFullName();
+    if( actualTypeParameters.size() )
+    {
+        std::string actualGenericTypesName;
+        BOOST_FOREACH( const Type &typeParameter, actualTypeParameters )
+        {
+            if( actualGenericTypesName.size() )
+            {
+                actualGenericTypesName += ",";
+            }
+            actualGenericTypesName += typeParameter.ToString();
+        }
+
+        interfaceName += "<" + actualGenericTypesName + ">";
+    }
+    return interfaceName;
+}
 
 bool CClass::IsClass() const
@@ -344 +363 @@
             1, ESC_OPERATOR,
             1, ESC_AS,
-            interfaceClass.GetName().c_str()
+            pDestInterface->GetFullNameWithActualGenericTypeParameters().c_str()
         );
 
@@ -539 +558 @@
             }
 
+            if( !pInterface->GetClass().IsReady() ){
+                // インターフェイスが未解析のとき
+                compiler.GetObjectModule().meta.GetClasses().LookaheadClass( pInterface->GetClass().GetName().c_str() );
+            }
+
             CMethod *pMethodForOverride = pInterface->GetDynamicMethods().FindForOverride( pUserProc );
             if( pMethodForOverride )