Changeset 59 in dev

Timestamp:

Feb 21, 2007, 1:50:32 AM (18 years ago)

Author:

dai_9181

Message:

派生クラスから基底クラスへのインスタンスコピーまたは参照を可能にした

Files:

• BasicCompiler32/CParameter.cpp (modified) (1 diff)
• BasicCompiler64/CParameter.cpp (modified) (1 diff)
• BasicCompiler_Common/Class.cpp (modified) (1 diff)
• BasicCompiler_Common/Class.h (modified) (1 diff)
• BasicCompiler_Common/error.cpp (modified) (1 diff)

BasicCompiler32/CParameter.cpp

@@ -369 +369 @@
                             if(DummyTypeInfo.type==VarType){
                                 if(DummyTypeInfo.type==DEF_OBJECT){
-                                    if(DummyTypeInfo.u.lpIndex!=lpVarIndex){
+                                    if( !DummyTypeInfo.u.pobj_Class->IsEqualsOrSubClass( (CClass *)lpVarIndex ) ){
                                         SetError(11,Parms[i2],cp);
                                     }

BasicCompiler64/CParameter.cpp

@@ -416 +416 @@
                             if(DummyTypeInfo.type==VarType){
                                 if(DummyTypeInfo.type==DEF_OBJECT){
-                                    if(DummyTypeInfo.u.lpIndex!=lpVarIndex){
+                                    if( !DummyTypeInfo.u.pobj_Class->IsEqualsOrSubClass( (CClass *)lpVarIndex ) ){
                                         SetError(11,Parms[i2],cp);
                                     }

BasicCompiler_Common/Class.cpp

@@ -540 +540 @@
     }
     return false;
+}
+
+//自身と等しいまたは派生クラスかどうかを確認
+bool CClass::IsEqualsOrSubClass( CClass *pClass ){
+    if( IsEquals( pClass ) ) return true;
+    return IsSubClass( pClass );
 }
 

BasicCompiler_Common/Class.h

@@ -170 +170 @@
     bool IsSubClass( CClass *pClass );
 
+    //自身と等しいまたは派生クラスかどうかを確認
+    bool IsEqualsOrSubClass( CClass *pClass );
+
 
     //線形リスト用

BasicCompiler_Common/error.cpp

@@ -399 +399 @@
 
     if(VarType==DEF_OBJECT||CalcType==DEF_OBJECT){
-        //オブジェクトインスタンスの場合
-        if(!(VarType==CalcType&&lpVarIndex==lpCalcIndex)){
+        //いずれかがオブジェクトインスタンスの場合
+        if( VarType != CalcType ){
+            DifferentTypeError(VarType,lpVarIndex,CalcType,lpCalcIndex,3,pszFuncName,ParmNum);
+            return false;
+        }
+
+        CClass *pClass = (CClass *)lpVarIndex;
+        if( !pClass->IsEqualsOrSubClass( (CClass *)lpCalcIndex ) ){
+            //等しくなく、派生クラスでもないとき
             DifferentTypeError(VarType,lpVarIndex,CalcType,lpCalcIndex,3,pszFuncName,ParmNum);
             return false;