Changeset 18 in dev for BasicCompiler_Common/Class.cpp

Timestamp:

Dec 24, 2006, 4:46:12 AM (18 years ago)

Author:

dai_9181

Message:

オブジェクト定数に対応。

File:

• BasicCompiler_Common/Class.cpp (modified) (15 diffs)

BasicCompiler_Common/Class.cpp

@@ -11 +11 @@
 CClass *pobj_CompilingClass;
 CClass *pobj_StringClass;
+
+CMember *pCompilingMethod;
 
 int AddDataTable(char *buffer,int length);
@@ -170 +172 @@
     lstrcpy(this->name,name);
 
-    isCompilingConstructor = 0;
+    isCompilingConstructor = false;
+    isCompilingDestructor = false;
 }
 CClass::~CClass(){
@@ -224 +227 @@
     iStaticMemberNum++;
 }
-void CClass::AddMethod(SUBINFO *psi,DWORD dwAccess,BOOL bAbstract,BOOL bVirtual){
-    ppobj_Method=(CMethod **)HeapReAlloc(hHeap,0,ppobj_Method,(iMethodNum+1)*sizeof(CMethod *));
-    ppobj_Method[iMethodNum]=new CMethod();
-    ppobj_Method[iMethodNum]->psi=psi;
-    ppobj_Method[iMethodNum]->dwAccess=dwAccess;
-    ppobj_Method[iMethodNum]->bAbstract=bAbstract;
-    ppobj_Method[iMethodNum]->bVirtual=bVirtual;
-    ppobj_Method[iMethodNum]->pobj_InheritsClass=0;
+void CClass::AddMethod( SUBINFO *psi,DWORD dwAccess, bool isConst, BOOL bAbstract, BOOL bVirtual ){
+    ppobj_Method = (CMethod **)HeapReAlloc( hHeap, 0, ppobj_Method, (iMethodNum + 1) * sizeof(CMethod *) );
+    ppobj_Method[iMethodNum] = new CMethod();
+    ppobj_Method[iMethodNum]->psi = psi;
+    ppobj_Method[iMethodNum]->dwAccess = dwAccess;
+    ppobj_Method[iMethodNum]->isConst = isConst;
+    ppobj_Method[iMethodNum]->bAbstract = bAbstract;
+    ppobj_Method[iMethodNum]->bVirtual = bVirtual;
+    ppobj_Method[iMethodNum]->pobj_InheritsClass = 0;
 
     iMethodNum++;
@@ -284 +288 @@
     return 0;
 }
+CMethod *CClass::GetMethodInfo( SUBINFO *psi ){
+    int i;
+    for( i=0; i<iMethodNum; i++ ){
+        if( psi == ppobj_Method[i]->psi ) break;
+    }
+    if( i == iMethodNum ){
+        return NULL;
+    }
+    return ppobj_Method[i];
+}
+CMethod *CClass::GetStaticMethodInfo( SUBINFO *psi ){
+    int i;
+    for( i=0; i<iStaticMethodNum; i++ ){
+        if( psi == ppobj_StaticMethod[i]->psi ) break;
+    }
+    if( i == iMethodNum ){
+        return NULL;
+    }
+    return ppobj_StaticMethod[i];
+}
 
 LONG_PTR CClass::AddVtblDataTable(SUBINFO **ppsi,int length){
@@ -409 +433 @@
 }
 
+//デストラクタのコンパイルを開始
+void CClass::NotifyStartDestructorCompile(){
+    isCompilingDestructor = true;
+}
+
+//デストラクタのコンパイルを終了
+void CClass::NotifyFinishDestructorCompile(){
+    isCompilingDestructor = false;
+}
+
+//デストラクタをコンパイル中かどうかを判別
+bool CClass::IsCompilingDestructor(){
+    return isCompilingDestructor;
+}
+
 
 int CDBClass::hash(char *name){
@@ -559 +598 @@
 
 
-void CDBClass::AddMemberSub(CClass *pobj_c,DWORD dwAccess,BOOL bStatic,BOOL bAbstract,BOOL bVirtual,BOOL bOverride,char *buffer,int NowLine){
+void CDBClass::AddMethod(CClass *pobj_c, DWORD dwAccess, BOOL bStatic, bool isConst, BOOL bAbstract,
+                         BOOL bVirtual, BOOL bOverride, char *buffer, int NowLine){
     int i,i2;
     char temporary[VN_SIZE];
@@ -580 +620 @@
 
     ////////////////////////////////////////////////////////////
-    // コンストラクタ、デストラクタのアクセシビリティをチェック
+    // コンストラクタ、デストラクタの場合の処理
     ////////////////////////////////////////////////////////////
     BOOL fConstructor=0,bDestructor=0;
 
     if(lstrcmp(temporary,pobj_c->name)==0){
+        //コンストラクタの場合
+
+        //標準コンストラクタ（引数なし）
         if(psi->ParmNum==1) fConstructor=1;
+
+        //コピーコンストラクタ
         if(psi->ParmNum==2){
             if(psi->pParmInfo[1].type==DEF_OBJECT&&
                 psi->pParmInfo[1].u.pobj_c==pobj_c) fConstructor=2;
         }
+
+        //強制的にConst修飾子をつける
+        isConst = true;
     }
     else if(temporary[0]=='~'){
@@ -599 +647 @@
     }
     if(fConstructor||bDestructor){
+        // コンストラクタ、デストラクタのアクセシビリティをチェック
         if(dwAccess!=ACCESS_PUBLIC){
             SetError(116,NULL,NowLine);
             dwAccess=ACCESS_PUBLIC;
         }
-    }
-
-
-    if(fConstructor==1) pobj_c->ConstructorMemberSubIndex=pobj_c->iMethodNum;
-    else if(fConstructor==2) pobj_c->CopyConstructorMemberSubIndex=pobj_c->iMethodNum;
-    else if(bDestructor) pobj_c->DestructorMemberSubIndex=pobj_c->iMethodNum;
+
+        //強制的にConst修飾子をつける
+        isConst = true;
+    }
+
+    if( fConstructor == 1 )
+        pobj_c->ConstructorMemberSubIndex = pobj_c->iMethodNum;
+    else if( fConstructor == 2 )
+        pobj_c->CopyConstructorMemberSubIndex = pobj_c->iMethodNum;
+    else if( bDestructor )
+        pobj_c->DestructorMemberSubIndex = pobj_c->iMethodNum;
 
 
@@ -678 +732 @@
     }
     else{
-        pobj_c->AddMethod(psi,dwAccess,bAbstract,bVirtual);
+        pobj_c->AddMethod(psi, dwAccess, isConst, bAbstract, bVirtual);
     }
 }
@@ -890 +944 @@
 
                 //メンバ関数を追加
-                AddMemberSub(pobj_c,ACCESS_PUBLIC,0,1,1,0,temporary,sub_address);
+                AddMethod(pobj_c,
+                    ACCESS_PUBLIC,      //Publicアクセス権
+                    0,                  //Static指定なし
+                    false,              //Constではない
+                    1,                  //Abstract
+                    1,                  //Virtual
+                    0,
+                    temporary,
+                    sub_address
+                    );
             }
         }
