Changeset 206 in dev for trunk/abdev/BasicCompiler_Common

Timestamp:

Jul 12, 2007, 2:58:26 AM (17 years ago)

Author:

dai_9181

Message:

コード全体のリファクタリングを実施

Location:

trunk/abdev/BasicCompiler_Common

Files:

• BasicCompiler.cpp (modified) (2 diffs)
• BasicCompiler.h (modified) (1 diff)
• BasicFixed.h (deleted)
• BreakPoint.cpp (modified) (1 diff)
• CDebugThreadInfo.cpp (modified) (1 diff)
• CommandFormat.cpp (modified) (1 diff)
• Compile.cpp (modified) (2 diffs)
• Debug.cpp (modified) (5 diffs)
• DebugMiddleFile.cpp (modified) (30 diffs)
• DebugSection.h (modified) (4 diffs)
• Diagnose.cpp (modified) (6 diffs)
• Enum.cpp (modified) (3 diffs)
• Intermediate_Step1.cpp (modified) (1 diff)
• Intermediate_Step2.cpp (modified) (6 diffs)
• MakeExe.cpp (modified) (5 diffs)
• NonVolatile.cpp (modified) (1 diff)
• NumOpe_GetType.cpp (modified) (8 diffs)
• Object.cpp (modified) (5 diffs)
• OldStatement.cpp (modified) (4 diffs)
• Overload.cpp (modified) (6 diffs)
• PESchedule.cpp (modified) (5 diffs)
• PESchedule.h (modified) (4 diffs)
• ParamImpl.cpp (modified) (4 diffs)
• RSrcSection.cpp (modified) (1 diff)
• Resource.cpp (modified) (1 diff)
• StrOperation.cpp (modified) (2 diffs)
• Subroutine.cpp (modified) (20 diffs)
• VarList.cpp (modified) (19 diffs)
• VariableOpe.cpp (modified) (54 diffs)
• VariableOpe.h (modified) (2 diffs)
• WatchList.cpp (modified) (27 diffs)
• calculation.cpp (modified) (8 diffs)
• common.h (modified) (11 diffs)
• error.cpp (modified) (2 diffs)
• gc.cpp (modified) (1 diff)
• hash.cpp (modified) (8 diffs)
• include/Class.h (moved) (moved from trunk/abdev/BasicCompiler_Common/include/ClassImpl.h ) (3 diffs)
• include/Compiler.h (modified) (1 diff)
• include/Const.h (moved) (moved from trunk/abdev/BasicCompiler_Common/Const.h ) (2 diffs)
• include/LexicalScopingImpl.h (modified) (1 diff)
• include/Member.h (added)
• include/MetaImpl.h (modified) (5 diffs)
• include/Method.h (added)
• include/Parameter.h (added)
• include/Procedure.h (moved) (moved from trunk/abdev/BasicCompiler_Common/include/ProcedureImpl.h ) (1 diff)
• include/Prototype.h (added)
• include/SmoothieImpl.h (modified) (1 diff)
• include/Symbol.h (added)
• include/Type.h (added)
• include/TypeDef.h (modified) (3 diffs)
• include/Variable.h (added)
• include/VariableImpl.h (deleted)
• include/option.h (modified) (2 diffs)
• src/Class.cpp (moved) (moved from trunk/abdev/BasicCompiler_Common/src/ClassImpl.cpp ) (26 diffs)
• src/CodeGenerator.cpp (modified) (1 diff)
• src/Compiler.cpp (modified) (1 diff)
• src/Const.cpp (moved) (moved from trunk/abdev/BasicCompiler_Common/Const.cpp ) (10 diffs)
• src/DataTable.cpp (modified) (1 diff)
• src/Exception.cpp (modified) (1 diff)
• src/LexicalScopingImpl.cpp (modified) (7 diffs)
• src/Method.cpp (added)
• src/NamespaceSupporter.cpp (modified) (1 diff)
• src/Procedure.cpp (moved) (moved from trunk/abdev/BasicCompiler_Common/src/ProcedureImpl.cpp ) (19 diffs)
• src/Program.cpp (modified) (1 diff)
• src/SmoothieImpl.cpp (modified) (1 diff)
• src/Symbol.cpp (added)
• src/Type.cpp (added)
• src/TypeDef.cpp (modified) (7 diffs)
• src/Variable.cpp (added)
• src/VariableImpl.cpp (deleted)

trunk/abdev/BasicCompiler_Common/BasicCompiler.cpp

@@ +1 @@
+#include "stdafx.h"
+
 #include <jenga/include/smoothie/Smoothie.h>
 
@@ -548 +550 @@
 }
 
