Changeset 140 in dev for BasicCompiler_Common/VariableOpe.cpp

Timestamp:

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

Author:

dai_9181

Message:

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

File:

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

BasicCompiler_Common/VariableOpe.cpp

@@ -547 +547 @@
 bool GetMemberType( const CClass &objClass, const char *lpszMember, Type &resultType, BOOL bPrivateAccess, bool isErrorEnabled){
     extern int cp;
-    int i;
 
     //クラス、配列の構成要素を解析する
@@ -558 +557 @@
     if(!GetVarFormatString(VarName,array,lpPtrOffset,NestMember,refType)) return false;
 
-    for(i=0;i<objClass.iMemberNum;i++){
-        if( objClass.ppobj_Member[i]->GetName() == VarName ){
+    bool isFound = false;
+    CMember *pMember = NULL;
+    BOOST_FOREACH( pMember, objClass.GetDynamicMembers() ){
+        if( pMember->GetName() == VarName ){
+            isFound = true;
             break;
         }
     }
-    if(i==objClass.iMemberNum){
+    if( !isFound ){
         if(isErrorEnabled) SetError(103,VarName,cp);
         return false;
@@ -571 +573 @@
     if( &objClass == pobj_CompilingClass ){
         //同一クラスオブジェクトの場合はプライベートアクセスを容認する
-        if( objClass.ppobj_Member[i]->IsNoneAccess() ){
+        if( pMember->IsNoneAccess() ){
             if(isErrorEnabled) SetError(107,VarName,cp);
             return false;
@@ -577 +579 @@
     }
     else{
-        if(( bPrivateAccess==0 && objClass.ppobj_Member[i]->IsPrivate() )||
-            objClass.ppobj_Member[i]->IsNoneAccess() ){
+        if(( bPrivateAccess==0 && pMember->IsPrivate() )||
+            pMember->IsNoneAccess() ){
             if(isErrorEnabled) SetError(107,VarName,cp);
             return false;
         }
-        else if( bPrivateAccess==0 && objClass.ppobj_Member[i]->IsProtected() ){
+        else if( bPrivateAccess==0 && pMember->IsProtected() ){
             if(isErrorEnabled) SetError(108,VarName,cp);
             return false;
@@ -588 +590 @@
     }
 
-    resultType = objClass.ppobj_Member[i]->GetType();
+    resultType = pMember->GetType();
 
     //ポインタ変数の場合
     if( resultType.IsPointer() ){
-        if(objClass.ppobj_Member[i]->SubScripts[0]==-1){
+        if(pMember->SubScripts[0]==-1){
             lstrcpy(lpPtrOffset,array);
             array[0]=0;
@@ -607 +609 @@
         //入れ子構造の場合
 
-        return GetMemberType( objClass.ppobj_Member[i]->GetType().GetClass(),
+        return GetMemberType( pMember->GetType().GetClass(),
             NestMember,
             resultType,
@@ -614 +616 @@
     }
 
-    if(array[0]==0&&objClass.ppobj_Member[i]->SubScripts[0]!=-1){
+    if(array[0]==0&&pMember->SubScripts[0]!=-1){
         resultType.SetBasicType( resultType.GetBasicType() | FLAG_PTR );
         return true;
@@ -633 +635 @@
 }
 bool GetVarType( const char *nameBuffer, Type &resultType, bool isErrorEnabled){
-    int i;
     char variable[VN_SIZE];
 
@@ -668 +669 @@
         /////////////////
 
-        pVar = UserProc::CompilingUserProc().localVars.BackSearch( VarName );
+        pVar = UserProc::CompilingUserProc().localVars.BackSearch( Symbol( VarName ) );
         if( pVar ){
             goto ok;
@@ -693 +694 @@
             //クラス内メンバを参照するとき（通常）
 
-            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;
         }
 
@@ -715 +718 @@
         GetNowStaticVarFullName(VarName,temporary);
 
-        pVar = globalVars.Find( temporary );
+        pVar = globalVars.Find( Symbol( temporary ) );
         if( pVar ){
             goto ok;
@@ -744 +747 @@
         sprintf(temp2,"%s.%s",VarName,temporary);
 
-        pVar = globalVars.Find( temp2 );
+        pVar = globalVars.Find( Symbol( temp2 ) );
         if( pVar ){
             lstrcpy(member,tempMember);
@@ -757 +760 @@
         sprintf(temp2,"%s.%s",pobj_CompilingClass->GetName().c_str(),VarName);
 
-        pVar = globalVars.Find( temp2 );
+        pVar = globalVars.Find( Symbol( temp2 ) );
         if( pVar ){
             goto ok;
@@ -768 +771 @@
     ////////////////////
 
-    pVar = globalVars.BackSearch( VarName );
+    pVar = globalVars.BackSearch( Symbol( VarName ) );
     if( pVar ){
         goto ok;
@@ -1041 +1044 @@
     extern int AllGlobalVarSize;
 
-    if( globalVars.DuplicateCheck( name ) ){
+    if( globalVars.DuplicateCheck( Symbol( name ) ) ){
         //２重定義のエラー
         SetError(15,name,cp);