Changeset 140 in dev for BasicCompiler32

Timestamp:

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

Author:

dai_9181

Message:

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

Location:

BasicCompiler32

Files:

• BasicCompiler.vcproj (modified) (4 diffs)
• Compile_Object.cpp (modified) (1 diff)
• Compile_ProcOp.cpp (modified) (2 diffs)
• Compile_Var.cpp (modified) (14 diffs)
• MakePeHdr.cpp (modified) (1 diff)
• Opcode.h (modified) (1 diff)

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