Changeset 140 in dev

Timestamp:

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

Author:

dai_9181

Message:

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

Files:

• BasicCompiler32/BasicCompiler.vcproj (modified) (4 diffs)
• BasicCompiler32/Compile_Object.cpp (modified) (1 diff)
• BasicCompiler32/Compile_ProcOp.cpp (modified) (2 diffs)
• BasicCompiler32/Compile_Var.cpp (modified) (14 diffs)
• BasicCompiler32/MakePeHdr.cpp (modified) (1 diff)
• BasicCompiler32/Opcode.h (modified) (1 diff)
• BasicCompiler64/BasicCompiler.vcproj (modified) (4 diffs)
• BasicCompiler64/Compile_Object.cpp (modified) (1 diff)
• BasicCompiler64/Compile_ProcOp.cpp (modified) (2 diffs)
• BasicCompiler64/Compile_Var.cpp (modified) (6 diffs)
• BasicCompiler64/MakePeHdr.cpp (modified) (1 diff)
• BasicCompiler64/NumOpe.cpp (modified) (1 diff)
• BasicCompiler64/Opcode.h (modified) (1 diff)
• BasicCompiler_Common/BasicCompiler.cpp (modified) (2 diffs)
• BasicCompiler_Common/Class.cpp (modified) (19 diffs)
• BasicCompiler_Common/Class.h (modified) (4 diffs)
• BasicCompiler_Common/DebugMiddleFile.cpp (modified) (4 diffs)
• BasicCompiler_Common/ParamImpl.cpp (modified) (5 diffs)
• BasicCompiler_Common/Procedure.cpp (modified) (1 diff)
• BasicCompiler_Common/Procedure.h (modified) (1 diff)
• BasicCompiler_Common/Subroutine.cpp (modified) (1 diff)
• BasicCompiler_Common/Type.cpp (modified) (1 diff)
• BasicCompiler_Common/VarList.cpp (modified) (8 diffs)
• BasicCompiler_Common/Variable.cpp (modified) (1 diff)
• BasicCompiler_Common/Variable.h (modified) (8 diffs)
• BasicCompiler_Common/VariableOpe.cpp (modified) (15 diffs)
• BasicCompiler_Common/WatchList.cpp (modified) (8 diffs)
• BasicCompiler_Common/common.h (modified) (2 diffs)
• BasicCompiler_Common/error.cpp (modified) (2 diffs)
• BasicCompiler_Common/include/Member.h (modified) (1 diff)
• BasicCompiler_Common/include/Symbol.h (added)
• BasicCompiler_Common/include/logger.h (added)
• BasicCompiler_Common/src/Namespace.cpp (modified) (1 diff)
• BasicCompiler_Common/src/Symbol.cpp (added)

BasicCompiler32/BasicCompiler.vcproj

@@ -146 +146 @@
                 Name="VCCLCompilerTool"
                 Optimization="2"
-                InlineFunctionExpansion="1"
+                InlineFunctionExpansion="2"
+                FavorSizeOrSpeed="1"
                 AdditionalIncludeDirectories="..\cpplibs\boost;..\BasicCompiler_Common\include"
                 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;JPN"
@@ -1840 +1841 @@
                     <File
                         RelativePath="..\BasicCompiler_Common\src\Prototype.cpp"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\BasicCompiler_Common\src\Symbol.cpp"
                         >
                     </File>
@@ -1952 +1957 @@
                     >
                     <File
+                        RelativePath="..\BasicCompiler_Common\include\logger.h"
+                        >
+                    </File>
+                    <File
                         RelativePath="..\BasicCompiler_Common\include\Namespace.h"
                         >
@@ -1961 +1970 @@
                     <File
                         RelativePath="..\BasicCompiler_Common\Procedure.h"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\BasicCompiler_Common\include\Symbol.h"
                         >
                     </File>

BasicCompiler32/Compile_Object.cpp

@@ -59 +59 @@
         if( subs.size() == 1 ){
             char temporary[VN_SIZE];
-            sprintf( temporary, "_System_TypeBase.Search(\"\",\"%s\"))", pobj_c->GetName().c_str() );
+            sprintf( temporary, "ActiveBasic.Core._System_TypeBase.Search(\"\",\"%s\"))", pobj_c->GetName().c_str() );
 
             Opcode_CallProc(temporary,

BasicCompiler32/Compile_ProcOp.cpp

@@ -514 +514 @@
             }
 
-            //新しいオブジェクト領域は0で初期化されているため、Nothingを明示的に代入する必要はない
-/*
-            //実体クラスを持つメンバのコンストラクタ（引数有りを除く）を呼び出す
-            for(i3=0;i3<pobj_CompilingClass->iMemberNum;i3++){
-                CMember *pMember = pobj_CompilingClass->ppobj_Member[i3];
-                if(pMember->IsObject()){
-                    // オブジェクトメンバを発見したとき
-
-                    sprintf(temporary, "This.%s=Nothing",
-                        pMember->name );
-                    OpcodeCalc( temporary );
-                }
-            }
-*/
-
             //仮想関数テーブルを初期化
             if(pobj_CompilingClass->vtbl_num&&
@@ -608 +593 @@
                 }
             }
-
-            //実体クラスを持つメンバのデストラクタ呼び出しはGCに任せる
-            /*
-            //※コンストラクタと逆順序で呼び出す
-            int offset;
-            int MemberTypeSize;
-            int MemberObjectNum;
-            offset=GetTypeSize(DEF_OBJECT,(LONG_PTR)pobj_CompilingClass);
-            for(i3=pobj_CompilingClass->iMemberNum-1;i3>=0;i3--){
-                CMember *pMember = pobj_CompilingClass->ppobj_Member[i3];
-
-                MemberTypeSize=
-                    GetTypeSize(pMember->TypeInfo.type,
-                        pMember->TypeInfo.u.lpIndex);
-
-                MemberObjectNum=
-                    JumpSubScripts(pMember->SubScripts);
-
-                offset-=MemberTypeSize*MemberObjectNum;
-
-                if(pMember->TypeInfo.type==DEF_OBJECT){
-                    CMethod *method = pMember->TypeInfo.u.pobj_Class->GetDestructorMethod();
-                    if( method ){
-                        for(i4=MemberObjectNum-1;i4>=0;i4--){
-                            //Thisポインタをecxにコピー
-                            SetThisPtrToReg(REG_ECX);
-
-                            //add ecx,offset
-                            OpBuffer[obp++]=(char)0x81;
-                            OpBuffer[obp++]=(char)0xC1;
-                            *((long *)(OpBuffer+obp))=offset+i4*MemberTypeSize;
-                            obp+=sizeof(long);
-
-                            //push ecx
-                            op_push(REG_ECX);
-
-                            //call destructor
-                            op_call( method->pUserProc );
-                        }
-                    }
-                }
-            }*/
         }
     }

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);