@@ -990 +1053 @@
                 }
 
-                //メンバ変数をコピー
+                //メンバをコピー
                 pobj_c->ppobj_Member=(CMember **)HeapReAlloc(
                     hHeap,
@@ -1006 +1069 @@
                 }
 
-                //メンバ関数をコピー
+                //メソッドをコピー
                 pobj_c->ppobj_Method=(CMethod **)HeapReAlloc(
                     hHeap,
@@ -1042 +1105 @@
 InheritsError:
 
-            //メンバ変数、関数を取得
+            //メンバとメソッドを取得
             while(1){
                 i++;
@@ -1180 +1243 @@
                     //メソッドを追加
                     cp=i;   //エラー用
-                    AddMemberSub(pobj_c,dwAccess,bStatic,bAbstract,bVirtual,bOverride,temporary,sub_address);
+                    AddMethod(pobj_c,
+                        dwAccess,
+                        bStatic,
+                        isConst,
+                        bAbstract,
+                        bVirtual,
+                        bOverride,
+                        temporary,
+                        sub_address);
 
                     if(bAbstract) continue;
@@ -1223 +1294 @@
 }
 
+void CDBClass::StartCompile( SUBINFO *psi ){
+    pCompilingClass = psi->pobj_ParentClass;
+    if( pCompilingClass ){
+        pCompilingMethod = pCompilingClass->GetMethodInfo( psi );
+        if( !pCompilingMethod ){
+            pCompilingMethod = pCompilingClass->GetStaticMethodInfo( psi );
+            if( !pCompilingMethod ){
+                SetError(300,NULL,cp);
+            }
+        }
+    }
+    else{
+        pCompilingMethod = NULL;
+    }
+}
+CClass *CDBClass::GetNowCompilingClass(){
+    return pCompilingClass;
+}
+CMethod *CDBClass::GetNowCompilingMethodInfo(){
+    return pCompilingMethod;
+}
+