Changeset 410 in dev for trunk/abdev/BasicCompiler64

Timestamp:

Mar 3, 2008, 6:36:30 PM (17 years ago)

Author:

dai_9181

Message:

[409]をマージした。

File:

• trunk/abdev/BasicCompiler64/Compile_Var.cpp (modified) (4 diffs)

trunk/abdev/BasicCompiler64/Compile_Var.cpp

@@ -208 +208 @@
     ////////////////////////////
 
-    int memberIndex;
-    int offset = objClass.GetMemberOffset( VarName, &memberIndex );
-    if( memberIndex == objClass.GetDynamicMembers().size() ){
+    const CMember *pMember = objClass.FindDynamicMember( VarName );
+    if( !pMember )
+    {
         if(isErrorEnabled) SetError(103,VarName,cp);
         return false;
     }
 
-    CMember *pMember = objClass.GetDynamicMembers()[memberIndex];
+    int offset = objClass.GetMemberOffset( VarName );
 
 
@@ -491 +491 @@
         }
         else{
-            //クラス内メンバを参照するとき（通常）
-
-            bool isFound = false;
-            BOOST_FOREACH( CMember *pMember, compiler.pCompilingClass->GetDynamicMembers() ){
-                if( pMember->GetName() == VarName ){
-                    isFound = true;
-                    break;
-                }
-            }
-            if( !isFound ) goto NonClassMember;
+            //クラス内の動的メンバを参照するとき（通常）
+
+            if( !compiler.pCompilingClass->HasDynamicMember( VarName ) )
+            {
+                goto NonClassMember;
+            }
         }
 
@@ -817 +813 @@
                 i=GetOneParameter(InitBuf,i,temporary);
 
-                i3=objClass.GetMemberOffset( pMember->GetName().c_str(), NULL );
+                i3=objClass.GetMemberOffset( pMember->GetName().c_str() );
 
                 if(!SetInitGlobalData(offset+i3,
@@ -985 +981 @@
                 i=GetOneParameter(InitBuf,i,temporary);
 
-                i3=objClass.GetMemberOffset( pMember->GetName().c_str(), NULL );
+                i3=objClass.GetMemberOffset( pMember->GetName().c_str() );
 
                 if(!InitLocalVar(offset+i3,