BasicCompiler32/MakePeHdr.cpp

@@ -259 +259 @@
         pSub_System_GC_free_for_SweepingDelete->Using();
 
-    if( pSubStaticMethod_System_TypeBase_InitializeUserTypes = GetSubHash( "_System_TypeBase.InitializeUserTypes",1 ) ){
+    if( pSubStaticMethod_System_TypeBase_InitializeUserTypes = GetSubHash( "ActiveBasic.Core._System_TypeBase.InitializeUserTypes",1 ) ){
         pSubStaticMethod_System_TypeBase_InitializeUserTypes->Using();
         pSubStaticMethod_System_TypeBase_InitializeUserTypes->ThisIsAutoGenerationProc();

BasicCompiler32/Opcode.h

@@ -232 +232 @@
 
 private:
-    bool _overload_check( int level, const Parameters &targetParms, const Type &targetResultType );
-    UserProc *OverloadSolutionWithReturnType( const char *name, std::vector<UserProc *> &subs );
+    bool EvaluateOverloadScore( int level, const Parameters &targetParms, const Type &targetResultType );
 public:
-    UserProc *OverloadSolution( const char *name, std::vector<UserProc *> &subs );
+    UserProc *_OverloadSolution( const char *name, std::vector<UserProc *> &subs, bool isEnabledReturnType = false );
+    UserProc *OverloadSolution( const char *name, std::vector<UserProc *> &subs, bool isEnabledReturnType = false );
 
     void ApplyDefaultParameters( const Parameters &params );

BasicCompiler64/BasicCompiler.vcproj

@@ -350 +350 @@
                 Name="VCCLCompilerTool"
                 Optimization="2"
+                InlineFunctionExpansion="2"
+                FavorSizeOrSpeed="1"
                 AdditionalIncludeDirectories="..\cpplibs\boost;..\BasicCompiler_Common\include"
                 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;JPN;_AMD64_;_WIN64"
@@ -480 +482 @@
                     >
                     <File
+                        RelativePath="..\BasicCompiler_Common\include\logger.h"
+                        >
+                    </File>
+                    <File
                         RelativePath="..\BasicCompiler_Common\include\Namespace.h"
                         >
@@ -489 +495 @@
                     <File
                         RelativePath="..\BasicCompiler_Common\Procedure.h"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\BasicCompiler_Common\include\Symbol.h"
                         >
                     </File>
@@ -1592 +1602 @@
                     </File>
                     <File
+                        RelativePath="..\BasicCompiler_Common\src\Symbol.cpp"
+                        >
+                    </File>
+                    <File
                         RelativePath="..\BasicCompiler_Common\Type.cpp"
                         >

BasicCompiler64/Compile_Object.cpp

@@ -57 +57 @@
         if( subs.size() == 1 ){
             char temporary[VN_SIZE];
-            sprintf( temporary, "_System_TypeBase.Search(\"\",\"%s\"))", pobj_c->GetName().c_str() );
+            sprintf( temporary, "ActiveBasic.Core._System_TypeBase.Search(\"\",\"%s\"))", pobj_c->GetName().c_str() );
 
             Opcode_CallProc(temporary,

BasicCompiler64/Compile_ProcOp.cpp

@@ -566 +566 @@
             }
 
-            //新しいオブジェクト領域は0で初期化されているため、Nothingを明示的に代入する必要はない
-/*
-            //実体クラスを持つメンバのコンストラクタ（引数有りを除く）を呼び出す
-            for(i3=0;i3<pobj_CompilingClass->iMemberNum;i3++){
-                CMember *pMember = pobj_CompilingClass->ppobj_Member[i3];
-                if(pMember->IsObject()){
-                    // オブジェクトメンバを発見したとき
-
-                    sprintf(temporary, "This.%s=Nothing",
-                        pMember->name );
-                    OpcodeCalc( temporary );
-                }
-            }
-*/
-
             //仮想関数テーブルを初期化
             if(pobj_CompilingClass->vtbl_num&&
@@ -659 +644 @@
                 }
             }
-
-            //実体クラスを持つメンバのデストラクタ呼び出しはGCに任せる
-            /*
-            //※コンストラクタと逆順序で呼び出す
-            for(i3=pobj_CompilingClass->iMemberNum-1;i3>=0;i3--){
-                CMember *pMember = pobj_CompilingClass->ppobj_Member[i3];
-                int MemberTypeSize=
-                    GetTypeSize(pMember->TypeInfo.type,
-                        pMember->TypeInfo.u.lpIndex);
-
-                int MemberObjectNum=
-                    JumpSubScripts(pMember->SubScripts);
-
-                int offset = pobj_CompilingClass->GetMemberOffset( pMember->name, NULL );
-
-                if(pMember->IsObject()){
-                    CMethod *method = pMember->GetClass().GetDestructorMethod();
-                    if( method ){
-                        for(i4=MemberObjectNum-1;i4>=0;i4--){
-                            //Thisポインタをrcxにコピー
-                            SetThisPtrToReg(REG_RCX);
-
-                            //add rcx,offset
-                            op_add_RV(REG_RCX,offset+i4*MemberTypeSize);
-
-                            //call destructor
-                            op_call(method->pUserProc);
-                        }
-                    }
-                }
-            }*/
         }
     }

BasicCompiler64/Compile_Var.cpp

