Changeset 290 in dev for trunk/abdev/BasicCompiler32/Compile_Var.cpp

Timestamp:

Aug 21, 2007, 11:00:25 PM (17 years ago)

Author:

dai_9181

Message:

ジェネリクスのベースを実装

File:

• trunk/abdev/BasicCompiler32/Compile_Var.cpp (modified) (7 diffs)

trunk/abdev/BasicCompiler32/Compile_Var.cpp

@@ -160 +160 @@
     return 1;
 }
-bool _member_offset(bool isErrorEnabled, bool isWriteAccess, const CClass &objClass, const char *member, RELATIVE_VAR *pRelativeVar, Type &resultType, BOOL bPrivateAccess){
+bool _member_offset(bool isErrorEnabled, bool isWriteAccess, const Type &classType, const char *member, RELATIVE_VAR *pRelativeVar, Type &resultType, BOOL bPrivateAccess)
+{
+    const CClass &objClass = classType.GetClass();
 
     //////////////////////////////////////
@@ -221 +223 @@
     resultType = pMember->GetType();
 
+
+    /////////////////////////////////////////////////////////
+    // ☆★☆ ジェネリクスサポート ☆★☆
+
+    if( resultType.IsTypeParameter() )
+    {
+        // 型パラメータだったとき
+        if( classType.HasActualGenericType() )
+        {
+            // TODO: GetDummyActualGenericTypeを適切な形に実装し直す
+            resultType = classType.GetDummyActualGenericType();
+        }
+        else
+        {
+            // TODO: ベースオブジェクト（指定されていないときはObjectクラス）にセットする
+            resultType.SetBasicType( DEF_OBJECT );
+        }
+    }
+
+    //
+    /////////////////////////////////////////////////////////
+
+
     //ポインタ変数の場合
     if( resultType.IsPointer() ){
@@ -321 +346 @@
             isErrorEnabled,
             isWriteAccess,
-            pMember->GetType().GetClass(),
+            pMember->GetType(),
             NestMember,
             pRelativeVar,
@@ -345 +370 @@
     RelativeVar.offset=-LocalVar_ThisPtrOffset;
 
-    SetReg_WholeVariable(DEF_PTR_VOID,&RelativeVar,reg);
+    SetReg_WholeVariable(Type(DEF_PTR_VOID),&RelativeVar,reg);
 }
 
@@ -472 +497 @@
             isErrorEnabled,
             isWriteAccess,
-            *compiler.pCompilingClass,
+            Type( DEF_OBJECT, *compiler.pCompilingClass ),
             variable,
             pRelativeVar,
@@ -701 +726 @@
             isErrorEnabled,
             isWriteAccess,
-            resultType.GetClass(),
+            resultType,
             member,pRelativeVar,resultType,0)) return false;
 
@@ -1204 +1229 @@
             SetError();
         }
-        SetVariableFromEax( DEF_OBJECT, DEF_OBJECT, &RelativeVar );
+        SetVariableFromEax( Type( DEF_OBJECT, *compiler.GetObjectModule().meta.GetClasses().GetObjectClassPtr() ), DEF_OBJECT, &RelativeVar );
     }
 }