Changeset 40 in dev for BasicCompiler_Common/Object.cpp

Timestamp:

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

Author:

dai_9181

Message:

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

File:

• BasicCompiler_Common/Object.cpp (modified) (4 diffs)

BasicCompiler_Common/Object.cpp

@@ -17 +17 @@
 
     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){
             //メンバクラスのアラインメントを取得
-            member_size=GetAlignment(pobj_c->ppobj_Member[i]->TypeInfo.u.pobj_Class);
+            member_size=GetAlignment(pMember->TypeInfo.u.pobj_Class);
         }
         else{
             //メンバサイズを取得
-            member_size=GetTypeSize(pobj_c->ppobj_Member[i]->TypeInfo.type,pobj_c->ppobj_Member[i]->TypeInfo.u.lpIndex);
+            member_size = pMember->GetSize();
         }
 
@@ -49 +51 @@
     int iMaxAlign=0;
     for(i=0;i<pobj_c->iMemberNum;i++){
-        //メンバ変数の型サイズを取得
-        i2=GetTypeSize(pobj_c->ppobj_Member[i]->TypeInfo.type,pobj_c->ppobj_Member[i]->TypeInfo.u.lpIndex);
-        if(i2==-1) return -1;
+        CMember *pMember = pobj_c->ppobj_Member[i];
+
+        i2 = pMember->GetSize();
 
         //アラインメントを算出
         int member_size;
-        if(pobj_c->ppobj_Member[i]->TypeInfo.type==DEF_OBJECT){
+        if(pMember->TypeInfo.type==DEF_OBJECT){
             //メンバクラスのアラインメントを取得
-            member_size=GetAlignment(pobj_c->ppobj_Member[i]->TypeInfo.u.pobj_Class);
+            member_size=GetAlignment(pMember->TypeInfo.u.pobj_Class);
         }
         else{
@@ -83 +85 @@
         if(pMemberName){
             //メンバ指定がある場合は、オフセットを返す
-            if(lstrcmp(pobj_c->ppobj_Member[i]->name,pMemberName)==0){
+            if(lstrcmp(pMember->name,pMemberName)==0){
                 if(pMemberNum) *pMemberNum=i;
                 return offset;
@@ -90 +92 @@
 
         //配列を考慮したメンバサイズを取得
-        member_size=i2 * JumpSubScripts(pobj_c->ppobj_Member[i]->SubScripts);
+        member_size=i2 * JumpSubScripts(pMember->SubScripts);
 
         //メンバサイズを加算