Changeset 316 in dev for trunk/abdev/BasicCompiler64/OperatorProc.cpp

Timestamp:

Sep 7, 2007, 3:15:41 AM (17 years ago)

Author:

dai_9181

Message:

 

File:

• trunk/abdev/BasicCompiler64/OperatorProc.cpp (modified) (3 diffs)

trunk/abdev/BasicCompiler64/OperatorProc.cpp

@@ -321 +321 @@
 
 //インデクサ（getter）を呼び出す
-void CallIndexerGetterProc(int reg,const CClass *pobj_Class,char *ObjectName,char *Parameter,Type &resultType ){
+void CallIndexerGetterProc(int reg, const Type &classType, char *ObjectName,char *Parameter,Type &resultType ){
 
     std::vector<const UserProc *> subs;
-    pobj_Class->GetMethods().Enum( CALC_ARRAY_GET, subs );
+    classType.GetClass().GetMethods().Enum( CALC_ARRAY_GET, subs );
     if( subs.size() == 0 ){
         return;
     }
 
+    const UserProc *pUserProc = subs[0];
+
     //////////////////////////////////////////////////////
     /////    レジスタ資源のバックアップ
@@ -334 +336 @@
     //////////////////////////////////////////////////////
 
-        Opcode_CallProc(Parameter,subs[0],0,ObjectName);
-        resultType = subs[0]->ReturnType();
+        Opcode_CallProc(Parameter,pUserProc,0,ObjectName);
+        resultType = pUserProc->ReturnType();
 
         //mov reg,rax
@@ -345 +347 @@
     }////////////////////////////////////////////
 
+
+    // 型パラメータを解決
+    ResolveFormalGenericTypeParameter( resultType, classType, pUserProc );
 }