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

Timestamp:

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

Author:

dai_9181

Message:

 

File:

• trunk/abdev/BasicCompiler64/Compile_Var.cpp (modified) (6 diffs)

trunk/abdev/BasicCompiler64/Compile_Var.cpp

@@ -191 +191 @@
     return true;
 }
-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();
 
     //////////////////////////////////////
@@ -252 +254 @@
     resultType = pMember->GetType();
 
+    // 型パラメータを解決
+    ResolveFormalGenericTypeParameter( resultType, classType );
+
     //ポインタ変数の場合
     if( resultType.IsPointer() ){
@@ -352 +357 @@
             isErrorEnabled,
             isWriteAccess,
-            pMember->GetType().GetClass(),
+            pMember->GetType(),
             NestMember,
             pRelativeVar,
@@ -441 +446 @@
             pSubscripts = &pVar->GetSubscripts();
             bConst = pVar->IsConst();
+
+            /////////////////////////////////////////////////////////
+            // ☆★☆ ジェネリクスサポート ☆★☆
+
+            if( resultType.IsTypeParameter() )
+            {
+                // 型パラメータだったとき
+
+                int ptrLevel = PTR_LEVEL( resultType.GetBasicType() );
+
+                // TODO: ベースオブジェクト（指定されていないときはObjectクラス）にセットする
+                resultType.SetBasicType( DEF_OBJECT );
+
+                for( int i=0; i<ptrLevel; i++ )
+                {
+                    resultType.PtrLevelUp();
+                }
+            }
+
+            //
+            /////////////////////////////////////////////////////////
 
             goto ok;
@@ -498 +524 @@
             isErrorEnabled,
             isWriteAccess,
-            *compiler.pCompilingClass,
+            Type( DEF_OBJECT, *compiler.pCompilingClass ),
             variable,
             pRelativeVar,
@@ -727 +753 @@
             isErrorEnabled,
             isWriteAccess,
-            resultType.GetClass(),
+            resultType,
             member,pRelativeVar,resultType,0)) return false;