Changeset 140 in dev for BasicCompiler32/Compile_Var.cpp

Timestamp:

Jun 15, 2007, 4:00:25 AM (17 years ago)

Author:

dai_9181

Message:

traceログ機能を搭載
動的メンバをstl::vectorにまとめた
シンボルをクラス化した

File:

• BasicCompiler32/Compile_Var.cpp (modified) (14 diffs)

BasicCompiler32/Compile_Var.cpp

@@ -158 +158 @@
 }
 bool _member_offset(bool isErrorEnabled, bool isWriteAccess, const CClass &objClass, const char *member, RELATIVE_VAR *pRelativeVar, Type &resultType, BOOL bPrivateAccess){
-    int i;
-
 
     //////////////////////////////////////
@@ -178 +176 @@
     ////////////////////////////
 
-    int offset = objClass.GetMemberOffset( VarName, &i );
-    if(i==objClass.iMemberNum){
+    int memberIndex;
+    int offset = objClass.GetMemberOffset( VarName, &memberIndex );
+    if(memberIndex==objClass.GetDynamicMembers().size()){
         if(isErrorEnabled) SetError(103,VarName,cp);
         return false;
     }
 
-    CMember *pMember=objClass.ppobj_Member[i];
+    CMember *pMember=objClass.GetDynamicMembers()[memberIndex];
 
 
@@ -351 +350 @@
 
 bool GetVarOffset(bool isErrorEnabled,bool isWriteAccess,const char *NameBuffer,RELATIVE_VAR *pRelativeVar,Type &resultType,int *pss){
-    int i;
     char variable[VN_SIZE];
 
@@ -387 +385 @@
         //////////////////
 
-        const Variable *pVar = UserProc::CompilingUserProc().localVars.BackSearch( VarName );
+        const Variable *pVar = UserProc::CompilingUserProc().localVars.BackSearch( Symbol( VarName ) );
         if( pVar ){
             //ポインタ変数の場合
@@ -444 +442 @@
             //クラス内メンバを参照するとき（通常）
 
-            for(i=0;i<pobj_CompilingClass->iMemberNum;i++){
-                if( pobj_CompilingClass->ppobj_Member[i]->GetName() == VarName ){
+            bool isFound = false;
+            BOOST_FOREACH( CMember *pMember, pobj_CompilingClass->GetDynamicMembers() ){
+                if( pMember->GetName() == VarName ){
+                    isFound = true;
                     break;
                 }
             }
-            if(i==pobj_CompilingClass->iMemberNum) goto NonClassMember;
+            if( !isFound ) goto NonClassMember;
         }
 
@@ -494 +494 @@
             GetNowStaticVarFullName(VarName,temporary);
 
-            pVar = globalVars.Find( temporary );
+            pVar = globalVars.Find( Symbol( temporary ) );
             if( pVar ){
                 goto GlobalOk;
@@ -525 +525 @@
             char temp2[VN_SIZE];
             sprintf(temp2,"%s.%s",VarName,temporary);
-            pVar = globalVars.Find( temp2 );
+            pVar = globalVars.Find( Symbol( temp2 ) );
             if( pVar ){
                 lstrcpy(member,tempMember);
@@ -537 +537 @@
             char temp2[VN_SIZE];
             sprintf(temp2,"%s.%s",pobj_CompilingClass->GetName().c_str(),VarName);
-            pVar = globalVars.Find( temp2 );
+            pVar = globalVars.Find( Symbol( temp2 ) );
             if( pVar ){
                 goto GlobalOk;
@@ -547 +547 @@
         /////////////////////
 
-        pVar = globalVars.BackSearch( VarName );
+        pVar = globalVars.BackSearch( Symbol( VarName ) );
         if( pVar ){
             goto GlobalOk;
@@ -716 +716 @@
 bool SetInitGlobalData(int offset,const Type &type,const int *SubScripts,const char *lpszInitBuf){
     extern BYTE *initGlobalBuf;
-    int i,i2,i3;
+    int i2,i3;
     char temporary[VN_SIZE];
     char InitBuf[VN_SIZE];
@@ -729 +729 @@
         if(SubScripts[0]!=-1){
             typeSize*=JumpSubScripts(SubScripts+1);
-            i=0;
+            int i=0;
             i2=0;
             while(1){
@@ -751 +751 @@
             const CClass &objClass = type.GetClass();
 
-            for(i=0,i2=0;i2<objClass.iMemberNum;i2++){
+            int i = 0;
+            BOOST_FOREACH( CMember *pMember, objClass.GetDynamicMembers() ){
+                if(InitBuf[i]=='\0'){
+                    SetError(41,0,cp);
+                    return false;
+                }
+
                 i=GetOneParameter(InitBuf,i,temporary);
 
-                i3=objClass.GetMemberOffset( objClass.ppobj_Member[i2]->GetName().c_str(), NULL );
+                i3=objClass.GetMemberOffset( pMember->GetName().c_str(), NULL );
 
                 if(!SetInitGlobalData(offset+i3,
-                    objClass.ppobj_Member[i2]->GetType(),
-                    objClass.ppobj_Member[i2]->SubScripts,
+                    pMember->GetType(),
+                    pMember->SubScripts,
                     temporary)) return false;
-
-                if(InitBuf[i]=='\0') break;
-            }
-            if(i2+1!=objClass.iMemberNum){
-                SetError(41,0,cp);
-                return false;
             }
             return true;
@@ -889 +889 @@
             const CClass &objClass = type.GetClass();
 
-            for(i=0,i2=0;i2<objClass.iMemberNum;i2++){
+            int i = 0;
+            BOOST_FOREACH( CMember *pMember, objClass.GetDynamicMembers() ){
+                if(InitBuf[i]=='\0'){
+                    SetError(41,0,cp);
+                    return false;
+                }
+
                 i=GetOneParameter(InitBuf,i,temporary);
 
-                i3=objClass.GetMemberOffset( objClass.ppobj_Member[i2]->GetName().c_str(), NULL );
+                i3=objClass.GetMemberOffset( pMember->GetName().c_str(), NULL );
 
                 if(!InitLocalVar(offset+i3,
-                    objClass.ppobj_Member[i2]->GetType(),
-                    objClass.ppobj_Member[i2]->SubScripts,
+                    pMember->GetType(),
+                    pMember->SubScripts,
                     temporary)) return false;
 
                 if(InitBuf[i]=='\0') break;
-            }
-            if(i2+1!=objClass.iMemberNum){
-                SetError(41,0,cp);
-                return 0;
             }
             return true;
@@ -1078 +1080 @@
         /////////////////
 
-        if( UserProc::CompilingUserProc().localVars.DuplicateCheck( VarName ) ){
+        if( UserProc::CompilingUserProc().localVars.DuplicateCheck( Symbol( VarName ) ) ){
             //２重定義のエラー
             SetError(15,VarName,cp);