@@ -187 +187 @@
 }
 bool _member_offset(bool isErrorEnabled, bool isWriteAccess, const CClass &objClass, const char *member, RELATIVE_VAR *pRelativeVar, Type &resultType, BOOL bPrivateAccess){
-    int i;
-
 
     //////////////////////////////////////
@@ -207 +205 @@
     ////////////////////////////
 
-    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];
 
 
@@ -379 +378 @@
 }
 bool GetVarOffset(bool isErrorEnabled,bool isWriteAccess,const char *NameBuffer,RELATIVE_VAR *pRelativeVar,Type &resultType,int *pss){
-    int i;
     char variable[VN_SIZE];
 
@@ -471 +469 @@
             //クラス内メンバを参照するとき（通常）
 
-            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;
         }
 
@@ -773 +773 @@
             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;
@@ -911 +911 @@
             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;

BasicCompiler64/MakePeHdr.cpp

@@ -240 +240 @@
         pSub_System_GC_free_for_SweepingDelete->Using();
 
-    if( pSubStaticMethod_System_TypeBase_InitializeUserTypes = GetSubHash( "_System_TypeBase.InitializeUserTypes",1 ) ){
+    if( pSubStaticMethod_System_TypeBase_InitializeUserTypes = GetSubHash( "ActiveBasic.Core._System_TypeBase.InitializeUserTypes",1 ) ){
         pSubStaticMethod_System_TypeBase_InitializeUserTypes->Using();
         pSubStaticMethod_System_TypeBase_InitializeUserTypes->ThisIsAutoGenerationProc();

BasicCompiler64/NumOpe.cpp

@@ -524 +524 @@
         //New演算子（オブジェクト生成）
 
-        if( !Operator_New( expression+2, baseType, resultType ) ){
-            return false;
-        }
+        if( pobj_BlockReg->check(REG_RAX) ){
+            SetError();
+        }
+
+        //////////////////////////////////////////////////////
+        /////    レジスタ資源のバックアップ
+        {   BACKUP_REGISTER_RESOURCE
+        //////////////////////////////////////////////////////
+
+            if( !Operator_New( expression+2, baseType, resultType ) ){
+                return false;
+            }
+
+        /////////////////////////////////////////////
+        //////   レジスタ資源を復元
+            RESTORE_REGISTER_RESOURCE
+        }////////////////////////////////////////////
 
         //mov reg,rax

BasicCompiler64/Opcode.h

@@ -353 +353 @@
 
 private:
-    bool _overload_check( int level, const Parameters &params, const Type &returnType );
-    UserProc *OverloadSolutionWithReturnType( const char *name, std::vector<UserProc *> &subs );
+    bool EvaluateOverloadScore( int level, const Parameters &targetParms, const Type &targetResultType );
+
 public:
-    UserProc *OverloadSolution( const char *name, std::vector<UserProc *> &subs );
+    UserProc *_OverloadSolution( const char *name, std::vector<UserProc *> &subs, bool isEnabledReturnType = false );
+    UserProc *OverloadSolution( const char *name, std::vector<UserProc *> &subs, bool isEnabledReturnType = false );
 
     void ApplyDefaultParameters( const Parameters &params );

BasicCompiler_Common/BasicCompiler.cpp

@@ -548 +548 @@
 
     //MessageBox(0,"starting compiler/debugger","ActiveBasic",MB_OK);
+    trace( "Start ActiveBasic Compiler!" );
 
     //コモンコントロールを初期化
@@ -840 +841 @@
     }
 
+    trace("Complete ActiveBasic Compiler!");
+
 
     return 0;

BasicCompiler_Common/Class.cpp

@@ -15 +15 @@
 
 CClass::CClass( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, const string &name )
-    : Prototype( namespaceScopes, name )
+    : isReady( false )
+    , Prototype( namespaceScopes, name )
     , importedNamespaces( importedNamespaces )
     , ConstructorMemberSubIndex( 0 )
@@ -21 +22 @@
     , classType( Class )
     , pobj_InheritsClass( NULL )
-    , ppobj_Member( NULL )
-    , iMemberNum( 0 )
     , vtbl_num( 0 )
     , iAlign( 0 )
@@ -32 +31 @@
 }
 CClass::~CClass(){
-    int i;
-
-    if(ppobj_Member){
-        //メンバ
-        for(i=0;i<iMemberNum;i++){
-            delete ppobj_Member[i];
-        }
-        HeapDefaultFree(ppobj_Member);
-        ppobj_Member=0;
-    }
-
-    //静的メンバ
+    // 動的メンバ
+    foreach( CMember *member, dynamicMembers ){
+        delete member;
+    }
+
+    // 静的メンバ
     foreach( CMember *member, staticMembers ){
         delete member;
@@ -149 +142 @@
     }
 
-    if( inheritsClass.ppobj_Member == 0 ){
+    if( !inheritsClass.IsReady() ){
         //継承先が読み取られていないとき
         pobj_LoopRefCheck->add(this->GetName().c_str());
@@ -157 +150 @@
 
     //メンバをコピー
-    ppobj_Member=(CMember **)HeapReAlloc(
-        hHeap,
-        0,
-        ppobj_Member,
-        ( iMemberNum + inheritsClass.iMemberNum )*sizeof(CMember *));
-    for(int i3=0;i3<inheritsClass.iMemberNum;i3++){
-        ppobj_Member[iMemberNum]=new CMember( *inheritsClass.ppobj_Member[i3] );
+    BOOST_FOREACH( CMember *inheritsClassDynamicMember, inheritsClass.dynamicMembers ){
+        CMember *pMember = new CMember( *inheritsClassDynamicMember );
 
         // アクセシビリティ
-        if( inheritsClass.ppobj_Member[i3]->IsPrivate() ){
-            ppobj_Member[iMemberNum]->SetAccessibility( Prototype::None );
+        if( inheritsClassDynamicMember->IsPrivate() ){
+            pMember->SetAccessibility( Prototype::None );
         }
         else{
-            ppobj_Member[iMemberNum]->SetAccessibility( inheritsClass.ppobj_Member[i3]->GetAccessibility() );
-        }
-
-        iMemberNum++;
+            pMember->SetAccessibility( inheritsClassDynamicMember->GetAccessibility() );
+        }
+
+        dynamicMembers.push_back( pMember );
     }
 
@@ -216 +204 @@
     }
 
-    if( inheritsInterface.ppobj_Member == 0 ){
+    if( !inheritsInterface.IsReady() ){
         //継承先が読み取られていないとき
         pobj_LoopRefCheck->add(this->GetName().c_str());
@@ -255 +243 @@
 }
 void CClass::AddMember( Prototype::Accessibility accessibility, bool isConst, bool isRef, char *buffer ){
-    ppobj_Member = (CMember **)HeapReAlloc( hHeap, 0, ppobj_Member, ( iMemberNum + 1 ) * sizeof(CMember *) );
-    ppobj_Member[iMemberNum] = new CMember( this, accessibility, isConst, isRef, buffer );
-    iMemberNum++;
+    CMember *pMember = new CMember( this, accessibility, isConst, isRef, buffer );
+    dynamicMembers.push_back( pMember );
 }
 void CClass::AddStaticMember( Prototype::Accessibility accessibility, bool isConst, bool isRef, char *buffer, int nowLine ){
-    CMember *member = new CMember( this, accessibility, isConst, isRef, buffer, nowLine );
-    staticMembers.push_back( member );
+    CMember *pMember = new CMember( this, accessibility, isConst, isRef, buffer, nowLine );
+    staticMembers.push_back( pMember );
 }
 BOOL CClass::DupliCheckAll(const char *name){
@@ -281 +268 @@
     //重複チェック
 
-    //メンバ
-    for( int i=0;i<iMemberNum;i++){
-        if( GetName() == ppobj_Member[i]->GetName() ){
+    // 動的メンバ
+    BOOST_FOREACH( CMember *pMember, dynamicMembers ){
+        if( GetName() == pMember->GetName() ){
             return 1;
         }
     }
 
-    //静的メンバ
-    foreach( CMember *member, staticMembers ){
-        if( GetName() == member->GetName() ){
+    // 静的メンバ
+    foreach( CMember *pMember, staticMembers ){
+        if( GetName() == pMember->GetName() ){
             return 1;
         }
@@ -321 +308 @@
 int CClass::GetMemberOffset( const char *memberName, int *pMemberNum ) const
 {
-    int i,i2,offset;
+    int i2,offset;
 
     //仮想関数が存在する場合は関数リストへのポインタのサイズを追加
@@ -332 +319 @@
 
     int iMaxAlign=0;
-    for(i=0;i<iMemberNum;i++){
-        CMember *pMember = ppobj_Member[i];
+    int i = -1;
+    BOOST_FOREACH( CMember *pMember, dynamicMembers ){
+        i++;
 
         i2 = pMember->GetType().GetSize();
@@ -393 +381 @@
 int CClass::GetAlignment() const
 {
-    int i;
     int alignment,member_size;
 
@@ -399 +386 @@
     else alignment=0;
 
-    for(i=0;i<iMemberNum;i++){
-        CMember *pMember = ppobj_Member[i];
-
+    BOOST_FOREACH( CMember *pMember, dynamicMembers ){
         if(pMember->GetType().IsStruct()){
             //メンバクラスのアラインメントを取得
@@ -969 +954 @@
 
 BOOL CDBClass::MemberVar_LoopRefCheck(const CClass &objClass){
-    int i,i2,bRet=1;
-    for(i=0;i<objClass.iMemberNum;i++){
-        const CMember *pMember = objClass.ppobj_Member[i];
+    int i2,bRet=1;
+    BOOST_FOREACH( CMember *pMember, objClass.dynamicMembers ){
         if(pMember->GetType().IsStruct()){
             //循環参照でないかをチェック
@@ -1055 +1039 @@
             }
 
-            if(pobj_c->ppobj_Member){
+            if(pobj_c->IsReady()){
                 //既に先読みされているとき
                 continue;
             }
 
-            //メンバ用メモリを初期化
-            pobj_c->ppobj_Member=(CMember **)HeapAlloc(hHeap,0,1);
-            pobj_c->iMemberNum=0;
+            pobj_c->Readed();
 
             pobj_c->ConstructorMemberSubIndex=-1;
@@ -1206 +1188 @@
             }
 
-            if(pobj_c->ppobj_Member){
+            if(pobj_c->IsReady()){
                 //既に先読みされているとき
                 continue;
@@ -1213 +1195 @@
             pobj_c->iAlign=iAlign;
 
-            //メンバ用メモリを初期化
-            pobj_c->ppobj_Member=(CMember **)HeapAlloc(hHeap,0,1);
-            pobj_c->iMemberNum=0;
+            pobj_c->Readed();
 
             pobj_c->ConstructorMemberSubIndex=-1;
@@ -1381 +1361 @@
 
 
-                        if(pobj_c->ppobj_Member[pobj_c->iMemberNum-1]->GetType().IsStruct()){
-                            if(pobj_c->ppobj_Member[pobj_c->iMemberNum-1]->GetType().GetClass().ppobj_Member==0){
+                        if(pobj_c->dynamicMembers[pobj_c->dynamicMembers.size()-1]->GetType().IsStruct()){
+                            if( !pobj_c->dynamicMembers[pobj_c->dynamicMembers.size()-1]->GetType().GetClass().IsReady() ){
                                 //参照先が読み取られていないとき
-                                GetClass_recur(pobj_c->ppobj_Member[pobj_c->iMemberNum-1]->GetType().GetClass().GetName().c_str());
+                                GetClass_recur(pobj_c->dynamicMembers[pobj_c->dynamicMembers.size()-1]->GetType().GetClass().GetName().c_str());
                             }
                         }
 
 
-                        if(pobj_c->ppobj_Member[pobj_c->iMemberNum-1]->GetType().IsStruct()){
+                        if(pobj_c->dynamicMembers[pobj_c->dynamicMembers.size()-1]->GetType().IsStruct()){
                             //循環参照のチェック
                             pobj_LoopRefCheck->add(pobj_c->GetName().c_str());
-                            if(!MemberVar_LoopRefCheck(pobj_c->ppobj_Member[pobj_c->iMemberNum-1]->GetType().GetClass())){
+                            if(!MemberVar_LoopRefCheck(pobj_c->dynamicMembers[pobj_c->dynamicMembers.size()-1]->GetType().GetClass())){
                                 //エラー回避
-                                pobj_c->ppobj_Member[pobj_c->iMemberNum-1]->GetType().SetBasicType( DEF_PTR_VOID );
+                                pobj_c->dynamicMembers[pobj_c->dynamicMembers.size()-1]->GetType().SetBasicType( DEF_PTR_VOID );
                             }
                             pobj_LoopRefCheck->del(pobj_c->GetName().c_str());
@@ -1481 +1461 @@
         char referenceOffsetsBuffer[1024] = "";
         int numOfReference = 0;
-        for( int i=0; i<objClass.iMemberNum; i++ ){
-            CMember &member = *objClass.ppobj_Member[i];
-
-            if( member.GetType().IsObject() || member.GetType().IsPointer() ){
+        BOOST_FOREACH( CMember *pMember, objClass.dynamicMembers ){
+            if( pMember->GetType().IsObject() || pMember->GetType().IsPointer() ){
                 if( referenceOffsetsBuffer[0] ){
                     lstrcat( referenceOffsetsBuffer, "," );
@@ -1491 +1469 @@
                 sprintf( referenceOffsetsBuffer + lstrlen( referenceOffsetsBuffer ),
                     "%d",
-                    objClass.GetMemberOffset( member.GetName().c_str() ) );
+                    objClass.GetMemberOffset( pMember->GetName().c_str() ) );
 
                 numOfReference++;

BasicCompiler_Common/Class.h

@@ -38 +38 @@
     friend CDebugSection;
 
+    bool isReady;
+    void Readed(){
+        isReady = true;
+    }
+    bool IsReady() const{
+        return isReady;
+    }
+
     // importされている名前空間
     NamespaceScopesCollection importedNamespaces;
@@ -47 +55 @@
     Type blittableType;
 
-    //静的メンバ情報
-    std::vector<CMember *> staticMembers;
-
-    //メソッド情報
+    // 動的メンバ
+    Members dynamicMembers;
+
+    // 静的メンバ
+    Members staticMembers;
+
+    // 動的メソッド
     Methods methods;
     int ConstructorMemberSubIndex;
     int DestructorMemberSubIndex;
 
-    //静的メソッド情報
+    // 静的メソッド
     Methods staticMethods;
 
@@ -73 +84 @@
     const CClass *pobj_InheritsClass;
 
-    //メンバ情報
-    CMember **ppobj_Member;
-    int iMemberNum;
-
     //仮想関数の数
     int vtbl_num;
@@ -129 +136 @@
     BOOL DupliCheckAll(const char *name);
     BOOL DupliCheckMember(const char *name);
+
+    const Members &GetDynamicMembers() const
+    {
+        return dynamicMembers;
+    }
 
     const Methods &GetMethods() const

BasicCompiler_Common/DebugMiddleFile.cpp

@@ -50 +50 @@
 void CDebugSection::make(void){
     extern INCLUDEFILEINFO IncludeFileInfo;
-    int i2,i3,i4,i5,BufferSize;
+    int i2,i3,i5,BufferSize;
 
     if(buffer){
@@ -324 +324 @@
 
         //メンバ
-        *(long *)(buffer+i2)=pobj_c->iMemberNum;
-        i2+=sizeof(long);
-        for(i4=0;i4<pobj_c->iMemberNum;i4++){
+        *(long *)(buffer+i2)=(int)pobj_c->dynamicMembers.size();
+        i2+=sizeof(long);
+        foreach( CMember *member, pobj_c->dynamicMembers ){
             // 名前
-            lstrcpy(buffer+i2,pobj_c->ppobj_Member[i4]->GetName().c_str());
+            lstrcpy(buffer+i2,member->GetName().c_str());
             i2+=lstrlen(buffer+i2)+1;
 
             // 型
-            *(long *)(buffer+i2)=pobj_c->ppobj_Member[i4]->GetType().GetBasicType();
+            *(long *)(buffer+i2)=member->GetType().GetBasicType();
             i2+=sizeof(long);
 
             // 型の拡張情報
-            SetLpIndex_DebugFile(buffer,&i2,pobj_c->ppobj_Member[i4]->GetType());
+            SetLpIndex_DebugFile(buffer,&i2,member->GetType());
 
             // アクセシビリティ
-            *(Prototype::Accessibility *)(buffer+i2)=pobj_c->ppobj_Member[i4]->GetAccessibility();
+            *(Prototype::Accessibility *)(buffer+i2)=member->GetAccessibility();
             i2+=sizeof(Prototype::Accessibility);
 
-            memcpy(buffer+i2,pobj_c->ppobj_Member[i4]->SubScripts,sizeof(int)*MAX_ARRAYDIM);
+            memcpy(buffer+i2,member->SubScripts,sizeof(int)*MAX_ARRAYDIM);
             i2+=sizeof(int)*MAX_ARRAYDIM;
 
@@ -705 +705 @@
         i2+=sizeof(long);
 
-        //メンバ
-        pobj_c->iMemberNum=*(long *)(buffer+i2);
-        i2+=sizeof(long);
-        pobj_c->ppobj_Member=
-            (CMember **)HeapAlloc(hHeap,0,pobj_c->iMemberNum*sizeof(CMember *));
-        for(i4=0;i4<pobj_c->iMemberNum;i4++){
-
+        //静的メンバ
+        int nDynamicMember = *(long *)(buffer+i2);
+        i2+=sizeof(long);
+        for( i4=0; i4<nDynamicMember; i4++ ){
             // 名前
             string name = (char *)(buffer+i2);
@@ -727 +724 @@
             i2+=sizeof(Prototype::Accessibility);
 
-            pobj_c->ppobj_Member[i4]=new CMember( accessibility, name, type, false );
-
-            memcpy(pobj_c->ppobj_Member[i4]->SubScripts,buffer+i2,sizeof(int)*MAX_ARRAYDIM);
+            CMember *member=new CMember( accessibility, name, type, false );
+
+            memcpy(member->SubScripts,buffer+i2,sizeof(int)*MAX_ARRAYDIM);
             i2+=sizeof(int)*MAX_ARRAYDIM;
+
+            pobj_c->dynamicMembers.push_back( member );
         }
 

BasicCompiler_Common/ParamImpl.cpp

@@ -98 +98 @@
 }
 
-bool ParamImpl::_overload_check( int level, const Parameters &targetParms, const Type &targetResultType ){
+bool ParamImpl::EvaluateOverloadScore( int level, const Parameters &targetParms, const Type &targetResultType ){
     //パラメータを識別してオーバーロードを解決
 
@@ -153 +153 @@
                         return false;
                 }
+                if( argType.IsPointer() || param.IsPointer() )
+                {
+                    // ポインタ型の不整合は認めない
+                    return false;
+                }
             }
             else if(level==OVERLOAD_LEVEL6){
@@ -190 +195 @@
 }
 
-UserProc *ParamImpl::OverloadSolutionWithReturnType( const char *name, std::vector<UserProc *> &subs ){
-    int sw=0;
-    UserProc *pUserProc = NULL;
-
-    for( int level=OVERLOAD_MIN_LEVEL; level<=OVERLOAD_MAX_LEVEL; level++ ){
-        foreach( UserProc *pTempUserProc, subs ){
-
-            //エラーチェック
-            if(_overload_check( level, pTempUserProc->Params(), pTempUserProc->ReturnType() )){
-                if(sw){
-                    SetError(52,name,cp);
-                    return 0;
-                }
-                sw=1;
-
-                pUserProc = pTempUserProc;
-            }
-        }
-
-        if( sw ) break;
-    }
-
-    if(!sw){
-        SetError(52,name,cp);
-        return 0;
-    }
-
-    return pUserProc;
-}
-UserProc *ParamImpl::OverloadSolution( const char *name, std::vector<UserProc *> &subs ){
+UserProc *ParamImpl::_OverloadSolution( const char *name, std::vector<UserProc *> &subs, bool isEnabledReturnType ){
     int sw=0;
     UserProc *pUserProc;
@@ -228 +204 @@
         foreach( UserProc *pTempUserProc, subs ){
 
-            //エラーチェック
-            if(_overload_check( level, pTempUserProc->Params(), Type() )){
+            if(EvaluateOverloadScore( level, pTempUserProc->Params(), isEnabledReturnType?pTempUserProc->ReturnType():Type() )){
+                trace( "レベル" << level <<    " ○適合..." << pTempUserProc->_paramStr );
+
                 if(sw){
-                    return OverloadSolutionWithReturnType(name,subs);
+                    if( isEnabledReturnType ){
+                        SetError(52,name,cp);
+
+                        return 0;
+                    }
+                    else{
+                        // 戻り値も比較するモードにして再びオーバーロード解決を試みる
+
+                        trace( "戻り値も比較するモードに切り替えてオーバーロード解決を試みる" );
+
+                        return OverloadSolution(name,subs, true);
+                    }
                 }
                 sw=1;
 
                 pUserProc = pTempUserProc;
+            }
+            else
+            {
+                trace( "レベル" << level <<    " ×不適合..." << pTempUserProc->_paramStr );
             }
         }
@@ -260 +252 @@
     if(!sw){
         SetError(52,name,cp);
+
         return 0;
     }
 
+
     return pUserProc;
+}
+UserProc *ParamImpl::OverloadSolution( const char *name, std::vector<UserProc *> &subs, bool isEnabledReturnType ){
+    trace( "" );
+    trace( "■■■■■■■■■■■■■■■■■■" );
+    trace( "■■■ オーバーロード解決(" << name << ")" );
+
+    UserProc *result = _OverloadSolution( name, subs, isEnabledReturnType );
+
+    trace( "■■■ ここまで" );
+    trace( "■■■■■■■■■■■■■■■■■■" );
+    trace( "" );
+
+    return result;
 }
 

BasicCompiler_Common/Procedure.cpp

@@ -487 +487 @@
     pGlobalProc->SetParamsAndReturnType( buffer + i, nowLine, true );
 
-#ifdef _DEBUG
+
     pGlobalProc->_paramStr = buffer + i;
-#endif
+
 
 

BasicCompiler_Common/Procedure.h

@@ -92 +92 @@
 class UserProc : public Procedure
 {
-#ifdef _DEBUG
 public:
     string _paramStr;
-#endif
 
 private:

BasicCompiler_Common/Subroutine.cpp

@@ -602 +602 @@
     pUserProc->SetParamsAndReturnType( buffer + i, nowLine, isStatic );
 
-#ifdef _DEBUG
     pUserProc->_paramStr = buffer + i;
-#endif
 
 

BasicCompiler_Common/Type.cpp

@@ -490 +490 @@
 
         if( !( index == 0 || index == -1 ) ){
+            if( pClass->GetNamespaceScopes().size() >= 1 )
+            {
+                return pClass->GetNamespaceScopes().ToString() + "." + pClass->GetName();
+            }
             return pClass->GetName();
         }

BasicCompiler_Common/VarList.cpp

@@ -155 +155 @@
 }
 void VarList_Member(HWND hVarTree,HTREEITEM hParent,LONG_PTR pTopOffset,const CClass &objClass,BOOL bPtr){
-    int i;
     char VarData[VN_SIZE],VarName[VN_SIZE];
     TV_INSERTSTRUCT tv;
@@ -165 +164 @@
     tv.item.pszText=VarData;
 
-    for(i=0;i<objClass.iMemberNum;i++){
+    BOOST_FOREACH( CMember *pMember, objClass.GetDynamicMembers() ){
         if(bPtr){
             lstrcpy(VarName,"->");
-            lstrcat(VarName,objClass.ppobj_Member[i]->GetName().c_str());
+            lstrcat(VarName,pMember->GetName().c_str());
         }
         else{
             lstrcpy(VarName,".");
-            lstrcat(VarName,objClass.ppobj_Member[i]->GetName().c_str());
+            lstrcat(VarName,pMember->GetName().c_str());
         }
 
         LONG_PTR offset;
         int i2;
-        offset=objClass.GetMemberOffset( objClass.ppobj_Member[i]->GetName().c_str(), &i2 );
-
-        if(objClass.ppobj_Member[i]->SubScripts[0]!=-1){
+        offset=objClass.GetMemberOffset( pMember->GetName().c_str(), &i2 );
+
+        if(pMember->SubScripts[0]!=-1){
             //構造体内の配列
             sprintf(VarData,"%s %s(&H%X)",VarName,STRING_ARRAY,pTopOffset+offset);
@@ -188 +187 @@
             VarList_Array(hVarTree,hParent,
                 pTopOffset+offset,
-                objClass.ppobj_Member[i]->GetType(),
-                objClass.ppobj_Member[i]->SubScripts);
+                pMember->GetType(),
+                pMember->SubScripts);
         }
         else{
@@ -196 +195 @@
                 &tv,
                 VarName,
-                objClass.ppobj_Member[i]->GetType(),
+                pMember->GetType(),
                 pTopOffset+offset);
         }
@@ -323 +322 @@
 }
 void RefreshLocalVar(void){
-    int i,i2,i3,sw;
+    int i2,i3,sw;
     char temporary[VN_SIZE];
     TV_INSERTSTRUCT tv;
@@ -415 +414 @@
     //Thisポインタを取得
     LONG_PTR pThis;
-    const Variable *pVar = pUserProc->localVars.Find( "_System_LocalThis" );
+    const Variable *pVar = pUserProc->localVars.Find( Symbol( "_System_LocalThis" ) );
     if( !pVar ){
         return;
@@ -422 +421 @@
     ReadProcessMemory(hDebugProcess,(void *)lpData,&pThis,sizeof(LONG_PTR),&accessBytes);
 
-    for(i=0;i<pUserProc->GetParentClassPtr()->iMemberNum;i++){
-        offset=pUserProc->GetParentClassPtr()->GetMemberOffset( pUserProc->GetParentClassPtr()->ppobj_Member[i]->GetName().c_str(),&i2);
-
-        if(pUserProc->GetParentClassPtr()->ppobj_Member[i]->SubScripts[0]!=-1){
+    BOOST_FOREACH( CMember *pMember, pUserProc->GetParentClassPtr()->GetDynamicMembers() ){
+        offset=pUserProc->GetParentClassPtr()->GetMemberOffset( pMember->GetName().c_str(),&i2);
+
+        if(pMember->SubScripts[0]!=-1){
             //配列
             sprintf(temporary,"%s %s(&H%X)",
-                pUserProc->GetParentClassPtr()->ppobj_Member[i]->GetName().c_str(),
+                pMember->GetName().c_str(),
                 STRING_ARRAY,
                 (ULONG_PTR)offset);
@@ -437 +436 @@
             VarList_Array(hVarTree_This,hParent,
                 pThis+offset,
-                pUserProc->GetParentClassPtr()->ppobj_Member[i]->GetType(),
-                pUserProc->GetParentClassPtr()->ppobj_Member[i]->SubScripts);
+                pMember->GetType(),
+                pMember->SubScripts);
         }
         else{
             VarList_Insert(hVarTree_This,&tv,
-                pUserProc->GetParentClassPtr()->ppobj_Member[i]->GetName().c_str(),
-                pUserProc->GetParentClassPtr()->ppobj_Member[i]->GetType(),
+                pMember->GetName().c_str(),
+                pMember->GetType(),
                 pThis+offset);
         }

BasicCompiler_Common/Variable.cpp

@@ -1 +1 @@
 #include "common.h"
 
-bool Variable::IsEqualSymbol( const NamespaceScopes &namespaceScopes, const string &name ) const
+bool Variable::IsEqualSymbol( const Symbol &symbol, bool isSupportStaticMember ) const
 {
-    if( GetName() != name ){
-        return false;
-    }
-    return NamespaceScopes::IsSameArea( this->namespaceScopes, namespaceScopes );
-}
-bool Variable::IsEqualSymbol( const string &fullName ) const
-{
-    char AreaName[VN_SIZE] = "";        //オブジェクト変数
-    char NestName[VN_SIZE] = "";        //入れ子メンバ
-    bool isNest = SplitMemberName( fullName.c_str(), AreaName, NestName );
-
-    if( IsEqualSymbol( NamespaceScopes( AreaName ), NestName ) ){
+    if( GetName() == symbol.GetName()
+        && NamespaceScopes::IsSameArea( this->namespaceScopes, symbol.GetNamespaceScopes() ) )
+    {
         return true;
     }
 
-    if( isNest ){
+    if( isSupportStaticMember && symbol.GetNamespaceScopes().size() >= 1 )
+    {
         // 静的メンバを考慮
+        NamespaceScopes namespaceScopes( symbol.GetNamespaceScopes() );
+        string name = namespaceScopes[namespaceScopes.size()-1] + "." + symbol.GetName();
+        namespaceScopes.pop_back();
 
-        char AreaName2[VN_SIZE] = "";       //オブジェクト変数
-        char NestName2[VN_SIZE] = "";       //入れ子メンバ
-        bool isNest = SplitMemberName( AreaName, AreaName2, NestName2 );
-        lstrcat( NestName2, "." );
-        lstrcat( NestName2, NestName );
-
-        return IsEqualSymbol( NamespaceScopes( AreaName2 ), NestName2 );
+        return IsEqualSymbol( Symbol( namespaceScopes, name ), false );
     }
-
     return false;
 }

BasicCompiler_Common/Variable.h

@@ -2 +2 @@
 
 #include "Type.h"
+#include <Symbol.h>
 
 class Variable : public Type
@@ -61 +62 @@
     }
 
-    bool IsEqualSymbol( const NamespaceScopes &namespaceScopes, const string &name ) const;
-    bool IsEqualSymbol( const string &name ) const;
+    bool IsEqualSymbol( const Symbol &symbol, bool isSupportStaticMember = true ) const;
 
     void ConstOff(){
@@ -157 +157 @@
     }
 
-    bool DuplicateCheck( const string &varName ) const
+    bool DuplicateCheck( const Symbol &symbol ) const
     {
         //レキシカルスコープを考慮して重複判定
@@ -165 +165 @@
                 && var.ScopeLevel == obj_LexScopes.GetNowLevel()    //現在のスコープと同一レベル
                 ){
-                    if( var.IsEqualSymbol( varName ) ){
+                    if( var.IsEqualSymbol( symbol ) ){
                         return true;
                     }
@@ -173 +173 @@
     }
 
-    const Variable *BackSearch( const string &varName ) const
+    const Variable *BackSearch( const Symbol &symbol ) const
     {
         //レキシカルスコープを考慮してバックサーチ
@@ -181 +181 @@
                 && var.ScopeLevel <= obj_LexScopes.GetNowLevel()    //現在のスコープレベルを超さないもの（Returnによる解放処理中を考慮）
                 ){
-                    if( var.IsEqualSymbol( varName ) ){
+                    if( var.IsEqualSymbol( symbol ) ){
                         return &var;
                     }
@@ -189 +189 @@
     }
 
-    const Variable *Find( const string &varName )const
+    const Variable *Find( const Symbol &symbol )const
     {
         int max = (int)this->size();
         for( int i=0; i<max; i++ ){
             Variable *pVar = (*this)[i];
-            if( pVar->IsEqualSymbol( varName ) ){
+            if( pVar->IsEqualSymbol( symbol ) ){
                 return pVar;
             }
@@ -205 +205 @@
 
 
+

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);

BasicCompiler_Common/WatchList.cpp

@@ -104 +104 @@
 
 int Debugging_GetMember( const CClass &objClass,char *member,RELATIVE_VAR *pRelativeVar, Type &resultType, BOOL bPrivateAccess){
-    int i,i2;
+    int i2;
 
     //直接参照に切り替え
@@ -124 +124 @@
     ////////////////////////////
 
-    int offset = objClass.GetMemberOffset( VarName, &i );
-    if(i==objClass.iMemberNum) return 0;
+    int memberIndex;
+    int offset = objClass.GetMemberOffset( VarName, &memberIndex );
+    if(memberIndex==objClass.GetDynamicMembers().size()) return 0;
+
+    CMember *pMember = objClass.GetDynamicMembers()[memberIndex];
 
 
     //アクセシビリティをチェック
-    if(( bPrivateAccess==0 && objClass.ppobj_Member[i]->IsPrivate() )||
-        objClass.ppobj_Member[i]->IsNoneAccess() ){
+    if(( bPrivateAccess==0 && pMember->IsPrivate() )||
+        pMember->IsNoneAccess() ){
         return 0;
     }
-    else if(bPrivateAccess==0&&objClass.ppobj_Member[i]->IsProtected())
+    else if(bPrivateAccess==0&&pMember->IsProtected())
         return 0;
 
-    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;
@@ -154 +157 @@
         //配列オフセット
         i2=Debugging_GetArray(
-            objClass.ppobj_Member[i]->SubScripts,
+            pMember->SubScripts,
             array,
             resultType,
@@ -167 +170 @@
         }
     }
-    else if(objClass.ppobj_Member[i]->SubScripts[0]!=-1){
+    else if(pMember->SubScripts[0]!=-1){
         resultType.SetBasicType( resultType.GetBasicType() | FLAG_PTR );
     }
@@ -209 +212 @@
         }
 
-        i2=Debugging_GetMember(objClass.ppobj_Member[i]->GetType().GetClass(),
+        i2=Debugging_GetMember(pMember->GetType().GetClass(),
             NestMember,
             pRelativeVar,
@@ -322 +325 @@
 int Debugging_GetVarOffset( char *variable,RELATIVE_VAR *pRelativeVar, Type &resultType, int *pss){
     extern HANDLE hDebugProcess;
-    int i,i2,i3;
+    int i2,i3;
     char member[VN_SIZE],VarName[VN_SIZE],array[VN_SIZE],lpPtrOffset[VN_SIZE];
     LONG_PTR lpData;
@@ -339 +342 @@
     /////////////////
     if( UserProc::IsLocalAreaCompiling() ){
-        const Variable *pVar = UserProc::CompilingUserProc().localVars.Find( VarName );
+        const Variable *pVar = UserProc::CompilingUserProc().localVars.Find( Symbol( VarName ) );
 
         if( pVar ){
@@ -379 +382 @@
             //クラス内メンバを参照するとき（通常）
 
-            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;
         }
 

BasicCompiler_Common/common.h

@@ -47 +47 @@
 
 #ifdef _AMD64_
-#define VER_INFO        "(x64) CP4(rev.265)"
+#define VER_INFO        "(x64) (rev.275)"
 #else
-#define VER_INFO        "CP4(rev.265)"
+#define VER_INFO        "(rev.275)"
 #endif
 
@@ -153 +153 @@
 #define EXE_HEADER_SIZE 0x1000
 
+
+// ログ生成を行うためのクラス
+#include <logger.h>
 
 // クラス管理用のクラス

BasicCompiler_Common/error.cpp

@@ -344 +344 @@
     SendDlgItemMessage(hMainDlg,IDC_ERRORLIST,EM_REPLACESEL,0,(LPARAM)temp2);
 
+
     if(num==-2){
         //コンパイルメッセージ
@@ -355 +356 @@
             extern BOOL bError;
             bError=1;
+
+            // ログに出力
+            trace( "error - " << temp2 );
         }
         else{
             extern int WarningNum;
             WarningNum++;
+
+            // ログに出力
+            trace( "warning - " << temp2 );
         }
     }

BasicCompiler_Common/include/Member.h

@@ -63 +63 @@
     static void InitStaticMember(void);
 };
+typedef std::vector<CMember *> Members;

BasicCompiler_Common/src/Namespace.cpp

@@ -3 +3 @@
 
 NamespaceScopes::NamespaceScopes( const string &namespaceStr ){
-    int i = 0;
-    while( i < (int)namespaceStr.size() ){
-        char temporary[VN_SIZE];
-        for( int i2=0; ; i2++, i++ ){
-            if( namespaceStr[i] == '.' || namespaceStr[i] == '\0' ){
-                temporary[i2] = 0;
-                break;
-            }
-            temporary[i2] = namespaceStr[i];
+    if( namespaceStr.size() == 0 ){
+        return;
+    }
+
+    string::size_type i = 0;
+    while( true ){
+        string::size_type i2 = namespaceStr.find( '.', i );
+
+        string tempName = namespaceStr.substr( i, i2-i );
+
+        push_back( tempName );
+
+        if( i2 == string::npos ){
+            break;
         }
-        push_back( temporary );
 
-        if( namespaceStr[i] == '.' ){
-            i++;
-        }
+        i = i2 + 1;
     }
 }