Changeset 301 in dev for trunk/abdev/BasicCompiler_Common/src/Type.cpp

Timestamp:

Aug 23, 2007, 10:58:43 PM (17 years ago)

Author:

dai_9181

Message:

 

File:

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

trunk/abdev/BasicCompiler_Common/src/Type.cpp

@@ -455 +455 @@
 }
 
-const Type &Type::GetDummyActualGenericType() const
-{
-    return actualGenericTypes[0].GetType();
+const Type &Type::GetActualGenericType( int index ) const
+{
+    return actualGenericTypes[index].GetType();
 }
 bool Type::HasActualGenericType() const
@@ -515 +515 @@
                     if( pClass->GetSuperClassActualTypeParameters().size() )
                     {
+                        // TODO: 適切な形に実装し直す（暫定的にトップの型を持ってきている）
                         typeParameter = pClass->GetSuperClassActualTypeParameters()[0];
                     }
@@ -526 +527 @@
             if( classType.HasActualGenericType() )
             {
-                // TODO: GetDummyActualGenericTypeを適切な形に実装し直す
-                typeParameter = classType.GetDummyActualGenericType();
+                typeParameter = classType.GetActualGenericType( typeParameter.GetFormalTypeIndex() );
             }
             else