+void _Test()
+{
+    Jenga::Common::LoggerSetting loggerSetting;
+    bool result = loggerSetting.Read( Jenga::Common::Environment::GetAppDir() + "\\logger.setting.xml" );
+
+    MessageBeep(0);
+}
+
 int PASCAL WinMain(HINSTANCE hThisInst,HINSTANCE hPrevInst,LPSTR lpCmdLine,int nShowCmd){
     int i,i2;
     char temporary[1024],temp2[MAX_PATH];
+
+    //_Test();
 
     //MessageBox(0,"starting compiler/debugger","ActiveBasic",MB_OK);

trunk/abdev/BasicCompiler_Common/BasicCompiler.h

@@ -23 +23 @@
 DWORD ImageBase;
 INCLUDEFILEINFO IncludeFileInfo;
-GlobalProc **ppSubHash;
-int SubNum;
-char **ppMacroNames;
-int MacroNum;
 DllProc **ppDeclareHash;
-CONSTINFO **ppConstHash;
 
 ERRORINFO *pErrorInfo;

trunk/abdev/BasicCompiler_Common/BreakPoint.cpp

@@ +1 @@
+#include "stdafx.h"
+
 #include <jenga/include/common/Environment.h>
+#include <jenga/include/smoothie/Source.h>
 
 #include "common.h"

trunk/abdev/BasicCompiler_Common/CDebugThreadInfo.cpp

@@ +1 @@
+#include "stdafx.h"
+
 #include "common.h"
+#include "DebugSection.h"
 
 

trunk/abdev/BasicCompiler_Common/CommandFormat.cpp

@@ +1 @@
+#include "stdafx.h"
+
 #include "common.h"
 

trunk/abdev/BasicCompiler_Common/Compile.cpp

@@ +1 @@
+#include "stdafx.h"
+
 #include <jenga/include/smoothie/Smoothie.h>
 #include <jenga/include/smoothie/LexicalAnalysis.h>
@@ -126 +128 @@
     int i,i2;
 
-    if(Command[0]=='\0') return;
+    if(Command[0]=='\0')
+    {
+        return;
+    }
+
+    trace_for_sourcecodestep( FormatEscapeSequenceStringToDefaultString(Command) );
+
     if(Command[0]=='*'&&IsVariableTopChar(Command[1])){
         //Goto先ラベル

trunk/abdev/BasicCompiler_Common/Debug.cpp

@@ +1 @@
+#include "stdafx.h"
+
+#include <Compiler.h>
+
 #include "../BasicCompiler_Common/common.h"
+#include "../BasicCompiler_Common/DebugSection.h"
 
 //デバッグ用
@@ -224 +229 @@
     SendDlgItemMessage(hMainDlg,IDC_DEBUGLIST,EM_REPLACESEL,0,(LPARAM)buffer);
 }
-GlobalProc *GetSubFromObp(ULONG_PTR pos){
-    extern GlobalProc **ppSubHash;
-    GlobalProc *pUserProc;
-    int i2;
-
-    for(i2=0;i2<MAX_HASH;i2++){
-        pUserProc=ppSubHash[i2];
-        while(pUserProc){
-            if(rva_to_real(pUserProc->beginOpAddress) <= pos  &&
-                pos < rva_to_real(pUserProc->endOpAddress))
-                return pUserProc;
-
-            pUserProc=pUserProc->pNextData;
-        }
-    }
-    return 0;
+UserProc *GetSubFromObp(ULONG_PTR pos){
+    compiler.GetMeta().GetUserProcs().Iterator_Reset();
+    while( compiler.GetMeta().GetUserProcs().Iterator_HasNext() )
+    {
+        UserProc *pUserProc = compiler.GetMeta().GetUserProcs().Iterator_GetNext();
+
+        if(rva_to_real(pUserProc->GetBeginOpAddress()) <= pos  &&
+            pos < rva_to_real(pUserProc->GetEndOpAddress()))
+        {
+            return pUserProc;
+        }
+    }
+    return NULL;
 }
 void ReleaseSingleStep(DWORD dwBeforeStepRun,HANDLE hThread,CONTEXT *pContext){
@@ -447 +449 @@
     pobj_dti=new CDebugThreadInfo();
 
-    GlobalProc *pUserProc;
+    UserProc *pUserProc;
 
     extern DWORD dwStepRun;
@@ -681 +683 @@
                         if(!bRet) MessageBox(hMainDlg,"プロセスメモリーの読み込みに失敗","error",MB_OK);
 
-                        extern UserProc *pSub_DebugSys_EndProc;
+                        extern const UserProc *pSub_DebugSys_EndProc;
                         if((BYTE)temporary[0]==0xE8&&
-                            *((long *)(temporary+1))+5==(long)rva_to_real(pSub_DebugSys_EndProc->beginOpAddress)-(long)EIP_RIP(Context)){
+                            *((long *)(temporary+1))+5==(long)rva_to_real(pSub_DebugSys_EndProc->GetBeginOpAddress())-(long)EIP_RIP(Context)){
                             //プロシージャの終端位置の場合はステップインを行う
                             goto StepIn;
@@ -704 +706 @@
                             //シングルステップON
                             WriteProcessMemory(hDebugProcess,
-                                (void *)rva_to_real(pUserProc->beginOpAddress),
-                                pobj_DBDebugSection->pobj_now->SingleStepCodeBuffer+pUserProc->beginOpAddress,
-                                pUserProc->endOpAddress-pUserProc->beginOpAddress,
+                                (void *)rva_to_real(pUserProc->GetBeginOpAddress()),
+                                pobj_DBDebugSection->pobj_now->SingleStepCodeBuffer+pUserProc->GetBeginOpAddress(),
+                                pUserProc->GetEndOpAddress()-pUserProc->GetBeginOpAddress(),
                                 &lpAccBytes);
                         }

trunk/abdev/BasicCompiler_Common/DebugMiddleFile.cpp

@@ +1 @@
+#include "stdafx.h"
+
 #include <jenga/include/smoothie/Smoothie.h>
 
 #include <Compiler.h>
-#include <ClassImpl.h>
-#include <VariableImpl.h>
+#include <Class.h>
+#include <Variable.h>
 
 #include "../BasicCompiler_Common/common.h"
+#include "../BasicCompiler_Common/DebugSection.h"
 
 #ifdef _AMD64_
@@ -44 +47 @@
 
 
-CDebugSection::CDebugSection(){
-    memset(this,0,sizeof(CDebugSection));
-}
 CDebugSection::~CDebugSection(){
     if(pobj_DBClass) DeleteDebugInfo();
@@ -56 +56 @@
 void CDebugSection::make(void){
     extern INCLUDEFILEINFO IncludeFileInfo;
-    int i2,i3,i5,BufferSize;
+    int i2,i3,BufferSize;
 
     if(buffer){
@@ -159 +159 @@
 
     //グローバル変数情報
-    *(long *)(buffer+i2)=(int)::globalVars.size();
-    i2+=sizeof(long);
-    BOOST_FOREACH( Variable *pVar, ::globalVars ){
+    *(long *)(buffer+i2)=(int)compiler.GetMeta().GetGlobalVars().size();
+    i2+=sizeof(long);
+    BOOST_FOREACH( Variable *pVar, compiler.GetMeta().GetGlobalVars() ){
         //変数名
         lstrcpy(buffer+i2,pVar->GetName().c_str());
@@ -167 +167 @@
 
         //型
-        *(long *)(buffer+i2)=pVar->GetBasicType();
+        *(long *)(buffer+i2)=pVar->GetType().GetBasicType();
         i2+=sizeof(long);
 
         //型の拡張情報
-        SetLpIndex_DebugFile(buffer,&i2,*pVar);
+        SetLpIndex_DebugFile(buffer,&i2,pVar->GetType());
 
         buffer[i2++] = pVar->IsRef() ? 1 : 0;
@@ -178 +178 @@
 
         if(pVar->IsArray()){
-            for(i5=0;;i5++){
-                *(long *)(buffer+i2)=pVar->GetSubScriptsPtr()[i5];
+            *(long *)(buffer+i2)=(int)pVar->GetSubscripts().size();
+            i2+=sizeof(long);
+            BOOST_FOREACH( int indexMax, pVar->GetSubscripts() )
+            {
+                *(long *)(buffer+i2)=indexMax;
                 i2+=sizeof(long);
-                if(pVar->GetSubScriptsPtr()[i5]==-1) break;
             }
         }
 
         //レキシカルスコープ情報
-        *(long *)(buffer+i2)=pVar->ScopeStartAddress;
-        i2+=sizeof(long);
-        *(long *)(buffer+i2)=pVar->ScopeEndAddress;
-        i2+=sizeof(long);
-        *(long *)(buffer+i2)=pVar->ScopeLevel;
+        *(long *)(buffer+i2)=pVar->GetScopeStartAddress();
+        i2+=sizeof(long);
+        *(long *)(buffer+i2)=pVar->GetScopeEndAddress();
+        i2+=sizeof(long);
+        *(long *)(buffer+i2)=pVar->GetScopeLevel();
         i2+=sizeof(long);
 
         //メモリ位置
-        *(long *)(buffer+i2)=pVar->offset;
+        *(long *)(buffer+i2)=pVar->GetOffsetAddress();
         i2+=sizeof(long);
 
@@ -210 +212 @@
 
     //プロシージャ情報
-    extern GlobalProc **ppSubHash;
-    extern int SubNum;
-    GlobalProc *pUserProc;
-    *(long *)(buffer+i2)=SubNum;
-    i2+=sizeof(long);
-    for(i3=0;i3<MAX_HASH;i3++){
-        pUserProc=ppSubHash[i3];
-        while(pUserProc){
-            if(pUserProc->GetParentClassPtr()){
-                lstrcpy(buffer+i2,pUserProc->GetParentClassPtr()->GetName().c_str());
-                i2+=lstrlen(buffer+i2)+1;
-            }
-            else{
-                lstrcpy(buffer+i2,"");
-                i2+=lstrlen(buffer+i2)+1;
-            }
-
-            //ID
-            *(long *)(buffer+i2)=pUserProc->id;
-            i2+=sizeof(long);
-
-            //関数名
-            lstrcpy(buffer+i2,pUserProc->GetName().c_str());
+    *(long *)(buffer+i2) = compiler.GetMeta().GetUserProcs().Iterator_GetMaxCount();
+    i2+=sizeof(long);
+    compiler.GetMeta().GetUserProcs().Iterator_Reset();
+    while( compiler.GetMeta().GetUserProcs().Iterator_HasNext() )
+    {
+        UserProc *pUserProc = compiler.GetMeta().GetUserProcs().Iterator_GetNext();
+
+        if(pUserProc->GetParentClassPtr()){
+            lstrcpy(buffer+i2,pUserProc->GetParentClassPtr()->GetName().c_str());
             i2+=lstrlen(buffer+i2)+1;
-
-            *(long *)(buffer+i2)=pUserProc->beginOpAddress;
-            i2+=sizeof(long);
-            *(long *)(buffer+i2)=pUserProc->endOpAddress;
-            i2+=sizeof(long);
-
-            //ローカル変数情報
-            *(long *)(buffer+i2)=(int)pUserProc->localVars.size();
-            i2+=sizeof(long);
+        }
+        else{
+            lstrcpy(buffer+i2,"");
+            i2+=lstrlen(buffer+i2)+1;
+        }
+
+        //ID
+        *(long *)(buffer+i2)=pUserProc->GetId();
+        i2+=sizeof(long);
+
+        //関数名
+        lstrcpy(buffer+i2,pUserProc->GetName().c_str());
+        i2+=lstrlen(buffer+i2)+1;
+
+        *(long *)(buffer+i2)=pUserProc->GetBeginOpAddress();
+        i2+=sizeof(long);
+        *(long *)(buffer+i2)=pUserProc->GetEndOpAddress();
+        i2+=sizeof(long);
+
+        //ローカル変数情報
+        *(long *)(buffer+i2)=(int)pUserProc->GetLocalVars().size();
+        i2+=sizeof(long);
+
+        //バッファが足りない場合は再確保
+        if(BufferSize<i2+32768){
+            BufferSize+=32768;
+            buffer=(char *)HeapReAlloc(hHeap,0,buffer,BufferSize);
+        }
+
+        BOOST_FOREACH( Variable *pVar, pUserProc->GetLocalVars() ){
+            lstrcpy(buffer+i2,pVar->GetName().c_str());
+            i2+=lstrlen(buffer+i2)+1;
+
+            //型
+            *(long *)(buffer+i2)=pVar->GetType().GetBasicType();
+            i2+=sizeof(long);
+
+            //型の拡張情報
+            SetLpIndex_DebugFile(buffer,&i2,pVar->GetType());
+
+            //参照型パラメータかどうか
+            buffer[i2++] = pVar->IsRef() ? 1 : 0;
+
+            //配列かどうか
+            buffer[i2++] = pVar->IsArray() ? 1 : 0;
+
+            //配列要素
+            if(pVar->IsArray()){
+                *(long *)(buffer+i2)=(int)pVar->GetSubscripts().size();
+                i2+=sizeof(long);
+                BOOST_FOREACH( int indexMax, pVar->GetSubscripts() )
+                {
+                    *(long *)(buffer+i2)=indexMax;
+                    i2+=sizeof(long);
+                }
+            }
+
+            //レキシカルスコープ情報
+            *(long *)(buffer+i2)=pVar->GetScopeStartAddress();
+            i2+=sizeof(long);
+            *(long *)(buffer+i2)=pVar->GetScopeEndAddress();
+            i2+=sizeof(long);
+            *(long *)(buffer+i2)=pVar->GetScopeLevel();
+            i2+=sizeof(long);
+
+            //メモリ位置
+            *(long *)(buffer+i2)=pVar->GetOffsetAddress();
+            i2+=sizeof(long);
+
+
+
 
             //バッファが足りない場合は再確保
@@ -249 +299 @@
                 buffer=(char *)HeapReAlloc(hHeap,0,buffer,BufferSize);
             }
-
-            BOOST_FOREACH( Variable *pVar, pUserProc->localVars ){
-                lstrcpy(buffer+i2,pVar->GetName().c_str());
-                i2+=lstrlen(buffer+i2)+1;
-
-                //型
-                *(long *)(buffer+i2)=pVar->GetBasicType();
-                i2+=sizeof(long);
-
-                //型の拡張情報
-                SetLpIndex_DebugFile(buffer,&i2,*pVar);
-
-                //参照型パラメータかどうか
-                buffer[i2++] = pVar->IsRef() ? 1 : 0;
-
-                //配列かどうか
-                buffer[i2++] = pVar->IsArray() ? 1 : 0;
-
-                //配列要素
-                if(pVar->IsArray()){
-                    for(i5=0;;i5++){
-                        *(long *)(buffer+i2)=pVar->GetSubScriptsPtr()[i5];
-                        i2+=sizeof(long);
-                        if(pVar->GetSubScriptsPtr()[i5]==-1) break;
-                    }
-                }
-
-                //レキシカルスコープ情報
-                *(long *)(buffer+i2)=pVar->ScopeStartAddress;
-                i2+=sizeof(long);
-                *(long *)(buffer+i2)=pVar->ScopeEndAddress;
-                i2+=sizeof(long);
-                *(long *)(buffer+i2)=pVar->ScopeLevel;
-                i2+=sizeof(long);
-
-                //メモリ位置
-                *(long *)(buffer+i2)=pVar->offset;
-                i2+=sizeof(long);
-
-
-
-
-                //バッファが足りない場合は再確保
-                if(BufferSize<i2+32768){
-                    BufferSize+=32768;
-                    buffer=(char *)HeapReAlloc(hHeap,0,buffer,BufferSize);
-                }
-            }
-
-            pUserProc=pUserProc->pNextData;
         }
     }
@@ -328 +328 @@
         i2+=sizeof(long);
 
-        //メンバ
+        // 動的メンバ
         *(long *)(buffer+i2)=(int)pobj_c->GetDynamicMembers().size();
         i2+=sizeof(long);
@@ -347 +347 @@
             i2+=sizeof(Prototype::Accessibility);
 
-            memcpy(buffer+i2,member->SubScripts,sizeof(int)*MAX_ARRAYDIM);
-            i2+=sizeof(int)*MAX_ARRAYDIM;
+            *(long *)(buffer+i2)=(int)member->GetSubscripts().size();
+            i2+=sizeof(long);
+            BOOST_FOREACH( int indexMax, member->GetSubscripts() )
+            {
+                *(long *)(buffer+i2)=indexMax;
+                i2+=sizeof(long);
+            }
 
             //バッファが足りない場合は再確保
@@ -357 +362 @@
         }
 
-        //メソッド
+        // 動的メソッド
         *(long *)(buffer+i2)=(long)pobj_c->GetMethods().size();
         i2+=sizeof(long);
@@ -371 +376 @@
                 i2+=lstrlen(buffer+i2)+1;
             }
-            lstrcpy(buffer+i2,pMethod->pUserProc->GetName().c_str());
+            lstrcpy(buffer+i2,pMethod->GetUserProc().GetName().c_str());
             i2+=lstrlen(buffer+i2)+1;
         }
@@ -394 +399 @@
             i2+=sizeof(Prototype::Accessibility);
 
-            memcpy(buffer+i2,member->SubScripts,sizeof(int)*MAX_ARRAYDIM);
-            i2+=sizeof(int)*MAX_ARRAYDIM;
+            // 配列
+            *(long *)(buffer+i2)=(int)member->GetSubscripts().size();
+            i2+=sizeof(long);
+            BOOST_FOREACH( int indexMax, member->GetSubscripts() )
+            {
+                *(long *)(buffer+i2)=indexMax;
+                i2+=sizeof(long);
+            }
 
             //バッファが足りない場合は再確保
@@ -434 +445 @@
 }
 BOOL CDebugSection::__load(void){
-    int i2,i3,i4,i5,num;
+    int i2,i3,i4,num;
     char temp2[MAX_PATH],*temp5;
 
-    Smoothie::Temp::pCompilingClass = NULL;
+    compiler.pCompilingClass = NULL;
 
     i2=0;
@@ -487 +498 @@
     ///////////////////////////////////////////
 
-    this->pobj_DBClass=new ClassesImpl();
+    this->pobj_DBClass=new Classes();
 
     int iMaxClassCount;
@@ -524 +535 @@
     //定数を取得
     GetConstInfo();
-    extern CONSTINFO **ppConstHash;
-    this->ppConstHash=ppConstHash;
-
+    this->globalConsts = compiler.GetMeta().GetGlobalConsts();
+    this->globalConstMacros = compiler.GetMeta().GetGlobalConstMacros();
 
     //グローバル変数情報
-    globalVars.clear();
+    compiler.GetMeta().GetGlobalVars().clear();
     int maxGlobalVars=*(long *)(buffer+i2);
     i2+=sizeof(long);
@@ -548 +558 @@
         bool isArray = (buffer[i2++]) ? true:false;
 
-        Variable *pVar = new VariableImpl( name, type, false, isRef );
+        Variable *pVar = new Variable( name, type, false, isRef, "" );
 
         if(isArray){
-            int SubScripts[MAX_ARRAYDIM];
-            for(i4=0;;i4++){
-                SubScripts[i4]=*(long *)(buffer+i2);
+            Subscripts subscripts;
+            int nSubScriptsNum = *(long *)(buffer+i2);
+            i2+=sizeof(long);
+            for( int i=0; i<nSubScriptsNum; i++ )
+            {
+                subscripts.push_back( *(long *)(buffer+i2) );
                 i2+=sizeof(long);
-
-                if(SubScripts[i4]==-1) break;
-            }
-
-            pVar->SetArray( SubScripts );
+            }
+
+            pVar->SetArray( subscripts );
         }
 
         //レキシカルスコープ情報
-        pVar->ScopeStartAddress=*(long *)(buffer+i2);
-        i2+=sizeof(long);
-        pVar->ScopeEndAddress=*(long *)(buffer+i2);
-        i2+=sizeof(long);
-        pVar->ScopeLevel=*(long *)(buffer+i2);
+        pVar->SetScopeStartAddress( *(long *)(buffer+i2) );
+        i2+=sizeof(long);
+        pVar->SetScopeEndAddress( *(long *)(buffer+i2) );
+        i2+=sizeof(long);
+        pVar->SetScopeLevel( *(long *)(buffer+i2) );
         i2+=sizeof(long);
 
         //メモリ位置
-        pVar->offset=*(long *)(buffer+i2);
+        pVar->SetOffsetAddress( *(long *)(buffer+i2) );
         i2+=sizeof(long);
 
         //変数を追加
-        globalVars.push_back( pVar );
+        compiler.GetMeta().GetGlobalVars().push_back( pVar );
     }
 
@@ -583 +594 @@
 
     //プロシージャ情報
-    GlobalProc *pUserProc;
-    SubNum=*(long *)(buffer+i2);
-    i2+=sizeof(long);
-    ppSubHash=(GlobalProc **)HeapAlloc(hHeap,HEAP_ZERO_MEMORY,MAX_HASH*sizeof(GlobalProc *));
-    for(int i6=0;i6<SubNum;i6++){
+    userProcs.Clear();
+    int subNum = *(long *)(buffer+i2);
+    i2+=sizeof(long);
+    for(int i6=0;i6<subNum;i6++){
         char szParentClassName[VN_SIZE];
         lstrcpy(szParentClassName,buffer+i2);
@@ -607 +617 @@
         // オブジェクトを生成
         // TODO: 名前空間が未完成
-        pUserProc = new GlobalProc( NamespaceScopes(), NamespaceScopesCollection(), name, Procedure::Function, false, false, false );
-        pUserProc->pNextData=0;
-        pUserProc->id=id;
+        UserProc *pUserProc = new UserProc( NamespaceScopes(), NamespaceScopesCollection(), name, Procedure::Function, false, false, false, id );
         pUserProc->SetParentClass( pClass );
 
-        pUserProc->beginOpAddress=*(long *)(buffer+i2);
-        i2+=sizeof(long);
-        pUserProc->endOpAddress=*(long *)(buffer+i2);
+        pUserProc->SetBeginOpAddress( *(long *)(buffer+i2) );
+        i2+=sizeof(long);
+        pUserProc->SetEndOpAddress( *(long *)(buffer+i2) );
         i2+=sizeof(long);
 
@@ -620 +628 @@
 
         //ローカル変数情報
-        pUserProc->localVars.clear();
+        pUserProc->GetLocalVars().clear();
         int maxLocalVar=*(long *)(buffer+i2);
         i2+=sizeof(long);
@@ -638 +646 @@
             bool isArray = (buffer[i2++]) ? true:false;
 
-            Variable *pVar = new VariableImpl( name, type, false, isRef );
+            Variable *pVar = new Variable( name, type, false, isRef, "" );
 
             if(isArray){
-                int SubScripts[MAX_ARRAYDIM];
-                for(i4=0;;i4++){
-                    SubScripts[i4]=*(long *)(buffer+i2);
+                Subscripts subscripts;
+                int nSubScriptsNum = *(long *)(buffer+i2);
+                i2+=sizeof(long);
+                for( int i=0; i<nSubScriptsNum; i++ )
+                {
+                    subscripts.push_back( *(long *)(buffer+i2) );
                     i2+=sizeof(long);
-
-                    if(SubScripts[i4]==-1) break;
                 }
 
-                pVar->SetArray( SubScripts );
+                pVar->SetArray( subscripts );
             }
 
             //レキシカルスコープ情報
-            pVar->ScopeStartAddress=*(long *)(buffer+i2);
-            i2+=sizeof(long);
-            pVar->ScopeEndAddress=*(long *)(buffer+i2);
-            i2+=sizeof(long);
-            pVar->ScopeLevel=*(long *)(buffer+i2);
+            pVar->SetScopeStartAddress( *(long *)(buffer+i2) );
+            i2+=sizeof(long);
+            pVar->SetScopeEndAddress( *(long *)(buffer+i2) );
+            i2+=sizeof(long);
+            pVar->SetScopeLevel( *(long *)(buffer+i2) );
             i2+=sizeof(long);
 
             //メモリ位置
-            pVar->offset=*(long *)(buffer+i2);
+            pVar->SetOffsetAddress( *(long *)(buffer+i2) );
             i2+=sizeof(long);
 
             //変数を追加
-            pUserProc->localVars.push_back( pVar );
+            pUserProc->GetLocalVars().push_back( pVar );
         }
 
@@ -673 +682 @@
         /////////////////////////////////
 
-        i4=hash_default(pUserProc->GetName().c_str());
-
-        GlobalProc *psi2;
-        if(ppSubHash[i4]){
-            psi2=ppSubHash[i4];
-            while(1){
-                if(psi2->pNextData==0){
-                    psi2->pNextData=pUserProc;
-                    break;
-                }
-                psi2=psi2->pNextData;
-            }
-        }
-        else{
-            ppSubHash[i4]=pUserProc;
-        }
-    }
+        // ハッシュに追加
+        if( !userProcs.Insert( pUserProc, -1 ) )
+        {
+            //return NULL;
+        }
+    }
+    userProcs.Iterator_Init();
 
     //クラス情報
@@ -709 +708 @@
         i2+=sizeof(long);
 
-        //静的メンバ
+        // 動的メンバ
         int nDynamicMember = *(long *)(buffer+i2);
         i2+=sizeof(long);
@@ -728 +727 @@
             i2+=sizeof(Prototype::Accessibility);
 
-            CMember *member=new CMember( accessibility, name, type, false, "", "" );
-
-            memcpy(member->SubScripts,buffer+i2,sizeof(int)*MAX_ARRAYDIM);
-            i2+=sizeof(int)*MAX_ARRAYDIM;
+            Subscripts subscripts;
+            int nSubScriptsNum = *(long *)(buffer+i2);
+            i2+=sizeof(long);
+            for( int i=0; i<nSubScriptsNum; i++ )
+            {
+                subscripts.push_back( *(long *)(buffer+i2) );
+                i2+=sizeof(long);
+            }
+
+            CMember *member=new CMember( accessibility, name, type, false, subscripts, "", "" );
 
             pobj_c->GetDynamicMembers().push_back( member );
         }
 
-        //メソッド
+        // 動的メソッド
         int nMethod = *(long *)(buffer+i2);
         i2+=sizeof(long);
@@ -759 +764 @@
             pobj_temp_c=pobj_InheritsClass;
             if(pobj_temp_c==0) pobj_temp_c=pobj_c;
-            i5=hash_default(temp2);
-            pUserProc=ppSubHash[i5];
-            while(1){
-                if( pUserProc->GetName() == temp2 &&pUserProc->GetParentClassPtr()==pobj_temp_c) break;
-                pUserProc=pUserProc->pNextData;
+
+            UserProc *pUserProc = compiler.GetMeta().GetUserProcs().GetHashArrayElement( temp2 );
+            while(pUserProc){
+                if( pUserProc->GetName() == temp2 &&pUserProc->GetParentClassPtr()==pobj_temp_c)
+                {
+                    break;
+                }
+
+                pUserProc=pUserProc->GetChainNext();
             }
 
@@ -790 +799 @@
             i2+=sizeof(Prototype::Accessibility);
 
-            CMember *member=new CMember( accessibility, name, type, false, "", "" );
-
-            memcpy(member->SubScripts,buffer+i2,sizeof(int)*MAX_ARRAYDIM);
-            i2+=sizeof(int)*MAX_ARRAYDIM;
+            // 配列
+            Subscripts subscripts;
+            int nSubScriptsNum = *(long *)(buffer+i2);
+            i2+=sizeof(long);
+            for( int i=0; i<nSubScriptsNum; i++ )
+            {
+                subscripts.push_back( *(long *)(buffer+i2) );
+                i2+=sizeof(long);
+            }
+
+            CMember *member=new CMember( accessibility, name, type, false, subscripts, "", "" );
 
             pobj_c->GetStaticMembers().push_back( member );
@@ -805 +821 @@
 
 
-    extern GlobalProc **ppSubHash;
-    ppSubHash=this->ppSubHash;
+    compiler.GetMeta().GetUserProcs() = userProcs;
     pSub_DebugSys_EndProc=GetSubHash("_DebugSys_EndProc");
 
@@ -950 +965 @@
 
     //定数を取得
-    extern CONSTINFO **ppConstHash;
-    ppConstHash=this->ppConstHash;
+    compiler.GetMeta().GetGlobalConsts() = this->globalConsts;
+    compiler.GetMeta().GetGlobalConstMacros() = this->globalConstMacros;
 
     //グローバル実行領域のサイズ
@@ -958 +973 @@
 
     //プロシージャ
-    extern char **ppMacroNames;
-    ppMacroNames=0;
-    extern GlobalProc **ppSubHash;
-    extern int SubNum;
-    ppSubHash=this->ppSubHash;
-    SubNum=this->SubNum;
-
-    extern UserProc *pSub_DebugSys_EndProc;
+    compiler.GetMeta().GetUserProcs() = userProcs;
+
+    extern const UserProc *pSub_DebugSys_EndProc;
     pSub_DebugSys_EndProc=this->pSub_DebugSys_EndProc;
 
@@ -986 +996 @@
     delete this->pobj_DBClass;
     this->pobj_DBClass=0;
-
-    //サブルーチン情報のメモリ解放
-    DeleteSubInfo(ppSubHash,0,0);
-
-    //定数に関する情報を解放
-    DeleteConstInfo(ppConstHash);
 
     //コードと行番号の関係を解放

trunk/abdev/BasicCompiler_Common/DebugSection.h

@@ -2 +2 @@
 
 #include <jenga/include/smoothie/Source.h>
-#include <jenga/include/smoothie/Class.h>
 
-#include <ProcedureImpl.h>
+#include <Class.h>
+#include <Procedure.h>
+#include <Const.h>
 
 
@@ -42 +43 @@
 
     //定数を取得
-    CONSTINFO **ppConstHash;
+    Consts globalConsts;
+    ConstMacros globalConstMacros;
 
     //グローバル実行領域のサイズ
@@ -48 +50 @@
 
     //プロシージャ
-    GlobalProc **ppSubHash;
-    int SubNum;
+    UserProcs userProcs;
 
-    UserProc *pSub_DebugSys_EndProc;
+    const UserProc *pSub_DebugSys_EndProc;
 
     //ネイティブコードバッファ
@@ -66 +67 @@
 
 
-    CDebugSection();
+    CDebugSection()
+        : buffer( NULL )
+        , length( 0 )
+        , dwImageBase( 0 )
+        , dwRVA_RWSection( 0 )
+        , dwRVA_CodeSection( 0 )
+        , SizeOf_CodeSection( 0 )
+        , pobj_DBClass( NULL )
+        , GlobalOpBufferSize( 0 )
+        , pSub_DebugSys_EndProc( NULL )
+        , OpBuffer( NULL )
+        , SingleStepCodeBuffer( NULL )
+        , BreakStepCodeBuffer( NULL )
+    {
+        szNowFilePath[0]=0;
+    }
     ~CDebugSection();
 

trunk/abdev/BasicCompiler_Common/Diagnose.cpp

@@ +1 @@
+#include "stdafx.h"
+
 #include <jenga/include/smoothie/Smoothie.h>
 
@@ -38 +40 @@
         int codeSizeOfGlobalProc = 0;
         int codeSizeOfClassMethod = 0;
-        for(int i2=0;i2<MAX_HASH;i2++){
-            extern GlobalProc **ppSubHash;
-            GlobalProc *pUserProc = ppSubHash[i2];
-            while(pUserProc){
-                if( pUserProc->IsCompiled() ){
-                    if( pUserProc->HasParentClass() ){
-                        codeSizeOfClassMethod += pUserProc->GetCodeSize();
-                    }
-                    else{
-                        codeSizeOfGlobalProc += pUserProc->GetCodeSize();
-                    }
+        compiler.GetMeta().GetUserProcs().Iterator_Reset();
+        while( compiler.GetMeta().GetUserProcs().Iterator_HasNext() )
+        {
+            UserProc *pUserProc = compiler.GetMeta().GetUserProcs().Iterator_GetNext();
+            if( pUserProc->IsCompiled() ){
+                if( pUserProc->HasParentClass() ){
+                    codeSizeOfClassMethod += pUserProc->GetCodeSize();
                 }
-
-                pUserProc=pUserProc->pNextData;
+                else{
+                    codeSizeOfGlobalProc += pUserProc->GetCodeSize();
+                }
             }
         }
@@ -83 +82 @@
             // 動的メソッド
             BOOST_FOREACH( const CMethod *pMethod, objClass.GetMethods() ){
-                if( pMethod->pUserProc->IsCompiled() ){
-                    codeSizeOfClass += pMethod->pUserProc->GetCodeSize();
+                if( pMethod->GetUserProc().IsCompiled() ){
+                    codeSizeOfClass += pMethod->GetUserProc().GetCodeSize();
                 }
             }
@@ -90 +89 @@
             // 静的メソッド
             BOOST_FOREACH( const CMethod *pMethod, objClass.GetStaticMethods() ){
-                    codeSizeOfClass += pMethod->pUserProc->GetCodeSize();
+                    codeSizeOfClass += pMethod->GetUserProc().GetCodeSize();
             }
 
@@ -118 +117 @@
             // 動的メソッド
             BOOST_FOREACH( const CMethod *pMethod, objClass.GetMethods() ){
-                if( pMethod->pUserProc->IsCompiled() ){
-                    codeSizeOfClass += pMethod->pUserProc->GetCodeSize();
+                if( pMethod->GetUserProc().IsCompiled() ){
+                    codeSizeOfClass += pMethod->GetUserProc().GetCodeSize();
                 }
             }
@@ -125 +124 @@
             // 静的メソッド
             BOOST_FOREACH( const CMethod *pMethod, objClass.GetStaticMethods() ){
-                    codeSizeOfClass += pMethod->pUserProc->GetCodeSize();
+                    codeSizeOfClass += pMethod->GetUserProc().GetCodeSize();
             }
 

trunk/abdev/BasicCompiler_Common/Enum.cpp

@@ +1 @@
+#include "stdafx.h"
+
 #include <jenga/include/common/logger.h>
 
@@ -5 +7 @@
 
 #include <Compiler.h>
+#include <../Enum.h>
 
 #include "common.h"
@@ -293 +296 @@
 
     // ログを生成
-    Jenga::Common::Logger logger( Jenga::Common::Environment::GetAppDir() + "\\enum_generated.log" );
+    Jenga::Common::Logger logger( Jenga::Common::Environment::GetAppDir() + "\\enum_generated.log", false );
     logger << buffer << endl;
 

trunk/abdev/BasicCompiler_Common/Intermediate_Step1.cpp

@@ +1 @@
+#include "stdafx.h"
+
 #include <jenga/include/smoothie/Smoothie.h>
 #include <jenga/include/smoothie/LexicalAnalysis.h>

trunk/abdev/BasicCompiler_Common/Intermediate_Step2.cpp

@@ +1 @@
+#include "stdafx.h"
+
 #include <jenga/include/smoothie/Smoothie.h>
 #include <jenga/include/smoothie/LexicalAnalysis.h>
@@ -6 +8 @@
 #include "../BasicCompiler_Common/common.h"
 
-CONSTINFO *GetNewConstHash(char *name){
-    extern int cp;
-    CONSTINFO *pci;
-
-    int key;
-    key=hash_default(name);
-
-    extern CONSTINFO **ppConstHash;
-    if(ppConstHash[key]){
-        pci=ppConstHash[key];
-        while(1){
-            if(lstrcmp(pci->name,name)==0){
-                //重複エラー
-                SetError(15,name,cp);
-                return 0;
-            }
-
-            if(pci->pNextData==0){
-                pci->pNextData=(CONSTINFO *)HeapAlloc(hHeap,HEAP_ZERO_MEMORY,sizeof(CONSTINFO));
-                break;
-            }
-            pci=pci->pNextData;
-        }
-        pci=pci->pNextData;
-    }
-    else{
-        ppConstHash[key]=(CONSTINFO *)HeapAlloc(hHeap,HEAP_ZERO_MEMORY,sizeof(CONSTINFO));
-        pci=ppConstHash[key];
-    }
-
-    return pci;
-}
-
-// マクロ定数を追加するための関数
-void AddConstData(char *Command){
-    extern HANDLE hHeap;
-    extern int cp;
-    int i,i2;
-    char temporary[VN_SIZE];
-
-    for(i=0;;i++){
-        if(Command[i]=='\0'){
-            SetError(10,"Const",cp);
-            return;
-        }
-        if(Command[i]=='=' ||  Command[i] == 1 && Command[i+1] == ESC_AS ){
-            //定数定義は新しいクラスモジュール（CDBConst）へ移行
-            // ※この関数はマクロ定数のみを扱う
-            return;
-        }
-        if(Command[i]=='('){
-            temporary[i]=0;
-            break;
-        }
-        temporary[i]=Command[i];
-    }
-
-
-    /////////////////////////////////
-    // 格納位置を計算してpciにセット
-    /////////////////////////////////
-
-    CONSTINFO *pci;
-    pci=GetNewConstHash(temporary);
-    if(!pci) return;
-
-
-
-    ////////////////////
-    // 定数情報を取得
-    ////////////////////
-
-    //定数名
-    pci->name=(char *)HeapAlloc(hHeap,0,lstrlen(temporary)+1);
-    lstrcpy(pci->name,temporary);
-
-    if(Command[i]=='('){
-        pci->ppParm=(char **)HeapAlloc(hHeap,0,1);
-        pci->ParmNum=0;
-        for(i++,i2=0;;i++,i2++){
-            if(Command[i]=='\0'){
-                SetError(1,NULL,cp);
-                return;
-            }
-            if(Command[i]==','||Command[i]==')'){
-                temporary[i2]=0;
-                pci->ppParm=(char **)HeapReAlloc(hHeap,0,pci->ppParm,(pci->ParmNum+1)*sizeof(char *));
-                pci->ppParm[pci->ParmNum]=(char *)HeapAlloc(hHeap,0,lstrlen(temporary)+1);
-                lstrcpy(pci->ppParm[pci->ParmNum],temporary);
-                pci->ParmNum++;
-                if(Command[i]==')'){
-                    i++;
-                    if(Command[i]!='='){
-                        SetError(1,NULL,cp);
-                        return;
-                    }
-                    break;
-                }
-
-                i2=-1;
-                continue;
-            }
-            temporary[i2]=Command[i];
-        }
-    }
-    else pci->ParmNum=0;
-
-    //データ
-    lstrcpy(temporary,Command+i+1);
-    if(pci->ParmNum){
-        pci->StrValue=(char *)HeapAlloc(hHeap,0,lstrlen(temporary)+1);
-        lstrcpy(pci->StrValue,temporary);
-    }
-    else if(temporary[0]=='\"'){
-        //文字列定数
-        RemoveStringQuotes(temporary);
-        i2=lstrlen(temporary);
-
-        pci->StrValue=(char *)HeapAlloc(hHeap,0,i2+1);
-        memcpy(pci->StrValue,temporary,i2);
-        pci->StrValue[i2]=0;
-
-        pci->DblValue=(double)i2;
-
-        pci->type=DEF_STRING;
-        pci->lpIndex=-1;
-    }
-    else if((temporary[0]=='e'||temporary[0]=='E')&&
-        (temporary[1]=='x'||temporary[1]=='X')&&
-        temporary[2]=='\"'){
-        //文字列定数
-        RemoveStringQuotes(temporary+2);
-        i2=FormatString_EscapeSequence(temporary+2);
-        pci->StrValue=(char *)HeapAlloc(hHeap,0,i2+1);
-        memcpy(pci->StrValue,temporary+2,i2);
-        pci->StrValue[i2]=0;
-
-        pci->DblValue=(double)i2;
-
-        pci->type=DEF_STRING;
-        pci->lpIndex=-1;
-    }
-    else{
-        //数値定数
-        _int64 i64data;
-        Type resultType;
-        StaticCalculation(true, temporary,0,&i64data,resultType);
-        pci->type=resultType.GetBasicType();
-        if(IsRealNumberType(pci->type)){
-            //実数型
-            memcpy(&pci->DblValue,&i64data,sizeof(double));
-        }
-        else if(Is64Type(pci->type)){
-            //64ビット型
-            pci->i64Value=i64data;
-        }
-        else if(IsWholeNumberType(pci->type)){
-            //その他整数型
-            pci->DblValue=(double)i64data;
-        }
-
-        pci->StrValue=0;
-    }
-}
+
 void AddConstEnum( const NamespaceScopes &namespaceScopes, char *buffer){
     extern int cp;
@@ -240 +79 @@
 
         //定数を追加
-        CDBConst::obj.AddConst( namespaceScopes, temporary, NextValue);
+        compiler.GetMeta().GetGlobalConsts().Add( namespaceScopes, temporary, NextValue);
     }
 }
@@ -255 +94 @@
     namespaceScopes.clear();
 
-    //定数に関する情報
-    extern CONSTINFO **ppConstHash;
-    ppConstHash=(CONSTINFO **)HeapAlloc(hHeap,HEAP_ZERO_MEMORY,MAX_HASH*sizeof(CONSTINFO *));
+    //定数に関する情報を初期化
+    compiler.GetMeta().GetGlobalConsts().Clear();
+    compiler.GetMeta().GetGlobalConstMacros().Clear();
 
     extern char *basbuf;
@@ -315 +154 @@
                     temporary[i2]=basbuf[i];
                 }
-                CDBConst::obj.Add( namespaceScopes, temporary);
+                AddConst( namespaceScopes, temporary);
                 if(basbuf[i]=='\0') break;
             }
@@ -331 +170 @@
         }
     }
+
+    // イテレータを初期化
+    compiler.GetMeta().GetGlobalConsts().Iterator_Init();
+    compiler.GetMeta().GetGlobalConstMacros().Iterator_Init();
+
     return true;
 }

trunk/abdev/BasicCompiler_Common/MakeExe.cpp

@@ +1 @@
+#include "stdafx.h"
+
 #include <jenga/include/smoothie/Smoothie.h>
+
+#include <Compiler.h>
 
 #include "common.h"
@@ -6 +10 @@
     extern HWND hMainDlg;
     PostMessage(GetDlgItem(hMainDlg,IDC_PROGRESS),PBM_STEPIT,0,0);
-}
-
-void Delete_ci(CONSTINFO *pci){
-    int i;
-
-    HeapDefaultFree(pci->name);
-    if(pci->StrValue) HeapDefaultFree(pci->StrValue);
-    if(pci->ParmNum){
-        for(i=0;i<pci->ParmNum;i++)
-            HeapDefaultFree(pci->ppParm[i]);
-        HeapDefaultFree(pci->ppParm);
-    }
-
-    if(pci->pNextData){
-        Delete_ci(pci->pNextData);
-    }
-
-    HeapDefaultFree(pci);
-}
-void DeleteConstInfo(CONSTINFO **ppConstHash){
-    int i;
-
-    for(i=0;i<MAX_HASH;i++){
-        if(ppConstHash[i]){
-            Delete_ci(ppConstHash[i]);
-        }
-    }
-    HeapDefaultFree(ppConstHash);
 }
 
@@ -128 +104 @@
     if(bError||bStopCompile) goto EndCompile;
 
-    /*未完成
-    //定数に関する情報
-    extern CONSTINFO **ppConstHash;
-    ppConstHash=(CONSTINFO **)HeapAlloc(hHeap,HEAP_ZERO_MEMORY,MAX_HASH*sizeof(CONSTINFO *));
-    */
-
     //コンパイルダイアログのプログレスバーを上げる
     StepCompileProgress();
@@ -167 +137 @@
     extern int AllGlobalVarSize;
     extern int AllInitGlobalVarSize;
-    globalVars.clear();
+    compiler.GetMeta().GetGlobalVars().clear();
     AllGlobalVarSize=0;
     AllInitGlobalVarSize=0;
@@ -195 +165 @@
     HeapDefaultFree(pLineInfo);
 
-    //サブルーチン（ユーザー定義）情報のメモリ解放
-    extern GlobalProc **ppSubHash;
-    extern char **ppMacroNames;
-    extern int MacroNum;
-    DeleteSubInfo(ppSubHash,ppMacroNames,MacroNum);
-
     //Declare（DLL関数）情報のメモリ解放
     DeleteDeclareInfo();
-
-    //定数に関する情報を解放
-    extern CONSTINFO **ppConstHash;
-    DeleteConstInfo(ppConstHash);
 
     //コンパイルダイアログのプログレスバーを上げる

trunk/abdev/BasicCompiler_Common/NonVolatile.cpp

@@ +1 @@
+#include "stdafx.h"
+
 #include <jenga/include/common/Environment.h>
 

trunk/abdev/BasicCompiler_Common/NumOpe_GetType.cpp

@@ +1 @@
+#include "stdafx.h"
+
 #include <jenga/include/smoothie/Smoothie.h>
 #include <jenga/include/smoothie/LexicalAnalysis.h>
@@ -198 +200 @@
     pobj_c=(CClass *)index_stack[sp-2];
 
-    std::vector<UserProc *> subs;
+    std::vector<const UserProc *> subs;
     pobj_c->GetMethods().Enum( idCalc, subs );
     if( subs.size() == 0 ){
@@ -228 +230 @@
     if(idCalc==CALC_EQUAL) lstrcpy(temporary,"==");
     else GetCalcName(idCalc,temporary);
-    UserProc *pUserProc = OverloadSolution( temporary, subs, params, baseType );
+    const UserProc *pUserProc = OverloadSolution( temporary, subs, params, baseType );
 
     if(bTwoTerm){
@@ -315 +317 @@
     // パース
     char member[VN_SIZE];
-    CClass::RefType refType;
-    if( CClass::SplitName( termFull, termLeft, member, refType ) ){
+    ReferenceKind refType;
+    if( SplitMemberName( termFull, termLeft, member, refType ) ){
         ///////////////////////////////////////////////////////////////////
         // オブジェクトとメンバに分解できるとき
@@ -371 +373 @@
         // 動的メソッドを検索
         ///////////////////////////////////////////////////////////////////
-        vector<UserProc *> userProcs;
-
         char methodName[VN_SIZE] ,lpPtrOffset[VN_SIZE];
         lstrcpy( methodName, member );
         GetVarFormatString(methodName,parameter,lpPtrOffset,member,refType);
 
+        vector<const UserProc *> userProcs;
         objClass.GetMethods().Enum( methodName, userProcs );
-        UserProc *pUserProc;
         if(userProcs.size()){
             //オーバーロードを解決
-            pUserProc=OverloadSolutionWithStrParam(termFull,userProcs,parameter,termLeft);
+            const UserProc *pUserProc = OverloadSolutionWithStrParam(termFull,userProcs,parameter,termLeft);
 
             if( pUserProc ){
@@ -413 +413 @@
     if(lstrcmpi(termFull,"This")==0){
         //Thisオブジェクト
-        resultType.SetType( DEF_OBJECT, Smoothie::Temp::pCompilingClass );
+        resultType.SetType( DEF_OBJECT, compiler.pCompilingClass );
         isLiteral = false;
         return true;
@@ -455 +455 @@
             return true;
         }
-        else if(GetConstCalcBuffer(procName,parameter,temporary)){
-            /////////////////////////
-            // マクロ関数
-            /////////////////////////
-
-            //閉じカッコ")"に続く文字がNULLでないときはエラーにする
-            if(termFull[i2+1+i4+1]!='\0') SetError(42,NULL,cp);
-
-            //マクロ関数の場合
-            if( !NumOpe_GetType(temporary,Type(),resultType) ){
-                return false;
-            }
-
-            if( !IS_LITERAL( resultType.GetIndex() ) ){
-                //リテラル値ではなかったとき
-                isLiteral = false;
-            }
-
-            return true;
+        else
+        {
+            ConstMacro *pConstMacro = compiler.GetMeta().GetGlobalConstMacros().Find( procName );
+            if( pConstMacro )
+            {
+                if( pConstMacro->GetCalcBuffer( parameter, temporary ) )
+                {
+                    /////////////////////////
+                    // マクロ関数
+                    /////////////////////////
+
+                    //閉じカッコ")"に続く文字がNULLでないときはエラーにする
+                    if(termFull[i2+1+i4+1]!='\0') SetError(42,NULL,cp);
+
+                    //マクロ関数の場合
+                    if( !NumOpe_GetType(temporary,Type(),resultType) ){
+                        return false;
+                    }
+
+                    if( !IS_LITERAL( resultType.GetIndex() ) ){
+                        //リテラル値ではなかったとき
+                        isLiteral = false;
+                    }
+
+                    return true;
+                }
+            }
         }
     }
@@ -732 +740 @@
                     //////////////
 
-                    i3 = CDBConst::obj.GetBasicType(term);
+                    i3 = compiler.GetMeta().GetGlobalConsts().GetBasicType(term);
                     if(i3){
-                        if( CDBConst::obj.IsStringPtr( term ) ){
+                        if( compiler.GetMeta().GetGlobalConsts().IsStringPtr( term ) ){
                             //リテラル文字列
                             goto StrLiteral;

trunk/abdev/BasicCompiler_Common/Object.cpp

@@ +1 @@
+#include "stdafx.h"
+
 #include <Compiler.h>
 
@@ -11 +13 @@
 extern HANDLE hHeap;
 
-void CallConstructor( const char *ObjectName,const int *SubScripts,const Type &type,const char *Parameter){
+void CallConstructor( const char *ObjectName,const Subscripts &subscripts,const Type &type,const char *Parameter){
     if( !type.IsObject() ){
         return;
@@ -21 +23 @@
     /////////////////////////////////////
 
-    UserProc *pUserProc;
-    pUserProc=GetMethodHash(ObjectName,type.GetClass().GetName().c_str(),Parameter);
+    const UserProc *pUserProc = GetMethodHash(ObjectName,type.GetClass().GetName().c_str(),Parameter);
     if(!pUserProc){
         if(Parameter[0]) SetError(113,type.GetClass().GetName().c_str(),cp);
@@ -31 +32 @@
     char temporary[VN_SIZE];
 
-    if(SubScripts[0]!=-1){
+    if( subscripts.size() > 0 ){
         int ss[MAX_ARRAYDIM];
         memset(ss,0,MAX_ARRAYDIM*sizeof(int));
         while(1){
             int i3;
-            for(i3=0;;i3++){
-                if(SubScripts[i3]==-1) break;
-
-                if(ss[i3]>SubScripts[i3]){
+            for(i3=0; i3<(int)subscripts.size(); i3++){
+                if(ss[i3]>subscripts[i3]){
                     ss[i3]=0;
                     ss[i3+1]++;
@@ -45 +44 @@
                 else break;
             }
-            if(SubScripts[i3]==-1) break;
+            if( i3 == subscripts.size() )
+            {
+                break;
+            }
             sprintf(temporary,"%s[%d",ObjectName,ss[0]);
-            for(i3=1;;i3++){
-                if(SubScripts[i3]==-1) break;
-
+            for(i3=1; i3<(int)subscripts.size(); i3++){
                 sprintf(temporary+lstrlen(temporary),",%d",ss[i3]);
             }

trunk/abdev/BasicCompiler_Common/OldStatement.cpp

@@ +1 @@
+#include "stdafx.h"
+
 #include "common.h"
 
@@ -116 +118 @@
     OpcodeCalc(temp2);
 
-    UserProc *pUserProc;
+    const UserProc *pUserProc;
     if(bFile) pUserProc=GetSubHash("INPUT_FromFile");
     else pUserProc=GetSubHash("INPUT_FromPrompt");
@@ -218 +220 @@
     OpcodeCalc(temp2);
 
-    UserProc *pUserProc;
+    const UserProc *pUserProc;
     if(bFile) pUserProc=GetSubHash("PRINTUSING_ToFile");
     else pUserProc=GetSubHash("PRINTUSING_ToPrompt");
@@ -322 +324 @@
     if(sw) lstrcat(buffer,"+Ex\"\\r\\n\"");
 
-    UserProc *pUserProc;
+    const UserProc *pUserProc;
     if(bFile) pUserProc=GetSubHash("PRINT_ToFile");
     else pUserProc=GetSubHash("PRINT_ToPrompt");

trunk/abdev/BasicCompiler_Common/Overload.cpp

@@ +1 @@
+#include "stdafx.h"
+
 #include "../BasicCompiler_Common/common.h"
 
@@ -7 +9 @@
 #endif
 
-UserProc *OverloadSolutionWithStrParam(
+const UserProc *OverloadSolutionWithStrParam(
     const char *name,
-    std::vector<UserProc *> &subs,
+    std::vector<const UserProc *> &subs,
     const char *Parameter,
     const char *ObjectName){
@@ -26 +28 @@
 
         char MethodName[VN_SIZE];
-        if( !CClass::SplitName( name, NULL, MethodName ) ) lstrcpy( MethodName, name );
+        if( !SplitMemberName( name, NULL, MethodName ) ) lstrcpy( MethodName, name );
 /*
         //メソッドの場合は静的かどうかを調べる
@@ -39 +41 @@
 
 
-        UserProc *pUserProc;
-        pUserProc=pobj_parameter->OverloadSolution(name,subs);
+        const UserProc *pUserProc = pobj_parameter->OverloadSolution(name,subs);
 
 
@@ -49 +50 @@
         return pUserProc;
 }
-UserProc *OverloadSolution(
+const UserProc *OverloadSolution(
     const char *name,
-    std::vector<UserProc *> &subs,
+    std::vector<const UserProc *> &subs,
     const Parameters &params,
     const Type &returnType ){
@@ -66 +67 @@
         }
 
-        UserProc *pUserProc;
-        pUserProc=pobj_Parameter->OverloadSolution(name,subs);
+        const UserProc *pUserProc = pobj_Parameter->OverloadSolution(name,subs);
 
         delete pobj_Parameter;

trunk/abdev/BasicCompiler_Common/PESchedule.cpp

@@ +1 @@
+#include "stdafx.h"
+
 #include "../BasicCompiler_Common/common.h"
 
@@ -197 +199 @@
 
 CImportAddrSchedule::CImportAddrSchedule(){
-    ppdi=(DllProc **)HeapAlloc(hHeap,0,1);
+    ppdi=(const DllProc **)HeapAlloc(hHeap,0,1);
 }
 CImportAddrSchedule::~CImportAddrSchedule(){
@@ -203 +205 @@
 }
 
-void CImportAddrSchedule::add(DllProc *pDllProc){
-    ppdi=(DllProc **)HeapReAlloc(hHeap,0,ppdi,(num+1)*sizeof(DllProc *));
+void CImportAddrSchedule::add(const DllProc *pDllProc){
+    ppdi=(const DllProc **)HeapReAlloc(hHeap,0,ppdi,(num+1)*sizeof(DllProc *));
     ppdi[num]=pDllProc;
 
@@ -220 +222 @@
 
 CSubAddrSchedule::CSubAddrSchedule(){
-    ppsi=(UserProc **)HeapAlloc(hHeap,0,1);
+    ppsi=(const UserProc **)HeapAlloc(hHeap,0,1);
     pbCall=(BOOL *)HeapAlloc(hHeap,0,1);
 }
@@ -228 +230 @@
 }
 
-void CSubAddrSchedule::add(UserProc *pUserProc,BOOL bCall){
+void CSubAddrSchedule::add(const UserProc *pUserProc,BOOL bCall){
     if(!pUserProc) return;
 
-    ppsi=(UserProc **)HeapReAlloc(hHeap,0,ppsi,(num+1)*sizeof(UserProc *));
+    ppsi=(const UserProc **)HeapReAlloc(hHeap,0,ppsi,(num+1)*sizeof(UserProc *));
     ppsi[num]=pUserProc;
     pbCall=(BOOL *)HeapReAlloc(hHeap,0,pbCall,(num+1)*sizeof(BOOL));

trunk/abdev/BasicCompiler_Common/PESchedule.h

@@ -1 +1 @@
 #pragma once
 
-#include <jenga/include/smoothie/Procedure.h>
+
+class UserProc;
+class DllProc;
+
 
 ///////////////////////
@@ -65 +68 @@
 class CImportAddrSchedule:public CSchedule{
 public:
-    DllProc **ppdi;
+    const DllProc **ppdi;
 
     CImportAddrSchedule();
     ~CImportAddrSchedule();
 
-    void add(DllProc *pDllProc);
+    void add(const DllProc *pDllProc);
 };
 extern CImportAddrSchedule *pobj_ImportAddrSchedule;
@@ -81 +84 @@
 class CSubAddrSchedule:public CSchedule{
 public:
-    UserProc **ppsi;
+    const UserProc **ppsi;
     BOOL *pbCall;
 
@@ -87 +90 @@
     ~CSubAddrSchedule();
 
-    void add(UserProc *pUserProc,BOOL bCall);
+    void add(const UserProc *pUserProc,BOOL bCall);
 };
 extern CSubAddrSchedule *pobj_SubAddrSchedule;

trunk/abdev/BasicCompiler_Common/ParamImpl.cpp

@@ +1 @@
+#include "stdafx.h"
+
 #include <Program.h>
 
@@ -197 +199 @@
 }
 
-UserProc *ParamImpl::_OverloadSolution( const char *name, std::vector<UserProc *> &subs, bool isEnabledReturnType ){
+const UserProc *ParamImpl::_OverloadSolution( const char *name, std::vector<const UserProc *> &subs, bool isEnabledReturnType ){
     int sw=0;
-    UserProc *pUserProc;
+    const UserProc *pUserProc;
     pUserProc=0;
 
     for( int level=OVERLOAD_MIN_LEVEL; level<=OVERLOAD_MAX_LEVEL; level++ ){
 
-        BOOST_FOREACH( UserProc *pTempUserProc, subs ){
+        BOOST_FOREACH( const UserProc *pTempUserProc, subs ){
 
             if(EvaluateOverloadScore( level, pTempUserProc->Params(), isEnabledReturnType?pTempUserProc->ReturnType():Type() )){
@@ -237 +239 @@
 
     if(!sw){
-        BOOST_FOREACH( UserProc *pTempUserProc, subs ){
+        BOOST_FOREACH( const UserProc *pTempUserProc, subs ){
 
             //エラーチェック
@@ -261 +263 @@
     return pUserProc;
 }
-UserProc *ParamImpl::OverloadSolution( const char *name, std::vector<UserProc *> &subs, bool isEnabledReturnType ){
+const UserProc *ParamImpl::OverloadSolution( const char *name, std::vector<const UserProc *> &subs, bool isEnabledReturnType ){
     trace_for_overload( "" );
     trace_for_overload( "■■■■■■■■■■■■■■■■■■" );
     trace_for_overload( "■■■ オーバーロード解決(" << name << ")" );
 
-    UserProc *result = _OverloadSolution( name, subs, isEnabledReturnType );
+    const UserProc *result = _OverloadSolution( name, subs, isEnabledReturnType );
 
     trace_for_overload( "■■■ ここまで" );

trunk/abdev/BasicCompiler_Common/RSrcSection.cpp

@@ +1 @@
+#include "stdafx.h"
+
 #include "../BasicCompiler_Common/common.h"
 

trunk/abdev/BasicCompiler_Common/Resource.cpp

@@ +1 @@
+#include "stdafx.h"
+
 #include <jenga/include/smoothie/LexicalAnalysis.h>
+
+#include <Type.h>
 
 #include "common.h"

trunk/abdev/BasicCompiler_Common/StrOperation.cpp

@@ +1 @@
+#include "stdafx.h"
+
 #include <jenga/include/smoothie/LexicalAnalysis.h>
+#include <jenga/include/smoothie/Source.h>
 
 #include "../BasicCompiler_Common/common.h"
@@ -406 +409 @@
     }
 }
-void GetCalcName(int idCalc,char *name){
-    switch(idCalc){
-        case CALC_XOR:
-            lstrcpy(name,"xor");
-            break;
-        case CALC_OR:
-            lstrcpy(name,"or");
-            break;
-        case CALC_AND:
-            lstrcpy(name,"and");
-            break;
-        case CALC_NOT:
-            lstrcpy(name,"Not");
-            break;
-
-        case CALC_PE:
-            lstrcpy(name,"<=");
-            break;
-        case CALC_QE:
-            lstrcpy(name,">=");
-            break;
-        case CALC_NOTEQUAL:
-            lstrcpy(name,"<>");
-            break;
-        case CALC_SUBSITUATION:
-        case CALC_EQUAL:
-            lstrcpy(name,"=");
-            break;
-        case CALC_P:
-            lstrcpy(name,"<");
-            break;
-        case CALC_Q:
-            lstrcpy(name,">");
-            break;
-
-        case CALC_SHL:
-            lstrcpy(name,"<<");
-            break;
-        case CALC_SHR:
-            lstrcpy(name,">>");
-            break;
-        case CALC_ADDITION:
-            lstrcpy(name,"+");
-            break;
-        case CALC_SUBTRACTION:
-            lstrcpy(name,"-");
-            break;
-        case CALC_MOD:
-            lstrcpy(name,"mod");
-            break;
-        case CALC_PRODUCT:
-            lstrcpy(name,"*");
-            break;
-        case CALC_QUOTIENT:
-            lstrcpy(name,"/");
-            break;
-        case CALC_INTQUOTIENT:
-            lstrcpy(name,"\\");
-            break;
-        case CALC_AS:
-            lstrcpy(name,"As");
-            break;
-        case CALC_BYVAL:
-            lstrcpy(name,"ByVal");
-            break;
-        case CALC_MINUSMARK:
-            lstrcpy(name,"-");
-            break;
-        case CALC_POWER:
-            lstrcpy(name,"^");
-            break;
-
-        case CALC_ARRAY_GET:
-            lstrcpy(name,"[]");
-            break;
-        case CALC_ARRAY_SET:
-            lstrcpy(name,"[]=");
-            break;
-    }
+const std::string &FormatEscapeSequenceStringToDefaultString( const std::string &source )
+{
+    int maxLength = (int)source.size();
+
+    char *temporary = (char *)malloc( source.size() + 8192 );
+    lstrcpy( temporary, source.c_str() );
+
+    for( int i=0; i<maxLength-1; i++ )
+    {
+        if( temporary[i] == 1 )
+        {
+            char temp2[255];
+            GetDefaultNameFromES( temporary[i+1], temp2 );
+            if( i>0 )
+            {
+                char temp3[255];
+                wsprintf( temp3, " %s", temp2 );
+                lstrcpy( temp2, temp3 );
+            }
+            if( i<maxLength-2 )
+            {
+                lstrcat( temp2, " " );
+            }
+
+            int length = lstrlen( temp2 );
+            SlideString( temporary + i+2, length-2 );
+            memcpy( temporary + i, temp2, length );
+            maxLength = lstrlen( temporary );
+        }
+    }
+
+    static std::string resultStr = "";
+    resultStr = temporary;
+
+    free( temporary );
+
+    return resultStr;
 }
 

trunk/abdev/BasicCompiler_Common/Subroutine.cpp

@@ +1 @@
+#include "stdafx.h"
+
 #include <jenga/include/smoothie/Smoothie.h>
 #include <jenga/include/smoothie/LexicalAnalysis.h>
 
 #include <Compiler.h>
-#include <ProcedureImpl.h>
+#include <Procedure.h>
 #include <NamespaceSupporter.h>
 
@@ -103 +105 @@
         /////////////////////
 
-        UserProc *pUserProc = (UserProc *)pProc;
+        const UserProc *pUserProc = (const UserProc *)pProc;
 
         //オブジェクト名を取得
@@ -115 +117 @@
         ////////////////////////
 
-        std::vector<UserProc *> subs;
+        std::vector<const UserProc *> subs;
         GetOverloadSubHash(fullCallName,subs);
         if(subs.size()){
@@ -194 +196 @@
 
     //オーバーロード用の関数リストを作成
-    std::vector<UserProc *> subs;
+    std::vector<const UserProc *> subs;
     GetOverloadSubHash(VarName,subs);
     if(subs.size()==0){
@@ -210 +212 @@
 
     //オーバーロードを解決
-    UserProc *pUserProc;
-    pUserProc=OverloadSolutionWithStrParam(VarName,subs,Parameter,ObjectName);
+    const UserProc *pUserProc = OverloadSolutionWithStrParam(VarName,subs,Parameter,ObjectName);
 
     if(pUserProc){
@@ -238 +239 @@
 
     //オーバーロード用の関数リストを作成
-    std::vector<UserProc *> subs;
+    std::vector<const UserProc *> subs;
     GetOverloadSubHash(VarName,subs);
     if(subs.size()==0){
@@ -254 +255 @@
 
     //オーバーロードを解決
-    UserProc *pUserProc;
-    pUserProc=OverloadSolutionWithStrParam(VarName,subs,Parameter,ObjectName);
+    const UserProc *pUserProc = OverloadSolutionWithStrParam(VarName,subs,Parameter,ObjectName);
 
     if(pUserProc){
@@ -266 +266 @@
 //インデクサ（getter）の戻り値を取得
 bool GetReturnTypeOfIndexerGetterProc( const CClass &objClass, Type &resultType ){
-    vector<UserProc *> subs;
+    vector<const UserProc *> subs;
     objClass.GetMethods().Enum( CALC_ARRAY_GET, subs );
     if( subs.size() == 0 ){
@@ -369 +369 @@
 
     // オブジェクトを生成
-    DllProc *pDllProc = new DllProcImpl( namespaceScopes, procName, kind, isCdecl, dllFileName, alias );
+    DllProc *pDllProc = new DllProc( namespaceScopes, procName, kind, isCdecl, dllFileName, alias );
 
     // パラメータを解析
@@ -429 +429 @@
 }
 
-GlobalProc *AddSubData( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, char *buffer,int nowLine,bool isVirtual,CClass *pobj_c, bool isStatic){
-    int i2,i3;
-    char temporary[8192];
-
-    int i=1;
-
-    Procedure::Kind kind = Procedure::Sub;
-    bool isMacro = false;
-    if(buffer[i]==ESC_FUNCTION) kind = Procedure::Function;
-    if(buffer[i]==ESC_MACRO){
-        isMacro = true;
-    }
-
-    i++;
-
-    bool isCdecl = false;
-    bool isExport = false;
-    while(1){
-        if(buffer[i]==1&&buffer[i+1]==ESC_CDECL&& isCdecl == false ){
-            isCdecl = true;
-
-            i+=2;
-        }
-        else if(buffer[i]==1&&buffer[i+1]==ESC_EXPORT&& isExport == false ){
-            isExport = true;
-
-            i+=2;
-        }
-        else break;
-    }
-
-    i2=0;
-    if(buffer[i]==1&&buffer[i+1]==ESC_OPERATOR){
-        if(!pobj_c){
-            SetError(126,NULL,nowLine);
-            return 0;
-        }
-
-        //オペレータの場合
-        temporary[i2++]=buffer[i++];
-        temporary[i2++]=buffer[i++];
-
-        int iCalcId;
-        if(buffer[i]=='='&&buffer[i+1]=='='){
-            iCalcId=CALC_EQUAL;
-            i3=2;
-        }
-        else if(buffer[i]=='='){
-            iCalcId=CALC_SUBSITUATION;
-            i3=1;
-        }
-        else if(buffer[i]=='('){
-            iCalcId=CALC_AS;
-            i3=0;
-        }
-        else if(buffer[i]=='['&&buffer[i+1]==']'&&buffer[i+2]=='='){
-            iCalcId=CALC_ARRAY_SET;
-            i3=3;
-        }
-        else if(buffer[i]=='['&&buffer[i+1]==']'){
-            iCalcId=CALC_ARRAY_GET;
-            i3=2;
-        }
-        else{
-            iCalcId=GetCalcId(buffer+i,&i3);
-            i3++;
-        }
-        if(!iCalcId){
-            SetError(1,NULL,nowLine);
-            return 0;
-        }
-        temporary[i2++]=iCalcId;
-        temporary[i2]=0;
-
-        i+=i3;
-    }
-    else{
-        if(pobj_c){
-            //クラスメンバの場合、デストラクタには~が付くことを考慮
-            if(buffer[i]=='~'){
-                temporary[i2]='~';
-                i++;
-                i2++;
-            }
-        }
-
-        for(;;i++,i2++){
-            if(!IsVariableChar(buffer[i])){
-                temporary[i2]=0;
-                break;
-            }
-            temporary[i2]=buffer[i];
-        }
-    }
-
-    if( isMacro ){
-        //大文字に変換
-        CharUpper(temporary);
-
-        //マクロ関数の場合は名前リストに追加
-        extern char **ppMacroNames;
-        extern int MacroNum;
-        ppMacroNames=(char **)HeapReAlloc(hHeap,0,ppMacroNames,(MacroNum+1)*sizeof(char *));
-        ppMacroNames[MacroNum]=(char *)HeapAlloc(hHeap,0,lstrlen(temporary)+1);
-        lstrcpy(ppMacroNames[MacroNum],temporary);
-        MacroNum++;
-    }
-
-    if(!pobj_c){
-        //クラスメンバ以外の場合のみ
-        //重複チェック
-
-        if(GetDeclareHash(temporary)){
-            SetError(15,temporary,nowLine);
-            return 0;
-        }
-    }
-
-    extern int SubNum;
-    SubNum++;
-
-    GlobalProc *pUserProc = new GlobalProc( namespaceScopes, importedNamespaces, temporary, kind, isMacro, isCdecl, isExport );
-    pUserProc->SetParentClass( pobj_c );
-    if( Smoothie::isFullCompile ){
-        // すべての関数・メソッドをコンパイルする
-        pUserProc->Using();
-    }
-
-    //ID
-    static int id_base=0;
-    pUserProc->id = (id_base++);
-
-    if(isExport){
-        pUserProc->Using();
-    }
-
-    // パラメータを解析
-    // ※第1パラメータにに指定するデータの例："( s As String ) As String"
-    pUserProc->SetParamsAndReturnType( buffer + i, nowLine, isStatic );
-
-    pUserProc->_paramStr = buffer + i;
-
-
-    /////////////////////////////////
-    // ハッシュデータに追加
-    /////////////////////////////////
-
-    int key;
-    key=hash_default(pUserProc->GetName().c_str());
-
-    extern GlobalProc **ppSubHash;
-    if(ppSubHash[key]){
-        GlobalProc *psi2;
-        psi2=ppSubHash[key];
-        while(1){
-            if(pobj_c==psi2->GetParentClassPtr()){
-                //重複エラーチェックを行う
-                if( pUserProc->IsEqualSymbol( *psi2 ) ){
-                    if( psi2->Params().Equals( pUserProc->Params() ) ){
-                        SetError(15,pUserProc->GetName().c_str(),nowLine);
-                        return 0;
-                    }
-                }
-            }
-
-            if(psi2->pNextData==0) break;
-            psi2=psi2->pNextData;
-        }
-        psi2->pNextData=pUserProc;
-    }
-    else{
-        ppSubHash[key]=pUserProc;
-    }
-
-    return pUserProc;
-}
-
-void GetSubInfo(void){  //サブルーチン情報を取得
+void UserProcs::CollectUserProcs( const BasicSource &source, UserProcs &userProcs )
+{
     extern HANDLE hHeap;
-    extern char *basbuf;
     int i,i2,i3;
     char temporary[8192];
@@ -617 +440 @@
 
     //サブルーチン（ユーザー定義）情報を初期化
-    extern GlobalProc **ppSubHash;
-    extern int SubNum;
-    ppSubHash=(GlobalProc **)HeapAlloc(hHeap,HEAP_ZERO_MEMORY,MAX_HASH*sizeof(GlobalProc *));
-    SubNum=0;
-
-    //マクロ関数の名前リストを初期化
-    extern char **ppMacroNames;
-    extern int MacroNum;
-    ppMacroNames=(char **)HeapAlloc(hHeap,0,1);
-    MacroNum=0;
+    userProcs.Clear();
 
     // 名前空間管理
@@ -640 +454 @@
         i++;
 
-        if(basbuf[i]==1&&(basbuf[i+1]==ESC_CLASS||basbuf[i+1]==ESC_INTERFACE)){
+        if(source[i]==1&&(source[i+1]==ESC_CLASS||source[i+1]==ESC_INTERFACE)){
             /*  Class ～ End Class
                 Interface ～ End Interface
                 を飛び越す           */
-            i3=GetEndXXXCommand(basbuf[i+1]);
+            i3=GetEndXXXCommand(source[i+1]);
             for(i+=2,i2=0;;i++,i2++){
-                if(basbuf[i]=='\0') break;
-                if(basbuf[i]==1&&basbuf[i+1]==(char)i3){
+                if(source[i]=='\0') break;
+                if(source[i]==1&&source[i+1]==(char)i3){
                     i++;
                     break;
                 }
             }
-            if(basbuf[i]=='\0') break;
-            continue;
-        }
-
-        if( basbuf[i] == 1 && basbuf[i+1] == ESC_NAMESPACE ){
+            if(source[i]=='\0') break;
+            continue;
+        }
+
+        if( source[i] == 1 && source[i+1] == ESC_NAMESPACE ){
             for(i+=2,i2=0;;i2++,i++){
-                if( IsCommandDelimitation( basbuf[i] ) ){
+                if( IsCommandDelimitation( source[i] ) ){
                     temporary[i2]=0;
                     break;
                 }
-                temporary[i2]=basbuf[i];
+                temporary[i2]=source[i];
             }
             namespaceScopes.push_back( temporary );
@@ -668 +482 @@
             continue;
         }
-        else if( basbuf[i] == 1 && basbuf[i+1] == ESC_ENDNAMESPACE ){
+        else if( source[i] == 1 && source[i+1] == ESC_ENDNAMESPACE ){
             if( namespaceScopes.size() <= 0 ){
                 SetError(12, "End Namespace", i );
@@ -679 +493 @@
             continue;
         }
-        else if( basbuf[i] == 1 && basbuf[i+1] == ESC_IMPORTS ){
+        else if( source[i] == 1 && source[i+1] == ESC_IMPORTS ){
             for(i+=2,i2=0;;i2++,i++){
-                if( IsCommandDelimitation( basbuf[i] ) ){
+                if( IsCommandDelimitation( source[i] ) ){
                     temporary[i2]=0;
                     break;
                 }
-                temporary[i2]=basbuf[i];
+                temporary[i2]=source[i];
             }
             if( !compiler.GetNamespaceSupporter().ImportsNamespace( temporary ) )
@@ -694 +508 @@
             continue;
         }
-        else if( basbuf[i] == 1 && basbuf[i+1] == ESC_CLEARNAMESPACEIMPORTED ){
+        else if( source[i] == 1 && source[i+1] == ESC_CLEARNAMESPACEIMPORTED ){
             importedNamespaces.clear();
             continue;
         }
 
-        if(basbuf[i]==1&&basbuf[i+1]==ESC_DECLARE){
+        if(source[i]==1&&source[i+1]==ESC_DECLARE){
             for(i+=2,i2=0;;i2++,i++){
-                if(basbuf[i]=='\n'){
+                if(source[i]=='\n'){
                     temporary[i2]=0;
                     break;
                 }
-                temporary[i2]=basbuf[i];
-                if(basbuf[i]=='\0') break;
+                temporary[i2]=source[i];
+                if(source[i]=='\0') break;
             }
             AddDeclareData(namespaceScopes,temporary,i);
@@ -712 +526 @@
             continue;
         }
-        if(basbuf[i]==1&&(basbuf[i+1]==ESC_SUB||basbuf[i+1]==ESC_FUNCTION||basbuf[i+1]==ESC_MACRO)){
-            char statementChar = basbuf[i+1];
+        if(source[i]==1&&(source[i+1]==ESC_SUB||source[i+1]==ESC_FUNCTION||source[i+1]==ESC_MACRO)){
+            char statementChar = source[i+1];
 
             for(i2=0;;i2++,i++){
-                if(IsCommandDelimitation(basbuf[i])){
+                if(IsCommandDelimitation(source[i])){
                     temporary[i2]=0;
                     break;
                 }
-                temporary[i2]=basbuf[i];
-                if(basbuf[i]=='\0') break;
-            }
-            AddSubData(namespaceScopes, importedNamespaces, temporary,i,0,0);
+                temporary[i2]=source[i];
+                if(source[i]=='\0') break;
+            }
+            userProcs.Add(namespaceScopes, importedNamespaces, temporary,i,false,NULL,false);
 
             /*  Sub ～ End Sub
@@ -731 +545 @@
             char endStatementChar = GetEndXXXCommand( statementChar );
             for(i2=0;;i++,i2++){
-                if( basbuf[i] == '\0' ) break;
-                if( basbuf[i] == 1 && basbuf[i+1] == endStatementChar ){
+                if( source[i] == '\0' ) break;
+                if( source[i] == 1 && source[i+1] == endStatementChar ){
                     i++;
                     break;
                 }
             }
-            if(basbuf[i]=='\0') break;
+            if(source[i]=='\0') break;
             continue;
         }
@@ -743 +557 @@
         //次の行
         for(;;i++){
-            if(IsCommandDelimitation(basbuf[i])) break;
-        }
-        if(basbuf[i]=='\0') break;
+            if(IsCommandDelimitation(source[i])) break;
+        }
+        if(source[i]=='\0') break;
     }
 
@@ -755 +569 @@
 
     sprintf(temporary,"%c%c_allrem()",1,ESC_SUB);
-    AddSubData( namespaceScopes, importedNamespaces, temporary,0,0,0);
+    userProcs.Add( namespaceScopes, importedNamespaces, temporary,0,false,NULL,false);
 
     sprintf(temporary,"%c%c_aullrem()",1,ESC_SUB);
-    AddSubData( namespaceScopes, importedNamespaces, temporary,0,0,0);
+    userProcs.Add( namespaceScopes, importedNamespaces, temporary,0,false,NULL,false);
 
     sprintf(temporary,"%c%c_allmul()",1,ESC_SUB);
-    AddSubData( namespaceScopes, importedNamespaces, temporary,0,0,0);
+    userProcs.Add( namespaceScopes, importedNamespaces, temporary,0,false,NULL,false);
 
     sprintf(temporary,"%c%c_alldiv()",1,ESC_SUB);
-    AddSubData( namespaceScopes, importedNamespaces, temporary,0,0,0);
+    userProcs.Add( namespaceScopes, importedNamespaces, temporary,0,false,NULL,false);
 
     sprintf(temporary,"%c%c_aulldiv()",1,ESC_SUB);
-    AddSubData( namespaceScopes, importedNamespaces, temporary,0,0,0);
+    userProcs.Add( namespaceScopes, importedNamespaces, temporary,0,false,NULL,false);
 
     sprintf(temporary,"%c%c_allshl()",1,ESC_SUB);
-    AddSubData( namespaceScopes, importedNamespaces, temporary,0,0,0);
+    userProcs.Add( namespaceScopes, importedNamespaces, temporary,0,false,NULL,false);
 
     sprintf(temporary,"%c%c_allshr()",1,ESC_SUB);
-    AddSubData( namespaceScopes, importedNamespaces, temporary,0,0,0);
+    userProcs.Add( namespaceScopes, importedNamespaces, temporary,0,false,NULL,false);
 
     sprintf(temporary,"%c%c_aullshr()",1,ESC_SUB);
-    AddSubData( namespaceScopes, importedNamespaces, temporary,0,0,0);
+    userProcs.Add( namespaceScopes, importedNamespaces, temporary,0,false,NULL,false);
 
     sprintf(temporary,"%c%c_System_InitStaticLocalVariables()",1,ESC_SUB);
-    AddSubData( namespaceScopes, importedNamespaces, temporary,0,0,0);
-}
-void Delete_si(GlobalProc *pUserProc){
-    if(pUserProc->pNextData) Delete_si(pUserProc->pNextData);
-    delete pUserProc;
-}
-void DeleteSubInfo(GlobalProc **ppSubHash,char **ppMacroNames,int MacroNum){    //サブルーチン情報のメモリ解放
-    int i;
-    for(i=0;i<MAX_HASH;i++){
-        if(!ppSubHash[i]) continue;
-
-        Delete_si(ppSubHash[i]);
-    }
-    HeapDefaultFree(ppSubHash);
-
-    //マクロの名前リスト
-    if(ppMacroNames){
-        for(i=0;i<MacroNum;i++){
-            HeapDefaultFree(ppMacroNames[i]);
-        }
-        HeapDefaultFree(ppMacroNames);
-    }
+    userProcs.Add( namespaceScopes, importedNamespaces, temporary,0,false,NULL,false);
 }
 void Delete_di(DllProc *pDllProc){
@@ -820 +613 @@
 
 bool IsNeedProcCompile(){
-    for(int i2=0;i2<MAX_HASH;i2++){
-        extern GlobalProc **ppSubHash;
-        GlobalProc *pUserProc=ppSubHash[i2];
-        while(pUserProc){
-            if( pUserProc->IsUsing() && pUserProc->IsCompiled() == false ){
-                return true;
-            }
-
-            pUserProc=pUserProc->pNextData;
+    compiler.GetMeta().GetUserProcs().Iterator_Reset();
+    while( compiler.GetMeta().GetUserProcs().Iterator_HasNext() )
+    {
+        UserProc *pUserProc = compiler.GetMeta().GetUserProcs().Iterator_GetNext();
+        if( pUserProc->IsUsing() && pUserProc->IsCompiled() == false ){
+            return true;
         }
     }

trunk/abdev/BasicCompiler_Common/VarList.cpp

@@ +1 @@
+#include "stdafx.h"
+
 #include <jenga/include/smoothie/Smoothie.h>
+
+#include <Compiler.h>
 
 #include "../BasicCompiler_Common/common.h"
@@ -9 +13 @@
 HWND hVarTree_Global,hVarTree_Local,hVarTree_This;
 
-int VarList_Array(HWND hVarTree,HTREEITEM hParent,LONG_PTR offset,const Type &type,const int *SubScripts);
+int VarList_Array(HWND hVarTree,HTREEITEM hParent,LONG_PTR offset,const Type &type,const Subscripts &subscripts);
 void VarList_Member(HWND hVarTree,HTREEITEM hParent,LONG_PTR pTopOffset,const CClass &objClass,BOOL bPtr);
 void VarList_Insert(HWND hVarTree,TV_INSERTSTRUCT *lptv,const char *VarName,const Type &type,LONG_PTR offset){
@@ -180 +184 @@
         offset=objClass.GetMemberOffset( pMember->GetName().c_str(), &i2 );
 
-        if(pMember->SubScripts[0]!=-1){
+        if( pMember->GetSubscripts().size() > 0 ){
             //構造体内の配列
             sprintf(VarData,"%s %s(&H%X)",VarName,STRING_ARRAY,pTopOffset+offset);
@@ -187 +191 @@
             hParent=TreeView_InsertItem(hVarTree,&tv);
 
-            VarList_Array(hVarTree,hParent,
-                pTopOffset+offset,
+            VarList_Array(
+                hVarTree,
+                hParent,
+                pTopOffset + offset,
                 pMember->GetType(),
-                pMember->SubScripts);
+                pMember->GetSubscripts()
+            );
         }
         else{
@@ -202 +209 @@
     }
 }
-int VarList_Array(HWND hVarTree,HTREEITEM hParent,LONG_PTR offset,const Type &type,const int *SubScripts ){
+int VarList_Array(HWND hVarTree,HTREEITEM hParent,LONG_PTR offset,const Type &type, const Subscripts &subscripts ){
     int i,i2,i3,ElementNum,MemCounter,UseCount[255];
     char temporary[VN_SIZE],temp2[DIGIT_SIZE];
@@ -213 +220 @@
     tv.item.pszText=temporary;
 
-    for(i=0;i<255;i++){
-        if(SubScripts[i]==-1) break;
+    for(i=0;i<(int)subscripts.size();i++){
         UseCount[i]=0;
     }
@@ -221 +227 @@
     while(1){
         UseCount[i]++;
-        for(ElementNum=0;SubScripts[i-ElementNum]<UseCount[i-ElementNum];ElementNum++){
+        for(ElementNum=0;subscripts[i-ElementNum]<UseCount[i-ElementNum];ElementNum++){
             UseCount[i-ElementNum]=0;
             if(i-ElementNum-1<0) return MemCounter;
@@ -268 +274 @@
     extern int MemPos_RWSection;
 
-    BOOST_FOREACH( Variable *pVar, globalVars ){
+    BOOST_FOREACH( Variable *pVar, compiler.GetMeta().GetGlobalVars() ){
 
         //スコープ外の場合は無視
-        if(pVar->ScopeLevel!=0){
-            if(rva_to_real(pVar->ScopeStartAddress) <= pobj_dti->lplpObp[0]  &&
-                pobj_dti->lplpObp[0] < rva_to_real(pVar->ScopeEndAddress)){
+        if(pVar->GetScopeLevel()!=0){
+            if(rva_to_real(pVar->GetScopeStartAddress()) <= pobj_dti->lplpObp[0]  &&
+                pobj_dti->lplpObp[0] < rva_to_real(pVar->GetScopeEndAddress())){
                 //範囲内
             }
@@ -304 +310 @@
                 pVar->GetName().c_str(),
                 STRING_ARRAY,
-                ImageBase+MemPos_RWSection+pVar->offset);
+                ImageBase+MemPos_RWSection+pVar->GetOffsetAddress());
             tv.item.iImage=0;
             tv.item.iSelectedImage=0;
             hParent=TreeView_InsertItem(hVarTree_Global,&tv);
 
-            VarList_Array(hVarTree_Global,hParent,
-                (LONG_PTR)(ImageBase+MemPos_RWSection+pVar->offset),
-                *pVar,
-                pVar->GetSubScriptsPtr());
+            VarList_Array(
+                hVarTree_Global,
+                hParent,
+                (LONG_PTR)(ImageBase+MemPos_RWSection + pVar->GetOffsetAddress()),
+                pVar->GetType(),
+                pVar->GetSubscripts()
+            );
         }
         else{
@@ -318 +327 @@
                 &tv,
                 pVar->GetName().c_str(),
-                *pVar,
-                (LONG_PTR)(ImageBase+MemPos_RWSection+pVar->offset));
+                pVar->GetType(),
+                (LONG_PTR)(ImageBase+MemPos_RWSection+pVar->GetOffsetAddress()));
         }
     }
 }
 void RefreshLocalVar(void){
-    int i2,i3,sw;
+    int i2;
     char temporary[VN_SIZE];
     TV_INSERTSTRUCT tv;
@@ -347 +356 @@
     if(pobj_dti->lplpSpBase[i2]==0) return;
 
-    extern GlobalProc **ppSubHash;
-    GlobalProc *pUserProc;
-    for(i3=0,sw=0;i3<MAX_HASH;i3++){
-        pUserProc=ppSubHash[i3];
-        while(pUserProc){
-            if(rva_to_real(pUserProc->beginOpAddress) <= pobj_dti->lplpObp[i2]  &&
-                pobj_dti->lplpObp[i2] < rva_to_real(pUserProc->endOpAddress)){
-                sw=1;
-                break;
-            }
-
-            pUserProc=pUserProc->pNextData;
-        }
-        if(sw) break;
+    UserProc *pUserProc = NULL;
+    compiler.GetMeta().GetUserProcs().Iterator_Reset();
+    while( compiler.GetMeta().GetUserProcs().Iterator_HasNext() )
+    {
+        pUserProc = compiler.GetMeta().GetUserProcs().Iterator_GetNext();
+        if(rva_to_real(pUserProc->GetBeginOpAddress()) <= pobj_dti->lplpObp[i2]  &&
+            pobj_dti->lplpObp[i2] < rva_to_real(pUserProc->GetEndOpAddress())){
+            break;
+        }
     }
     if(!pUserProc) return;
 
-    BOOST_FOREACH( Variable *pVar, pUserProc->localVars ){
+    BOOST_FOREACH( Variable *pVar, pUserProc->GetLocalVars() ){
 
         //スコープ外の場合は無視
-        if(pVar->ScopeLevel!=0){
-            if(rva_to_real(pVar->ScopeStartAddress) <= pobj_dti->lplpObp[i2]  &&
-                pobj_dti->lplpObp[i2] < rva_to_real(pVar->ScopeEndAddress)){
+        if(pVar->GetScopeLevel()!=0){
+            if(rva_to_real(pVar->GetScopeStartAddress()) <= pobj_dti->lplpObp[i2]  &&
+                pobj_dti->lplpObp[i2] < rva_to_real(pVar->GetScopeEndAddress())){
                 //範囲内
             }
@@ -382 +386 @@
                 pVar->GetName().c_str(),
                 STRING_ARRAY,
-                pobj_dti->lplpSpBase[i2]+pVar->offset);
+                pobj_dti->lplpSpBase[i2]+pVar->GetOffsetAddress());
             tv.item.iImage=0;
             tv.item.iSelectedImage=0;
             hParent=TreeView_InsertItem(hVarTree_Local,&tv);
 
-            VarList_Array(hVarTree_Local,hParent,
-                pobj_dti->lplpSpBase[i2]+pVar->offset,
-                *pVar,
-                pVar->GetSubScriptsPtr());
+            VarList_Array(
+                hVarTree_Local,
+                hParent,
+                pobj_dti->lplpSpBase[i2] + pVar->GetOffsetAddress(),
+                pVar->GetType(),
+                pVar->GetSubscripts()
+            );
         }
         else{
-            offset=pobj_dti->lplpSpBase[i2]+pVar->offset;
+            offset=pobj_dti->lplpSpBase[i2]+pVar->GetOffsetAddress();
             if(pVar->IsRef()){
                 ReadProcessMemory(hDebugProcess,(void *)offset,&lpData,sizeof(LONG_PTR),&accessBytes);
@@ -400 +407 @@
             VarList_Insert(hVarTree_Local,&tv,
                 pVar->GetName().c_str(),
-                *pVar,
+                pVar->GetType(),
                 offset);
         }
@@ -416 +423 @@
     //Thisポインタを取得
     LONG_PTR pThis;
-    const Variable *pVar = pUserProc->localVars.Find( Symbol( "_System_LocalThis" ) );
+    const Variable *pVar = pUserProc->GetLocalVars().Find( Symbol( "_System_LocalThis" ) );
     if( !pVar ){
         return;
     }
-    lpData=pobj_dti->lplpSpBase[i2]+pVar->offset;
+    lpData=pobj_dti->lplpSpBase[i2]+pVar->GetOffsetAddress();
     ReadProcessMemory(hDebugProcess,(void *)lpData,&pThis,sizeof(LONG_PTR),&accessBytes);
 
@@ -426 +433 @@
         offset=pUserProc->GetParentClassPtr()->GetMemberOffset( pMember->GetName().c_str(),&i2);
 
-        if(pMember->SubScripts[0]!=-1){
+        if( pMember->GetSubscripts().size() > 0 ){
             //配列
             sprintf(temporary,"%s %s(&H%X)",
@@ -436 +443 @@
             hParent=TreeView_InsertItem(hVarTree_This,&tv);
 
-            VarList_Array(hVarTree_This,hParent,
-                pThis+offset,
+            VarList_Array(
+                hVarTree_This,
+                hParent,
+                pThis + offset,
                 pMember->GetType(),
-                pMember->SubScripts);
+                pMember->GetSubscripts()
+            );
         }
         else{
@@ -590 +600 @@
 
     //プロシージャ コンボボックス
-    extern GlobalProc **ppSubHash;
-    GlobalProc *pUserProc;
-    int sw;
     SendMessage(hProcCombo,CB_RESETCONTENT,0,0);
     for(i2=pobj_dti->iProcLevel;i2>=0;i2--){
-        for(i3=0,sw=0;i3<MAX_HASH;i3++){
-            pUserProc=ppSubHash[i3];
-            while(pUserProc){
-                if(rva_to_real(pUserProc->beginOpAddress) <= pobj_dti->lplpObp[i2]  &&
-                    pobj_dti->lplpObp[i2] < rva_to_real(pUserProc->endOpAddress)){
-                        lstrcpy(temporary,pUserProc->GetName().c_str());
-                        sw=1;
-                        break;
-                }
-                pUserProc=pUserProc->pNextData;
-            }
-            if(sw) break;
+
+        UserProc *pUserProc = NULL;
+        compiler.GetMeta().GetUserProcs().Iterator_Reset();
+        while( compiler.GetMeta().GetUserProcs().Iterator_HasNext() )
+        {
+            pUserProc = compiler.GetMeta().GetUserProcs().Iterator_GetNext();
+
+            if(rva_to_real(pUserProc->GetBeginOpAddress()) <= pobj_dti->lplpObp[i2]  &&
+                pobj_dti->lplpObp[i2] < rva_to_real(pUserProc->GetEndOpAddress()))
+            {
+                lstrcpy(temporary,pUserProc->GetName().c_str());
+                break;
+            }
         }
         if(!pUserProc){
@@ -675 +683 @@
 void InitVarList(DWORD dwThreadId){
     extern HWND hDebugWnd;
-    int i2,i3,i5;
+    int i2,i5;
     char temporary[255];
 
@@ -703 +711 @@
     ///////////////////////////////////////////////
 
-    int sw;
-
     i2=(int)SendDlgItemMessage(hDebugWnd,IDC_PROCCOMBO,CB_GETCURSEL,0,0);
     i2=pobj_dti->iProcLevel-i2;
 
     if(pobj_dti->lplpSpBase[i2]){
-        extern GlobalProc **ppSubHash;
-        GlobalProc *pUserProc;
-        for(i3=0,sw=0;i3<MAX_HASH;i3++){
-            pUserProc=ppSubHash[i3];
-            while(pUserProc){
-                if(rva_to_real(pUserProc->beginOpAddress) <= pobj_dti->lplpObp[i2]  &&
-                    pobj_dti->lplpObp[i2] < rva_to_real(pUserProc->endOpAddress)){
-                    sw=1;
-                    break;
-                }
-
-                pUserProc=pUserProc->pNextData;
-            }
-            if(sw) break;
-        }
-
+
+        UserProc *pUserProc = NULL;
+        compiler.GetMeta().GetUserProcs().Iterator_Reset();
+        while( compiler.GetMeta().GetUserProcs().Iterator_HasNext() )
+        {
+            pUserProc = compiler.GetMeta().GetUserProcs().Iterator_GetNext();
+
+            if(rva_to_real(pUserProc->GetBeginOpAddress()) <= pobj_dti->lplpObp[i2]  &&
+                pobj_dti->lplpObp[i2] < rva_to_real(pUserProc->GetEndOpAddress())){
+                break;
+            }
+        }
 
         if(pUserProc){
-            Smoothie::Temp::pCompilingClass = pUserProc->GetParentClassPtr();
+            compiler.pCompilingClass = pUserProc->GetParentClassPtr();
             UserProc::CompileStartForUserProc( pUserProc );
         }

trunk/abdev/BasicCompiler_Common/VariableOpe.cpp

@@ +1 @@
+#include "stdafx.h"
+
 #include <jenga/include/smoothie/Smoothie.h>
 #include <jenga/include/smoothie/LexicalAnalysis.h>
@@ -4 +6 @@
 #include <Compiler.h>
 #include <LexicalScopingImpl.h>
-#include <VariableImpl.h>
+#include <Variable.h>
 #include <NamespaceSupporter.h>
 
@@ -247 +249 @@
 
 
-void GetArrange(char *variable,char *variAnswer,int *SubScripts){
+void GetArrange(char *variable,char *variAnswer, Subscripts &subscripts ){
     extern int cp;
-    int i,i2,i3,i4;
+    int i,i2,i4;
     double dbl;
     _int64 i64data;
@@ -261 +263 @@
 
             variAnswer[i]=0;
-            for(i++,i2=0,i3=0;;i++,i2++){
+            for(i++,i2=0;;i++,i2++){
                 if(variable[i]==','){
                     temporary[i2]=0;
@@ -274 +276 @@
                     }
 
-                    if(i64data<0){
+                    if(i64data<0)
+                    {
                         //error
-                        SubScripts[i3]=0;
+                        subscripts.push_back( 0 );
                     }
-                    else SubScripts[i3]=(int)i64data;
-                    i3++;
+                    else
+                    {
+                        subscripts.push_back( (int)i64data );
+                    }
                     i2=-1;
                     continue;
@@ -299 +304 @@
                     temporary[i2]=0;
                     if(i2==0){
-                        SubScripts[i3]=-2;
+                        subscripts.push_back( -2 );
                         break;
                     }
@@ -314 +319 @@
                     if(i64data<0){
                         //error
-                        SubScripts[i3]=0;
+                        subscripts.push_back( 0 );
                     }
-                    else SubScripts[i3]=(int)i64data;
-                    SubScripts[i3+1]=-1;
+                    else
+                    {
+                        subscripts.push_back( (int)i64data );
+                    }
                     break;
                 }
@@ -330 +337 @@
         variAnswer[i]=variable[i];
         if(variable[i]=='\0'){
-            SubScripts[0]=-1;
             break;
         }
@@ -337 +343 @@
 
 
-BOOL GetVarFormatString(char *buffer,char *array,char *array2,char *NestMember,CClass::RefType &refType){
+BOOL GetVarFormatString(char *buffer,char *array,char *array2,char *NestMember,ReferenceKind &refType){
     extern int cp;
     int i,i2,i3;
@@ -403 +409 @@
         if(buffer[i]=='.'){
             lstrcpy(NestMember,buffer+i+1);
-            refType = CClass::Dot;
+            refType = RefDot;
             buffer[i]=0;
             break;
@@ -409 +415 @@
         if(buffer[i]==1&&buffer[i+1]==ESC_PSMEM){
             lstrcpy(NestMember,buffer+i+2);
-            refType = CClass::Pointer;
+            refType = RefPointer;
             buffer[i]=0;
             break;
@@ -459 +465 @@
 }
 
-int JumpSubScripts(const int *ss){
+int JumpSubScripts( const Subscripts &subscripts ){
     //DIMで定義された並んだ配列の数だけアドレスを進める
-    int i,i2;
-    for(i=0,i2=1;i<255;i++){
-        if(ss[i]==-1) break;
-        i2*=ss[i]+1;
+    int i, i2;
+    for( i=0,i2=1; i<(int)subscripts.size(); i++ ){
+        i2 *= subscripts[i] + 1;
     }
     return i2;
@@ -478 +483 @@
     char lpPtrOffset[VN_SIZE];      //第2次配列
     char NestMember[VN_SIZE];   //入れ子メンバ
-    CClass::RefType refType = CClass::Non;
+    ReferenceKind refType = RefNon;
     lstrcpy(VarName,lpszMember);
     if(!GetVarFormatString(VarName,array,lpPtrOffset,NestMember,refType)) return false;
@@ -496 +501 @@
 
     //アクセシビリティをチェック
-    if( &objClass == Smoothie::Temp::pCompilingClass ){
+    if( &objClass == compiler.pCompilingClass ){
         //同一クラスオブジェクトの場合はプライベートアクセスを容認する
         if( pMember->IsNoneAccess() ){
@@ -519 +524 @@
     //ポインタ変数の場合
     if( resultType.IsPointer() ){
-        if(pMember->SubScripts[0]==-1){
+        if( pMember->GetSubscripts().size() == 0 ){
             lstrcpy(lpPtrOffset,array);
             array[0]=0;
@@ -531 +536 @@
     }
 
-    if( refType != CClass::Non ){
+    if( refType != RefNon ){
         //入れ子構造の場合
 
@@ -541 +546 @@
     }
 
-    if(array[0]==0&&pMember->SubScripts[0]!=-1){
+    if( array[0] == 0 && pMember->GetSubscripts().size() > 0 ){
         resultType.SetBasicType( resultType.GetBasicType() | FLAG_PTR );
         return true;
@@ -573 +578 @@
 
     // 先頭オブジェクトまたはクラス名と入れ子メンバに分割
-    CClass::RefType refType;
+    ReferenceKind refType;
     char member[VN_SIZE],array[VN_SIZE],lpPtrOffset[VN_SIZE];
     GetVarFormatString(simpleName,array,lpPtrOffset,member,refType);
@@ -587 +592 @@
 
     const Variable *pVar = NULL;
-    const int *pSubScripts;
 
     if( UserProc::IsLocalAreaCompiling() ){
@@ -594 +598 @@
         /////////////////
 
-        pVar = UserProc::CompilingUserProc().localVars.BackSearch( Symbol( VarName ) );
+        pVar = UserProc::CompilingUserProc().GetLocalVars().BackSearch( Symbol( VarName ) );
         if( pVar ){
             goto ok;
@@ -600 +604 @@
     }
 
-    if(Smoothie::Temp::pCompilingClass){
+    if(compiler.pCompilingClass){
         ///////////////////////
         // クラスメンバの参照
@@ -607 +611 @@
         if(lstrcmpi(variable,"This")==0){
             //Thisオブジェクト
-            resultType.SetType( DEF_OBJECT, Smoothie::Temp::pCompilingClass );
+            resultType.SetType( DEF_OBJECT, compiler.pCompilingClass );
             return true;
         }
@@ -620 +624 @@
 
             bool isFound = false;
-            BOOST_FOREACH( CMember *pMember, Smoothie::Temp::pCompilingClass->GetDynamicMembers() ){
+            BOOST_FOREACH( CMember *pMember, compiler.pCompilingClass->GetDynamicMembers() ){
                 if( pMember->GetName() == VarName ){
                     isFound = true;
@@ -629 +633 @@
         }
 
-        return GetMemberType(*Smoothie::Temp::pCompilingClass,variable,resultType,1,isErrorEnabled);
+        return GetMemberType(*compiler.pCompilingClass,variable,resultType,1,isErrorEnabled);
     }
 
@@ -643 +647 @@
         GetNowStaticVarFullName(VarName,temporary);
 
-        pVar = globalVars.Find( Symbol( temporary ) );
+        pVar = compiler.GetMeta().GetGlobalVars().Find( Symbol( temporary ) );
         if( pVar ){
             goto ok;
@@ -659 +663 @@
         char tempArray[VN_SIZE];
         {
-            CClass::RefType refType;
+            ReferenceKind refType;
             GetVarFormatString(temporary,tempArray,lpPtrOffset,tempMember,refType);
         }
@@ -672 +676 @@
         sprintf(temp2,"%s.%s",VarName,temporary);
 
-        pVar = globalVars.Find( Symbol( temp2 ) );
+        pVar = compiler.GetMeta().GetGlobalVars().Find( Symbol( temp2 ) );
         if( pVar ){
             lstrcpy(member,tempMember);
@@ -680 +684 @@
     }
 
-    if(Smoothie::Temp::pCompilingClass){
+    if(compiler.pCompilingClass){
         //自身のクラスから静的メンバを参照する場合
         char temp2[VN_SIZE];
-        sprintf(temp2,"%s.%s",Smoothie::Temp::pCompilingClass->GetName().c_str(),VarName);
-
-        pVar = globalVars.Find( Symbol( temp2 ) );
+        sprintf(temp2,"%s.%s",compiler.pCompilingClass->GetName().c_str(),VarName);
+
+        pVar = compiler.GetMeta().GetGlobalVars().Find( Symbol( temp2 ) );
         if( pVar ){
             goto ok;
@@ -696 +700 @@
     ////////////////////
 
-    pVar = globalVars.BackSearch( Symbol( VarName ) );
+    pVar = compiler.GetMeta().GetGlobalVars().BackSearch( Symbol( VarName ) );
     if( pVar ){
         goto ok;
@@ -708 +712 @@
 
     //ポインタ変数の場合
-    if( pVar->IsPointer() ){
+    if( pVar->GetType().IsPointer() ){
         if( !pVar->IsArray() ){
             lstrcpy(lpPtrOffset,array);
@@ -721 +725 @@
     }
 
-    resultType = (*pVar);
-    pSubScripts=pVar->GetSubScriptsPtr();
-
+    resultType = pVar->GetType();
 
     if(member[0]){
@@ -732 +734 @@
     }
 
-    if(array[0]==0&&pSubScripts[0]!=-1){
+    if( array[0] == 0 && pVar->GetSubscripts().size() > 0 ){
         //配列の先頭ポインタを示す場合
         resultType.SetBasicType( resultType.GetBasicType() | FLAG_PTR );
@@ -751 +753 @@
 }
 
-bool GetVarOffsetReadOnly(const char *NameBuffer,RELATIVE_VAR *pRelativeVar,Type &resultType,int *pss ){
+bool GetVarOffsetReadOnly(const char *NameBuffer,RELATIVE_VAR *pRelativeVar,Type &resultType, Subscripts *pResultSubscripts ){
     //読み取り専用で変数へアクセス
     return GetVarOffset(
@@ -759 +761 @@
         pRelativeVar,
         resultType,
-        pss);
-}
-bool GetVarOffsetReadWrite(const char *NameBuffer,RELATIVE_VAR *pRelativeVar,Type &resultType,int *pss ){
+        pResultSubscripts
+    );
+}
+bool GetVarOffsetReadWrite(const char *NameBuffer,RELATIVE_VAR *pRelativeVar,Type &resultType, Subscripts *pResultSubscripts ){
     //読み書き両用で変数へアクセス
     return GetVarOffset(
@@ -769 +772 @@
         pRelativeVar,
         resultType,
-        pss);
+        pResultSubscripts
+    );
 }
 
@@ -776 +780 @@
 bool GetDimentionFormat( const char *buffer,
                         char *VarName,
-                        int *SubScripts,
+                        Subscripts &subscripts,
                         Type &type,
                         char *InitBuf,
@@ -924 +928 @@
     }
 
-    GetArrange(variable,VarName,SubScripts);
+    GetArrange(variable,VarName,subscripts);
     return true;
 }
@@ -934 +938 @@
     }
 
-    UserProc &proc = UserProc::CompilingUserProc();
+    const UserProc &proc = UserProc::CompilingUserProc();
 
     //Static識別
@@ -940 +944 @@
 
     //クラス名
-    if(Smoothie::Temp::pCompilingClass){
-        lstrcat(FullName,Smoothie::Temp::pCompilingClass->GetName().c_str());
+    if(compiler.pCompilingClass){
+        lstrcat(FullName,compiler.pCompilingClass->GetName().c_str());
         lstrcat(FullName,"%");
     }
@@ -951 +955 @@
     //ID
     char temp[255];
-    sprintf(temp,"%x",proc.id);
+    sprintf(temp,"%x",proc.GetId());
     lstrcat(FullName,temp);
     lstrcat(FullName,"%");
@@ -962 +966 @@
 
 
-void AddGlobalVariable( const char *name,int *SubScripts, const Type &type,const char *InitBuf,const char *ConstractParameter,DWORD dwFlag){
+void AddGlobalVariable( const char *name, const Subscripts &subscripts, const Type &type,const char *InitBuf,const char *ConstractParameter,DWORD dwFlag){
     /////////////////////////
     // グローバル変数を追加
@@ -969 +973 @@
     extern int AllGlobalVarSize;
 
-    if( globalVars.DuplicateCheck( Symbol( name ) ) ){
+    if( compiler.GetMeta().GetGlobalVars().DuplicateCheck( Symbol( name ) ) ){
         //２重定義のエラー
         SetError(15,name,cp);
@@ -977 +981 @@
     bool isConst = ( dwFlag & DIMFLAG_CONST ) ? true:false;
 
-    Variable *pVar = new VariableImpl( compiler.GetNamespaceSupporter().GetLivingNamespaceScopes(), name, type, isConst );
-
-    if( SubScripts[0] != -1 ){
+    Variable *pVar = new Variable( compiler.GetNamespaceSupporter().GetLivingNamespaceScopes(), name, type, isConst, false, ConstractParameter );
+
+    if( subscripts.size() > 0 ){
         //配列あり
-        pVar->SetArray( SubScripts );
-    }
-
-    //コンストラクタ用パラメータ
-    pVar->paramStrForConstructor = ConstractParameter;
+        pVar->SetArray( subscripts );
+    }
 
     //レキシカルスコープ
-    pVar->ScopeLevel=GetLexicalScopes().GetNowLevel();
-    pVar->ScopeStartAddress=GetLexicalScopes().GetStartAddress();
+    pVar->SetScopeLevel( GetLexicalScopes().GetNowLevel() );
+    pVar->SetScopeStartAddress( GetLexicalScopes().GetStartAddress() );
     pVar->bLiving=TRUE;
 
@@ -996 +997 @@
 
     // 変数を追加
-    globalVars.push_back( pVar );
+    compiler.GetMeta().GetGlobalVars().push_back( pVar );
 
     //アラインメントを考慮
     int alignment = 0;
-    if( pVar->IsStruct() ){
-        alignment = pVar->GetClass().iAlign;
+    if( pVar->GetType().IsStruct() ){
+        alignment = pVar->GetType().GetClass().iAlign;
     }
 
@@ -1013 +1014 @@
         }
 
-        pVar->offset=AllInitGlobalVarSize;
+        pVar->SetOffsetAddress( AllInitGlobalVarSize );
         AllInitGlobalVarSize += pVar->GetMemorySize();
     }
@@ -1025 +1026 @@
         }
 
-        pVar->offset=AllGlobalVarSize | 0x80000000;
+        pVar->SetOffsetAddress( AllGlobalVarSize | 0x80000000 );
         AllGlobalVarSize += pVar->GetMemorySize();
     }
@@ -1031 +1032 @@
     if(InitBuf[0]){
         int result = 0;
-        if( !pVar->IsObject() ){
+        if( !pVar->GetType().IsObject() ){
             //初期バッファにデータをセット
             extern BYTE *initGlobalBuf;
@@ -1039 +1040 @@
                 AllInitGlobalVarSize);
 
-            result = SetInitGlobalData(pVar->offset,
-                *pVar,
-                pVar->GetSubScriptsPtr(),
+            result = SetInitGlobalData(pVar->GetOffsetAddress(),
+                pVar->GetType(),
+                pVar->GetSubscripts(),
                 InitBuf);
         }
@@ -1070 +1071 @@
         const CMethod *method = type.GetClass().GetDestructorMethod();
         if( method ){
-            method->pUserProc->Using();
+            method->GetUserProc().Using();
         }
     }
@@ -1104 +1105 @@
 
         //定数と２重定義されていないる場合は抜け出す
-        if(CDBConst::obj.GetBasicType(VarName)){
+        if(compiler.GetMeta().GetGlobalConsts().GetBasicType(VarName)){
             return;
         }
 
         //定数マクロとして定義されている場合は抜け出す
-        if(GetConstHash(VarName)){
+        if( compiler.GetMeta().GetGlobalConstMacros().IsExist( VarName ) )
+        {
             return;
         }
@@ -1115 +1117 @@
 
     //構文を解析
-    int SubScripts[MAX_ARRAYDIM];
     Type type;
     char InitBuf[8192];
     char ConstractParameter[VN_SIZE];
-    if(!GetDimentionFormat(Parameter, VarName,SubScripts,type,InitBuf,ConstractParameter))
+    Subscripts subscripts;
+    if(!GetDimentionFormat(Parameter, VarName,subscripts,type,InitBuf,ConstractParameter))
         return;
 
 
     //定数と２重定義されていないかを調べる
-    if(CDBConst::obj.GetBasicType(VarName)){
+    if(compiler.GetMeta().GetGlobalConsts().GetBasicType(VarName)){
         SetError(15,VarName,cp);
         return;
@@ -1130 +1132 @@
 
     //定数マクロとして定義されている場合
-    if(GetConstHash(VarName)){
+    if( compiler.GetMeta().GetGlobalConstMacros().IsExist( VarName ) ){
         SetError(15,VarName,cp);
         return;
@@ -1165 +1167 @@
         GetNowStaticVarFullName(VarName,temporary);
 
-        dim( temporary,SubScripts,type,InitBuf,ConstractParameter,dwFlags );
+        dim( temporary,subscripts,type,InitBuf,ConstractParameter,dwFlags );
 
         /*
@@ -1173 +1175 @@
     }
     else{
-        dim( VarName,SubScripts,type,InitBuf,ConstractParameter,dwFlags );
+        dim( VarName,subscripts,type,InitBuf,ConstractParameter,dwFlags );
     }
 }

trunk/abdev/BasicCompiler_Common/VariableOpe.h

@@ +1 @@
+#pragma once
 
+#include <jenga/include/smoothie/LexicalAnalysis.h>
+
+class Type;
+class CClass;
 
 BOOL IsPtrType(int type);
@@ -14 +19 @@
 Type GetStringTypeInfo();
 void GetWithName(char *buffer);
-BOOL GetVarFormatString(char *buffer,char *array,char *array2,char *NestMember, CClass::RefType &refType );
+BOOL GetVarFormatString(char *buffer,char *array,char *array2,char *NestMember, ReferenceKind &refType );
 void GetArrayElement( const char *buffer,char *variable,char *array_element);
 BOOL CheckVarNameError(char *name,int nowLine);
-int JumpSubScripts(const int *ss);
+int JumpSubScripts( const Subscripts &subscripts );
 bool GetMemberType( const CClass &objClass, const char *lpszMember, Type &resultType, BOOL bPrivateAccess, bool isErrorEnabled);
 bool GetVarType( const char *nameBuffer, Type &resultType, bool isError);
-bool GetVarOffsetReadOnly(const char *NameBuffer,RELATIVE_VAR *pRelativeVar,Type &resultType,int *pss = NULL );
-bool GetVarOffsetReadWrite(const char *NameBuffer,RELATIVE_VAR *pRelativeVar,Type &resultType,int *pss = NULL );
+bool GetVarOffsetReadOnly(const char *NameBuffer,RELATIVE_VAR *pRelativeVar,Type &resultType, Subscripts *pResultSubscripts = NULL );
+bool GetVarOffsetReadWrite(const char *NameBuffer,RELATIVE_VAR *pRelativeVar,Type &resultType, Subscripts *pResultSubscripts = NULL );
 bool GetDimentionFormat( const char *buffer,
                         char *VarName,
-                        int *SubScripts,
+                        Subscripts &subscripts,
                         Type &type,
                         char *InitBuf,
                         char *ConstractParameter );
 BOOL GetNowStaticVarFullName(char *VarName,char *FullName);
-void AddGlobalVariable( const char *name,int *SubScripts, const Type &type,const char *InitBuf,const char *ConstractParameter,DWORD dwFlag);
+void AddGlobalVariable( const char *name, const Subscripts &subscripts, const Type &type,const char *InitBuf,const char *ConstractParameter,DWORD dwFlag);
 void dim(char *Parameter,DWORD dwFlags);
 void OpcodeDim(char *Parameter,DWORD dwFlags);

trunk/abdev/BasicCompiler_Common/WatchList.cpp

@@ +1 @@
+#include "stdafx.h"
+
 #include <jenga/include/smoothie/Smoothie.h>
+
+#include <Compiler.h>
 
 #include "common.h"
@@ -12 +16 @@
 #include "debug.h"
 
-int Debugging_GetArray( const int *SubScripts,char *array,const Type &type,LONG_PTR *plpOffset);
+int Debugging_GetArray( const Subscripts &subscripts,char *array,const Type &type,LONG_PTR *plpOffset);
 
 ULONG_PTR Debugging_GetVarPtr(RELATIVE_VAR *pRelativeVar){
@@ -117 +121 @@
     char lpPtrOffset[VN_SIZE];  //第2次配列
     char NestMember[VN_SIZE];   //入れ子メンバ
-    CClass::RefType refType;
+    ReferenceKind refType;
     lstrcpy(VarName,member);
     if(!GetVarFormatString(VarName,array,lpPtrOffset,NestMember, refType ) ) return 0;
@@ -145 +149 @@
     //ポインタ変数の場合
     if( resultType.IsPointer() ){
-        if(pMember->SubScripts[0]==-1){
+        if( pMember->GetSubscripts().size() == 0 ){
             lstrcpy(lpPtrOffset,array);
             array[0]=0;
@@ -159 +163 @@
         //配列オフセット
         i2=Debugging_GetArray(
-            pMember->SubScripts,
+            pMember->GetSubscripts(),
             array,
             resultType,
@@ -172 +176 @@
         }
     }
-    else if(pMember->SubScripts[0]!=-1){
+    else if( pMember->GetSubscripts().size() > 0 ){
         resultType.SetBasicType( resultType.GetBasicType() | FLAG_PTR );
     }
@@ -180 +184 @@
 
         if( resultType.IsObject() || resultType.IsStruct() ){
-            if( refType != CClass::Dot ) return 0;
+            if( refType != RefDot ) return 0;
 
             if( resultType.IsObject() ){
@@ -195 +199 @@
 
             if(lpPtrOffset[0]){
-                if( refType != CClass::Dot ) return 0;
+                if( refType != RefDot ) return 0;
 
                 //直接参照に切り替え
@@ -203 +207 @@
             }
             else{
-                if( refType != CClass::Pointer ) return 0;
+                if( refType != RefPointer ) return 0;
 
                 extern HANDLE hDebugProcess;
@@ -235 +239 @@
     return 1;
 }
-int Debugging_GetArray( const int *SubScripts,char *array,const Type &type,LONG_PTR *plpOffset){
+int Debugging_GetArray( const Subscripts &subscripts,char *array,const Type &type,LONG_PTR *plpOffset){
     extern HANDLE hHeap;
     int i,i2,i3,i4,i5,array_offset;
@@ -254 +258 @@
         }
         if(array[i]==','||array[i]=='\0'){
-            if(SubScripts[i3]==-1){
+            if( i3 >= (int)subscripts.size() )
+            {
                 for(i3--;i3>=0;i3--) HeapDefaultFree(pParm[i3]);
                 return 0;
@@ -267 +272 @@
 
             if(array[i]=='\0'){
-                if(SubScripts[i3]!=-1){
+                if( i3 < (int)subscripts.size() )
+                {
                     for(i3--;i3>=0;i3--) HeapDefaultFree(pParm[i3]);
                     return 0;
@@ -302 +308 @@
         i5=(int)i64data;
 
-        for(i2=i+1,i4=1;i2<i3;i2++) i4*=SubScripts[i2]+1;
+        for(i2=i+1,i4=1;i2<i3;i2++) i4*=subscripts[i2]+1;
 
         array_offset+=i5*i4;
@@ -316 +322 @@
 }
 ULONG_PTR Debugging_GetThisPtrOffset(LONG_PTR obp_Rip){
-    GlobalProc *pUserProc = GetSubFromObp(obp_Rip);
-
-    BOOST_FOREACH( Variable *pVar, pUserProc->localVars ){
+    UserProc *pUserProc = GetSubFromObp(obp_Rip);
+
+    BOOST_FOREACH( Variable *pVar, pUserProc->GetLocalVars() ){
         if( pVar->GetName() == "_System_LocalThis" ){
-            return pVar->offset;
+            return pVar->GetOffsetAddress();
         }
     }
     return 0;
 }
-int Debugging_GetVarOffset( char *variable,RELATIVE_VAR *pRelativeVar, Type &resultType, int *pss){
+int Debugging_GetVarOffset( char *variable,RELATIVE_VAR *pRelativeVar, Type &resultType, Subscripts *pResultSubscripts){
     extern HANDLE hDebugProcess;
     int i2,i3;
@@ -333 +339 @@
 
     lstrcpy(VarName,variable);
-    CClass::RefType refType;
+    ReferenceKind refType;
     GetVarFormatString(VarName,array,lpPtrOffset,member,refType);
 
-    const int *pSubScripts;
+    const Subscripts *pSubscripts;
     bool isArray;
 
@@ -344 +350 @@
     /////////////////
     if( UserProc::IsLocalAreaCompiling() ){
-        const Variable *pVar = UserProc::CompilingUserProc().localVars.Find( Symbol( VarName ) );
+        const Variable *pVar = UserProc::CompilingUserProc().GetLocalVars().Find( Symbol( VarName ) );
 
         if( pVar ){
             //ポインタ変数の場合
-            if( pVar->IsPointer() ){
+            if( pVar->GetType().IsPointer() ){
                 if( !pVar->IsArray() ){
                     lstrcpy(lpPtrOffset,array);
@@ -358 +364 @@
             }
 
-            pRelativeVar->offset = pVar->offset;
+            pRelativeVar->offset = pVar->GetOffsetAddress();
             if( pVar->IsRef() ){
                 pRelativeVar->dwKind=VAR_REFLOCAL;
@@ -365 +371 @@
                 pRelativeVar->dwKind=VAR_LOCAL;
             }
-            resultType = *pVar;
+            resultType = pVar->GetType();
             isArray = pVar->IsArray();
-            pSubScripts = pVar->GetSubScriptsPtr();
-        }
-    }
-
-    if(Smoothie::Temp::pCompilingClass){
+            pSubscripts = &pVar->GetSubscripts();
+        }
+    }
+
+    if(compiler.pCompilingClass){
         ///////////////////////
         // クラスメンバの参照
@@ -385 +391 @@
 
             bool isFound = false;
-            BOOST_FOREACH( CMember *pMember, Smoothie::Temp::pCompilingClass->GetDynamicMembers() ){
+            BOOST_FOREACH( CMember *pMember, compiler.pCompilingClass->GetDynamicMembers() ){
                 if( pMember->GetName() == VarName ){
                     isFound = true;
@@ -414 +420 @@
         pRelativeVar->dwKind=VAR_DIRECTMEM;
 
-        i3=Debugging_GetMember(*Smoothie::Temp::pCompilingClass,variable,pRelativeVar,resultType,1);
+        i3=Debugging_GetMember(*compiler.pCompilingClass,variable,pRelativeVar,resultType,1);
         if(i3==0){
             //式エラー
@@ -434 +440 @@
         ///////////////////
 
-        const Variable *pVar = globalVars.Find( VarName );
+        const Variable *pVar = compiler.GetMeta().GetGlobalVars().Find( VarName );
         if( !pVar ){
             //一致しないとき
@@ -441 +447 @@
 
         //ポインタ変数の場合
-        if( pVar->IsPointer() ){
+        if( pVar->GetType().IsPointer() ){
             if( !pVar->IsArray() ){
                 lstrcpy(lpPtrOffset,array);
@@ -451 +457 @@
         }
 
-        pRelativeVar->offset=pVar->offset;
+        pRelativeVar->offset=pVar->GetOffsetAddress();
         if(pVar->IsRef()) pRelativeVar->dwKind=VAR_REFGLOBAL;
         else pRelativeVar->dwKind=VAR_GLOBAL;
-        resultType = *pVar;
+        resultType = pVar->GetType();
         isArray = pVar->IsArray();
-        pSubScripts=pVar->GetSubScriptsPtr();
+        pSubscripts = &pVar->GetSubscripts();
     }
 
@@ -463 +469 @@
         //配列の先頭ポインタを示す場合
         resultType.SetBasicType( resultType.GetBasicType() | FLAG_PTR );
-        if(pss) memcpy(pss,pSubScripts,MAX_ARRAYDIM*sizeof(int));
+        if( pResultSubscripts )
+        {
+            (*pResultSubscripts) = *pSubscripts;
+        }
         return 1;
     }
 
     if(array[0]){
-        i3=Debugging_GetArray(pSubScripts,array,resultType,&pRelativeVar->offset);
+        i3=Debugging_GetArray( *pSubscripts, array,resultType,&pRelativeVar->offset);
         if(i3==0){
             //式エラー
@@ -481 +490 @@
         if( resultType.IsObject() || resultType.IsStruct() ){
             //実態オブジェクトのメンバを参照（obj.member）
-            if( refType != CClass::Dot ){
+            if( refType != RefDot ){
                 return 0;
             }
@@ -499 +508 @@
             if(lpPtrOffset[0]){
                 //pObj[n].member
-                if( refType != CClass::Dot ) return 0;
+                if( refType != RefDot ) return 0;
                 Debugging_SetRelativeOffset(resultType,pRelativeVar,lpPtrOffset);
 
@@ -514 +523 @@
             else{
                 //pObj->member
-                if( refType != CClass::Pointer ) return 0;
+                if( refType != RefPointer ) return 0;
 
                 pRelativeVar->offset=Debugging_GetVarPtr(pRelativeVar);

trunk/abdev/BasicCompiler_Common/calculation.cpp

@@ +1 @@
+#include "stdafx.h"
+
 #include <jenga/include/smoothie/LexicalAnalysis.h>
 
@@ -498 +500 @@
                         //定数関数
 
-                        if(!GetConstCalcBuffer(temporary,temp2,Parms)){
+                        ConstMacro *pConstMacro = compiler.GetMeta().GetGlobalConstMacros().Find( temporary );
+                        if( !pConstMacro )
+                        {
+                            if(enableerror) SetError(3,temporary,cp);
+                            return false;
+                        }
+                        if( !pConstMacro->GetCalcBuffer( temp2, Parms ) )
+                        {
                             if(enableerror) SetError(3,temporary,cp);
                             return false;
@@ -554 +563 @@
 
                             RELATIVE_VAR RelativeVar;
-                            int ss[MAX_ARRAYDIM];
                             void *offset;
                             DWORD dwData;
@@ -563 +571 @@
 
                             Type tempType;
-                            i3=Debugging_GetVarOffset(Parms,&RelativeVar,tempType,ss);
+                            i3=Debugging_GetVarOffset(Parms,&RelativeVar,tempType);
                             if(i3==0){
                                 //式エラー
@@ -657 +665 @@
                         /////////
                         StrPtr[pnum]=0;
-                        type[pnum] = CDBConst::obj.GetBasicType(Parms);
+                        type[pnum] = compiler.GetMeta().GetGlobalConsts().GetBasicType(Parms);
                         if(type[pnum]){
                             if(IsRealNumberType(type[pnum])){
                                 //実数型
-                                nums[pnum] = CDBConst::obj.GetDoubleData(Parms);
+                                nums[pnum] = compiler.GetMeta().GetGlobalConsts().GetDoubleData(Parms);
                             }
                             else if(IsWholeNumberType(type[pnum])){
                                 //整数
-                                i64nums[pnum] = CDBConst::obj.GetWholeData(Parms);
+                                i64nums[pnum] = compiler.GetMeta().GetGlobalConsts().GetWholeData(Parms);
                             }
 /*                          else if(type[pnum]==DEF_STRING){
@@ -1108 +1116 @@
 #pragma optimize("", on)
 
-BOOL GetConstCalcBuffer(const char *name,const char *Parameter,char *pCalcBuffer){
-    extern HANDLE hHeap;
-    int i2,i3,i4,num;
-    char temporary[VN_SIZE];
-    char *pParms[MAX_PARMS];
-
-    CONSTINFO *pci;
-    pci=GetConstHash(name);
-    if(!pci) return 0;
-
-    num=0;
-    i2=0;
-    while(1){
-        i2=GetOneParameter(Parameter,i2,temporary);
-
-        pParms[num]=(char *)HeapAlloc(hHeap,0,lstrlen(temporary)+1);
-        lstrcpy(pParms[num],temporary);
-
-        num++;
-        if(Parameter[i2]=='\0') break;
-    }
-    if(num!=pci->ParmNum){
-        extern int cp;
-        for(i2=0;i2<num;i2++) HeapDefaultFree(pParms[i2]);
-        SetError(10,name,cp);
-        lstrcpy(pCalcBuffer,"0");
-        return 1;
-    }
-
-    i2=0;
-    i4=0;
-    while(1){
-
-        //数式内の項を取得
-        for(i3=0;;i2++,i3++){
-            if(!IsVariableChar(pci->StrValue[i2])){
-                temporary[i3]=0;
-                break;
-            }
-            temporary[i3]=pci->StrValue[i2];
-        }
-
-        //パラメータと照合する
-        for(i3=0;i3<pci->ParmNum;i3++){
-            if(lstrcmp(pci->ppParm[i3],temporary)==0) break;
-        }
-
-        if(i3==pci->ParmNum){
-            //パラメータでないとき
-            lstrcpy(pCalcBuffer+i4,temporary);
-            i4+=lstrlen(temporary);
-        }
-        else{
-            //パラメータのとき
-            lstrcpy(pCalcBuffer+i4,pParms[i3]);
-            i4+=lstrlen(pParms[i3]);
-        }
-
-        //演算子をコピー
-        for(;;i2++,i4++){
-            if(pci->StrValue[i2]==1){
-                pCalcBuffer[i4++]=pci->StrValue[i2++];
-                pCalcBuffer[i4]=pci->StrValue[i2];
-                continue;
-            }
-            if(IsVariableTopChar(pci->StrValue[i2])) break;
-            pCalcBuffer[i4]=pci->StrValue[i2];
-            if(pci->StrValue[i2]=='\0') break;
-        }
-
-        if(pci->StrValue[i2]=='\0') break;
-    }
-
-    for(i2=0;i2<num;i2++) HeapDefaultFree(pParms[i2]);
-
-    return 1;
-}
-DWORD GetConstValue(char *name,double *pDbl,char *buffer,LONG_PTR *plpIndex){
-    CONSTINFO *pci;
-    pci=GetConstHash(name);
-    if(pci){
-        //定数が見つかったとき
-
-        if(pci->StrValue){
-            //文字列定数
-
-            //バイト数
-            *pDbl=pci->DblValue;
-
-            //データ
-            memcpy(buffer,pci->StrValue,(int)pci->DblValue);
-
-            if(plpIndex) *plpIndex=pci->lpIndex;
-
-            return DEF_STRING;
-        }
-        else{
-            if(pci->type==DEF_INT64){
-                memcpy(pDbl,&pci->i64Value,sizeof(_int64));
-                return DEF_INT64;
-            }
-
-            if(plpIndex) *plpIndex=pci->lpIndex;
-
-            *pDbl=pci->DblValue;
-            return pci->type;
-        }
-    }
-
-    if(plpIndex) *plpIndex=-1;
-
-    return -1;
-}
 int IsStrCalculation(char *Command){
     int i,i2,i3,i4,PareNum;
@@ -1283 +1178 @@
 
                     //ユーザー定義関数
-                    UserProc *pUserProc;
-                    pUserProc=GetSubHash(temporary);
+                    const UserProc *pUserProc = GetSubHash(temporary);
                     if(pUserProc){
                         if( pUserProc->ReturnType().IsStringClass() ){
@@ -1300 +1194 @@
 
                     //定数
-                    CONSTINFO *pci;
-                    pci=GetConstHash(temporary);
-                    if(pci){
-
-                        if(pci->ParmNum){
-                            //マクロ関数の場合
-                            GetStringInPare_RemovePare(temporary,Command+i2+i3+1);
-                            GetConstCalcBuffer(pci->name,temporary,temp2);
-                            return IsStrCalculation(temp2);
-                        }
-
-                        if(pci->type==DEF_STRING) return 1;
-                        else return 0;
+                    ConstMacro *pConstMacro = compiler.GetMeta().GetGlobalConstMacros().Find( temporary );
+                    if(pConstMacro){
+                        //マクロ関数の場合
+                        GetStringInPare_RemovePare(temporary,Command+i2+i3+1);
+                        pConstMacro->GetCalcBuffer( temporary, temp2 );
+                        return IsStrCalculation(temp2);
                     }
                 }
 
                 //定数
-                i3 = CDBConst::obj.GetBasicType(Command+i2);
+                i3 = compiler.GetMeta().GetGlobalConsts().GetBasicType(Command+i2);
                 if(i3==DEF_STRING) return 1;    //文字列
                 if(i3) return 0;            //数値

trunk/abdev/BasicCompiler_Common/common.h

@@ +1 @@
+#pragma once
+
 //#define _CRT_SECURE_NO_DEPRECATE
 #pragma warning(disable : 4996)
 
 #include <option.h>
-
-#include <windows.h>
-#include <stdio.h>
-#include <string.h>
-#include <math.h>
-#include <commctrl.h>
-#include <time.h>
-#include <limits.h>
-#include <shlobj.h>
-#include <vector>
-#include <string>
-#include <fstream>
-
-//boost libraries
-#include <boost/foreach.hpp>
 
 using namespace std;
@@ -33 +20 @@
 #endif
 
-#include "../BasicCompiler_Common/BasicFixed.h"
+#include <jenga/include/smoothie/BasicFixed.h>
 #include "../BasicCompiler_Common/NonVolatile.h"
 #include "../BasicCompiler_Common/psapi.h"
@@ -139 +126 @@
 
 
-// 列挙体管理用のクラス
-#include "Enum.h"
-
-// 定数管理用のクラス
-#include "Const.h"
-
-
 
 struct ERRORINFO{
@@ -157 +137 @@
     LONG_PTR offset;
     BOOL bOffsetOffset;
-};
-
-struct CONSTINFO{
-    char *name;
-    char *StrValue;
-
-    double DblValue;
-    _int64 i64Value;
-    int type;
-    LONG_PTR lpIndex;
-
-    int ParmNum;
-    char **ppParm;
-
-    CONSTINFO *pNextData;
 };
 
@@ -245 +210 @@
 
 #include "../BasicCompiler_Common/PESchedule.h"
-#include "../BasicCompiler_Common/DebugSection.h"
 #include "../BasicCompiler_Common/VariableOpe.h"
 
@@ -268 +232 @@
 //hash.cpp
 int hash_default(const char *name);
-CONSTINFO *GetConstHash(const char *name);
 DllProc *GetDeclareHash(char *name);
-void GetOverloadSubHash( const char *lpszName, std::vector<UserProc *> &subs );
-UserProc *GetSubHash(const char *name,BOOL bError=0);
-UserProc *GetMethodHash(const char *ObjectName,const char *MethodName,const char *Parameter,BOOL bError=0);
-UserProc *GetClassMethod( const char *className, const char *methodName );
+void GetOverloadSubHash( const char *lpszName, std::vector<const UserProc *> &subs );
+const UserProc *GetSubHash(const char *name,BOOL bError=0);
+const UserProc *GetMethodHash(const char *ObjectName,const char *MethodName,const char *Parameter,BOOL bError=0);
+const UserProc *GetClassMethod( const char *className, const char *methodName );
 
 //Object.cpp
-void CallConstructor( const char *ObjectName,const int *SubScripts, const Type &type,const char *Parameter);
+void CallConstructor( const char *ObjectName,const Subscripts &subscripts, const Type &type,const char *Parameter);
 bool Operator_New( const char *expression, const Type &baseType, Type &resultType );
 
 //Overload.sbp
-UserProc *OverloadSolutionWithStrParam(
+class Parameters;
+const UserProc *OverloadSolutionWithStrParam(
     const char *name,
-    std::vector<UserProc *> &subs,
+    std::vector<const UserProc *> &subs,
     const char *Parameter,
     const char *ObjectName);
-UserProc *OverloadSolution(
+const UserProc *OverloadSolution(
     const char *name,
-    std::vector<UserProc *> &subs,
+    std::vector<const UserProc *> &subs,
     const Parameters &params,
     const Type &returnType );
@@ -298 +262 @@
 void Debugger_Pause(void);
 ULONG_PTR rva_to_real(DWORD p);
-GlobalProc *GetSubFromObp(ULONG_PTR pos);
+UserProc *GetSubFromObp(ULONG_PTR pos);
 void ReadOpBuffer();
 void DebugProgram(void);
@@ -310 +274 @@
 ULONG_PTR Debugging_GetVarPtr(RELATIVE_VAR *pRelativeVar);
 ULONG_PTR Debugging_GetThisPtrOffset(LONG_PTR obp_Rip);
-int Debugging_GetVarOffset( char *variable,RELATIVE_VAR *pRelativeVar, Type &resultType, int *pss);
+int Debugging_GetVarOffset( char *variable,RELATIVE_VAR *pRelativeVar, Type &resultType, Subscripts *pResultSubscripts = NULL );
 
 //MakeExe.cpp
 void StepCompileProgress(void);
-void DeleteConstInfo(CONSTINFO **ppConstHash);
 void DeleteDeclareInfo(void);
 void AddSourceCode(char *buffer);
@@ -366 +329 @@
 char GetEndXXXCommand(char es);
 void GetDefaultNameFromES(char es,char *name);
-void GetCalcName(int idCalc,char *name);
+const std::string &FormatEscapeSequenceStringToDefaultString( const std::string &source );
 BOOL IsFile(char *path);
 BOOL ShortPathToLongPath(char ShortPath[MAX_PATH],char *LongPath);
@@ -382 +345 @@
 int NeutralizationType(int type1,LONG_PTR index1,int type2,LONG_PTR index2);
 DWORD GetLiteralValue(char *value,_int64 *pi64,int BaseType);
-BOOL GetConstCalcBuffer(const char *name,const char *Parameter,char *pCalcBuffer);
-DWORD GetConstValue(char *name,double *dbl,char *buffer,LONG_PTR *plpIndex);
 int IsStrCalculation(char *Command);
 BYTE GetCalcId(const char *Command,int *pi);
@@ -403 +364 @@
 bool GetReturnTypeOfPropertyMethod( const char *variable, const char *rightSide, Type &resultType );
 bool GetReturnTypeOfIndexerGetterProc( const CClass &objClass, Type &resultType );
-GlobalProc *AddSubData( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, char *buffer,int nowLine,bool isVirtual,CClass *pobj_c, bool isStatic = false );
-void GetSubInfo(void);
-void DeleteSubInfo(GlobalProc **ppSubHash,char **ppMacroNames,int MacroNum);
 void DeleteDeclareInfo(void);
 int AddProcPtrInfo( const string &typeExpression, int nowLine );

trunk/abdev/BasicCompiler_Common/error.cpp

@@ +1 @@
+#include "stdafx.h"
+
 #include <jenga/include/smoothie/LexicalAnalysis.h>
 
 #include <Program.h>
+#include <Class.h>
 
 #include "../BasicCompiler_Common/common.h"
@@ -301 +304 @@
         if(num>-100){
             //エラーのみ
+
             i2=0;
         }

trunk/abdev/BasicCompiler_Common/gc.cpp

@@ +1 @@
+#include "stdafx.h"
+
 #include "common.h"
 

trunk/abdev/BasicCompiler_Common/hash.cpp

@@ +1 @@
+#include "stdafx.h"
+
 #include <jenga/include/smoothie/Smoothie.h>
 
@@ -21 +23 @@
 }
 
-CONSTINFO *GetConstHash(const char *name){
-    //ハッシュ値を取得
-    int key;
-    key=hash_default(name);
-
-    //格納位置を取得
-    extern CONSTINFO **ppConstHash;
-    CONSTINFO *pci;
-    pci=ppConstHash[key];
-    while(pci){
-        if(lstrcmp(pci->name,name)==0) break;
-
-        pci=pci->pNextData;
-    }
-
-    return pci;
-}
-
 DllProc *GetDeclareHash(char *fullName){
     char ObjName[VN_SIZE];      //オブジェクト変数
     char NestMember[VN_SIZE];   //入れ子メンバ
-    bool isObjectMember = CClass::SplitName( fullName, ObjName, NestMember );
+    bool isObjectMember = SplitMemberName( fullName, ObjName, NestMember );
 
     //ハッシュ値を取得
@@ -64 +48 @@
 }
 
-void GetOverloadSubHash( const char *lpszName, std::vector<UserProc *> &subs ){
+void GetOverloadSubHash( const char *lpszName, std::vector<const UserProc *> &subs ){
     char name[VN_SIZE];
 
@@ -75 +59 @@
     char ObjName[VN_SIZE];      //オブジェクト変数
     char NestMember[VN_SIZE];   //入れ子メンバ
-    bool isObjectMember = CClass::SplitName( name, ObjName, NestMember );
+    bool isObjectMember = SplitMemberName( name, ObjName, NestMember );
 
     if(isObjectMember){
@@ -84 +68 @@
         if(lstrcmpi(ObjName,"Super")==0){
             //クラスメンバ関数内から基底クラスの呼び出し
-            pobj_c=Smoothie::Temp::pCompilingClass;
+            pobj_c=compiler.pCompilingClass;
         }
         else{
@@ -114 +98 @@
 
 
-    if(Smoothie::Temp::pCompilingClass){
+    if(compiler.pCompilingClass){
         //自身のオブジェクトのメンバ関数を検索
 
         // 静的メソッド
-        Smoothie::Temp::pCompilingClass->GetStaticMethods().Enum( name, subs );
+        compiler.pCompilingClass->GetStaticMethods().Enum( name, subs );
 
         // 動的メソッド
-        Smoothie::Temp::pCompilingClass->GetMethods().Enum( name, subs );
+        compiler.pCompilingClass->GetMethods().Enum( name, subs );
     }
 
 
-    ///////////////////////////
     // グローバル関数を検索
-    ///////////////////////////
-
-    //ハッシュ値を取得
-    int key;
-    key=hash_default(NestMember);
-
-    //格納位置を取得
-    extern GlobalProc **ppSubHash;
-    GlobalProc *pUserProc;
-    pUserProc=ppSubHash[key];
-    while(pUserProc){
-        if(!pUserProc->GetParentClassPtr()){
-            if( pUserProc->IsEqualSymbol( name ) ){
-                subs.push_back( pUserProc );
-            }
-        }
-
-        pUserProc=pUserProc->pNextData;
-    }
+    compiler.GetMeta().GetUserProcs().EnumGlobalProcs( NestMember, name, subs );
 }
 
 //オーバーロードされていない関数を取得（昔のコンパイラソースコードとの互換性保持）
-UserProc *GetSubHash(const char *lpszName,BOOL bError){
-    std::vector<UserProc *> subs;
+const UserProc *GetSubHash(const char *lpszName,BOOL bError){
+    std::vector<const UserProc *> subs;
     GetOverloadSubHash(lpszName,subs);
 
@@ -166 +131 @@
     }
 
-    UserProc *pUserProc;
-    pUserProc = subs[0];
+    const UserProc *pUserProc = subs[0];
 
     return pUserProc;
 }
-UserProc *GetMethodHash(const char *ObjectName,const char *MethodName,const char *Parameter,BOOL bError){
+const UserProc *GetMethodHash(const char *ObjectName,const char *MethodName,const char *Parameter,BOOL bError){
     char temporary[VN_SIZE];
     sprintf(temporary,"%s.%s",ObjectName,MethodName);
 
-    std::vector<UserProc *> subs;
-    UserProc *pUserProc;
+    std::vector<const UserProc *> subs;
     GetOverloadSubHash(temporary,subs);
 
@@ -185 +148 @@
 
     //オーバーロードを解決
-    pUserProc=OverloadSolutionWithStrParam(temporary,subs,Parameter,ObjectName);
+    const UserProc *pUserProc = OverloadSolutionWithStrParam(temporary,subs,Parameter,ObjectName);
 
     return pUserProc;
 }
 
-UserProc *GetClassMethod( const char *className, const char *methodName ){
+const UserProc *GetClassMethod( const char *className, const char *methodName ){
     const CClass *pClass = compiler.GetMeta().GetClasses().Find( className );
     if( pClass ){
-        vector<UserProc *> userProcs;
+        vector<const UserProc *> userProcs;
         pClass->GetMethods().Enum( methodName, userProcs );
         if( userProcs.size() == 1 ){

trunk/abdev/BasicCompiler_Common/include/Class.h

@@ -1 +1 @@
 #pragma once
 
-#include <jenga/include/smoothie/Class.h>
-
-class ClassImpl: public CClass
+#include <option.h>
+#include <Program.h>
+#include <Prototype.h>
+#include <Method.h>
+#include <Member.h>
+
+class UserProc;
+
+class InheritedInterface
 {
-public:
-    ClassImpl( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, const string &name )
-        : CClass( namespaceScopes, importedNamespaces, name )
-    {
-    }
-    ClassImpl()
-        : CClass()
-    {
-    }
-
-    virtual bool IsEqualSymbol( const NamespaceScopes &namespaceScopes, const string &name ) const;
+    CClass *pInterfaceClass;
+    int vtblOffset;
+public:
+    InheritedInterface( CClass *pInterfaceClass, int vtblOffset )
+        : pInterfaceClass( pInterfaceClass )
+        , vtblOffset( vtblOffset )
+    {
+    }
+
+    CClass &GetInterfaceClass() const{
+        return *pInterfaceClass;
+    }
+    int GetVtblOffset() const
+    {
+        return vtblOffset;
+    }
+};
+typedef vector<InheritedInterface> Interfaces;
+
+class CClass: public Prototype
+{
+public:
+    // 型の種類
+    enum ClassType{
+        Class,
+        Interface,
+        Enum,
+        Delegate,
+        Structure,
+    };
+
+private:
+    ClassType classType;
+
+    // importされている名前空間
+    NamespaceScopesCollection importedNamespaces;
+    
+    // 継承クラス
+    const CClass *pSuperClass;
+
+    // Blittable型情報
+    Type blittableType;
+
+    // 実装するインターフェイス
+    Interfaces interfaces;
+
+    // 動的メンバ
+    Members dynamicMembers;
+
+    // 静的メンバ
+    Members staticMembers;
+
+    // 動的メソッド
+    Methods methods;
+    int ConstructorMemberSubIndex;
+    int DestructorMemberSubIndex;
+    int vtblNum;                    // 仮想関数の数
+
+    // 静的メソッド
+    Methods staticMethods;
+
+    // XMLシリアライズ用
+private:
+    friend class boost::serialization::access;
+    template<class Archive> void serialize(Archive& ar, const unsigned int version)
+    {
+        trace_for_serialize( "serializing - CClass" );
+
+        ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP( Prototype );
+        ar & BOOST_SERIALIZATION_NVP( classType );
+        ar & BOOST_SERIALIZATION_NVP( importedNamespaces );
+        ar & boost::serialization::make_nvp( "pSuperClass", const_cast<CClass *&>(pSuperClass) );
+        ar & BOOST_SERIALIZATION_NVP( blittableType );
+        //ar & BOOST_SERIALIZATION_NVP( interfaces );
+        ar & BOOST_SERIALIZATION_NVP( dynamicMembers );
+        ar & BOOST_SERIALIZATION_NVP( staticMembers );
+        ar & BOOST_SERIALIZATION_NVP( methods );
+        ar & BOOST_SERIALIZATION_NVP( ConstructorMemberSubIndex );
+        ar & BOOST_SERIALIZATION_NVP( DestructorMemberSubIndex );
+        ar & BOOST_SERIALIZATION_NVP( vtblNum );
+        ar & BOOST_SERIALIZATION_NVP( staticMethods );
+    }
+
+    bool isReady;
+public:
+
+    //アラインメント値
+    int iAlign;
+
+    CClass( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, const string &name )
+        : Prototype( namespaceScopes, name )
+        , importedNamespaces( importedNamespaces )
+        , classType( Class )
+        , pSuperClass( NULL )
+        , isReady( false )
+        , iAlign( 0 )
+        , ConstructorMemberSubIndex( -1 )
+        , DestructorMemberSubIndex( -1 )
+        , vtblNum( 0 )
+        , vtbl_offset( -1 )
+        , isCompilingConstructor( false )
+        , isCompilingDestructor( false )
+        , pobj_NextClass( NULL )
+    {
+    }
+    CClass()
+        : Prototype()
+        , importedNamespaces()
+        , classType()
+        , pSuperClass( NULL )
+        , isReady( false )
+        , iAlign( 0 )
+        , ConstructorMemberSubIndex( -1 )
+        , DestructorMemberSubIndex( -1 )
+        , vtblNum( 0 )
+        , vtbl_offset( -1 )
+        , isCompilingConstructor( false )
+        , isCompilingDestructor( false )
+        , pobj_NextClass( NULL )
+    {
+    }
+    ~CClass()
+    {
+        // 動的メンバ
+        BOOST_FOREACH( CMember *member, dynamicMembers ){
+            delete member;
+        }
+
+        // 静的メンバ
+        BOOST_FOREACH( CMember *member, staticMembers ){
+            delete member;
+        }
+    }
+
+    void Readed(){
+        isReady = true;
+    }
+    bool IsReady() const{
+        return isReady;
+    }
+
+    const NamespaceScopesCollection &GetImportedNamespaces() const
+    {
+        return importedNamespaces;
+    }
+
+    // 継承元クラス
+    bool HasSuperClass() const
+    {
+        return ( pSuperClass != NULL );
+    }
+    const CClass &GetSuperClass() const
+    {
+        return *pSuperClass;
+    }
+    void SetSuperClass( const CClass *pSuperClass )
+    {
+        this->pSuperClass = pSuperClass;
+    }
+
+    // Blittable型
+    bool IsBlittableType() const
+    {
+        return !blittableType.IsNull();
+    }
+    const Type &GetBlittableType() const
+    {
+        return blittableType;
+    }
+    void SetBlittableType( const Type &type ){
+        blittableType = type;
+    }
+
+    bool IsClass() const;
+    bool IsInterface() const;
+    bool IsEnum() const;
+    bool IsDelegate() const;
+    bool IsStructure() const;
+    void SetClassType( ClassType classType )
+    {
+        this->classType = classType;
+    }
+
+
+    //コンストラクタをコンパイルしているかどうかのチェックフラグ
+private:
+    mutable bool isCompilingConstructor;
+public:
+    void NotifyStartConstructorCompile() const;
+    void NotifyFinishConstructorCompile() const;
+    bool IsCompilingConstructor() const;
+
+    //デストラクタをコンパイルしているかどうかのチェックフラグ
+private:
+    mutable bool isCompilingDestructor;
+public:
+    void NotifyStartDestructorCompile() const;
+    void NotifyFinishDestructorCompile() const;
+    bool IsCompilingDestructor() const;
+
+
+    //自身の派生クラスかどうかを確認
+    bool IsSubClass( const CClass *pClass ) const;
+
+    //自身と等しいまたは派生クラスかどうかを確認
+    bool IsEqualsOrSubClass( const CClass *pClass ) const;
+
+    // 自身と等しいまたは派生クラス、基底クラスかどうかを確認
+    bool IsEqualsOrSubClassOrSuperClass( const CClass &objClass ) const;
+
+    // インターフェイス
+    bool HasInterfaces() const
+    {
+        return ( interfaces.size() != 0 );
+    }
+    bool IsInheritsInterface( const CClass *pInterfaceClass ) const;
 
     //継承させる
-    virtual bool Inherits( const char *inheritNames, int nowLine );
-    virtual bool InheritsClass( const CClass &inheritsClass, int nowLine );
-    virtual bool InheritsInterface( const CClass &inheritsClass, int nowLine );
+    bool Inherits( const char *inheritNames, int nowLine );
+    bool InheritsClass( const CClass &inheritsClass, int nowLine );
+    bool InheritsInterface( const CClass &inheritsClass, int nowLine );
 
     //メンバ、メソッドの追加
     CMember *CreateMember( Prototype::Accessibility accessibility, bool isConst, bool isRef, char *buffer, int nowLine );
-    virtual void AddMember( Prototype::Accessibility accessibility, bool idConst, bool isRef, char *buffer, int nowLine );
-    virtual void AddStaticMember( Prototype::Accessibility accessibility, bool isConst, bool isRef, char *buffer, int nowLine );
-
-    virtual void AddMethod(CClass *pobj_c, Prototype::Accessibility accessibility, BOOL bStatic, bool isConst, bool isAbstract,
+    void AddMember( Prototype::Accessibility accessibility, bool idConst, bool isRef, char *buffer, int nowLine );
+    void AddStaticMember( Prototype::Accessibility accessibility, bool isConst, bool isRef, char *buffer, int nowLine );
+
+    void AddMethod(CClass *pobj_c, Prototype::Accessibility accessibility, BOOL bStatic, bool isConst, bool isAbstract,
         bool isVirtual, bool isOverride, char *buffer, int nowLine);
 
-    virtual LONG_PTR GetVtblGlobalOffset(void) const;
-    virtual void ActionVtblSchedule(LONG_PTR ImageBase, LONG_PTR MemPos_CodeSection);
-
-
-    // XMLシリアライズ用
-private:
-    friend class boost::serialization::access;
-    template<class Archive> void serialize(Archive& ar, const unsigned int version)
-    {
-        ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP( CClass );
-    }
+    //重複チェック
+    bool DupliCheckAll(const char *name);
+    bool DupliCheckMember(const char *name);
+
+    const Members &GetDynamicMembers() const
+    {
+        return dynamicMembers;
+    }
+    const Members &GetStaticMembers() const
+    {
+        return staticMembers;
+    }
+    Members &GetDynamicMembers()
+    {
+        return dynamicMembers;
+    }
+    Members &GetStaticMembers()
+    {
+        return staticMembers;
+    }
+
+    const Methods &GetMethods() const
+    {
+        return methods;
+    }
+    const Methods &GetStaticMethods() const
+    {
+        return staticMethods;
+    }
+    Methods &GetMethods()
+    {
+        return methods;
+    }
+    Methods &GetStaticMethods()
+    {
+        return staticMethods;
+    }
+
+    //デフォルト コンストラクタ
+    const CMethod *GetConstructorMethod() const
+    {
+        if( ConstructorMemberSubIndex == -1 ) return NULL;
+        return methods[ConstructorMemberSubIndex];
+    }
+    void SetConstructorMemberSubIndex( int constructorMemberSubIndex )
+    {
+        this->ConstructorMemberSubIndex = constructorMemberSubIndex;
+    }
+
+    //デストラクタ メソッドを取得
+    const CMethod *GetDestructorMethod() const
+    {
+        if( DestructorMemberSubIndex == -1 ) return NULL;
+        return methods[DestructorMemberSubIndex];
+    }
+    void SetDestructorMemberSubIndex( int destructorMemberSubIndex )
+    {
+        this->DestructorMemberSubIndex = destructorMemberSubIndex;
+    }
+
+    // vtblに存在する仮想関数の数
+    int GetVtblNum() const
+    {
+        return vtblNum;
+    }
+    void SetVtblNum( int vtblNum )
+    {
+        this->vtblNum = vtblNum;
+    }
+    void AddVtblNum( int vtblNum )
+    {
+        this->vtblNum += vtblNum;
+    }
+    bool IsExistVirtualFunctions() const
+    {
+        return ( vtblNum > 0 );
+    }
+
+    // メンバの総合サイズを取得
+    int GetSize() const;
+
+    // メンバのオフセットを取得
+    int GetMemberOffset( const char *memberName, int *pMemberNum = NULL ) const;
+private:
+    // アラインメント値を取得
+    int GetAlignment() const;
+
+    //vtbl
+protected:
+    mutable long vtbl_offset;
+public:
+    int GetFuncNumInVtbl( const UserProc *pUserProc ) const;
+    LONG_PTR GetVtblGlobalOffset(void) const;
+    void ActionVtblSchedule(LONG_PTR ImageBase, LONG_PTR MemPos_CodeSection);
+    bool IsAbstract() const;
+
+
+    //線形リスト用
+    CClass *pobj_NextClass;
 };
-BOOST_IS_ABSTRACT( CClass );
-
-class ClassesImpl : public Classes
+
+#define MAX_CLASS_HASH 65535
+class Classes
 {
-public:
-    ClassesImpl()
-        : Classes()
-    {
-    }
-
-    virtual CClass *Create( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, const char *name);
-    virtual void CollectClassesForNameOnly( const BasicSource &source );
-
-    virtual void InitStaticMember();
-
-private:
-    bool MemberVar_LoopRefCheck(const CClass &objClass);
-public:
-    virtual void GetClass_recur(const char *lpszInheritsClass);
-    virtual void GetAllClassInfo();
-    virtual void Compile_System_InitializeUserTypes();
-
-    virtual const CClass *Find( const NamespaceScopes &namespaceScopes, const string &name ) const;
-
+    CClass *pobj_ClassHash[MAX_CLASS_HASH];
+    int GetHashCode(const char *name) const;
 
     // XMLシリアライズ用
@@ -73 +354 @@
     template<class Archive> void load(Archive& ar, const unsigned int version)
     {
-        std::vector<ClassImpl *> vectorClasses;
+        trace_for_serialize( "serializing(load) - Classes" );
+
+        std::vector<CClass *> vectorClasses;
         ar & BOOST_SERIALIZATION_NVP( vectorClasses );
 
@@ -82 +365 @@
             Insert( pClass );
         }
+        Iterator_Init();
     }
     template<class Archive> void save(Archive& ar, const unsigned int version) const
     {
+        trace_for_serialize( "serializing(save) - Classes" );
+
         // 保存準備
-        std::vector<ClassImpl *> vectorClasses;
+        std::vector<CClass *> vectorClasses;
         vectorClasses.clear();
         Iterator_Reset();
         while( Iterator_HasNext() )
         {
-            vectorClasses.push_back( dynamic_cast<ClassImpl *>(Iterator_GetNext()) );
+            vectorClasses.push_back( dynamic_cast<CClass *>(Iterator_GetNext()) );
         }
 
         ar & BOOST_SERIALIZATION_NVP( vectorClasses );
     }
+
+public:
+    Classes()
+        : pCompilingMethod( NULL )
+        , pStringClass( NULL )
+        , pObjectClass( NULL )
+        , ppobj_IteClass( NULL )
+        , iIteMaxNum( 0 )
+        , iIteNextNum( 0 )
+    {
+        memset( pobj_ClassHash, 0, MAX_CLASS_HASH * sizeof(CClass *) );
+    }
+    ~Classes()
+    {
+        for(int i=0;i<MAX_CLASS_HASH;i++){
+            if(pobj_ClassHash[i]) DestroyClass(pobj_ClassHash[i]);
+        }
+    }
+    void DestroyClass(CClass *pobj_c)
+    {
+        if(pobj_c->pobj_NextClass){
+            DestroyClass(pobj_c->pobj_NextClass);
+        }
+
+        delete pobj_c;
+    }
+    void Clear()
+    {
+        if(ppobj_IteClass)
+        {
+            free(ppobj_IteClass);
+            ppobj_IteClass = NULL;
+        }
+        // TODO: ここはこれでいいのか…
+        memset( pobj_ClassHash, 0, MAX_CLASS_HASH * sizeof(CClass *) );
+    }
+
+    virtual CClass *Create( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, const char *name);
+    bool Insert( CClass *pClass );
+    CClass *Add( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, const char *name,int nowLine);
+    virtual void CollectClassesForNameOnly( const BasicSource &source );
+
+    void ActionVtblSchedule(LONG_PTR ImageBase, LONG_PTR MemPos_CodeSection);
+
+    virtual void InitStaticMember();
+
+private:
+    bool MemberVar_LoopRefCheck(const CClass &objClass);
+public:
+    virtual void GetClass_recur(const char *lpszInheritsClass);
+    virtual void GetAllClassInfo();
+    virtual void Compile_System_InitializeUserTypes();
+
+    const CClass *Find( const NamespaceScopes &namespaceScopes, const string &name ) const;
+    const CClass *Find( const string &fullName ) const;
+
+
+    /////////////////////////////
+    // 現在コンパイル中の情報
+    /////////////////////////////
+private:
+    const CMethod *pCompilingMethod;
+public:
+    void StartCompile( const UserProc *pUserProc );
+
+    //現在コンパイル中のメソッド情報を取得
+    const CMethod *GetNowCompilingMethodInfo(){
+        return pCompilingMethod;
+    }
+
+
+    /////////////////////////////
+    // 特殊クラス
+    /////////////////////////////
+    CClass *pStringClass;
+    CClass *pObjectClass;
+    CClass *GetStringClassPtr() const;
+    CClass *GetObjectClassPtr() const;
+
+
+    /////////////////////
+    // イテレータ
+    /////////////////////
+private:
+    mutable CClass **ppobj_IteClass;
+    mutable int iIteMaxNum;
+    mutable int iIteNextNum;
+public:
+    void Iterator_Init() const;
+    void Iterator_Reset() const;
+    BOOL Iterator_HasNext() const;
+    CClass *Iterator_GetNext() const;
+    int Iterator_GetMaxCount() const;
 };
-BOOST_IS_ABSTRACT( Classes );

trunk/abdev/BasicCompiler_Common/include/Compiler.h

@@ -34 +34 @@
     static bool StringToType( const std::string &typeName, Type &type );
     static const std::string TypeToString( const Type &type );
+
+    // コンパイル中のクラス
+    const CClass *pCompilingClass;
 };
 

trunk/abdev/BasicCompiler_Common/include/Const.h

@@ -1 +1 @@
 #pragma once
 
-#include <jenga/include/smoothie/Type.h>
+#include <Type.h>
+#include <Symbol.h>
 
-//定数の基底クラス
-class ConstBase{
-    const string name;
-    const NamespaceScopes namespaceScopes;
+
+void AddConst( const NamespaceScopes &namespaceScopes, char *buffer );
+
+//定数
+class CConst : public Symbol, public Jenga::Common::ObjectInHashmap<CConst>
+{
+    Type type;
+    _int64 i64data;
+
+    // XMLシリアライズ用
+private:
+    friend class boost::serialization::access;
+    template<class Archive> void serialize(Archive& ar, const unsigned int version)
+    {
+        trace_for_serialize( "serializing - CConst" );
+
+        ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP( Symbol );
+        ar & BOOST_SERIALIZATION_NVP( type );
+        ar & BOOST_SERIALIZATION_NVP( i64data );
+    }
 
 public:
 
-    ConstBase( const NamespaceScopes &namespaceScopes, const string &name )
-        : namespaceScopes( namespaceScopes )
-        , name( name )
+    CConst( const NamespaceScopes &namespaceScopes, const std::string &name, const Type &newType, _int64 i64data)
+        : Symbol( namespaceScopes, name )
+        , type( newType )
+        , i64data( i64data )
     {
     }
-    ~ConstBase()
+    CConst( const NamespaceScopes &namespaceScopes, const std::string &name, int value)
+        : Symbol( namespaceScopes, name )
+        , type( Type(DEF_LONG) )
+        , i64data( value )
+    {
+    }
+    CConst()
+    {
+    }
+    ~CConst()
     {
     }
 
-    const string &GetName() const
+    virtual const std::string &GetKeyName() const
     {
-        return name;
+        return GetName();
     }
 
-    bool IsEqualSymbol( const NamespaceScopes &namespaceScopes, const string &name ) const;
-    bool IsEqualSymbol( const string &name ) const;
-};
-
-//定数
-class CConst:public ConstBase{
-    Type type;
-    _int64 i64data;
-
-public:
-    CConst *pNext;
-
-    CConst( const NamespaceScopes &namespaceScopes, const string &name, const Type &newType, _int64 i64data);
-    CConst( const NamespaceScopes &namespaceScopes, const string &name, int value);
-    ~CConst();
-
-    Type GetType();
-    _int64 GetWholeData();
+    Type GetType()
+    {
+        return type;
+    }
+    _int64 GetWholeData()
+    {
+        return i64data;
+    }
     double GetDoubleData();
 };
+class Consts : public Jenga::Common::Hashmap<CConst>
+{
+    // XMLシリアライズ用
+private:
+    friend class boost::serialization::access;
+    template<class Archive> void serialize(Archive& ar, const unsigned int version)
+    {
+        trace_for_serialize( "serializing - Consts" );
 
-//定数マクロ
-class CConstMacro:public ConstBase{
-    int ParmNum;
-    char **ppParm;
-public:
-
-    CConstMacro( const NamespaceScopes &namespaceScopes, const string &name, char *Expression);
-    ~CConstMacro();
-};
-
-//定数管理クラス
-class CDBConst{
-    CConst **ppHash;
-
-    CConstMacro **ppobj_Macro;
-    int NumOfMacro;
-
-    //シングルトンクラスなので、プライベートに置く
-    CDBConst();
-    ~CDBConst();
-    void _free();
-    void Free();
+        ar & boost::serialization::make_nvp("Hashmap_CConst",
+            boost::serialization::base_object<Jenga::Common::Hashmap<CConst>>(*this));
+    }
 
 public:
 
-    void Init();
-
     void Add( const NamespaceScopes &namespaceScopes, char *buffer);
-private:
-    void AddConst( const string &name, CConst *newconst);
-public:
-    void AddConst( const NamespaceScopes &namespaceScopes, const string &name, char *Expression);
-    void AddConst( const NamespaceScopes &namespaceScopes, const string &name, int value);
+    void Add( const NamespaceScopes &namespaceScopes, const string &name, char *Expression);
+    void Add( const NamespaceScopes &namespaceScopes, const string &name, int value);
 
 private:
@@ -87 +88 @@
     double GetDoubleData(char *Name);
     bool IsStringPtr(char *Name);
+};
 
+//定数マクロ
+class ConstMacro : public Symbol, public Jenga::Common::ObjectInHashmap<ConstMacro>
+{
+    std::vector<std::string> parameters;
+    std::string expression;
 
-    //シングルトンオブジェクト
-    static CDBConst obj;
+    // XMLシリアライズ用
+private:
+    friend class boost::serialization::access;
+    template<class Archive> void serialize(Archive& ar, const unsigned int version)
+    {
+        trace_for_serialize( "serializing - ConstMacro" );
+
+        ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP( Symbol );
+        ar & BOOST_SERIALIZATION_NVP( parameters );
+        ar & BOOST_SERIALIZATION_NVP( expression );
+    }
+
+public:
+    ConstMacro( const NamespaceScopes &namespaceScopes, const std::string &name, const std::vector<std::string> &parameters, const string &expression )
+        : Symbol( namespaceScopes, name )
+        , parameters( parameters )
+        , expression( expression )
+    {
+    }
+    ConstMacro()
+    {
+    }
+    ~ConstMacro()
+    {
+    }
+
+    virtual const std::string &GetKeyName() const
+    {
+        return GetName();
+    }
+
+    const std::vector<std::string> &GetParameters() const
+    {
+        return parameters;
+    }
+    const std::string &GetExpression() const
+    {
+        return expression;
+    }
+
+    bool GetCalcBuffer( const char *parameterStr, char *dest ) const;
 };
+class ConstMacros : public Jenga::Common::Hashmap<ConstMacro>
+{
+    // XMLシリアライズ用
+private:
+    friend class boost::serialization::access;
+    template<class Archive> void serialize(Archive& ar, const unsigned int version)
+    {
+        trace_for_serialize( "serializing - ConstMacros" );
+
+        ar & boost::serialization::make_nvp("Hashmap_ConstMacro",
+            boost::serialization::base_object<Jenga::Common::Hashmap<ConstMacro>>(*this));
+    }
+
+public:
+    void Add( const NamespaceScopes &namespaceScopes, const std::string &name, const char *parameterStr );
+    ConstMacro *Find( const std::string &name );
+};

trunk/abdev/BasicCompiler_Common/include/LexicalScopingImpl.h

@@ -26 +26 @@
 public:
 
+    virtual void End();
+
     //スコープ終了時のデストラクタ呼び出し
     virtual void CallDestructorsOfScopeEnd();

trunk/abdev/BasicCompiler_Common/include/MetaImpl.h

@@ -3 +3 @@
 #include <jenga/include/common/BoostXmlSupport.h>
 
-#include <jenga/include/smoothie/ObjectModule.h>
+#include <option.h>
+#include <Program.h>
+#include <Class.h>
+#include <Procedure.h>
+#include <TypeDef.h>
+#include <Variable.h>
+#include <Const.h>
 
-#include <ClassImpl.h>
-#include <ProcedureImpl.h>
-#include <TypeDef.h>
-
-class MetaImpl : public Meta, public Jenga::Common::BoostXmlSupport<MetaImpl>
+class MetaImpl : public Jenga::Common::BoostXmlSupport<MetaImpl>
 {
     // 名前空間
     NamespaceScopesCollection namespaceScopesCollection;
 
+    // 関数・メソッド
+    UserProcs userProcs;
+
     // クラス
-    ClassesImpl classesImpl;
-    Classes *pNowClassesForDebugger;
+    Classes classesImpl;
+
+    // グローバル変数
+    Variables globalVars;
+
+    // グローバル定数
+    Consts globalConsts;
+
+    // グローバル定数マクロ
+    ConstMacros globalConstMacros;
 
     // blittable型
@@ -24 +37 @@
     TypeDefCollection typeDefs;
 
+    // 関数ポインタ
+    ProcPointers procPointers;
+
+    // XMLシリアライズ用
+private:
+    virtual const char *RootTagName() const
+    {
+        return "metaImpl";
+    }
+    friend class boost::serialization::access;
+    template<class Archive> void serialize(Archive& ar, const unsigned int version)
+    {
+        trace_for_serialize( "serializing - MetaImpl" );
+
+        ar & BOOST_SERIALIZATION_NVP( namespaceScopesCollection );
+        ar & BOOST_SERIALIZATION_NVP( userProcs );
+        ar & BOOST_SERIALIZATION_NVP( classesImpl );
+        ar & BOOST_SERIALIZATION_NVP( globalVars );
+        ar & BOOST_SERIALIZATION_NVP( globalConsts );
+        ar & BOOST_SERIALIZATION_NVP( globalConstMacros );
+        ar & BOOST_SERIALIZATION_NVP( blittableTypes );
+        ar & BOOST_SERIALIZATION_NVP( typeDefs );
+        ar & BOOST_SERIALIZATION_NVP( procPointers );
+    }
+
+    Classes *pNowClassesForDebugger;
+
 public:
     MetaImpl()
-        : Meta( new ProcPointersImpl() )
-        , classesImpl()
+        : classesImpl()
         , pNowClassesForDebugger( &classesImpl )
     {
@@ -41 +80 @@
     }
 
-    virtual Classes &GetClasses()
+    const UserProcs &GetUserProcs() const
+    {
+        return userProcs;
+    }
+    UserProcs &GetUserProcs()
+    {
+        return userProcs;
+    }
+
+    Classes &GetClasses()
     {
         return *pNowClassesForDebugger;
     }
-    virtual void SetClasses( Classes *pClasses )
+    void SetClasses( Classes *pClasses )
     {
         this->pNowClassesForDebugger = pClasses;
+    }
+
+    const Variables &GetGlobalVars() const
+    {
+        return globalVars;
+    }
+    Variables &GetGlobalVars()
+    {
+        return globalVars;
+    }
+
+    const Consts &GetGlobalConsts() const
+    {
+        return globalConsts;
+    }
+    Consts &GetGlobalConsts()
+    {
+        return globalConsts;
+    }
+
+    const ConstMacros &GetGlobalConstMacros() const
+    {
+        return globalConstMacros;
+    }
+    ConstMacros &GetGlobalConstMacros()
+    {
+        return globalConstMacros;
     }
 
@@ -60 +135 @@
     }
 
-    virtual bool AutoWrite( const std::string &filePath )
+    // 関数ポインタ
+    ProcPointers &GetProcPointers()
+    {
+        return procPointers;
+    }
+
+    bool AutoWrite( const std::string &filePath )
     {
         std::ofstream ofs( filePath.c_str() );
@@ -82 +163 @@
         return isSuccessful;
     }
-
-
-    // XMLシリアライズ用
-private:
-    virtual const char *RootTagName() const
-    {
-        return "metaImpl";
-    }
-    friend class boost::serialization::access;
-    template<class Archive> void serialize(Archive& ar, const unsigned int version)
-    {
-        ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP( Meta );
-        ar & BOOST_SERIALIZATION_NVP( classesImpl );
-    }
 };
-BOOST_IS_ABSTRACT( Meta );

trunk/abdev/BasicCompiler_Common/include/Procedure.h

@@ -1 +1 @@
 #pragma once
 
-#include <jenga/include/smoothie/Procedure.h>
-
-
-class UserProcImpl : public UserProc
+#include <jenga/include/common/Hashmap.h>
+#include <jenga/include/smoothie/Source.h>
+#include <jenga/include/smoothie/LexicalAnalysis.h>
+
+#include <option.h>
+#include <Program.h>
+#include <Class.h>
+#include <Method.h>
+#include <Procedure.h>
+#include <Parameter.h>
+#include <Variable.h>
+
+class CClass;
+class CMethod;
+
+class Procedure
 {
 public:
-    UserProcImpl( const string &name, Kind kind, bool isMacro, bool isCdecl, bool isExport )
-        : UserProc( name, kind, isMacro, isCdecl, isExport )
-    {
-    }
-    virtual bool SetParamsAndReturnType( const char *sourceOfParams, int nowLine, bool isStatic );
+    // 種類
+    enum Kind{
+        Sub,
+        Function,
+    };
+
+private:
+    string name;                        // プロシージャ名
+
+    Kind kind;
+
+    bool isCdecl;
+    mutable bool isUsing;
+
+protected:
+
+    // パラメータ
+    Parameters params;
+
+    // 戻り値の型
+    Type returnType;
+
+    // ソースコードの位置
+    int codePos;
+
+    // XMLシリアライズ用
+private:
+private:
+    friend class boost::serialization::access;
+    BOOST_SERIALIZATION_SPLIT_MEMBER();
+    template<class Archive> void load(Archive& ar, const unsigned int version)
+    {
+        trace_for_serialize( "serializing - Procedure" );
+
+        std::string _name;
+        ar & BOOST_SERIALIZATION_NVP( _name );
+        this->name = Operator_NaturalStringToCalcMarkString( _name );
+
+        ar & BOOST_SERIALIZATION_NVP( kind );
+        ar & BOOST_SERIALIZATION_NVP( isCdecl );
+        ar & BOOST_SERIALIZATION_NVP( isUsing );
+        ar & BOOST_SERIALIZATION_NVP( params );
+        ar & BOOST_SERIALIZATION_NVP( returnType );
+        ar & BOOST_SERIALIZATION_NVP( codePos );
+    }
+    template<class Archive> void save(Archive& ar, const unsigned int version) const
+    {
+        trace_for_serialize( "serializing - Procedure" );
+
+        std::string _name = Operator_CalcMarkStringToNaturalString( name );
+        ar & BOOST_SERIALIZATION_NVP( _name );
+
+        ar & BOOST_SERIALIZATION_NVP( kind );
+        ar & BOOST_SERIALIZATION_NVP( isCdecl );
+        ar & BOOST_SERIALIZATION_NVP( isUsing );
+        ar & BOOST_SERIALIZATION_NVP( params );
+        ar & BOOST_SERIALIZATION_NVP( returnType );
+        ar & BOOST_SERIALIZATION_NVP( codePos );
+    }
+
+public:
+    Procedure( const string &name, Kind kind, bool isCdecl )
+        : name( name )
+        , kind( kind )
+        , isCdecl( isCdecl )
+        , isUsing( false )
+        , codePos( -1 )
+    {
+    }
+    Procedure()
+    {
+    }
+    ~Procedure(){
+        BOOST_FOREACH( Parameter *pParam, params ){
+            delete pParam;
+        }
+    }
+
+    const string &GetName() const
+    {
+        return name;
+    }
+
+    bool IsSub() const
+    {
+        return ( kind == Sub );
+    }
+    bool IsFunction() const
+    {
+        return ( kind == Function );
+    }
+
+    bool IsCdecl() const
+    {
+        return isCdecl;
+    }
+    void Using() const
+    {
+        isUsing = true;
+    }
+    bool IsUsing() const
+    {
+        return isUsing;
+    }
+
+    int GetCodePos() const
+    {
+        return codePos;
+    }
+
+    const Parameters &Params() const
+    {
+        return params;
+    }
+    const Type &ReturnType() const
+    {
+        return returnType;
+    }
 };
 
-class GlobalProc : public UserProcImpl
+class UserProc : public Procedure, public Jenga::Common::ObjectInHashmap<UserProc>
 {
-    const NamespaceScopes namespaceScopes;
-    const NamespaceScopesCollection importedNamespaces;
+public:
+    string _paramStr;
+
+private:
+    NamespaceScopes namespaceScopes;
+    NamespaceScopesCollection importedNamespaces;
+
+    // 親クラスと対応するメソッド
+    const CClass *pParentClass;
+    CMethod *pMethod;
+
+    bool isMacro;
+
+    // パラメータの追加情報
+    int secondParmNum;
+    Parameters realParams;
+    int realSecondParmNum;
+
+    // 各種フラグ
+    bool isExport;
+    mutable bool isSystem;
+    mutable bool isAutoGeneration;
+    mutable bool isCompiled;
+
+    mutable DWORD beginOpAddress;
+    mutable DWORD endOpAddress;
+
+    // ローカル変数
+    mutable Variables localVars;
+
+    // 識別ID
+    int id;
+
+    // XMLシリアライズ用
+private:
+    friend class boost::serialization::access;
+    template<class Archive> void serialize(Archive& ar, const unsigned int version)
+    {
+        trace_for_serialize( "serializing - UserProc" );
+
+        ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP( Procedure );
+        ar & BOOST_SERIALIZATION_NVP( _paramStr );
+        ar & BOOST_SERIALIZATION_NVP( namespaceScopes );
+        ar & BOOST_SERIALIZATION_NVP( importedNamespaces );
+        ar & boost::serialization::make_nvp("pParentClass", const_cast<CClass *&>(pParentClass) );
+        ar & BOOST_SERIALIZATION_NVP( pMethod );
+        ar & BOOST_SERIALIZATION_NVP( isMacro );
+        ar & BOOST_SERIALIZATION_NVP( secondParmNum );
+        ar & BOOST_SERIALIZATION_NVP( realParams );
+        ar & BOOST_SERIALIZATION_NVP( realSecondParmNum );
+        ar & BOOST_SERIALIZATION_NVP( isExport );
+        ar & BOOST_SERIALIZATION_NVP( isSystem );
+        ar & BOOST_SERIALIZATION_NVP( isAutoGeneration );
+        ar & BOOST_SERIALIZATION_NVP( isCompiled );
+        ar & BOOST_SERIALIZATION_NVP( beginOpAddress );
+        ar & BOOST_SERIALIZATION_NVP( endOpAddress );
+        ar & BOOST_SERIALIZATION_NVP( localVars );
+        ar & BOOST_SERIALIZATION_NVP( id );
+    }
+
+public:
+
+    UserProc( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, const string &name, Kind kind, bool isMacro, bool isCdecl, bool isExport, int id )
+        : Procedure( name, kind, isCdecl )
+        , namespaceScopes( namespaceScopes )
+        , importedNamespaces( importedNamespaces )
+        , pParentClass( NULL )
+        , pMethod( NULL )
+        , isMacro( isMacro )
+        , isExport( isExport )
+        , isSystem( false )
+        , isAutoGeneration( false )
+        , isCompiled( false )
+        , beginOpAddress( 0 )
+        , endOpAddress( 0 )
+        , id( id )
+    {
+    }
+    UserProc()
+    {
+    }
+    ~UserProc()
+    {
+        BOOST_FOREACH( Parameter *pParam, realParams ){
+            delete pParam;
+        }
+    }
+
+    virtual const std::string &GetKeyName() const
+    {
+        return GetName();
+    }
+
+    bool IsMacro() const
+    {
+        return isMacro;
+    }
+
+    int GetSecondParmNum() const
+    {
+        return secondParmNum;
+    }
+    const Parameters &RealParams() const
+    {
+        return realParams;
+    }
+    int GetRealSecondParmNum() const
+    {
+        return realSecondParmNum;
+    }
+
+    void ExportOff(){
+        isExport = false;
+    }
+    bool IsExport() const
+    {
+        return isExport;
+    }
+    void ThisIsSystemProc() const
+    {
+        isSystem = true;
+    }
+    bool IsSystem() const
+    {
+        return isSystem;
+    }
+    void ThisIsAutoGenerationProc() const
+    {
+        isAutoGeneration = true;
+    }
+    bool IsAutoGeneration() const
+    {
+        return isAutoGeneration;
+    }
+    void CompleteCompile() const
+    {
+        isCompiled = true;
+    }
+    void KillCompileStatus() const
+    {
+        isCompiled = false;
+    }
+    bool IsCompiled() const
+    {
+        return isCompiled;
+    }
+    bool IsDestructor() const
+    {
+        return ( GetName()[0] == '~' );
+    }
+
+    // バイナリコード位置とサイズ
+    DWORD GetBeginOpAddress() const
+    {
+        return beginOpAddress;
+    }
+    void SetBeginOpAddress( DWORD beginOpAddress ) const
+    {
+        this->beginOpAddress = beginOpAddress;
+    }
+    DWORD GetEndOpAddress() const
+    {
+        return endOpAddress;
+    }
+    void SetEndOpAddress( DWORD endOpAddress ) const
+    {
+        this->endOpAddress = endOpAddress;
+    }
+    int GetCodeSize() const
+    {
+        return endOpAddress - beginOpAddress;
+    }
+
+    const NamespaceScopes &GetNamespaceScopes() const;
+    const NamespaceScopesCollection &GetImportedNamespaces() const;
+
+    Variables &GetLocalVars() const
+    {
+        return localVars;
+    }
+
+    int GetId() const
+    {
+        return id;
+    }
+
+    std::string GetFullName() const;
+
+    virtual bool IsDuplication( const UserProc *pUserProc ) const
+    {
+        if( this->GetParentClassPtr() == pUserProc->GetParentClassPtr()
+            && pUserProc->IsEqualSymbol( *this )
+            && this->Params().Equals( pUserProc->Params() ) )
+        {
+            return true;
+        }
+        return false;
+    }
+
+    bool IsEqualSymbol( const NamespaceScopes &namespaceScopes, const string &name ) const;
+    bool IsEqualSymbol( const UserProc &globalProc ) const;
+    bool IsEqualSymbol( const string &name ) const;
+
+    bool IsVirtual() const;
+
+    void SetParentClass( const CClass *pParentClass ){
+        this->pParentClass = pParentClass;
+    }
+    const CClass *GetParentClassPtr() const
+    {
+        return pParentClass;
+    }
+    const CClass &GetParentClass() const
+    {
+        return *pParentClass;
+    }
+    bool HasParentClass() const
+    {
+        return ( pParentClass != NULL );
+    }
+    void SetMethod( CMethod *pMethod ){
+        this->pMethod = pMethod;
+    }
+
+    bool SetParamsAndReturnType( const char *sourceOfParams, int nowLine, bool isStatic );
+
+
+
+    /////////////////////////////////////////////////////////////////
+    // コンパイル中の関数を管理
+    /////////////////////////////////////////////////////////////////
+private:
+    static const UserProc *pCompilingUserProc;
+public:
+    static void CompileStartForGlobalArea(){
+        pCompilingUserProc = NULL;
+    }
+    static void CompileStartForUserProc( const UserProc *pUserProc ){
+        pCompilingUserProc = pUserProc;
+    }
+    static bool IsGlobalAreaCompiling(){
+        return ( pCompilingUserProc == NULL );
+    }
+    static bool IsLocalAreaCompiling(){
+        return ( pCompilingUserProc != NULL );
+    }
+    static const UserProc &CompilingUserProc(){
+        return *pCompilingUserProc;
+    }
+};
+
+class UserProcs : public Jenga::Common::Hashmap<UserProc>
+{
+    std::vector<std::string> macroNames;
+
+    // XMLシリアライズ用
+private:
+    friend class boost::serialization::access;
+    template<class Archive> void serialize(Archive& ar, const unsigned int version)
+    {
+        trace_for_serialize( "serializing - UserProcs" );
+
+        ar & boost::serialization::make_nvp("Hashmap_UserProcImpl",
+            boost::serialization::base_object<Jenga::Common::Hashmap<UserProc>>(*this));
+        ar & BOOST_SERIALIZATION_NVP( macroNames );
+    }
+
+
+public:
+    UserProcs()
+    {
+    }
+    ~UserProcs()
+    {
+    }
+
+    bool Insert( UserProc *pUserProc, int nowLine );
+
+    UserProc *Add( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, char *buffer,int nowLine,bool isVirtual,CClass *pobj_c, bool isStatic);
+
+    void EnumGlobalProcs( const char *simpleName, const char *localName, std::vector<const UserProc *> &subs );
+
+    static void CollectUserProcs( const BasicSource &source, UserProcs &userProcs );
+};
+
+class DllProc : public Procedure
+{
+    NamespaceScopes namespaceScopes;
+
+    string dllFileName;
+    string alias;
+    int lookupAddress;
+
+    // XMLシリアライズ用
+private:
+    friend class boost::serialization::access;
+    template<class Archive> void serialize(Archive& ar, const unsigned int version)
+    {
+        trace_for_serialize( "serializing - DllProc" );
+
+        ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP( Procedure );
+        ar & BOOST_SERIALIZATION_NVP( namespaceScopes );
+        ar & BOOST_SERIALIZATION_NVP( dllFileName );
+        ar & BOOST_SERIALIZATION_NVP( alias );
+        ar & BOOST_SERIALIZATION_NVP( lookupAddress );
+    }
+
 public:
     // ハッシュリスト用
-    GlobalProc *pNextData;
-
-    GlobalProc( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, const string &name, Kind kind, bool isMacro, bool isCdecl, bool isExport ):
-      UserProcImpl( name, kind, isMacro, isCdecl, isExport ),
+    DllProc *pNextData;
+
+    DllProc( const NamespaceScopes &namespaceScopes, const string &name, Kind kind, bool isCdecl, const string &dllFileName, const string &alias ):
+      Procedure( name, kind, isCdecl ),
       namespaceScopes( namespaceScopes ),
-      importedNamespaces( importedNamespaces ),
+      dllFileName( dllFileName ),
+      alias( alias ),
+      lookupAddress( 0 ),
       pNextData( NULL )
-    {}
-    ~GlobalProc(){}
-
-    virtual const NamespaceScopes &GetNamespaceScopes() const;
-    virtual const NamespaceScopesCollection &GetImportedNamespaces() const
-    {
-        return importedNamespaces;
-    }
+    {
+    }
+    ~DllProc(){}
 
     virtual bool IsEqualSymbol( const NamespaceScopes &namespaceScopes, const string &name ) const;
-    virtual bool IsEqualSymbol( const GlobalProc &globalProc ) const;
-    virtual bool IsEqualSymbol( const string &name ) const;
+    bool IsEqualSymbol( const string &name ) const;
+
+    const NamespaceScopes &GetNamespaceScopes() const
+    {
+        return namespaceScopes;
+    }
+
+    const string &GetDllFileName() const
+    {
+        return dllFileName;
+    }
+    const string &GetAlias() const
+    {
+        return alias;
+    }
+
+    void SetLookupAddress( int lookupAddress ){
+        this->lookupAddress = lookupAddress;
+    }
+    int GetLookupAddress() const
+    {
+        return lookupAddress;
+    }
+
+    bool SetParamsAndReturnType( const char *sourceOfParams, int nowLine );
 };
 
-class DllProcImpl : public DllProc
+class ProcPointer : public Procedure
 {
-public:
-    DllProcImpl( const NamespaceScopes &namespaceScopes, const string &name, Kind kind, bool isCdecl, const string &dllFileName, const string &alias )
-        : DllProc( namespaceScopes, name, kind, isCdecl, dllFileName, alias )
-    {
-    }
-
-    virtual bool IsEqualSymbol( const NamespaceScopes &namespaceScopes, const string &name ) const;
+    // XMLシリアライズ用
+private:
+    friend class boost::serialization::access;
+    template<class Archive> void serialize(Archive& ar, const unsigned int version)
+    {
+        trace_for_serialize( "serializing - ProcPointer" );
+
+        ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP( Procedure );
+    }
+
+public:
+    ProcPointer( Kind kind )
+        : Procedure( "", kind, false )
+    {
+    }
+    ProcPointer()
+    {
+    }
+    ~ProcPointer(){}
 
     virtual bool SetParamsAndReturnType( const char *sourceOfParams, int nowLine );
 };
 
-class ProcPointerImpl : public ProcPointer
+class ProcPointers : public vector<ProcPointer *>
 {
-public:
-    ProcPointerImpl( Kind kind ):
-      ProcPointer( kind )
-    {
-    }
-
-    virtual bool SetParamsAndReturnType( const char *sourceOfParams, int nowLine );
-};
-
-class ProcPointersImpl : public ProcPointers
-{
-public:
-    ProcPointersImpl()
-    {
-    }
-    ~ProcPointersImpl()
+    // XMLシリアライズ用
+private:
+    friend class boost::serialization::access;
+    template<class Archive> void serialize(Archive& ar, const unsigned int version)
+    {
+        trace_for_serialize( "serializing - ProcPointers" );
+
+        ar & boost::serialization::make_nvp("vector_ProcPointer",
+            boost::serialization::base_object<vector<ProcPointer *>>(*this));
+    }
+
+public:
+    ProcPointers()
+    {
+    }
+    ~ProcPointers()
     {
         Clear();

trunk/abdev/BasicCompiler_Common/include/SmoothieImpl.h

@@ -2 +2 @@
 
 #include <jenga/include/smoothie/Smoothie.h>
-#include <jenga/include/smoothie/ObjectModule.h>
 
 #include <MetaImpl.h>

trunk/abdev/BasicCompiler_Common/include/TypeDef.h

@@ -4 +4 @@
 #include <string>
 
-#include <jenga/include/smoothie/Type.h>
 #include <jenga/include/smoothie/Namespace.h>
+
+#include <Type.h>
+#include <Symbol.h>
 
 using namespace std;
@@ -11 +13 @@
 class TypeDefCollection;
 
-class TypeDef{
+class TypeDef : public Symbol
+{
     friend TypeDefCollection;
 
-    NamespaceScopes namespaceScopes;
-
-    string name;
     string baseName;
     Type baseType;
+
+    // XMLシリアライズ用
+private:
+    friend class boost::serialization::access;
+    template<class Archive> void serialize(Archive& ar, const unsigned int version)
+    {
+        trace_for_serialize( "serializing - TypeDef" );
+
+        ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP( Symbol );
+        ar & BOOST_SERIALIZATION_NVP( baseName );
+        ar & BOOST_SERIALIZATION_NVP( baseType );
+    }
+
 public:
     TypeDef( const NamespaceScopes &namespaceScopes, const string &name, const string &baseName, int nowLine );
-    ~TypeDef();
+    TypeDef()
+    {
+    }
+    ~TypeDef()
+    {
+    }
 
-    const string &GetName() const
-    {
-        return name;
-    }
     const string &GetBaseName() const
     {
@@ -35 +49 @@
         return baseType;
     }
-
-    bool IsEqualSymbol( const NamespaceScopes &namespaceScopes, const string &name ) const;
-    bool IsEqualSymbol( const string &name ) const;
 };
 
-class TypeDefCollection : public vector<TypeDef>
+class TypeDefCollection : public std::vector<TypeDef>
 {
+    // XMLシリアライズ用
+private:
+    friend class boost::serialization::access;
+    template<class Archive> void serialize(Archive& ar, const unsigned int version)
+    {
+        trace_for_serialize( "serializing - TypeDefCollection" );
+
+        ar & boost::serialization::make_nvp("vector_TypeDef",
+            boost::serialization::base_object<std::vector<TypeDef>>(*this));
+    }
+
 public:
     TypeDefCollection();

trunk/abdev/BasicCompiler_Common/include/option.h

@@ -23 +23 @@
 
 // ログ生成しない場合はこの下の行をコメントアウトする
-//#define USE_TRACE
+#define USE_TRACE
 
 // オーバーロードに関するログを生成する
-#define USE_TRACE_FOR_OVERLOAD
+//#define USE_TRACE_FOR_OVERLOAD
 
 // モジュールサイズに関するログを生成する
-#define USE_TRACE_FOR_SIZE
+//#define USE_TRACE_FOR_SIZE
+
+// XMLシリアライズに関するログを生成する
+#define USE_TRACE_FOR_SERIALIZE
+
+// ソースコードステップに関するログを生成する
+#define USE_TRACE_FOR_SOURCECODESTEP
 
 
@@ -53 +59 @@
 #define trace_for_size(s)
 #endif
+
+#ifdef USE_TRACE_FOR_SERIALIZE
+#define trace_for_serialize(s) trace(s)
+#else
+#define trace_for_serialize(s)
+#endif
+
+#ifdef USE_TRACE_FOR_SOURCECODESTEP
+#define trace_for_sourcecodestep(s) trace( "[source code step] " << s)
+#else
+#define trace_for_sourcecodestep(s)
+#endif

trunk/abdev/BasicCompiler_Common/src/Class.cpp

@@ +1 @@
+#include "stdafx.h"
+
 #include <jenga/include/smoothie/Smoothie.h>
-#include <jenga/include/smoothie/Class.h>
 #include <jenga/include/smoothie/Source.h>
 #include <jenga/include/smoothie/SmoothieException.h>
 #include <jenga/include/smoothie/LexicalAnalysis.h>
 
-#include <ClassImpl.h>
+#include <Class.h>
 #include <Compiler.h>
 #include <NamespaceSupporter.h>
@@ -15 +16 @@
 #include "../../BasicCompiler32/opcode.h"
 #endif
-
-
 
 
@@ -77 +76 @@
 
 
-bool ClassImpl::IsEqualSymbol( const NamespaceScopes &namespaceScopes, const string &name ) const
-{
-    if( GetName() != name ){
+bool CClass::IsClass() const
+{
+    return classType == CClass::Class;
+}
+bool CClass::IsInterface() const
+{
+    return classType == CClass::Interface;
+}
+bool CClass::IsEnum() const
+{
+    return classType == CClass::Enum;
+}
+bool CClass::IsDelegate() const
+{
+    return classType == CClass::Delegate;
+}
+bool CClass::IsStructure() const
+{
+    return classType == CClass::Structure;
+}
+
+
+// コンストラクタのコンパイルを開始
+void CClass::NotifyStartConstructorCompile() const
+{
+    isCompilingConstructor = true;
+}
+
+//コンストラクタのコンパイルを終了
+void CClass::NotifyFinishConstructorCompile() const
+{
+    isCompilingConstructor = false;
+}
+
+//コンストラクタをコンパイル中かどうかを判別
+bool CClass::IsCompilingConstructor() const
+{
+    return isCompilingConstructor;
+}
+
+//デストラクタのコンパイルを開始
+void CClass::NotifyStartDestructorCompile() const{
+    isCompilingDestructor = true;
+}
+
+//デストラクタのコンパイルを終了
+void CClass::NotifyFinishDestructorCompile() const{
+    isCompilingDestructor = false;
+}
+
+//デストラクタをコンパイル中かどうかを判別
+bool CClass::IsCompilingDestructor() const
+{
+    return isCompilingDestructor;
+}
+
+//自身の派生クラスかどうかを確認
+bool CClass::IsSubClass( const CClass *pClass ) const
+{
+    if( !pClass->HasSuperClass() )
+    {
         return false;
     }
 
-    return compiler.GetNamespaceSupporter().IsSameAreaNamespace( GetNamespaceScopes(), namespaceScopes );
-}
-
-bool ClassImpl::Inherits( const char *inheritNames, int nowLine ){
+    const CClass *pTempClass = &pClass->GetSuperClass();
+    while( pTempClass ){
+        if( this == pTempClass ) return true;
+        pTempClass = &pTempClass->GetSuperClass();
+    }
+    return false;
+}
+
+//自身と等しいまたは派生クラスかどうかを確認
+bool CClass::IsEqualsOrSubClass( const CClass *pClass ) const
+{
+    if( IsEquals( pClass ) ) return true;
+    return IsSubClass( pClass );
+}
+
+// 自身と等しいまたは派生クラス、基底クラスかどうかを確認
+bool CClass::IsEqualsOrSubClassOrSuperClass( const CClass &objClass ) const
+{
+    if( IsEquals( &objClass ) ) return true;
+    if( IsSubClass( &objClass ) ) return true;
+    if( objClass.IsSubClass( this ) ) return true;
+    return false;
+}
+
+bool CClass::IsInheritsInterface( const CClass *pInterfaceClass ) const
+{
+    BOOST_FOREACH( const InheritedInterface &objInterface, interfaces ){
+        if( pInterfaceClass == &objInterface.GetInterfaceClass() ){
+            return true;
+        }
+    }
+    return false;
+}
+
+bool CClass::Inherits( const char *inheritNames, int nowLine ){
     int i = 0;
     bool isInheritsClass = false;
@@ -183 +271 @@
     return true;
 }
-bool ClassImpl::InheritsClass( const CClass &inheritsClass, int nowLine ){
+bool CClass::InheritsClass( const CClass &inheritsClass, int nowLine ){
 
     //ループ継承でないかをチェック
@@ -245 +333 @@
     return true;
 }
-bool ClassImpl::InheritsInterface( const CClass &inheritsInterface, int nowLine ){
+bool CClass::InheritsInterface( const CClass &inheritsInterface, int nowLine ){
 
     //ループ継承でないかをチェック
@@ -291 +379 @@
     return true;
 }
-CMember *ClassImpl::CreateMember( Prototype::Accessibility accessibility, bool isConst, bool isRef, char *buffer, int nowLine )
+CMember *CClass::CreateMember( Prototype::Accessibility accessibility, bool isConst, bool isRef, char *buffer, int nowLine )
 {
     extern int cp;
@@ -299 +387 @@
     char initBuffer[VN_SIZE];
     char lpszConstructParameter[VN_SIZE];
-    int SubScripts[MAX_ARRAYDIM];
+    Subscripts subscripts;
     Type type;
-    GetDimentionFormat(buffer,VarName,SubScripts,type,initBuffer,lpszConstructParameter);
+    GetDimentionFormat(buffer,VarName,subscripts,type,initBuffer,lpszConstructParameter);
 
     //重複チェック
@@ -308 +396 @@
     }
 
-    CMember *pMember = new CMember( accessibility, VarName, type, isConst, initBuffer, lpszConstructParameter );
+    CMember *pMember = new CMember( accessibility, VarName, type, isConst, subscripts, initBuffer, lpszConstructParameter );
     pMember->source_code_address = nowLine;
-    memcpy( pMember->SubScripts, SubScripts, MAX_ARRAYDIM * sizeof(int) );
     return pMember;
 }
-void ClassImpl::AddMember( Prototype::Accessibility accessibility, bool isConst, bool isRef, char *buffer, int nowLine ){
+void CClass::AddMember( Prototype::Accessibility accessibility, bool isConst, bool isRef, char *buffer, int nowLine ){
     dynamicMembers.push_back(
         CreateMember( accessibility, isConst, isRef, buffer, nowLine )
     );
 }
-void ClassImpl::AddStaticMember( Prototype::Accessibility accessibility, bool isConst, bool isRef, char *buffer, int nowLine ){
+void CClass::AddStaticMember( Prototype::Accessibility accessibility, bool isConst, bool isRef, char *buffer, int nowLine ){
     staticMembers.push_back(
         CreateMember( accessibility, isConst, isRef, buffer, nowLine )
@@ -324 +411 @@
 }
 
-void ClassImpl::AddMethod(CClass *pobj_c, Prototype::Accessibility accessibility, BOOL bStatic, bool isConst, bool isAbstract,
+void CClass::AddMethod(CClass *pobj_c, Prototype::Accessibility accessibility, BOOL bStatic, bool isConst, bool isAbstract,
                          bool isVirtual, bool isOverride, char *buffer, int nowLine){
     int i,i2;
@@ -340 +427 @@
 
     //関数ハッシュへ登録
-    GlobalProc *pUserProc;
-    pUserProc=AddSubData( NamespaceScopes(), NamespaceScopesCollection(), buffer,nowLine,isVirtual,pobj_c, (bStatic!=0) );
+    UserProc *pUserProc = compiler.GetMeta().GetUserProcs().Add( NamespaceScopes(), NamespaceScopesCollection(), buffer,nowLine,isVirtual,pobj_c, (bStatic!=0) );
     if(!pUserProc) return;
 
@@ -394 +480 @@
         if( pMethod->GetInheritsClassPtr() ) continue;
 
-        if( pMethod->pUserProc->GetName() == temporary ){
-            if( pMethod->pUserProc->Params().Equals( pUserProc->Params() ) ){
+        if( pMethod->GetUserProc().GetName() == temporary ){
+            if( pMethod->GetUserProc().Params().Equals( pUserProc->Params() ) ){
                 //関数名、パラメータ属性が合致したとき
                 SetError(15,pUserProc->GetName().c_str(),nowLine);
@@ -408 +494 @@
     //メソッドのオーバーライド
     BOOST_FOREACH( CMethod *pMethod, pobj_c->GetMethods() ){
-        if( pMethod->pUserProc->GetName() == temporary ){
-            if( pMethod->pUserProc->Params().Equals( pUserProc->Params() ) ){
+        if( pMethod->GetUserProc().GetName() == temporary ){
+            if( pMethod->GetUserProc().Params().Equals( pUserProc->Params() ) ){
 
                 if(pMethod->IsVirtual()){
                     //メンバ関数を上書き
-                    pMethod->pUserProc=pUserProc;
+                    pMethod->SetUserProcPtr( pUserProc );
                     pMethod->Override();
 
@@ -446 +532 @@
 }
 
-LONG_PTR ClassImpl::GetVtblGlobalOffset(void) const
+bool CClass::DupliCheckAll(const char *name){
+    //重複チェック
+
+    //メンバ
+    if(DupliCheckMember(name)) return 1;
+
+    //メソッド
+    BOOST_FOREACH( const CMethod *pMethod, methods ){
+        if( lstrcmp( name, pMethod->GetUserProc().GetName().c_str() ) == 0 ){
+            return 1;
+        }
+    }
+
+    return 0;
+}
+bool CClass::DupliCheckMember(const char *name){
+    //重複チェック
+
+    // 動的メンバ
+    BOOST_FOREACH( CMember *pMember, dynamicMembers ){
+        if( GetName() == pMember->GetName() ){
+            return 1;
+        }
+    }
+
+    // 静的メンバ
+    BOOST_FOREACH( CMember *pMember, staticMembers ){
+        if( GetName() == pMember->GetName() ){
+            return 1;
+        }
+    }
+
+    return 0;
+}
+
+//サイズを取得
+int CClass::GetSize() const
+{
+    return GetMemberOffset( NULL, NULL );
+}
+
+//メンバのオフセットを取得
+int CClass::GetMemberOffset( const char *memberName, int *pMemberNum ) const
+{
+    int i2;
+
+    //仮想関数が存在する場合は関数リストへのポインタのサイズを追加
+    int offset = IsExistVirtualFunctions() ? PTR_SIZE : 0;
+
+    int alignment;
+    if(iAlign) alignment=iAlign;
+    else alignment=1;
+
+    int iMaxAlign=0;
+    int i = -1;
+    BOOST_FOREACH( CMember *pMember, dynamicMembers ){
+        i++;
+
+        i2 = pMember->GetType().GetSize();
+
+        //アラインメントを算出
+        int member_size;
+        if( pMember->GetType().IsStruct() ){
+            //メンバクラスのアラインメントを取得
+            member_size=pMember->GetType().GetClass().GetAlignment();
+        }
+        else{
+            //メンバサイズを取得
+            member_size=i2;
+        }
+        if(iMaxAlign<member_size) iMaxAlign=member_size;
+
+        //アラインメントを考慮
+        if(iAlign&&iAlign<member_size){
+            if(offset%alignment) offset+=alignment-(offset%alignment);
+        }
+        else{
+            if(alignment<member_size) alignment=member_size;
+
+            if(member_size==0){
+                //メンバを持たないクラス
+                //※何もしない（オフセットの計算をしない）
+            }
+            else{
+                if(offset%member_size) offset+=member_size-(offset%member_size);
+            }
+        }
+
+        if(memberName){
+            //メンバ指定がある場合は、オフセットを返す
+            if( pMember->GetName() == memberName ){
+                if(pMemberNum) *pMemberNum=i;
+                return offset;
+            }
+        }
+
+        //配列を考慮したメンバサイズを取得
+        member_size = i2 * Variable::GetSubScriptCounts( pMember->GetSubscripts() );
+
+        //メンバサイズを加算
+        offset+= member_size;
+    }
+
+    if(iMaxAlign<alignment) alignment=iMaxAlign;
+
+    //アラインメントを考慮
+    if(alignment){
+        if(offset%alignment) offset+=alignment-(offset%alignment);
+    }
+
+    if(pMemberNum) *pMemberNum=i;
+    return offset;
+}
+int CClass::GetAlignment() const
+{
+    //仮想関数が存在する場合は関数リストへのポインタのサイズを追加
+    int alignment = IsExistVirtualFunctions() ? PTR_SIZE : 0;
+
+    BOOST_FOREACH( CMember *pMember, dynamicMembers ){
+        int member_size;
+        if(pMember->GetType().IsStruct()){
+            //メンバクラスのアラインメントを取得
+            member_size=pMember->GetType().GetClass().GetAlignment();
+        }
+        else{
+            //メンバサイズを取得
+            member_size = pMember->GetType().GetSize();
+        }
+
+        //アラインメントをセット
+        if(alignment<member_size) alignment=member_size;
+    }
+
+    if(alignment==0) return 0;
+
+    if(iAlign) alignment=iAlign;
+
+    return alignment;
+}
+int CClass::GetFuncNumInVtbl( const UserProc *pUserProc ) const
+{
+    int n = 0;
+    BOOST_FOREACH( const CMethod *pMethod, methods ){
+        if( &pMethod->GetUserProc() == pUserProc ) break;
+        if( pMethod->IsVirtual() ) n++;
+    }
+    return n;
+}
+LONG_PTR CClass::GetVtblGlobalOffset(void) const
 {
 
@@ -458 +692 @@
     //////////////////////////////////////
 
-    UserProc **ppsi;
-    ppsi=(UserProc **)malloc(GetVtblNum()*sizeof(UserProc *));
+    const UserProc **ppsi;
+    ppsi=(const UserProc **)malloc(GetVtblNum()*sizeof(UserProc *));
 
     //関数テーブルに値をセット
@@ -465 +699 @@
     BOOST_FOREACH( const CMethod *pMethod, methods ){
         if(pMethod->IsVirtual()){
-            pMethod->pUserProc->Using();
+            pMethod->GetUserProc().Using();
 
             if(pMethod->IsAbstract()){
@@ -474 +708 @@
             }
             else{
-                ppsi[i2]=pMethod->pUserProc;
+                ppsi[i2]=&pMethod->GetUserProc();
             }
             i2++;
@@ -490 +724 @@
     return vtbl_offset;
 }
-void ClassImpl::ActionVtblSchedule(LONG_PTR ImageBase, LONG_PTR MemPos_CodeSection){
+void CClass::ActionVtblSchedule(LONG_PTR ImageBase, LONG_PTR MemPos_CodeSection){
     if(vtbl_offset==-1) return;
 
@@ -501 +735 @@
         pUserProc=(UserProc *)pVtbl[i];
         if(!pUserProc) continue;
-        pVtbl[i]=pUserProc->beginOpAddress+ImageBase+MemPos_CodeSection;
-    }
-}
-
-CClass *ClassesImpl::Create( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, const char *name){
-    return new ClassImpl(namespaceScopes, importedNamespaces, name);
-}
-
-void ClassesImpl::CollectClassesForNameOnly( const BasicSource &source )
+        pVtbl[i]=pUserProc->GetBeginOpAddress()+ImageBase+MemPos_CodeSection;
+    }
+}
+bool CClass::IsAbstract() const
+{
+    // 未実装(abstract)の仮想関数を持つ場合はtrueを返す
+
+    BOOST_FOREACH( const CMethod *pMethod, methods ){
+        if(pMethod->IsVirtual()){
+            if(pMethod->IsAbstract()){
+                return true;
+            }
+        }
+    }
+
+    return false;
+}
+
+
+int Classes::GetHashCode(const char *name) const
+{
+    int key;
+
+    for(key=0;*name!='\0';name++){
+        key=((key<<8)+ *name )%MAX_CLASS_HASH;
+    }
+
+    return key;
+}
+
+CClass *Classes::Create( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, const char *name){
+    return new CClass(namespaceScopes, importedNamespaces, name);
+}
+bool Classes::Insert( CClass *pClass )
+{
+    // キャッシュしておくクラス
+    if( pClass->GetName() == "String" )
+    {
+        pStringClass=pClass;
+    }
+    else if( pClass->GetName() == "Object" )
+    {
+        pObjectClass = pClass;
+    }
+
+    /////////////////////////////////
+    // ハッシュデータに追加
+    /////////////////////////////////
+
+    int key;
+    key=GetHashCode( pClass->GetName().c_str() );
+
+    if(pobj_ClassHash[key]){
+        CClass *pobj_c2;
+        pobj_c2=pobj_ClassHash[key];
+        while(1){
+            if( ((const Prototype *)pobj_c2)->IsEqualSymbol( *(const Prototype *)pClass ) ){
+                //名前空間及びクラス名が重複した場合
+                SmoothieException::Throw(15,pClass->GetName());
+                return false;
+            }
+
+            if(pobj_c2->pobj_NextClass==0) break;
+            pobj_c2=pobj_c2->pobj_NextClass;
+        }
+        pobj_c2->pobj_NextClass=pClass;
+    }
+    else{
+        pobj_ClassHash[key]=pClass;
+    }
+    return true;
+}
+CClass *Classes::Add( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, const char *name,int nowLine){
+    //////////////////////////////////////////////////////////////////////////
+    // クラスを追加
+    // ※名前のみを登録。その他の情報はSetClassメソッドで！
+    //////////////////////////////////////////////////////////////////////////
+
+    CClass *pClass = Create(namespaceScopes, importedNamespaces, name);
+
+    if( !Insert( pClass ) )
+    {
+        return NULL;
+    }
+
+    return pClass;  
+}
+
+void Classes::CollectClassesForNameOnly( const BasicSource &source )
 {
     int i, i2;
@@ -641 +955 @@
 }
 
-void ClassesImpl::InitStaticMember(){
+void Classes::ActionVtblSchedule(LONG_PTR ImageBase, LONG_PTR MemPos_CodeSection){
+    int i;
+    for(i=0;i<MAX_CLASS_HASH;i++){
+        if(pobj_ClassHash[i]){
+            CClass *pobj_c;
+            pobj_c=pobj_ClassHash[i];
+            while(1){
+                pobj_c->ActionVtblSchedule(ImageBase,MemPos_CodeSection);
+
+                if(pobj_c->pobj_NextClass==0) break;
+                pobj_c=pobj_c->pobj_NextClass;
+            }
+        }
+    }
+}
+
+
+void Classes::InitStaticMember(){
     //静的メンバをグローバル領域に作成
 
@@ -662 +993 @@
             dim(
                 temporary,
-                member->SubScripts,
+                member->GetSubscripts(),
                 member->GetType(),
                 member->GetInitializeExpression().c_str(),
@@ -679 +1010 @@
     cp=back_cp;
 }
-bool ClassesImpl::MemberVar_LoopRefCheck(const CClass &objClass){
+bool Classes::MemberVar_LoopRefCheck(const CClass &objClass){
     bool result = true;
     BOOST_FOREACH( CMember *pMember, objClass.GetDynamicMembers() ){
@@ -704 +1035 @@
     return result;
 }
-void ClassesImpl::GetClass_recur(const char *lpszInheritsClass){
+void Classes::GetClass_recur(const char *lpszInheritsClass){
     extern char *basbuf;
     int i,i2,i3,sub_address,top_pos;
@@ -1156 +1487 @@
     compiler.GetNamespaceSupporter().GetLivingNamespaceScopes() = backupNamespaceScopes;
 }
-void ClassesImpl::GetAllClassInfo(void){
+void Classes::GetAllClassInfo(void){
     //ループ継承チェック用のクラス
     pobj_LoopRefCheck=new CLoopRefCheck();
@@ -1169 +1500 @@
     this->Iterator_Init();
 }
-void ClassesImpl::Compile_System_InitializeUserTypes(){
+void Classes::Compile_System_InitializeUserTypes(){
     char temporary[VN_SIZE];
 
@@ -1296 +1627 @@
 }
 
-const CClass *ClassesImpl::Find( const NamespaceScopes &namespaceScopes, const string &name ) const
+const CClass *Classes::Find( const NamespaceScopes &namespaceScopes, const string &name ) const
 {
     int key;
@@ -1333 +1664 @@
     return NULL;
 }
+const CClass *Classes::Find( const string &fullName ) const
+{
+    char AreaName[VN_SIZE] = "";        //オブジェクト変数
+    char NestName[VN_SIZE] = "";        //入れ子メンバ
+    bool isNest = SplitMemberName( fullName.c_str(), AreaName, NestName );
+
+    return Find( NamespaceScopes( AreaName ), NestName );
+}
+void Classes::StartCompile( const UserProc *pUserProc ){
+    const CClass *pParentClass = pUserProc->GetParentClassPtr();
+    if( pParentClass ){
+        pParentClass->Using();
+
+        pCompilingMethod = pParentClass->GetMethods().GetMethodPtr( pUserProc );
+        if( !pCompilingMethod ){
+            pCompilingMethod = pParentClass->GetStaticMethods().GetMethodPtr( pUserProc );
+            if( !pCompilingMethod ){
+                SmoothieException::Throw(300);
+            }
+        }
+    }
+    else{
+        pCompilingMethod = NULL;
+    }
+}
+
+CClass *Classes::GetStringClassPtr() const
+{
+    if( !pStringClass ){
+        SmoothieException::Throw();
+        return NULL;
+    }
+    return pStringClass;
+}
+CClass *Classes::GetObjectClassPtr() const
+{
+    if( !pObjectClass ){
+        SmoothieException::Throw();
+        return NULL;
+    }
+    return pObjectClass;
+}
+
+
+//////////////////////
+// イテレータ
+//////////////////////
+
+void Classes::Iterator_Init() const
+{
+    if(ppobj_IteClass) free(ppobj_IteClass);
+
+    iIteMaxNum=0;
+    iIteNextNum=0;
+    ppobj_IteClass=(CClass **)malloc(1);
+
+    int i;
+    for(i=0;i<MAX_CLASS_HASH;i++){
+        if(pobj_ClassHash[i]){
+            CClass *pobj_c;
+            pobj_c=pobj_ClassHash[i];
+            while(1){
+                ppobj_IteClass=(CClass **)realloc(ppobj_IteClass,(iIteMaxNum+1)*sizeof(CClass *));
+                ppobj_IteClass[iIteMaxNum]=pobj_c;
+                iIteMaxNum++;
+
+                if(pobj_c->pobj_NextClass==0) break;
+                pobj_c=pobj_c->pobj_NextClass;
+            }
+        }
+    }
+}
+void Classes::Iterator_Reset() const
+{
+    iIteNextNum = 0;
+}
+BOOL Classes::Iterator_HasNext() const
+{
+    if(iIteNextNum<iIteMaxNum) return 1;
+    return 0;
+}
+CClass *Classes::Iterator_GetNext() const
+{
+    CClass *pobj_c = ppobj_IteClass[iIteNextNum];
+    iIteNextNum++;
+    return pobj_c;
+}
+int Classes::Iterator_GetMaxCount() const
+{
+    return iIteMaxNum;
+}

trunk/abdev/BasicCompiler_Common/src/CodeGenerator.cpp

@@ +1 @@
+#include "stdafx.h"
+
 #include <windows.h>
 #include <stdlib.h>

trunk/abdev/BasicCompiler_Common/src/Compiler.cpp

@@ -1 @@
-#include <jenga/include/smoothie/Type.h>
+#include "stdafx.h"
+
 #include <jenga/include/smoothie/SmoothieException.h>
 
 #include <Compiler.h>
+#include <Type.h>
 
 Compiler compiler;

trunk/abdev/BasicCompiler_Common/src/Const.cpp

@@ +1 @@
+#include "stdafx.h"
+
 #include <Compiler.h>
-#include <NamespaceSupporter.h>
-
-#include "common.h"
-#include OPCODE_H_PATH  //opcode.h
-
-
-//シングルトンオブジェクト
-CDBConst CDBConst::obj;
-
-
-bool ConstBase::IsEqualSymbol( const NamespaceScopes &namespaceScopes, const string &name ) const
-{
-    if( GetName() != name ){
-        return false;
-    }
-    return compiler.GetNamespaceSupporter().IsSameAreaNamespace( this->namespaceScopes, namespaceScopes );
-}
-bool ConstBase::IsEqualSymbol( const string &fullName ) const
-{
-    char AreaName[VN_SIZE] = "";        //オブジェクト変数
-    char NestName[VN_SIZE] = "";        //入れ子メンバ
-    bool isNest = CClass::SplitName( fullName.c_str(), AreaName, NestName );
-
-    return IsEqualSymbol( NamespaceScopes( AreaName ), NestName );
-}
-
-
-
-
-CConst::CConst( const NamespaceScopes &namespaceScopes, const string &name, const Type &newType, _int64 i64data)
-    : ConstBase( namespaceScopes, name )
-    , type( newType )
-    , i64data( i64data )
-    , pNext( NULL )
-{
-}
-CConst::CConst( const NamespaceScopes &namespaceScopes, const string &name, int value)
-    : ConstBase( namespaceScopes, name )
-    , type( Type(DEF_LONG) )
-    , i64data( value )
-    , pNext( NULL )
-{
-}
-CConst::~CConst(){
-    //連結先のオブジェクトを破棄
-    if(pNext){
-        delete pNext;
-        pNext = 0;
-    }
-}
-
-Type CConst::GetType(){
-    return type;
-}
-_int64 CConst::GetWholeData(){
-    return i64data;
-}
+
+
 double CConst::GetDoubleData(){
     double dbl;
@@ -63 +10 @@
 }
 
-
-
-CConstMacro::CConstMacro( const NamespaceScopes &namespaceScopes, const string &name, char *Expression)
-    : ConstBase( namespaceScopes, name )
-{
-}
-CConstMacro::~CConstMacro(){
-}
-
-
-
-
-
-CDBConst::CDBConst(){
-    memset(this,0,sizeof(CDBConst));
-
-    ppHash = (CConst **)calloc(MAX_HASH*sizeof(CConst *),1);
-    Init();
-}
-CDBConst::~CDBConst(){
-    Free();
-
-    free(ppHash);
-}
-
-//解放
-void CDBConst::Free(){
+void AddConst( const NamespaceScopes &namespaceScopes, char *buffer ){
     int i;
-    for(i=0; i<MAX_HASH; i++){
-        if(ppHash[i]){
-            delete ppHash[i];
-            ppHash[i] = 0;
-        }
-    }
-}
-
-//初期化
-void CDBConst::Init(){
-    Free();
-}
-
-void AddConstData(char *Command);
-void CDBConst::Add( const NamespaceScopes &namespaceScopes, char *buffer ){
-    int i;
 
     //名前を取得
-    char Name[VN_SIZE];
+    char name[VN_SIZE];
     for(i=0;;i++){
         if(buffer[i]=='\0'){
@@ -116 +21 @@
         }
         if(buffer[i]=='='||buffer[i]=='('){
-            Name[i]=0;
+            name[i]=0;
             break;
         }
-        Name[i]=buffer[i];
+        name[i]=buffer[i];
     }
 
     //重複チェック
-    if(GetBasicType(Name)){
-        SetError(15,Name,cp);
+    if( compiler.GetMeta().GetGlobalConstMacros().IsExist( name )
+        || compiler.GetMeta().GetGlobalConsts().IsExist( name ) )
+    {
+        SetError(15,name,cp);
         return;
     }
@@ -131 +38 @@
         //定数マクロ
 
-        //未完成
-        AddConstData(buffer);
+        compiler.GetMeta().GetGlobalConstMacros().Add( namespaceScopes, name, buffer + i );
     }
     else{
         //一般の定数
-        char *Expression = buffer + i + 1;
-
-        AddConst( namespaceScopes, Name,Expression);
-    }
-}
-
-void CDBConst::AddConst( const string &name, CConst *newconst){
-    int key = hash_default(name.c_str());
-
-    //ハッシュリストに追加
-    if(ppHash[key]){
-        CConst *pConst = ppHash[key];
-        while(pConst->pNext){
-            pConst = pConst->pNext;
-        }
-
-        pConst->pNext = newconst;
-    }
-    else{
-        ppHash[key] = newconst;
-    }
-}
-void CDBConst::AddConst( const NamespaceScopes &namespaceScopes, const string &name , char *Expression){
+        char *expression = buffer + i + 1;
+
+        compiler.GetMeta().GetGlobalConsts().Add( namespaceScopes, name, expression );
+    }
+}
+
+void Consts::Add( const NamespaceScopes &namespaceScopes, const string &name , char *Expression)
+{
     _int64 i64data;
     Type resultType;
@@ -172 +63 @@
     CConst *newconst = new CConst(namespaceScopes, name, resultType, i64data);
 
-    AddConst( name, newconst);
-}
-void CDBConst::AddConst(const NamespaceScopes &namespaceScopes, const string &name, int value){
+    //ハッシュリストに追加
+    Put( newconst );
+}
+void Consts::Add(const NamespaceScopes &namespaceScopes, const string &name, int value){
     CConst *newconst = new CConst( namespaceScopes, name, value);
 
-    AddConst(name, newconst);
-}
-
-CConst *CDBConst::GetObjectPtr( const string &name ){
+    //ハッシュリストに追加
+    Put( newconst );
+}
+
+CConst *Consts::GetObjectPtr( const string &name ){
     char ObjName[VN_SIZE];      //オブジェクト変数
     char NestMember[VN_SIZE];   //入れ子メンバ
-    bool isObjectMember = CClass::SplitName( name.c_str(), ObjName, NestMember );
-
-    //ハッシュ値を取得
-    int key;
-    key=hash_default( NestMember );
-
-    //格納位置を取得
-    CConst *pConst;
-    pConst=ppHash[key];
-    while(pConst){
-        if( pConst->IsEqualSymbol( name ) ) break;
-
-        pConst=pConst->pNext;
+    bool isObjectMember = SplitMemberName( name.c_str(), ObjName, NestMember );
+
+    CConst *pConst = GetHashArrayElement( NestMember );
+    while( pConst )
+    {
+        if( pConst->IsEqualSymbol( name ) )
+        {
+            break;
+        }
+        pConst = pConst->GetChainNext();
     }
 
@@ -202 +92 @@
 
 
-int CDBConst::GetBasicType(char *Name){
+int Consts::GetBasicType(char *Name){
     CConst *pConst = GetObjectPtr(Name);
 
@@ -209 +99 @@
     return pConst->GetType().GetBasicType();
 }
-_int64 CDBConst::GetWholeData(char *Name){
+_int64 Consts::GetWholeData(char *Name){
     CConst *pConst = GetObjectPtr(Name);
 
@@ -216 +106 @@
     return pConst->GetWholeData();
 }
-double CDBConst::GetDoubleData(char *Name){
+double Consts::GetDoubleData(char *Name){
     CConst *pConst = GetObjectPtr(Name);
 
@@ -223 +113 @@
     return pConst->GetDoubleData();
 }
-bool CDBConst::IsStringPtr( char *Name ){
+bool Consts::IsStringPtr( char *Name ){
     CConst *pConst = GetObjectPtr(Name);
 
@@ -232 +122 @@
     return ( type.GetBasicType() == typeOfPtrChar && type.GetIndex() == LITERAL_STRING );
 }
+
+
+bool ConstMacro::GetCalcBuffer( const char *parameterStr, char *dest ) const
+{
+    extern HANDLE hHeap;
+    int i2,i3,i4,num;
+    char temporary[VN_SIZE];
+    char *pParms[MAX_PARMS];
+    num=0;
+    i2=0;
+    while(1){
+        i2=GetOneParameter(parameterStr,i2,temporary);
+
+        pParms[num]=(char *)HeapAlloc(hHeap,0,lstrlen(temporary)+1);
+        lstrcpy(pParms[num],temporary);
+
+        num++;
+        if(parameterStr[i2]=='\0') break;
+    }
+    if( num != this->GetParameters().size() ){
+        extern int cp;
+        for(i2=0;i2<num;i2++) HeapDefaultFree(pParms[i2]);
+        SetError(10,GetName().c_str(),cp);
+        lstrcpy(dest,"0");
+        return 1;
+    }
+
+    i2=0;
+    i4=0;
+    while(1){
+
+        //数式内の項を取得
+        for(i3=0;;i2++,i3++){
+            if(!IsVariableChar( this->GetExpression()[i2] )){
+                temporary[i3]=0;
+                break;
+            }
+            temporary[i3] = this->GetExpression()[i2];
+        }
+
+        //パラメータと照合する
+        for( i3=0; i3<(int)this->GetParameters().size(); i3++ ){
+            if( this->GetParameters()[i3] == temporary ) break;
+        }
+
+        if( i3 == (int)this->GetParameters().size() ){
+            //パラメータでないとき
+            lstrcpy(dest+i4,temporary);
+            i4+=lstrlen(temporary);
+        }
+        else{
+            //パラメータのとき
+            lstrcpy(dest+i4,pParms[i3]);
+            i4+=lstrlen(pParms[i3]);
+        }
+
+        //演算子をコピー
+        for(;;i2++,i4++){
+            if( this->GetExpression()[i2] == 1 ){
+                dest[i4++] = this->GetExpression()[i2++];
+                dest[i4] = this->GetExpression()[i2];
+                continue;
+            }
+            if(IsVariableTopChar( this->GetExpression()[i2] )) break;
+            dest[i4] = this->GetExpression()[i2];
+            if( this->GetExpression()[i2] == '\0' ) break;
+        }
+
+        if( this->GetExpression()[i2] == '\0' ) break;
+    }
+
+    for(i2=0;i2<num;i2++) HeapDefaultFree(pParms[i2]);
+
+    return 1;
+}
+
+// マクロ定数を追加するための関数
+void ConstMacros::Add( const NamespaceScopes &namespaceScopes, const std::string &name, const char *parameterStr )
+{
+    std::vector<std::string> parameters;
+
+    int i = 0;
+    if(parameterStr[i]!='(')
+    {
+        SetError();
+        return;
+    }
+
+    char temporary[VN_SIZE];
+    int i2;
+    for(i++,i2=0;;i++,i2++){
+        if(parameterStr[i]=='\0'){
+            SetError(1,NULL,cp);
+            return;
+        }
+        if(parameterStr[i]==','||parameterStr[i]==')'){
+            temporary[i2]=0;
+
+            parameters.push_back( temporary );
+
+            if(parameterStr[i]==')'){
+                i++;
+                if(parameterStr[i]!='='){
+                    extern int cp;
+                    SetError(1,NULL,cp);
+                    return;
+                }
+                break;
+            }
+
+            i2=-1;
+            continue;
+        }
+        temporary[i2]=parameterStr[i];
+    }
+
+    //データ
+    lstrcpy(temporary,parameterStr+i+1);
+
+    Put( new ConstMacro( namespaceScopes, name, parameters, temporary ) );
+}
+ConstMacro *ConstMacros::Find( const std::string &name ){
+    char ObjName[VN_SIZE];      //オブジェクト変数
+    char NestMember[VN_SIZE];   //入れ子メンバ
+    bool isObjectMember = SplitMemberName( name.c_str(), ObjName, NestMember );
+
+    ConstMacro *pConstMacro = GetHashArrayElement( NestMember );
+    while( pConstMacro )
+    {
+        if( pConstMacro->IsEqualSymbol( name ) )
+        {
+            break;
+        }
+        pConstMacro = pConstMacro->GetChainNext();
+    }
+
+    return pConstMacro;
+}

trunk/abdev/BasicCompiler_Common/src/DataTable.cpp

@@ +1 @@
+#include "stdafx.h"
+
 #include <jenga/include/smoothie/Smoothie.h>
 

trunk/abdev/BasicCompiler_Common/src/Exception.cpp

@@ +1 @@
+#include "stdafx.h"
+
 #include <Exception.h>
 

trunk/abdev/BasicCompiler_Common/src/LexicalScopingImpl.cpp

@@ +1 @@
+#include "stdafx.h"
+
 #include <LexicalScopingImpl.h>
+#include <Compiler.h>
 
 #include "../common.h"
@@ -29 +32 @@
 }
 
+void LexicalScopesImpl::End(){
+    if( level <= 0 ){
+        SetError();
+        return;
+    }
+
+    //デストラクタを呼ぶ
+    CallDestructorsOfScopeEnd();
+
+    Variables &vars = UserProc::IsGlobalAreaCompiling() ?
+        compiler.GetMeta().GetGlobalVars() :
+        UserProc::CompilingUserProc().GetLocalVars();
+
+    //使用済みローカル変数の生存チェックを外す
+    BOOST_FOREACH( Variable *pVar, vars ){
+        if(pVar->bLiving&&pVar->GetScopeLevel()==level){
+            pVar->bLiving=0;
+            extern int obp;
+            pVar->SetScopeEndAddress( obp );
+        }
+    }
+
+
+    //スコープ抜け出しスケジュール
+    ppScopes[level]->RunScheduleOfBreak();
+
+
+    //スコープレベルを下げる
+    delete ppScopes[level];
+    level--;
+}
+
 // スコープ終了時のデストラクタ呼び出し
 void LexicalScopesImpl::CallDestructorsOfScopeEnd(){
 
-    Variables &vars = UserProc::IsGlobalAreaCompiling()?
-        globalVars :
-        UserProc::CompilingUserProc().localVars;
+    Variables &vars = UserProc::IsGlobalAreaCompiling() ?
+        compiler.GetMeta().GetGlobalVars() :
+        UserProc::CompilingUserProc().GetLocalVars();
 
 
@@ -52 +87 @@
         //同一レベルのレキシカルスコープのみを検知
         if(!pVar->bLiving) continue;
-        if( pVar->ScopeLevel != GetNowLevel() ) continue;
+        if( pVar->GetScopeLevel() != GetNowLevel() ) continue;
 
-        if( pVar->IsStruct() && pVar->IsParameter() ){
+        if( pVar->GetType().IsStruct() && pVar->IsParameter() ){
             //構造体パラメータを持つとき
 
@@ -64 +99 @@
             //mov rcx,qword ptr[rsp+offset]
             op_mov_RM(sizeof(_int64),REG_RCX,REG_RSP,
-                -pVar->offset,
+                -pVar->GetOffsetAddress(),
                 MOD_BASE_DISP32);
             obp-=sizeof(long);
@@ -73 +108 @@
 
             //mov ecx,dword ptr[ebp+offset]
-            op_mov_RM(sizeof(long),REG_ECX,REG_EBP,-pVar->offset,MOD_BASE_DISP32);
+            op_mov_RM(sizeof(long),REG_ECX,REG_EBP,-pVar->GetOffsetAddress(),MOD_BASE_DISP32);
             obp-=sizeof(long);
             AddLocalVarAddrSchedule();
@@ -83 +118 @@
 
             //call free
-            extern UserProc *pSub_free;
+            extern const UserProc *pSub_free;
             op_call(pSub_free);
 
@@ -96 +131 @@
     if(indexSystemGC!=-1){
         //_System_GCオブジェクトのデストラクタの呼び出し処理
-        const CMethod *method = vars[indexSystemGC]->GetClass().GetDestructorMethod();
+        const CMethod *method = vars[indexSystemGC]->GetType().GetClass().GetDestructorMethod();
         if( method ){
-            Opcode_CallProc("",method->pUserProc,0,vars[indexSystemGC]->GetName().c_str(),DEF_OBJECT);
+            Opcode_CallProc("",&method->GetUserProc(),0,vars[indexSystemGC]->GetName().c_str(),DEF_OBJECT);
         }
     }

trunk/abdev/BasicCompiler_Common/src/NamespaceSupporter.cpp

@@ +1 @@
+#include "stdafx.h"
+
 #include <jenga/include/smoothie/SmoothieException.h>
+#include <jenga/include/smoothie/LexicalAnalysis.h>
 
 #include <Compiler.h>

trunk/abdev/BasicCompiler_Common/src/Procedure.cpp

@@ +1 @@
+#include "stdafx.h"
+
+#include <jenga/include/smoothie/Smoothie.h>
 #include <jenga/include/smoothie/SmoothieException.h>
 #include <jenga/include/smoothie/LexicalAnalysis.h>
 
 #include <Compiler.h>
-#include <ProcedureImpl.h>
+#include <Procedure.h>
 #include <NamespaceSupporter.h>
 
@@ -13 +16 @@
 #endif
 
-bool UserProcImpl::SetParamsAndReturnType( const char *sourceOfParams, int nowLine, bool isStatic ){
+
+std::string UserProc::GetFullName() const
+{
+    if( HasParentClass() ){
+        return GetParentClass().GetName() + "." + GetName();
+    }
+
+    return GetName();
+}
+const NamespaceScopes &UserProc::GetNamespaceScopes() const
+{
+    if( HasParentClass() ){
+        return GetParentClassPtr()->GetNamespaceScopes();
+    }
+    return namespaceScopes;
+}
+const NamespaceScopesCollection &UserProc::GetImportedNamespaces() const
+{
+    return importedNamespaces;
+}
+bool UserProc::IsEqualSymbol( const NamespaceScopes &namespaceScopes, const string &name ) const
+{
+    if( GetName() != name ){
+        return false;
+    }
+
+    return compiler.GetNamespaceSupporter().IsSameAreaNamespace( GetNamespaceScopes(), namespaceScopes );
+}
+bool UserProc::IsEqualSymbol( const UserProc &globalProc ) const
+{
+    return IsEqualSymbol( globalProc.GetNamespaceScopes(), globalProc.GetName() );
+}
+bool UserProc::IsEqualSymbol( const string &fullName ) const
+{
+    char AreaName[VN_SIZE] = "";        //オブジェクト変数
+    char NestName[VN_SIZE] = "";        //入れ子メンバ
+    bool isNest = SplitMemberName( fullName.c_str(), AreaName, NestName );
+
+    return IsEqualSymbol( NamespaceScopes( AreaName ), NestName );
+}
+bool UserProc::IsVirtual() const
+{
+    if( pMethod == NULL ){
+        return false;
+    }
+    return ( pMethod->IsVirtual() != 0 );
+}
+
+bool UserProc::SetParamsAndReturnType( const char *sourceOfParams, int nowLine, bool isStatic ){
     int i = 0;
     int i2,i3,sw;
@@ -51 +102 @@
         //パラメータ名
         bool isArray = false;
-        int subScripts[MAX_ARRAYDIM];
+        Subscripts subscripts;
         char name[VN_SIZE];
         sw=0;
@@ -83 +134 @@
 
             if((name[i2-2]=='('&&name[i2-1]==')')||
-                (name[i2-2]=='['&&name[i2-1]==']')){
-                subScripts[0]=LONG_MAX;
-                subScripts[1]=-1;
+                (name[i2-2]=='['&&name[i2-1]==']'))
+            {
+                subscripts.push_back( LONG_MAX );
 
                 name[i2-2]=0;
             }
             else{
-                GetArrange(name,temp2,subScripts);
+                GetArrange(name,temp2,subscripts);
                 lstrcpy(name,temp2);
             }
@@ -152 +203 @@
         Parameter *pParam = new Parameter( name, type, isRef, initValue );
         if( isArray ){
-            pParam->SetArray( subScripts );
+            pParam->SetArray( subscripts );
         }
 
@@ -189 +240 @@
             //パラメータ名
             bool isArray = false;
-            int subScripts[MAX_ARRAYDIM];
+            Subscripts subscripts;
             char name[VN_SIZE];
             sw=0;
@@ -221 +272 @@
 
                 if((name[i2-2]=='('&&name[i2-1]==')')||
-                    (name[i2-2]=='['&&name[i2-1]==']')){
-                    subScripts[0]=LONG_MAX;
-                    subScripts[1]=-1;
+                    (name[i2-2]=='['&&name[i2-1]==']'))
+                {
+                    subscripts.push_back( LONG_MAX );
 
                     name[i2-2]=0;
                 }
                 else{
-                    GetArrange(name,temp2,subScripts);
+                    GetArrange(name,temp2,subscripts);
                     lstrcpy(name,temp2);
                 }
@@ -273 +324 @@
             Parameter *pParam = new Parameter( name, type, isRef );
             if( isArray ){
-                pParam->SetArray( subScripts );
+                pParam->SetArray( subscripts );
             }
 
@@ -376 +427 @@
 }
 
-const NamespaceScopes &GlobalProc::GetNamespaceScopes() const
-{
-    if( HasParentClass() ){
-        return GetParentClassPtr()->GetNamespaceScopes();
-    }
-    return namespaceScopes;
-}
-bool GlobalProc::IsEqualSymbol( const NamespaceScopes &namespaceScopes, const string &name ) const
+const UserProc *UserProc::pCompilingUserProc = NULL;
+
+
+bool UserProcs::Insert( UserProc *pUserProc, int nowLine )
+{
+    /////////////////////////////////
+    // ハッシュデータに追加
+    /////////////////////////////////
+
+    if( !Put( pUserProc ) )
+    {
+        // 重複しているため、失敗
+        SetError(15,pUserProc->GetName().c_str(),nowLine);
+        return false;
+    }
+
+    return true;
+}
+UserProc *UserProcs::Add( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, char *buffer,int nowLine,bool isVirtual,CClass *pobj_c, bool isStatic)
+{
+    int i2,i3;
+    char temporary[8192];
+
+    int i=1;
+
+    Procedure::Kind kind = Procedure::Sub;
+    bool isMacro = false;
+    if(buffer[i]==ESC_FUNCTION) kind = Procedure::Function;
+    if(buffer[i]==ESC_MACRO){
+        isMacro = true;
+    }
+
+    i++;
+
+    bool isCdecl = false;
+    bool isExport = false;
+    while(1){
+        if(buffer[i]==1&&buffer[i+1]==ESC_CDECL&& isCdecl == false ){
+            isCdecl = true;
+
+            i+=2;
+        }
+        else if(buffer[i]==1&&buffer[i+1]==ESC_EXPORT&& isExport == false ){
+            isExport = true;
+
+            i+=2;
+        }
+        else break;
+    }
+
+    i2=0;
+    if(buffer[i]==1&&buffer[i+1]==ESC_OPERATOR){
+        if(!pobj_c){
+            SetError(126,NULL,nowLine);
+            return 0;
+        }
+
+        //オペレータの場合
+        temporary[i2++]=buffer[i++];
+        temporary[i2++]=buffer[i++];
+
+        int iCalcId;
+        if(buffer[i]=='='&&buffer[i+1]=='='){
+            iCalcId=CALC_EQUAL;
+            i3=2;
+        }
+        else if(buffer[i]=='='){
+            iCalcId=CALC_SUBSITUATION;
+            i3=1;
+        }
+        else if(buffer[i]=='('){
+            iCalcId=CALC_AS;
+            i3=0;
+        }
+        else if(buffer[i]=='['&&buffer[i+1]==']'&&buffer[i+2]=='='){
+            iCalcId=CALC_ARRAY_SET;
+            i3=3;
+        }
+        else if(buffer[i]=='['&&buffer[i+1]==']'){
+            iCalcId=CALC_ARRAY_GET;
+            i3=2;
+        }
+        else{
+            iCalcId=GetCalcId(buffer+i,&i3);
+            i3++;
+        }
+        if(!iCalcId){
+            SetError(1,NULL,nowLine);
+            return 0;
+        }
+        temporary[i2++]=iCalcId;
+        temporary[i2]=0;
+
+        i+=i3;
+    }
+    else{
+        if(pobj_c){
+            //クラスメンバの場合、デストラクタには~が付くことを考慮
+            if(buffer[i]=='~'){
+                temporary[i2]='~';
+                i++;
+                i2++;
+            }
+        }
+
+        for(;;i++,i2++){
+            if(!IsVariableChar(buffer[i])){
+                temporary[i2]=0;
+                break;
+            }
+            temporary[i2]=buffer[i];
+        }
+    }
+
+    if( isMacro ){
+        //大文字に変換
+        CharUpper(temporary);
+
+        //マクロ関数の場合は名前リストに追加
+        macroNames.push_back( temporary );
+    }
+
+    if(!pobj_c){
+        //クラスメンバ以外の場合のみ
+        //重複チェック
+
+        if(GetDeclareHash(temporary)){
+            SetError(15,temporary,nowLine);
+            return 0;
+        }
+    }
+
+    // 識別ID
+    static int id_base=0;
+
+    UserProc *pUserProc = new UserProc( namespaceScopes, importedNamespaces, temporary, kind, isMacro, isCdecl, isExport, (id_base++) );
+    pUserProc->SetParentClass( pobj_c );
+    if( Smoothie::isFullCompile ){
+        // すべての関数・メソッドをコンパイルする
+        pUserProc->Using();
+    }
+
+    if(isExport){
+        pUserProc->Using();
+    }
+
+    // パラメータを解析
+    // ※第1パラメータにに指定するデータの例："( s As String ) As String"
+    pUserProc->SetParamsAndReturnType( buffer + i, nowLine, isStatic );
+
+    pUserProc->_paramStr = buffer + i;
+
+    // ハッシュに追加
+    if( !Insert( pUserProc, nowLine ) )
+    {
+        return NULL;
+    }
+
+    return pUserProc;
+}
+void UserProcs::EnumGlobalProcs( const char *simpleName, const char *localName, std::vector<const UserProc *> &subs )
+{
+    ///////////////////////////
+    // グローバル関数を検索
+    ///////////////////////////
+
+    // ハッシュ値を取得
+    UserProc *pUserProc = GetHashArrayElement( simpleName );
+    while(pUserProc){
+        if(!pUserProc->GetParentClassPtr()){
+            if( pUserProc->IsEqualSymbol( localName ) ){
+                subs.push_back( pUserProc );
+            }
+        }
+
+        pUserProc=pUserProc->GetChainNext();
+    }
+}
+
+
+bool DllProc::IsEqualSymbol( const NamespaceScopes &namespaceScopes, const string &name ) const
 {
     if( GetName() != name ){
         return false;
     }
-
-    return compiler.GetNamespaceSupporter().IsSameAreaNamespace( GetNamespaceScopes(), namespaceScopes );
-}
-bool GlobalProc::IsEqualSymbol( const GlobalProc &globalProc ) const
-{
-    return IsEqualSymbol( globalProc.GetNamespaceScopes(), globalProc.GetName() );
-}
-bool GlobalProc::IsEqualSymbol( const string &fullName ) const
+    return compiler.GetNamespaceSupporter().IsSameAreaNamespace( this->GetNamespaceScopes(), namespaceScopes );
+}
+bool DllProc::IsEqualSymbol( const string &fullName ) const
 {
     char AreaName[VN_SIZE] = "";        //オブジェクト変数
     char NestName[VN_SIZE] = "";        //入れ子メンバ
-    bool isNest = CClass::SplitName( fullName.c_str(), AreaName, NestName );
-
-    return IsEqualSymbol( NamespaceScopes( AreaName ), NestName );
-}
-
-bool DllProcImpl::IsEqualSymbol( const NamespaceScopes &namespaceScopes, const string &name ) const
-{
-    if( GetName() != name ){
-        return false;
-    }
-    return compiler.GetNamespaceSupporter().IsSameAreaNamespace( this->GetNamespaceScopes(), namespaceScopes );
-}
-bool DllProcImpl::SetParamsAndReturnType( const char *sourceOfParams, int nowLine ){
+    bool isNest = SplitMemberName( fullName.c_str(), AreaName, NestName );
+
+    if( IsEqualSymbol( NamespaceScopes( AreaName ), NestName ) ){
+        return true;
+    }
+
+    if( isNest ){
+        // 静的メンバを考慮
+
+        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 false;
+}
+bool DllProc::SetParamsAndReturnType( const char *sourceOfParams, int nowLine ){
     int i = 0;
     int i2,i3,sw;
@@ -443 +670 @@
         //パラメータ名
         bool isArray = false;
-        int subScripts[MAX_ARRAYDIM];
+        Subscripts subscripts;
         char name[VN_SIZE];
         sw=0;
@@ -475 +702 @@
 
             if((name[i2-2]=='('&&name[i2-1]==')')||
-                (name[i2-2]=='['&&name[i2-1]==']')){
-                subScripts[0]=LONG_MAX;
-                subScripts[1]=-1;
+                (name[i2-2]=='['&&name[i2-1]==']'))
+            {
+                subscripts.push_back( LONG_MAX );
 
                 name[i2-2]=0;
             }
             else{
-                GetArrange(name,temp2,subScripts);
+                GetArrange(name,temp2,subscripts);
                 lstrcpy(name,temp2);
             }
@@ -528 +755 @@
         Parameter *pParam = new Parameter( name, type, isRef );
         if( isArray ){
-            pParam->SetArray( subScripts );
+            pParam->SetArray( subscripts );
         }
 
@@ -584 +811 @@
 }
 
-bool ProcPointerImpl::SetParamsAndReturnType( const char *sourceOfParams, int nowLine ){
+bool ProcPointer::SetParamsAndReturnType( const char *sourceOfParams, int nowLine ){
     int i = 0;
     int i2,i3,sw;
@@ -615 +842 @@
         //パラメータ名
         bool isArray = false;
-        int subScripts[MAX_ARRAYDIM];
+        Subscripts subscripts;
         char name[VN_SIZE];
         sw=0;
@@ -647 +874 @@
 
             if((name[i2-2]=='('&&name[i2-1]==')')||
-                (name[i2-2]=='['&&name[i2-1]==']')){
-                subScripts[0]=LONG_MAX;
-                subScripts[1]=-1;
+                (name[i2-2]=='['&&name[i2-1]==']'))
+            {
+                subscripts.push_back( LONG_MAX );
 
                 name[i2-2]=0;
             }
             else{
-                GetArrange(name,temp2,subScripts);
+                GetArrange(name,temp2,subscripts);
                 lstrcpy(name,temp2);
             }
@@ -699 +926 @@
         Parameter *pParam = new Parameter( name, type, isRef );
         if( isArray ){
-            pParam->SetArray( subScripts );
+            pParam->SetArray( subscripts );
         }
 
@@ -771 +998 @@
 }
 
-int ProcPointersImpl::Add( const string &typeExpression )
+int ProcPointers::Add( const string &typeExpression )
 {
     DWORD dwProcType = (DWORD)typeExpression[2];
@@ -781 +1008 @@
     }
 
-    ProcPointer *pProcPointer = new ProcPointerImpl( kind );
+    ProcPointer *pProcPointer = new ProcPointer( kind );
 
     //buffer[0]は'('となっている
@@ -792 +1019 @@
 }
 
-void ProcPointersImpl::Clear()
-{
-    ProcPointersImpl &procPointers = *this;
+void ProcPointers::Clear()
+{
+    ProcPointers &procPointers = *this;
     BOOST_FOREACH( ProcPointer *pProcPointer, procPointers ){
         delete pProcPointer;

trunk/abdev/BasicCompiler_Common/src/Program.cpp

@@ +1 @@
+#include "stdafx.h"
+
 #include <jenga/include/common/Environment.h>
 
 #include <Program.h>
 
-Jenga::Common::Logger Program::logger( Jenga::Common::Environment::GetAppDir() + "\\logger.log" );
+Jenga::Common::Logger Program::logger( Jenga::Common::Environment::GetAppDir() + "\\logger.log", true );

trunk/abdev/BasicCompiler_Common/src/SmoothieImpl.cpp

@@ +1 @@
+#include "stdafx.h"
+
 #include <jenga/include/smoothie/Smoothie.h>
 
 #include <SmoothieImpl.h>
-#include <ClassImpl.h>
-#include <ProcedureImpl.h>
+#include <Class.h>
+#include <Procedure.h>
 #include <LexicalScopingImpl.h>
 

trunk/abdev/BasicCompiler_Common/src/TypeDef.cpp

@@ +1 @@
+#include "stdafx.h"
+
 #include <jenga/include/smoothie/Smoothie.h>
-#include <jenga/include/smoothie/Class.h>
 #include <jenga/include/smoothie/SmoothieException.h>
+#include <jenga/include/smoothie/LexicalAnalysis.h>
 
 #include <TypeDef.h>
@@ -8 +10 @@
 
 TypeDef::TypeDef( const NamespaceScopes &namespaceScopes, const string &name, const string &baseName, int nowLine )
-    : namespaceScopes( namespaceScopes )
-    , name( name )
+    : Symbol( namespaceScopes, name )
     , baseName( baseName )
 {
@@ -17 +18 @@
     }
 }
-TypeDef::~TypeDef(){
-}
-
+/*
 bool TypeDef::IsEqualSymbol( const NamespaceScopes &namespaceScopes, const string &name ) const
 {
@@ -31 +30 @@
     char AreaName[VN_SIZE] = "";        //オブジェクト変数
     char NestName[VN_SIZE] = "";        //入れ子メンバ
-    bool isNest = CClass::SplitName( fullName.c_str(), AreaName, NestName );
+    bool isNest = SplitMemberName( fullName.c_str(), AreaName, NestName );
 
     if( IsEqualSymbol( NamespaceScopes( AreaName ), NestName ) ){
@@ -42 +41 @@
         char AreaName2[VN_SIZE] = "";       //オブジェクト変数
         char NestName2[VN_SIZE] = "";       //入れ子メンバ
-        bool isNest = CClass::SplitName( AreaName, AreaName2, NestName2 );
+        bool isNest = SplitMemberName( AreaName, AreaName2, NestName2 );
         lstrcat( NestName2, "." );
         lstrcat( NestName2, NestName );
@@ -50 +49 @@
 
     return false;
-}
+}*/
 
 
@@ -74 +73 @@
     char AreaName[VN_SIZE] = "";        //オブジェクト変数
     char NestName[VN_SIZE] = "";        //入れ子メンバ
-    bool isNest = CClass::SplitName( fullName.c_str(), AreaName, NestName );
+    bool isNest = SplitMemberName( fullName.c_str(), AreaName, NestName );
 
     return GetIndex( NamespaceScopes( AreaName ), NestName );