Changeset 40 in dev for BasicCompiler_Common/Class.cpp

Timestamp:

Jan 28, 2007, 3:48:22 AM (17 years ago)

Author:

dai_9181

Message:

ByRef修飾子を関数戻り値とDimステートメントで指定可能にした。

File:

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

BasicCompiler_Common/Class.cpp

@@ -18 +18 @@
 
 
-CMember::CMember( CClass *pobj_c, DWORD access, bool isConst, char *buffer, int NowLine ){
+CMember::CMember( CClass *pobj_c, DWORD access, bool isConst, bool isRef, char *buffer, int NowLine ){
     extern int cp;
 
@@ -25 +25 @@
     char init_buf[VN_SIZE];
     char constract_parameter[VN_SIZE];
-    GetDimentionFormat(buffer,VarName,SubScripts,&TypeInfo,init_buf,constract_parameter);
+    GetDimentionFormat(buffer,isRef,VarName,SubScripts,&TypeInfo,init_buf,constract_parameter);
 
     //重複チェック
@@ -49 +49 @@
     this->isConst = isConst;
 
+    //参照型かどうか
+    this->isRef = isRef;
+
     //初期データ
     InitBuf=(char *)HeapAlloc(hHeap,0,lstrlen(init_buf)+1);
@@ -70 +73 @@
     //定数扱いかどうか
     isConst = pobj->isConst;
+
+    //参照型かどうか
+    isRef = pobj->isRef;
 
     //SubScripts
@@ -91 +97 @@
 bool CMember::IsConst(){
     return isConst;
+}
+bool CMember::IsRef(){
+    return isRef;
+}
+
+int CMember::GetSize(){
+    if( IsRef() ){
+        // 参照型
+        return PTR_SIZE;
+    }
+
+    //メンバサイズを取得
+    return GetTypeSize(TypeInfo.type,TypeInfo.u.lpIndex);
 }
 
@@ -264 +283 @@
     pobj_InheritsClass = pInheritsClass;
 }
-void CClass::AddMember( DWORD dwAccess, bool isConst, char *buffer ){
+void CClass::AddMember( DWORD dwAccess, bool isConst, bool isRef, char *buffer ){
     ppobj_Member = (CMember **)HeapReAlloc( hHeap, 0, ppobj_Member, ( iMemberNum + 1 ) * sizeof(CMember *) );
-    ppobj_Member[iMemberNum] = new CMember( this, dwAccess, isConst, buffer );
+    ppobj_Member[iMemberNum] = new CMember( this, dwAccess, isConst, isRef, buffer );
     iMemberNum++;
 }
-void CClass::AddStaticMember( DWORD dwAccess, bool isConst, char *buffer, int NowLine ){
+void CClass::AddStaticMember( DWORD dwAccess, bool isConst, bool isRef, char *buffer, int NowLine ){
     ppobj_StaticMember=(CMember **)HeapReAlloc(hHeap,0,ppobj_StaticMember,(iStaticMemberNum+1)*sizeof(CMember *));
-    ppobj_StaticMember[iStaticMemberNum]=new CMember( this, dwAccess, isConst, buffer, NowLine );
+    ppobj_StaticMember[iStaticMemberNum]=new CMember( this, dwAccess, isConst, isRef, buffer, NowLine );
     iStaticMemberNum++;
 }
@@ -439 +458 @@
     //コンポジションの関係にあるメンバも検査する
     for(int i=0;i < iMemberNum;i++){
-        if(ppobj_Member[i]->TypeInfo.type==DEF_OBJECT){
+        if(ppobj_Member[i]->TypeInfo.type==DEF_OBJECT && ppobj_Member[i]->IsRef() == false){
             if(ppobj_Member[i]->TypeInfo.u.pobj_Class->IsAbstract())
                 return true;
@@ -809 +828 @@
     int i,i2,bRet=1;
     for(i=0;i<pobj_c->iMemberNum;i++){
-        if(pobj_c->ppobj_Member[i]->TypeInfo.type==DEF_OBJECT){
+        CMember *pMember = pobj_c->ppobj_Member[i];
+        if(pMember->TypeInfo.type==DEF_OBJECT && pMember->IsRef()==false ){
             //循環参照でないかをチェック
-            if(pobj_LoopRefCheck->check(pobj_c->ppobj_Member[i]->TypeInfo.u.pobj_Class->name)){
+            if(pobj_LoopRefCheck->check(pMember->TypeInfo.u.pobj_Class->name)){
                 extern int cp;
-                SetError(123,pobj_c->ppobj_Member[i]->TypeInfo.u.pobj_Class->name,cp);
+                SetError(124,pMember->TypeInfo.u.pobj_Class->name,cp);
                 return 0;
             }
@@ -819 +839 @@
             pobj_LoopRefCheck->add(pobj_c->name);
 
-            i2=MemberVar_LoopRefCheck(pobj_c->ppobj_Member[i]->TypeInfo.u.pobj_Class);
+            i2=MemberVar_LoopRefCheck(pMember->TypeInfo.u.pobj_Class);
             if(bRet==1) bRet=i2;
 
@@ -1132 +1152 @@
                 }
 
+                //Ref修飾子
+                bool isRef = false;
+                if( basbuf[i] == 1 && basbuf[i + 1] == ESC_BYREF ){
+                    isRef = true;
+                    i += 2;
+                }
+
                 if(basbuf[i]==1&&(
                     basbuf[i+1]==ESC_ABSTRACT||basbuf[i+1]==ESC_VIRTUAL||basbuf[i+1]==ESC_OVERRIDE||
@@ -1209 +1236 @@
                         //静的メンバを追加
                         cp=i;   //エラー用
-                        pobj_c->AddStaticMember( dwAccess, isConst, temporary, i);
+                        pobj_c->AddStaticMember( dwAccess, isConst, isRef, temporary, i);
                     }
                     else{
                         //メンバを追加
                         cp=i;   //エラー用
-                        pobj_c->AddMember( dwAccess, isConst, temporary );
+                        pobj_c->AddMember( dwAccess, isConst, isRef, temporary );
 
 
@@ -1237 +1264 @@
                 }
                 else{
+                    // 文法エラーチェック
+                    if( isRef ){
+                        SetError(1,NULL,cp);
+                    }
+
                     //メソッドを追加
                     cp=i;   //エラー用