Changeset 183 in dev for trunk

Timestamp:

Jun 24, 2007, 6:50:40 PM (17 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/abdev

Files:

• BasicCompiler32/BasicCompiler.vcproj (modified) (8 diffs)
• BasicCompiler32/Compile_Calc.cpp (modified) (8 diffs)
• BasicCompiler32/Compile_CallProc.cpp (modified) (5 diffs)
• BasicCompiler32/Compile_Func.cpp (modified) (4 diffs)
• BasicCompiler32/Compile_ProcOp.cpp (modified) (21 diffs)
• BasicCompiler32/Compile_Set_Var.cpp (modified) (4 diffs)
• BasicCompiler32/Compile_Statement.cpp (modified) (12 diffs)
• BasicCompiler32/Compile_Var.cpp (modified) (14 diffs)
• BasicCompiler32/MakePeHdr.cpp (modified) (14 diffs)
• BasicCompiler32/NumOpe.cpp (modified) (13 diffs)
• BasicCompiler32/NumOpe_TypeOperation.cpp (modified) (4 diffs)
• BasicCompiler64/BasicCompiler.vcproj (modified) (9 diffs)
• BasicCompiler64/Compile_Calc.cpp (modified) (2 diffs)
• BasicCompiler64/Compile_CallProc.cpp (modified) (5 diffs)
• BasicCompiler64/Compile_Func.cpp (modified) (4 diffs)
• BasicCompiler64/Compile_ProcOp.cpp (modified) (20 diffs)
• BasicCompiler64/Compile_Statement.cpp (modified) (14 diffs)
• BasicCompiler64/Compile_Var.cpp (modified) (14 diffs)
• BasicCompiler64/MakePeHdr.cpp (modified) (16 diffs)
• BasicCompiler64/NumOpe.cpp (modified) (15 diffs)
• BasicCompiler64/NumOpe_Arithmetic.cpp (modified) (3 diffs)
• BasicCompiler64/NumOpe_TypeOperation.cpp (modified) (8 diffs)
• BasicCompiler_Common/Procedure.cpp (deleted)

trunk/abdev/BasicCompiler32/BasicCompiler.vcproj

@@ -75 +75 @@
             <Tool
                 Name="VCLinkerTool"
-                AdditionalDependencies="comctl32.lib psapi.lib commond.lib"
+                AdditionalDependencies="comctl32.lib psapi.lib commond.lib smoothied.lib"
                 OutputFile="../ActiveBasic/BasicCompiler32.exe"
                 LinkIncremental="2"
@@ -177 +177 @@
             <Tool
                 Name="VCLinkerTool"
-                AdditionalDependencies="comctl32.lib psapi.lib common.lib"
+                AdditionalDependencies="comctl32.lib psapi.lib common.lib smoothie.lib"
                 OutputFile="../ActiveBasic/BasicCompiler32.exe"
                 LinkIncremental="1"
@@ -581 +581 @@
                     >
                     <File
-                        RelativePath="..\BasicCompiler_Common\DataTable.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\BasicCompiler_Common\LoopRefCheck.cpp"
-                        >
-                        <FileConfiguration
-                            Name="Debug|Win32"
-                            >
-                            <Tool
-                                Name="VCCLCompilerTool"
-                                PreprocessorDefinitions=""
-                            />
-                        </FileConfiguration>
-                        <FileConfiguration
-                            Name="Release|Win32"
-                            >
-                            <Tool
-                                Name="VCCLCompilerTool"
-                                PreprocessorDefinitions=""
-                            />
-                        </FileConfiguration>
-                    </File>
-                    <File
                         RelativePath="..\BasicCompiler_Common\NonVolatile.cpp"
                         >
@@ -751 +727 @@
                     >
                     <File
-                        RelativePath="..\BasicCompiler_Common\Class.cpp"
-                        >
-                        <FileConfiguration
-                            Name="Debug|Win32"
-                            >
-                            <Tool
-                                Name="VCCLCompilerTool"
-                                PreprocessorDefinitions=""
-                            />
-                        </FileConfiguration>
-                        <FileConfiguration
-                            Name="Release|Win32"
-                            >
-                            <Tool
-                                Name="VCCLCompilerTool"
-                                PreprocessorDefinitions=""
-                            />
-                        </FileConfiguration>
-                    </File>
-                    <File
-                        RelativePath="..\BasicCompiler_Common\Class.h"
-                        >
-                    </File>
-                    <File
                         RelativePath="..\BasicCompiler_Common\Enum.cpp"
                         >
@@ -824 +776 @@
                     <File
                         RelativePath="..\BasicCompiler_Common\PESchedule.h"
-                        >
-                    </File>
-                </Filter>
-                <Filter
-                    Name="LexicalScoping"
-                    >
-                    <File
-                        RelativePath="..\BasicCompiler_Common\LexicalScoping.cpp"
-                        >
-                        <FileConfiguration
-                            Name="Debug|Win32"
-                            >
-                            <Tool
-                                Name="VCCLCompilerTool"
-                                PreprocessorDefinitions=""
-                            />
-                        </FileConfiguration>
-                        <FileConfiguration
-                            Name="Release|Win32"
-                            >
-                            <Tool
-                                Name="VCCLCompilerTool"
-                                PreprocessorDefinitions=""
-                            />
-                        </FileConfiguration>
-                    </File>
-                    <File
-                        RelativePath="..\BasicCompiler_Common\LexicalScoping.h"
                         >
                     </File>
@@ -1325 +1249 @@
             </Filter>
             <Filter
-                Name="Common Classes"
-                >
-                <File
-                    RelativePath="..\BasicCompiler_Common\src\Smoothie.cpp"
-                    >
-                </File>
-                <Filter
-                    Name="Meta Parts"
-                    >
-                    <File
-                        RelativePath="..\BasicCompiler_Common\src\Member.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\BasicCompiler_Common\src\Method.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\BasicCompiler_Common\src\Namespace.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\BasicCompiler_Common\Procedure.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\BasicCompiler_Common\src\Prototype.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\BasicCompiler_Common\src\Symbol.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\BasicCompiler_Common\Type.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\BasicCompiler_Common\TypeDef.cpp"
-                        >
-                        <FileConfiguration
-                            Name="Debug|Win32"
-                            >
-                            <Tool
-                                Name="VCCLCompilerTool"
-                                PreprocessorDefinitions=""
-                            />
-                        </FileConfiguration>
-                        <FileConfiguration
-                            Name="Release|Win32"
-                            >
-                            <Tool
-                                Name="VCCLCompilerTool"
-                                PreprocessorDefinitions=""
-                            />
-                        </FileConfiguration>
-                    </File>
-                    <File
-                        RelativePath="..\BasicCompiler_Common\Variable.cpp"
-                        >
-                    </File>
-                </Filter>
-                <Filter
-                    Name="Lexical Parts"
-                    >
-                    <File
-                        RelativePath="..\BasicCompiler_Common\src\Source.cpp"
-                        >
-                    </File>
-                </Filter>
-                <Filter
-                    Name="Operation Statements"
-                    >
-                    <File
-                        RelativePath="..\BasicCompiler_Common\src\Exception.cpp"
-                        >
-                    </File>
-                </Filter>
-                <Filter
-                    Name="Application Classes"
-                    >
-                    <File
-                        RelativePath="..\BasicCompiler_Common\src\Program.cpp"
-                        >
-                    </File>
-                </Filter>
+                Name="Application Classes"
+                >
+                <File
+                    RelativePath="..\BasicCompiler_Common\src\ClassImpl.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\BasicCompiler_Common\src\CodeGenerator.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\BasicCompiler_Common\src\Compiler.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\BasicCompiler_Common\src\DataTable.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\BasicCompiler_Common\src\Exception.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\BasicCompiler_Common\src\LexicalScopingImpl.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\BasicCompiler_Common\src\ProcedureImpl.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\BasicCompiler_Common\src\Program.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\BasicCompiler_Common\src\SmoothieImpl.cpp"
+                    >
+                </File>
             </Filter>
         </Filter>
@@ -1437 +1313 @@
                 >
             </File>
+            <File
+                RelativePath="..\BasicCompiler_Common\include\option.h"
+                >
+            </File>
             <Filter
                 Name="言語対応文字列"
@@ -1461 +1341 @@
                 >
                 <File
+                    RelativePath="..\BasicCompiler_Common\include\ClassImpl.h"
+                    >
+                </File>
+                <File
+                    RelativePath="..\BasicCompiler_Common\include\CodeGenerator.h"
+                    >
+                </File>
+                <File
+                    RelativePath="..\BasicCompiler_Common\include\Compiler.h"
+                    >
+                </File>
+                <File
+                    RelativePath="..\BasicCompiler_Common\include\DataTable.h"
+                    >
+                </File>
+                <File
+                    RelativePath="..\BasicCompiler_Common\include\Exception.h"
+                    >
+                </File>
+                <File
+                    RelativePath="..\BasicCompiler_Common\include\LexicalScopingImpl.h"
+                    >
+                </File>
+                <File
+                    RelativePath="..\BasicCompiler_Common\include\ProcedureImpl.h"
+                    >
+                </File>
+                <File
                     RelativePath="..\BasicCompiler_Common\include\Program.h"
                     >
                 </File>
-            </Filter>
-            <Filter
-                Name="Common Classes"
-                >
-                <File
-                    RelativePath="..\BasicCompiler_Common\include\option.h"
-                    >
-                </File>
-                <File
-                    RelativePath="..\BasicCompiler_Common\include\Smoothie.h"
-                    >
-                </File>
-                <Filter
-                    Name="Meta Parts"
-                    >
-                    <File
-                        RelativePath="..\BasicCompiler_Common\include\Namespace.h"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\BasicCompiler_Common\Parameter.h"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\BasicCompiler_Common\Procedure.h"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\BasicCompiler_Common\include\Symbol.h"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\BasicCompiler_Common\Type.h"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\BasicCompiler_Common\TypeDef.h"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\BasicCompiler_Common\Variable.h"
-                        >
-                    </File>
-                    <Filter
-                        Name="Prototype"
-                        >
-                        <File
-                            RelativePath="..\BasicCompiler_Common\include\Member.h"
-                            >
-                        </File>
-                        <File
-                            RelativePath="..\BasicCompiler_Common\include\Method.h"
-                            >
-                        </File>
-                        <File
-                            RelativePath="..\BasicCompiler_Common\include\Prototype.h"
-                            >
-                        </File>
-                    </Filter>
-                </Filter>
-                <Filter
-                    Name="Lexical Parts"
-                    >
-                    <File
-                        RelativePath="..\BasicCompiler_Common\include\Source.h"
-                        >
-                    </File>
-                </Filter>
-                <Filter
-                    Name="Operation Statements"
-                    >
-                    <File
-                        RelativePath="..\BasicCompiler_Common\include\Exception.h"
-                        >
-                    </File>
-                </Filter>
-                <Filter
-                    Name="Module"
-                    >
-                    <File
-                        RelativePath="..\BasicCompiler_Common\include\ObjectModule.h"
-                        >
-                    </File>
-                </Filter>
             </Filter>
         </Filter>

trunk/abdev/BasicCompiler32/Compile_Calc.cpp

@@ +1 @@
+#include <jenga/include/smoothie/Smoothie.h>
+#include <jenga/include/smoothie/LexicalAnalysis.h>
+
 #include "../BasicCompiler_Common/common.h"
 #include "Opcode.h"
@@ -78 +81 @@
             //符号あり
 
-            if(OldType==DEF_INTEGER || (isUnicode&&OldType==DEF_CHAR)){
+            if(OldType==DEF_INTEGER || (Smoothie::IsUnicode()&&OldType==DEF_CHAR)){
                 //pop eax
                 op_pop(REG_EAX);
@@ -90 +93 @@
                 op_push(REG_EAX);
             }
-            else if(OldType==DEF_SBYTE || (isUnicode==false&&OldType==DEF_CHAR)){
+            else if(OldType==DEF_SBYTE || (Smoothie::IsUnicode()==false&&OldType==DEF_CHAR)){
                 //pop eax
                 op_pop(REG_EAX);
@@ -170 +173 @@
             //符号あり
 
-            if(OldType==DEF_INTEGER || (isUnicode&&OldType==DEF_CHAR)){
+            if(OldType==DEF_INTEGER || (Smoothie::IsUnicode()&&OldType==DEF_CHAR)){
                 //pop eax
                 op_pop(REG_EAX);
@@ -182 +185 @@
                 op_push(REG_EAX);
             }
-            else if(OldType==DEF_SBYTE || (isUnicode==false&&OldType==DEF_CHAR)){
+            else if(OldType==DEF_SBYTE || (Smoothie::IsUnicode()==false&&OldType==DEF_CHAR)){
                 //pop eax
                 op_pop(REG_EAX);
@@ -304 +307 @@
     if(OldType==DEF_BOOLEAN||
         OldType==DEF_BYTE||
-        OldType==DEF_WORD||OldType==DEF_INTEGER || (isUnicode&&OldType==DEF_CHAR)) return;
-    else if(OldType==DEF_SBYTE || (isUnicode==false&&OldType==DEF_CHAR)){
+        OldType==DEF_WORD||OldType==DEF_INTEGER || (Smoothie::IsUnicode()&&OldType==DEF_CHAR)) return;
+    else if(OldType==DEF_SBYTE || (Smoothie::IsUnicode()==false&&OldType==DEF_CHAR)){
         //pop eax
         op_pop(REG_EAX);
@@ -334 +337 @@
 void ChangeTypeToByte(int OldType){
     //現在のスタックの内容をbyte型に変換する
-    if(OldType==DEF_BYTE||OldType==DEF_SBYTE || (isUnicode==false&&OldType==DEF_CHAR)) return;
+    if(OldType==DEF_BYTE||OldType==DEF_SBYTE || (Smoothie::IsUnicode()==false&&OldType==DEF_CHAR)) return;
 
     ChangeTypeToLong(OldType);
@@ -619 +622 @@
 
 
-    if( varType.IsObject() && Smoothie::meta.blittableTypes.IsExist( calcType ) ){
+    if( varType.IsObject() && Smoothie::GetMeta().blittableTypes.IsExist( calcType ) ){
         // Blittable型をオブジェクトとして扱う
         vector<UserProc *> userProcs;
-        Smoothie::meta.blittableTypes.GetClass( calcType ).GetStaticMethods().Enum( "_Create", userProcs );
+        Smoothie::GetMeta().blittableTypes.GetClass( calcType ).GetStaticMethods().Enum( "_Create", userProcs );
         if( userProcs.size() != 1 ){
             SetError();

trunk/abdev/BasicCompiler32/Compile_CallProc.cpp

@@ +1 @@
+#include <jenga/include/smoothie/Smoothie.h>
+
 #include "../BasicCompiler_Common/common.h"
 #include "Opcode.h"
@@ -119 +121 @@
             if(lstrcmpi(ObjectName,"Super")==0){
                 //クラスメンバ関数内から基底クラスの呼び出し
-                pobj_c=pobj_CompilingClass;
+                pobj_c=Smoothie::Temp::pCompilingClass;
             }
             else{
@@ -127 +129 @@
                 pobj_c = &varType.GetClass();
                 if( NATURAL_TYPE( varType.GetBasicType() ) != DEF_OBJECT ){
-                    pobj_c=pobj_DBClass->Find(ObjectName);
+                    pobj_c=Smoothie::GetMeta().GetClasses().Find(ObjectName);
                     if( pobj_c ){
                         isStatic = true;
@@ -144 +146 @@
             else{
                 //クラスメンバ関数内から同一クラスのメンバ関数の呼び出し
-                pobj_c=pobj_CompilingClass;
+                pobj_c=Smoothie::Temp::pCompilingClass;
             }
         }
@@ -173 +175 @@
         if(ObjectName[0]){
             //外部からの呼び出し
-            if(pobj_c==pobj_CompilingClass){
+            if(pobj_c==Smoothie::Temp::pCompilingClass){
                 //同一クラスオブジェクトの場合はプライベートアクセスを容認する
                 if( pMethod->IsNoneAccess() ){

trunk/abdev/BasicCompiler32/Compile_Func.cpp

@@ +1 @@
+#include <jenga/include/smoothie/Smoothie.h>
+
 #include "../BasicCompiler_Common/common.h"
 #include "Opcode.h"
@@ -176 +178 @@
         tempParm=temp2;
 
-        type.SetType( DEF_OBJECT, pobj_DBClass->GetStringClassPtr() );
+        type.SetType( DEF_OBJECT, Smoothie::GetMeta().GetClasses().GetStringClassPtr() );
     }
 
@@ -228 +230 @@
 
         //オーバーロードを解決
-        pUserProc=OverloadSolution(name,subs,Smoothie::meta.procPointers[ProcPtr_BaseIndex]->Params(), Type() );
+        pUserProc=OverloadSolution(name,subs,Smoothie::GetMeta().GetProcPointers()[ProcPtr_BaseIndex]->Params(), Type() );
 
         if(!pUserProc){
@@ -280 +282 @@
             SetThisPtrToReg(REG_RCX);
 
-            pobj_c=pobj_CompilingClass;
+            pobj_c=Smoothie::Temp::pCompilingClass;
         }
 

trunk/abdev/BasicCompiler32/Compile_ProcOp.cpp

@@ +1 @@
+#include <jenga/include/smoothie/Smoothie.h>
+#include <jenga/include/smoothie/LexicalAnalysis.h>
+
+#include <Program.h>
+#include <LexicalScopingImpl.h>
+#include <ClassImpl.h>
+
 #include "../BasicCompiler_Common/common.h"
 #include "Opcode.h"
@@ -48 +55 @@
 
         //クラスに属する静的メンバを定義
-        CMember::InitStaticMember();
+        Smoothie::GetMeta().GetClasses().InitStaticMember();
 
         GetGlobalDataForDll();
@@ -61 +68 @@
         //静的ローカルオブジェクトのコンストラクタ呼び出し
 
-        foreach( Variable *pVar, globalVars ){
+        BOOST_FOREACH( Variable *pVar, globalVars ){
             if(memicmp(pVar->GetName().c_str(),"Static%",7)==0){
                 //コンストラクタ呼び出し
@@ -87 +94 @@
         UserProc::CompileStartForGlobalArea();
 
-        obj_LexScopes.CallDestructorsOfScopeEnd();
+        GetLexicalScopes().CallDestructorsOfScopeEnd();
 
         UserProc::CompileStartForUserProc( pBackUserProc );
@@ -217 +224 @@
         && userProc.GetParentClass().GetName() == "_System_TypeBase" ){
 
-            pobj_DBClass->Compile_System_InitializeUserTypes();
+            Smoothie::GetMeta().GetClasses().Compile_System_InitializeUserTypes();
     }
     else if( userProc.GetName() == "RegisterGlobalRoots"
@@ -263 +270 @@
 
     //コンパイル中の関数が属するクラス
-    pobj_CompilingClass=pUserProc->GetParentClassPtr();
+    Smoothie::Temp::pCompilingClass=pUserProc->GetParentClassPtr();
 
     //コンパイルスタートをクラス管理クラスに追加
-    pobj_DBClass->StartCompile( pUserProc );
+    Smoothie::GetMeta().GetClasses().StartCompile( pUserProc );
 
     //コンパイル中の関数
@@ -272 +279 @@
 
     // コンパイル中の関数が属する名前空間
-    Smoothie::Lexical::liveingNamespaceScopes = pUserProc->GetNamespaceScopes();
+    Smoothie::Temp::liveingNamespaceScopes = pUserProc->GetNamespaceScopes();
 
     // コンパイル中の関数でImportsされている名前空間
@@ -335 +342 @@
 
         //レキシカルスコープ情報
-        pVar->ScopeLevel=obj_LexScopes.GetNowLevel();
-        pVar->ScopeStartAddress=obj_LexScopes.GetStartAddress();
+        pVar->ScopeLevel=GetLexicalScopes().GetNowLevel();
+        pVar->ScopeStartAddress=GetLexicalScopes().GetStartAddress();
         pVar->bLiving=TRUE;
 
@@ -450 +457 @@
     }
 
-    if(pobj_CompilingClass){
-        if( pUserProc->GetName() == pobj_CompilingClass->GetName() ){
+    if(Smoothie::Temp::pCompilingClass){
+        if( pUserProc->GetName() == Smoothie::Temp::pCompilingClass->GetName() ){
             ////////////////////////////////////
             // コンストラクタをコンパイルするとき
@@ -457 +464 @@
 
             //コンストラクタのコンパイル開始を通知
-            pobj_CompilingClass->NotifyStartConstructorCompile();
+            Smoothie::Temp::pCompilingClass->NotifyStartConstructorCompile();
 
             //基底クラスかどうかの識別
             //（継承元がインターフェイスの場合も基底クラスと見なす）
             BOOL bThisIsSuperClass;
-            if(pobj_CompilingClass->pobj_InheritsClass==0) bThisIsSuperClass=1;
-            else if( pobj_CompilingClass->pobj_InheritsClass->GetConstructorMethod() == NULL ){
+            if(Smoothie::Temp::pCompilingClass->pobj_InheritsClass==0) bThisIsSuperClass=1;
+            else if( Smoothie::Temp::pCompilingClass->pobj_InheritsClass->GetConstructorMethod() == NULL ){
                 //インターフェイスを継承したときはコンストラクタを持たない
                 bThisIsSuperClass=1;
@@ -482 +489 @@
                     temporary[i4]=basbuf[i3];
                 }
-                if( pobj_CompilingClass->pobj_InheritsClass->GetName() == temporary ){
+                if( Smoothie::Temp::pCompilingClass->pobj_InheritsClass->GetName() == temporary ){
                     //基底クラスのコンストラクタを呼び出す
                     cp=i3;
@@ -499 +506 @@
                     Type dummyType;
                     CallProc( PROC_DEFAULT
-                        , pobj_CompilingClass->pobj_InheritsClass->GetConstructorMethod()->pUserProc
-                        , pobj_CompilingClass->pobj_InheritsClass->GetConstructorMethod()->pUserProc->GetName().c_str()
+                        , Smoothie::Temp::pCompilingClass->pobj_InheritsClass->GetConstructorMethod()->pUserProc
+                        , Smoothie::Temp::pCompilingClass->pobj_InheritsClass->GetConstructorMethod()->pUserProc->GetName().c_str()
                         , temporary
                         , dummyType );
@@ -507 +514 @@
                     //基底クラスのコンストラクタを暗黙的に呼び出す
                     Opcode_CallProc("",
-                        pobj_CompilingClass->pobj_InheritsClass->GetConstructorMethod()->pUserProc,
+                        Smoothie::Temp::pCompilingClass->pobj_InheritsClass->GetConstructorMethod()->pUserProc,
                         0,
                         "",
@@ -515 +522 @@
 
             //仮想関数テーブルを初期化
-            if( pobj_CompilingClass->IsExistVirtualFunctions()
-                && !pobj_CompilingClass->IsAbstract() ){
+            if( Smoothie::Temp::pCompilingClass->IsExistVirtualFunctions()
+                && !Smoothie::Temp::pCompilingClass->IsAbstract() ){
                     //関数テーブルに値をセット
-                    int offset = (int)pobj_CompilingClass->GetVtblGlobalOffset();
+                    int offset = (int)Smoothie::Temp::pCompilingClass->GetVtblGlobalOffset();
 
                     //mov eax,offset
@@ -538 +545 @@
 
             //デストラクタのコンパイル開始を通知
-            pobj_CompilingClass->NotifyStartDestructorCompile();
+            Smoothie::Temp::pCompilingClass->NotifyStartDestructorCompile();
         }
     }
@@ -564 +571 @@
     //////////////////////////////////////////
 
-    if( pobj_CompilingClass ){
-
-        if( pobj_CompilingClass->IsCompilingConstructor() ){
+    if( Smoothie::Temp::pCompilingClass ){
+
+        if( Smoothie::Temp::pCompilingClass->IsCompilingConstructor() ){
             // コンストラクタをコンパイルしていたとき
 
             // コンストラクタのコンパイルが完了したことを通知
-            pobj_CompilingClass->NotifyFinishConstructorCompile();
+            Smoothie::Temp::pCompilingClass->NotifyFinishConstructorCompile();
         }
         else if( pUserProc->IsDestructor() ){
@@ -578 +585 @@
 
             // デストラクタのコンパイルが完了したことを通知
-            pobj_CompilingClass->NotifyFinishDestructorCompile();
-
-            if(pobj_CompilingClass->pobj_InheritsClass){
+            Smoothie::Temp::pCompilingClass->NotifyFinishDestructorCompile();
+
+            if(Smoothie::Temp::pCompilingClass->pobj_InheritsClass){
                 /* サブクラスのデストラクタをコンパイルしているときは、
                     基底クラスのデストラクタを呼び出す */
 
-                const CMethod *method = pobj_CompilingClass->pobj_InheritsClass->GetDestructorMethod();
+                const CMethod *method = Smoothie::Temp::pCompilingClass->pobj_InheritsClass->GetDestructorMethod();
                 if( method ){
                     Opcode_CallProc("",
@@ -627 +634 @@
 
     //ローカルオブジェクトの解放処理
-    obj_LexScopes.CallDestructorsOfScopeEnd();
+    GetLexicalScopes().CallDestructorsOfScopeEnd();
 
     //プロシージャ抜け出しスケジュール（Exit Sub/Function）
@@ -702 +709 @@
             obp+=sizeof(long);
         }
-        else if(i3==DEF_INTEGER||i3==DEF_WORD || (isUnicode&&i3==DEF_CHAR)){
+        else if(i3==DEF_INTEGER||i3==DEF_WORD || (Smoothie::IsUnicode()&&i3==DEF_CHAR)){
             //xor eax,eax（eaxを0に初期化する）
             op_zero_reg(REG_EAX);
@@ -714 +721 @@
             obp+=sizeof(long);
         }
-        else if(i3==DEF_SBYTE||i3==DEF_BYTE||i3==DEF_BOOLEAN || (isUnicode==false&&i3==DEF_CHAR)){
+        else if(i3==DEF_SBYTE||i3==DEF_BYTE||i3==DEF_BOOLEAN || (Smoothie::IsUnicode()==false&&i3==DEF_CHAR)){
             //xor eax,eax（eaxを0に初期化する）
             op_zero_reg(REG_EAX);
@@ -732 +739 @@
     }
     HeapDefaultFree(pLocalVarAddrSchedule);
-    foreach( Variable *pVar, pUserProc->localVars ){
+    BOOST_FOREACH( Variable *pVar, pUserProc->localVars ){
         //後にデバッグで利用する
         pVar->offset = AllLocalVarSize - pVar->offset;

trunk/abdev/BasicCompiler32/Compile_Set_Var.cpp

@@ +1 @@
+#include <jenga/include/smoothie/Smoothie.h>
+
 #include "../BasicCompiler_Common/common.h"
 #include "Opcode.h"
@@ -213 +215 @@
 }
 void ExtendTypeTo32(int type,int reg){
-    if(type==DEF_INTEGER || (isUnicode&&type==DEF_CHAR)){
+    if(type==DEF_INTEGER || (Smoothie::IsUnicode()&&type==DEF_CHAR)){
         //movsx reg32,reg16
         op_movsx_R32R16(reg,reg);
@@ -221 +223 @@
         op_and_RV(reg,(int)0x0000FFFF);
     }
-    else if(type==DEF_SBYTE || (isUnicode==false&&type==DEF_CHAR)){
+    else if(type==DEF_SBYTE || (Smoothie::IsUnicode()==false&&type==DEF_CHAR)){
         //movsx reg32,reg8
         op_movsx_R32R8(reg,reg);
@@ -231 +233 @@
 }
 void ExtendTypeTo16(int type,int reg){
-    if(type==DEF_SBYTE || (isUnicode==false&&type==DEF_CHAR)){
+    if(type==DEF_SBYTE || (Smoothie::IsUnicode()==false&&type==DEF_CHAR)){
         //movsx reg16,reg8
         op_movsx_R16R8(reg,reg);

trunk/abdev/BasicCompiler32/Compile_Statement.cpp

@@ +1 @@
+#include <jenga/include/smoothie/LexicalAnalysis.h>
+
+#include <LexicalScopingImpl.h>
+#include <Compiler.h>
+
 #include "../BasicCompiler_Common/common.h"
 #include "Opcode.h"
@@ -274 +279 @@
 
     //レキシカルスコープをレベルアップ
-    obj_LexScopes.Start( obp, SCOPE_TYPE_IF );
+    GetLexicalScopes().Start( obp, SCOPE_TYPE_IF );
 
     i2=CompileBuffer(ESC_ENDIF,0);
 
     //レキシカルスコープをレベルダウン
-    obj_LexScopes.End();
+    GetLexicalScopes().End();
 
 
@@ -299 +304 @@
 
         //レキシカルスコープをレベルアップ
-        obj_LexScopes.Start( obp, SCOPE_TYPE_IF );
+        GetLexicalScopes().Start( obp, SCOPE_TYPE_IF );
 
         CompileBuffer(ESC_ENDIF,0);
 
         //レキシカルスコープをレベルダウン
-        obj_LexScopes.End();
+        GetLexicalScopes().End();
 
 
@@ -525 +530 @@
 
     //レキシカルスコープをレベルアップ
-    obj_LexScopes.Start( obp, SCOPE_TYPE_WHILE );
+    GetLexicalScopes().Start( obp, SCOPE_TYPE_WHILE );
 
     //While内をコンパイル
     CompileBuffer(0,COM_WEND);
 
-    obj_LexScopes.CallDestructorsOfScopeEnd();
+    GetLexicalScopes().CallDestructorsOfScopeEnd();
 
     if( i3 == -1 ){
@@ -542 +547 @@
 
     //レキシカルスコープをレベルダウン
-    obj_LexScopes.End();
+    GetLexicalScopes().End();
 
     *((long *)(OpBuffer+je_schedule-sizeof(long)))=obp-je_schedule; //jeジャンプ先のオフセット値
@@ -660 +665 @@
 
     //レキシカルスコープをレベルアップ
-    obj_LexScopes.Start( obp, SCOPE_TYPE_FOR );
+    GetLexicalScopes().Start( obp, SCOPE_TYPE_FOR );
 
     //For内をコンパイル
     CompileBuffer(0,COM_NEXT);
 
-    obj_LexScopes.CallDestructorsOfScopeEnd();
+    GetLexicalScopes().CallDestructorsOfScopeEnd();
 
     if(szNextVariable[0]){
@@ -679 +684 @@
 
     //レキシカルスコープをレベルダウン
-    obj_LexScopes.End();
+    GetLexicalScopes().End();
 
     *((long *)(OpBuffer+je_schedule))=obp-(je_schedule+sizeof(long)); //jeジャンプ先のオフセット値
@@ -700 +705 @@
 
     //レキシカルスコープをレベルアップ
-    obj_LexScopes.Start( obp, SCOPE_TYPE_DO );
+    GetLexicalScopes().Start( obp, SCOPE_TYPE_DO );
 
     //Do内をコンパイル
     CompileBuffer(0,COM_LOOP);
 
-    obj_LexScopes.CallDestructorsOfScopeEnd();
+    GetLexicalScopes().CallDestructorsOfScopeEnd();
 
     extern char *basbuf;
@@ -908 +913 @@
 
     //レキシカルスコープをレベルダウン
-    obj_LexScopes.End();
+    GetLexicalScopes().End();
 
     *((long *)(OpBuffer+je_schedule))=obp-(je_schedule+sizeof(long)); //jmpジャンプ先のオフセット値
@@ -942 +947 @@
 
     //未解放のローカルオブジェクトのデストラクタを呼び出す
-    obj_LexScopes.CallDestructorsOfReturn();
+    GetLexicalScopes().CallDestructorsOfReturn();
 
     //jmp ...(End Sub/Function)
@@ -1217 +1222 @@
 
     //レキシカルスコープをレベルアップ
-    obj_LexScopes.Start( obp, SCOPE_TYPE_SELECT );
+    GetLexicalScopes().Start( obp, SCOPE_TYPE_SELECT );
 
     //Select Case内をコンパイル
@@ -1234 +1239 @@
 
     //レキシカルスコープをレベルダウン
-    obj_LexScopes.End();
+    GetLexicalScopes().End();
 
     pCaseSchedule=temp_pCaseSchedule;

trunk/abdev/BasicCompiler32/Compile_Var.cpp

@@ +1 @@
+#include <jenga/include/smoothie/Smoothie.h>
+#include <jenga/include/smoothie/LexicalAnalysis.h>
+
+#include <LexicalScopingImpl.h>
+#include <CodeGenerator.h>
+#include <Compiler.h>
+
 #include "../BasicCompiler_Common/common.h"
 #include "Opcode.h"
@@ -187 +194 @@
 
     //アクセシビリティをチェック
-    if(&objClass==pobj_CompilingClass){
+    if(&objClass==Smoothie::Temp::pCompilingClass){
         //同一クラスオブジェクトの場合はプライベートアクセスを容認する
         if(pMember->IsNoneAccess()){
@@ -360 +367 @@
     // 名前空間を分離
     char namespaceStr[VN_SIZE]="", simpleName[VN_SIZE];
-    Smoothie::meta.namespaceScopesCollection.SplitNamespace( variable, namespaceStr, simpleName );
+    Smoothie::GetMeta().namespaceScopesCollection.SplitNamespace( variable, namespaceStr, simpleName );
 
     // 先頭オブジェクトまたはクラス名と入れ子メンバに分割
@@ -417 +424 @@
     }
 
-    if(pobj_CompilingClass){
+    if(Smoothie::Temp::pCompilingClass){
         //////////////////////
         // クラスメンバの参照
@@ -430 +437 @@
             pRelativeVar->dwKind=VAR_DIRECTMEM;
 
-            resultType.SetType( DEF_OBJECT, pobj_CompilingClass );
+            resultType.SetType( DEF_OBJECT, Smoothie::Temp::pCompilingClass );
             return true;
         }
@@ -443 +450 @@
 
             bool isFound = false;
-            BOOST_FOREACH( CMember *pMember, pobj_CompilingClass->GetDynamicMembers() ){
+            BOOST_FOREACH( CMember *pMember, Smoothie::Temp::pCompilingClass->GetDynamicMembers() ){
                 if( pMember->GetName() == VarName ){
                     isFound = true;
@@ -454 +461 @@
         //Const修飾子のメソッド内でメンバ書き込みアクセスが発生したとき
         //（コンストラクタ、デストラクタ内を除く）
-        const CMethod *pMethod = pobj_DBClass->GetNowCompilingMethodInfo();
+        const CMethod *pMethod = Smoothie::GetMeta().GetClasses().GetNowCompilingMethodInfo();
         if( isWriteAccess &&
             pMethod->IsConst() &&
-            pobj_CompilingClass->IsCompilingConstructor() == false &&
-            pobj_CompilingClass->IsCompilingDestructor() == false
+            Smoothie::Temp::pCompilingClass->IsCompilingConstructor() == false &&
+            Smoothie::Temp::pCompilingClass->IsCompilingDestructor() == false
             ){
                 SetError(131, NULL, cp );
@@ -473 +480 @@
             isErrorEnabled,
             isWriteAccess,
-            *pobj_CompilingClass,
+            *Smoothie::Temp::pCompilingClass,
             variable,
             pRelativeVar,
@@ -517 +524 @@
             }
 
-            int typeDefIndex = Smoothie::meta.typeDefs.GetIndex( VarName );
+            int typeDefIndex = Smoothie::GetMeta().typeDefs.GetIndex( VarName );
             if( typeDefIndex != -1 ){
                 // TypeDef後の型名だったとき
-                lstrcpy( VarName, Smoothie::meta.typeDefs[typeDefIndex].GetBaseName().c_str() );
+                lstrcpy( VarName, Smoothie::GetMeta().typeDefs[typeDefIndex].GetBaseName().c_str() );
             }
 
@@ -533 +540 @@
         }
 
-        if(pobj_CompilingClass){
+        if(Smoothie::Temp::pCompilingClass){
             //自身のクラスから静的メンバを参照する場合
             char temp2[VN_SIZE];
-            sprintf(temp2,"%s.%s",pobj_CompilingClass->GetName().c_str(),VarName);
+            sprintf(temp2,"%s.%s",Smoothie::Temp::pCompilingClass->GetName().c_str(),VarName);
             pVar = globalVars.Find( Symbol( temp2 ) );
             if( pVar ){
@@ -825 +832 @@
             char *temp;
             temp=(char *)i64data;
-            i2=dataTable.AddString(temp,lstrlen(temp));
+            i2=Compiler::GetNativeCode().GetDataTable().AddString(temp,lstrlen(temp));
             HeapDefaultFree(temp);
 
@@ -1015 +1022 @@
             char *temp;
             temp=(char *)i64data;
-            i2=dataTable.AddString(temp,lstrlen(temp));
+            i2=Compiler::GetNativeCode().GetDataTable().AddString(temp,lstrlen(temp));
             HeapDefaultFree(temp);
 
@@ -1099 +1106 @@
 
         //レキシカルスコープ
-        pVar->ScopeLevel=obj_LexScopes.GetNowLevel();
-        pVar->ScopeStartAddress=obj_LexScopes.GetStartAddress();
+        pVar->ScopeLevel=GetLexicalScopes().GetNowLevel();
+        pVar->ScopeStartAddress=GetLexicalScopes().GetStartAddress();
         pVar->bLiving=TRUE;
 
@@ -1134 +1141 @@
 
         //レキシカルスコープ
-        pVar->ScopeLevel=obj_LexScopes.GetNowLevel();
-        pVar->ScopeStartAddress=obj_LexScopes.GetStartAddress();
+        pVar->ScopeLevel=GetLexicalScopes().GetNowLevel();
+        pVar->ScopeStartAddress=GetLexicalScopes().GetStartAddress();
         pVar->bLiving=TRUE;
 

trunk/abdev/BasicCompiler32/MakePeHdr.cpp

@@ -1 +1 @@
 #include <jenga/include/common/Environment.h>
+
+#include <jenga/include/smoothie/Smoothie.h>
+
+#include <LexicalScopingImpl.h>
+#include <ClassImpl.h>
+#include <Compiler.h>
 
 #include "../BasicCompiler_Common/common.h"
@@ -134 +140 @@
     //////////////////
     // データテーブル
-    dataTable.Init();
+    Compiler::GetNativeCode().GetDataTable().Init();
     if(bDebugCompile){
-        dataTable.Add( (long)0x00000002 );
+        Compiler::GetNativeCode().GetDataTable().Add( (long)0x00000002 );
     }
 
@@ -160 +166 @@
 
     //関数ポインタ情報を初期化
-    Smoothie::meta.procPointers.clear();
+    Smoothie::GetMeta().GetProcPointers().clear();
 
     // 名前空間情報を取得
     NamespaceScopesCollection::CollectNamespaces(
         Smoothie::Lexical::source.GetBuffer(),
-        Smoothie::meta.namespaceScopesCollection
+        Smoothie::GetMeta().namespaceScopesCollection
     );
 
@@ -171 +177 @@
     //   GetSubInfo関数の中で参照されるオブジェクト名を事前に取得する。
     //     ※オブジェクトの内容までは取得しない
-    pobj_DBClass=new Classes();
-    pobj_DBClass->InitNames();
+    Smoothie::GetMeta().GetClasses().CollectClassesForNameOnly( Smoothie::Lexical::source );
 
     //TypeDef情報を初期化
-    Smoothie::meta.typeDefs.Init();
+    Smoothie::GetMeta().typeDefs.Init();
 
     //定数情報を取得
@@ -181 +186 @@
 
     //サブルーチン（ユーザー定義、DLL関数）の識別子、アドレスを取得
-    pobj_CompilingClass=0;
+    Smoothie::Temp::pCompilingClass=0;
     GetSubInfo();
 
     //クラス情報を取得（※注 - GetSubInfoの後に呼び出す）
-    pobj_DBClass->GetAllClassInfo();
+    Smoothie::GetMeta().GetClasses().GetAllClassInfo();
 
     //コードと行番号の関係
@@ -336 +341 @@
 
     //レキシカルスコープ情報を初期化
-    obj_LexScopes.Init(obp);
+    GetLexicalScopes().Init(obp);
 
 
@@ -360 +365 @@
     if(!bDll){
         // 名前空間が初期化されているかをチェック
-        if( Smoothie::Lexical::liveingNamespaceScopes.size() ){
+        if( Smoothie::Temp::liveingNamespaceScopes.size() ){
             SetError();
         }
@@ -405 +410 @@
 
         //クラスに属する静的メンバを定義
-        CMember::InitStaticMember();
+        Smoothie::GetMeta().GetClasses().InitStaticMember();
 
         //グローバル実行領域をコンパイル開始
@@ -460 +465 @@
 
         // 名前空間が正しく閉じられているかをチェック
-        if( Smoothie::Lexical::liveingNamespaceScopes.size() ){
+        if( Smoothie::Temp::liveingNamespaceScopes.size() ){
             SetError(63,NULL,-1);
         }
@@ -792 +797 @@
     //（デバッグ情報で利用される）
     extern int AllInitGlobalVarSize;
-    foreach( Variable *pVar, globalVars ){
+    BOOST_FOREACH( Variable *pVar, globalVars ){
         if(pVar->offset&0x80000000){
             pVar->offset=(pVar->offset&0x7FFFFFFF)+AllInitGlobalVarSize;
@@ -874 +879 @@
 
     //データセクションのファイル上のサイズ
-    if(dataTable.GetSize()%FILE_ALIGNMENT) FileSize_DataSection=dataTable.GetSize()+(FILE_ALIGNMENT-dataTable.GetSize()%FILE_ALIGNMENT);
-    else FileSize_DataSection=dataTable.GetSize();
+    if(Compiler::GetNativeCode().GetDataTable().GetSize()%FILE_ALIGNMENT) FileSize_DataSection=Compiler::GetNativeCode().GetDataTable().GetSize()+(FILE_ALIGNMENT-Compiler::GetNativeCode().GetDataTable().GetSize()%FILE_ALIGNMENT);
+    else FileSize_DataSection=Compiler::GetNativeCode().GetDataTable().GetSize();
     if(FileSize_DataSection) bUse_DataSection=1;
     else bUse_DataSection=0;
@@ -1066 +1071 @@
     ////////////////////////////////////////
     //仮想関数データテーブルスケジュール
-    pobj_DBClass->ActionVtblSchedule(ImageBase,MemPos_CodeSection);
+    Smoothie::GetMeta().GetClasses().ActionVtblSchedule(ImageBase,MemPos_CodeSection);
 
 
@@ -1601 +1606 @@
     if(bUse_DataSection){
         //データ テーブル
-        WriteFile(hFile,dataTable.GetPtr(),dataTable.GetSize(),(DWORD *)&i2,NULL);
+        WriteFile(hFile,Compiler::GetNativeCode().GetDataTable().GetPtr(),Compiler::GetNativeCode().GetDataTable().GetSize(),(DWORD *)&i2,NULL);
         i+=i2;
     }
@@ -1713 +1718 @@
 
     //クラスに関するメモリを解放
-    delete pobj_DBClass;
-    pobj_DBClass=0;
+    Smoothie::GetMeta().GetClasses().Clear();
 }

trunk/abdev/BasicCompiler32/NumOpe.cpp

@@ +1 @@
+#include <jenga/include/smoothie/Smoothie.h>
+#include <jenga/include/smoothie/LexicalAnalysis.h>
+
+#include <Compiler.h>
+
 #include "../BasicCompiler_Common/common.h"
 #include "Opcode.h"
@@ -39 +44 @@
         op_push(REG_EAX);
     }
-    else if(type==DEF_INTEGER || (isUnicode&&type==DEF_CHAR)){
+    else if(type==DEF_INTEGER || (Smoothie::IsUnicode()&&type==DEF_CHAR)){
         //movsx ebx,ax
         OpBuffer[obp++]=(char)0x0F;
@@ -48 +53 @@
         op_push(REG_EBX);
     }
-    else if(type==DEF_SBYTE || (isUnicode==false&&type==DEF_CHAR)){
+    else if(type==DEF_SBYTE || (Smoothie::IsUnicode()==false&&type==DEF_CHAR)){
         //movsx ebx,al
         OpBuffer[obp++]=(char)0x0F;
@@ -77 +82 @@
     SetStringQuotes( parameter );
 
-    Operator_New( *pobj_DBClass->GetStringClassPtr(), "", parameter, Type( DEF_OBJECT, *pobj_DBClass->GetStringClassPtr() ) );
+    Operator_New( *Smoothie::GetMeta().GetClasses().GetStringClassPtr(), "", parameter, Type( DEF_OBJECT, *Smoothie::GetMeta().GetClasses().GetStringClassPtr() ) );
 
     free( parameter );
@@ -244 +249 @@
     char member[VN_SIZE];
     CClass::RefType refType;
-    if( SplitMemberName( termFull, termLeft, member, refType ) ){
+    if( CClass::SplitName( termFull, termLeft, member, refType ) ){
         ///////////////////////////////////////////////////////////////////
         // オブジェクトとメンバに分解できるとき
@@ -256 +261 @@
         Type leftType;
         if( GetTermType( termLeft, leftType, isLiteral, &isClassName ) ){
-            if( isClassName == false && Smoothie::meta.blittableTypes.IsExist( leftType ) ){
+            if( isClassName == false && Smoothie::GetMeta().blittableTypes.IsExist( leftType ) ){
                 // 左側のオブジェクト部分がBlittable型のとき
 
@@ -262 +267 @@
                 lstrcpy( temporary, termLeft );
                 sprintf( termLeft, "%s(%s)",
-                    Smoothie::meta.blittableTypes.Find( leftType ).GetCreateStaticMethodFullName().c_str(),
+                    Smoothie::GetMeta().blittableTypes.Find( leftType ).GetCreateStaticMethodFullName().c_str(),
                     temporary );
             }
@@ -291 +296 @@
 
     if( pIsClassName ){
-        if( pobj_DBClass->Find( termFull ) ){
+        if( Smoothie::GetMeta().GetClasses().Find( termFull ) ){
             *pIsClassName = true;
             return true;
@@ -307 +312 @@
     if(lstrcmpi(termFull,"This")==0 && isProcedureCallOnly == false ){
         //Thisオブジェクト
-        resultType.SetType( DEF_OBJECT, pobj_CompilingClass );
+        resultType.SetType( DEF_OBJECT, Smoothie::Temp::pCompilingClass );
 
         SetThisPtrToReg( useReg );
@@ -588 +593 @@
         }
 
-        i2 = dataTable.AddBinary( binary, num * tempBaseType.GetSize() );
+        i2 = Compiler::GetNativeCode().GetDataTable().AddBinary( binary, num * tempBaseType.GetSize() );
 
         //mov eax,i2
@@ -735 +740 @@
 
                         type_stack[sp]=DEF_OBJECT;
-                        index_stack[sp]=(LONG_PTR)pobj_DBClass->GetStringClassPtr();
+                        index_stack[sp]=(LONG_PTR)Smoothie::GetMeta().GetClasses().GetStringClassPtr();
                         bLiteralCalculation=0;
 
@@ -746 +751 @@
                     bLiteralCalculation=0;
 
-                    i2=dataTable.AddString(term,i3);
+                    i2=Compiler::GetNativeCode().GetDataTable().AddString(term,i3);
 
                     //push DataSize
@@ -833 +838 @@
                         }
                         else{
-                            index_stack[sp] = (LONG_PTR)pobj_DBClass->GetObjectClassPtr();
+                            index_stack[sp] = (LONG_PTR)Smoothie::GetMeta().GetClasses().GetObjectClassPtr();
                         }
 

trunk/abdev/BasicCompiler32/NumOpe_TypeOperation.cpp

@@ +1 @@
+#include <jenga/include/smoothie/Smoothie.h>
+
+#include <Compiler.h>
+
 #include "../BasicCompiler_Common/common.h"
 #include "Opcode.h"
@@ -51 +55 @@
         op_push(REG_EAX);
     }
-    else if(type==DEF_INTEGER || (isUnicode&&type==DEF_CHAR)){
+    else if(type==DEF_INTEGER || (Smoothie::IsUnicode()&&type==DEF_CHAR)){
         //pop eax
         op_pop(REG_EAX);
@@ -75 +79 @@
         op_push(REG_EAX);
     }
-    else if(type==DEF_SBYTE || (isUnicode==false&&type==DEF_CHAR)){
+    else if(type==DEF_SBYTE || (Smoothie::IsUnicode()==false&&type==DEF_CHAR)){
         //pop eax
         op_pop(REG_EAX);
@@ -101 +105 @@
 }
 void ExtendStackTo16(int type){
-    if(type==DEF_SBYTE || (isUnicode==false&&type==DEF_CHAR)){
+    if(type==DEF_SBYTE || (Smoothie::IsUnicode()==false&&type==DEF_CHAR)){
         //pop eax
         op_pop(REG_EAX);

trunk/abdev/BasicCompiler64/BasicCompiler.vcproj

@@ -79 +79 @@
                 Name="VCLinkerTool"
                 AdditionalOptions="/MACHINE:AMD64"
-                AdditionalDependencies="comctl32.lib psapi.lib bufferoverflowu.lib commond.lib"
+                AdditionalDependencies="comctl32.lib psapi.lib bufferoverflowu.lib commond.lib smoothied.lib"
                 OutputFile="../ActiveBasic/BasicCompiler64.exe"
                 LinkIncremental="2"
@@ -153 +153 @@
                 Optimization="2"
                 InlineFunctionExpansion="2"
+                EnableIntrinsicFunctions="true"
                 FavorSizeOrSpeed="1"
-                AdditionalIncludeDirectories="..\..\;..\..\cpplibs\boost;..\BasicCompiler_Common\include"
+                AdditionalIncludeDirectories="..\..\;..\..\cpplibs\STLPort;..\..\cpplibs\boost;..\BasicCompiler_Common\include"
                 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;JPN;_AMD64_;_WIN64"
                 MinimalRebuild="false"
@@ -187 +188 @@
                 Name="VCLinkerTool"
                 AdditionalOptions="/MACHINE:AMD64"
-                AdditionalDependencies="comctl32.lib psapi.lib bufferoverflowu.lib common.lib"
+                AdditionalDependencies="comctl32.lib psapi.lib bufferoverflowu.lib common.lib smoothie.lib"
                 OutputFile="../ActiveBasic/BasicCompiler64.exe"
                 LinkIncremental="1"
@@ -275 +276 @@
             </Filter>
             <Filter
-                Name="Common Classes"
-                >
-                <File
-                    RelativePath="..\BasicCompiler_Common\include\Smoothie.h"
-                    >
-                </File>
-                <Filter
-                    Name="Meta Parts"
-                    >
-                    <File
-                        RelativePath="..\BasicCompiler_Common\include\Namespace.h"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\BasicCompiler_Common\Parameter.h"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\BasicCompiler_Common\Procedure.h"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\BasicCompiler_Common\include\Symbol.h"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\BasicCompiler_Common\Type.h"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\BasicCompiler_Common\TypeDef.h"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\BasicCompiler_Common\Variable.h"
-                        >
-                    </File>
-                    <Filter
-                        Name="Prototype"
-                        >
-                        <File
-                            RelativePath="..\BasicCompiler_Common\include\Class.h"
-                            >
-                        </File>
-                        <File
-                            RelativePath="..\BasicCompiler_Common\include\Member.h"
-                            >
-                        </File>
-                        <File
-                            RelativePath="..\BasicCompiler_Common\include\Method.h"
-                            >
-                        </File>
-                        <File
-                            RelativePath="..\BasicCompiler_Common\include\Prototype.h"
-                            >
-                        </File>
-                    </Filter>
-                </Filter>
-                <Filter
-                    Name="Lexical Parts"
-                    >
-                    <File
-                        RelativePath="..\BasicCompiler_Common\include\Source.h"
-                        >
-                    </File>
-                </Filter>
-                <Filter
-                    Name="Operation Statements"
-                    >
-                    <File
-                        RelativePath="..\BasicCompiler_Common\include\Exception.h"
-                        >
-                    </File>
-                </Filter>
-                <Filter
-                    Name="Module"
-                    >
-                    <File
-                        RelativePath="..\BasicCompiler_Common\include\ObjectModule.h"
-                        >
-                    </File>
-                </Filter>
-            </Filter>
-            <Filter
                 Name="Application Classes"
                 >
+                <File
+                    RelativePath="..\BasicCompiler_Common\include\ClassImpl.h"
+                    >
+                </File>
+                <File
+                    RelativePath="..\BasicCompiler_Common\include\CodeGenerator.h"
+                    >
+                </File>
+                <File
+                    RelativePath="..\BasicCompiler_Common\include\Compiler.h"
+                    >
+                </File>
+                <File
+                    RelativePath="..\BasicCompiler_Common\include\DataTable.h"
+                    >
+                </File>
+                <File
+                    RelativePath="..\BasicCompiler_Common\include\Exception.h"
+                    >
+                </File>
+                <File
+                    RelativePath="..\BasicCompiler_Common\include\LexicalScopingImpl.h"
+                    >
+                </File>
+                <File
+                    RelativePath="..\BasicCompiler_Common\include\ProcedureImpl.h"
+                    >
+                </File>
                 <File
                     RelativePath="..\BasicCompiler_Common\include\Program.h"
@@ -919 +864 @@
                     >
                     <File
-                        RelativePath="..\BasicCompiler_Common\DataTable.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\BasicCompiler_Common\LoopRefCheck.cpp"
-                        >
-                    </File>
-                    <File
                         RelativePath="..\BasicCompiler_Common\NonVolatile.cpp"
                         >
@@ -993 +930 @@
                     >
                     <File
-                        RelativePath="..\BasicCompiler_Common\Class.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\BasicCompiler_Common\Class.h"
-                        >
-                    </File>
-                    <File
                         RelativePath="..\BasicCompiler_Common\Enum.cpp"
                         >
@@ -1022 +951 @@
                 </Filter>
                 <Filter
-                    Name="LexicalScoping"
-                    >
-                    <File
-                        RelativePath="..\BasicCompiler_Common\LexicalScoping.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\BasicCompiler_Common\LexicalScoping.h"
-                        >
-                    </File>
-                </Filter>
-                <Filter
                     Name="Constant"
                     >
@@ -1066 +983 @@
                     <File
                         RelativePath="..\BasicCompiler_Common\Subroutine.cpp"
-                        >
-                    </File>
-                </Filter>
-            </Filter>
-            <Filter
-                Name="Common Classes"
-                >
-                <File
-                    RelativePath="..\BasicCompiler_Common\src\Smoothie.cpp"
-                    >
-                </File>
-                <Filter
-                    Name="Meta Parts"
-                    >
-                    <File
-                        RelativePath="..\BasicCompiler_Common\src\Member.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\BasicCompiler_Common\src\Method.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\BasicCompiler_Common\src\Namespace.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\BasicCompiler_Common\Procedure.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\BasicCompiler_Common\src\Prototype.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\BasicCompiler_Common\src\Symbol.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\BasicCompiler_Common\Type.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\BasicCompiler_Common\TypeDef.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\BasicCompiler_Common\Variable.cpp"
-                        >
-                    </File>
-                </Filter>
-                <Filter
-                    Name="Lexical Parts"
-                    >
-                    <File
-                        RelativePath="..\BasicCompiler_Common\src\Source.cpp"
-                        >
-                    </File>
-                </Filter>
-                <Filter
-                    Name="Operation Statements"
-                    >
-                    <File
-                        RelativePath="..\BasicCompiler_Common\src\Exception.cpp"
                         >
                     </File>
@@ -1138 +991 @@
                 >
                 <File
+                    RelativePath="..\BasicCompiler_Common\src\ClassImpl.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\BasicCompiler_Common\src\CodeGenerator.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\BasicCompiler_Common\src\Compiler.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\BasicCompiler_Common\src\DataTable.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\BasicCompiler_Common\src\Exception.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\BasicCompiler_Common\src\LexicalScopingImpl.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\BasicCompiler_Common\src\ProcedureImpl.cpp"
+                    >
+                </File>
+                <File
                     RelativePath="..\BasicCompiler_Common\src\Program.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\BasicCompiler_Common\src\SmoothieImpl.cpp"
                     >
                 </File>

trunk/abdev/BasicCompiler64/Compile_Calc.cpp

@@ +1 @@
+#include <jenga/include/smoothie/Smoothie.h>
+#include <jenga/include/smoothie/LexicalAnalysis.h>
+
 #include "../BasicCompiler_Common/common.h"
 #include "Opcode.h"
@@ -227 +230 @@
     }
 
-    if( varType.IsObject() && Smoothie::meta.blittableTypes.IsExist( calcType ) ){
+    if( varType.IsObject() && Smoothie::GetMeta().blittableTypes.IsExist( calcType ) ){
         // Blittable型をオブジェクトとして扱う
         vector<UserProc *> userProcs;
-        Smoothie::meta.blittableTypes.GetClass( calcType ).GetStaticMethods().Enum( "_Create", userProcs );
+        Smoothie::GetMeta().blittableTypes.GetClass( calcType ).GetStaticMethods().Enum( "_Create", userProcs );
         if( userProcs.size() != 1 ){
             SetError();

trunk/abdev/BasicCompiler64/Compile_CallProc.cpp

@@ +1 @@
+#include <jenga/include/smoothie/Smoothie.h>
+
 #include "../BasicCompiler_Common/common.h"
 #include "Opcode.h"
@@ -124 +126 @@
             if(lstrcmpi(ObjectName,"Super")==0){
                 //クラスメンバ関数内から基底クラスの呼び出し
-                pobj_c=pobj_CompilingClass;
+                pobj_c=Smoothie::Temp::pCompilingClass;
             }
             else{
@@ -132 +134 @@
                 pobj_c = &varType.GetClass();
                 if( NATURAL_TYPE( varType.GetBasicType() ) != DEF_OBJECT ){
-                    pobj_c=pobj_DBClass->Find(ObjectName);
+                    pobj_c=Smoothie::GetMeta().GetClasses().Find(ObjectName);
                     if( pobj_c ){
                         isStatic = true;
@@ -149 +151 @@
             else{
                 //クラスメンバ関数内から同一クラスのメンバ関数の呼び出し
-                pobj_c=pobj_CompilingClass;
+                pobj_c=Smoothie::Temp::pCompilingClass;
             }
         }
@@ -178 +180 @@
         if(ObjectName[0]){
             //外部からの呼び出し
-            if(pobj_c==pobj_CompilingClass){
+            if(pobj_c==Smoothie::Temp::pCompilingClass){
                 //同一クラスオブジェクトの場合はプライベートアクセスを容認する
                 if( pMethod->IsNoneAccess() ){

trunk/abdev/BasicCompiler64/Compile_Func.cpp

@@ +1 @@
+#include <jenga/include/smoothie/Smoothie.h>
+
 #include "../BasicCompiler_Common/common.h"
 #include "Opcode.h"
@@ -30 +32 @@
         tempParm=temp2;
 
-        type.SetType( DEF_OBJECT, pobj_DBClass->GetStringClassPtr() );
+        type.SetType( DEF_OBJECT, Smoothie::GetMeta().GetClasses().GetStringClassPtr() );
     }
 
@@ -78 +80 @@
 
         //オーバーロードを解決
-        pUserProc=OverloadSolution(name,subs,Smoothie::meta.procPointers[ProcPtr_BaseIndex]->Params(), Type() );
+        pUserProc=OverloadSolution(name,subs,Smoothie::GetMeta().GetProcPointers()[ProcPtr_BaseIndex]->Params(), Type() );
 
         if(!pUserProc){
@@ -127 +129 @@
             SetThisPtrToReg(REG_RCX);
 
-            pobj_c=pobj_CompilingClass;
+            pobj_c=Smoothie::Temp::pCompilingClass;
         }
 

trunk/abdev/BasicCompiler64/Compile_ProcOp.cpp

@@ +1 @@
+#include <jenga/include/smoothie/Smoothie.h>
+#include <jenga/include/smoothie/LexicalAnalysis.h>
+
 #include <Program.h>
+#include <LexicalScopingImpl.h>
+#include <ClassImpl.h>
 
 #include "../BasicCompiler_Common/common.h"
@@ -51 +56 @@
 
         //クラスに属する静的メンバを定義
-        CMember::InitStaticMember();
+        Smoothie::GetMeta().GetClasses().InitStaticMember();
 
         GetGlobalDataForDll();
@@ -75 +80 @@
         StackFrameSchedule=obp-sizeof(long);
 
-        foreach( Variable *pVar, globalVars ){
+        BOOST_FOREACH( Variable *pVar, globalVars ){
             if(memicmp(pVar->GetName().c_str(),"Static%",7)==0){
                 //コンストラクタ呼び出し
@@ -110 +115 @@
         UserProc::CompileStartForGlobalArea();
 
-        obj_LexScopes.CallDestructorsOfScopeEnd();
+        GetLexicalScopes().CallDestructorsOfScopeEnd();
 
         UserProc::CompileStartForUserProc( pBackUserProc );
@@ -210 +215 @@
         && userProc.GetParentClass().GetName() == "_System_TypeBase" ){
 
-            pobj_DBClass->Compile_System_InitializeUserTypes();
+            Smoothie::GetMeta().GetClasses().Compile_System_InitializeUserTypes();
     }
     else if( userProc.GetName() == "RegisterGlobalRoots"
@@ -255 +260 @@
 
     //コンパイル中の関数が属するクラス
-    pobj_CompilingClass=pUserProc->GetParentClassPtr();
+    Smoothie::Temp::pCompilingClass=pUserProc->GetParentClassPtr();
 
     //コンパイルスタートをクラス管理クラスに追加
-    pobj_DBClass->StartCompile( pUserProc );
+    Smoothie::GetMeta().GetClasses().StartCompile( pUserProc );
 
     //コンパイル中の関数
@@ -264 +269 @@
 
     // コンパイル中の関数が属する名前空間
-    Smoothie::Lexical::liveingNamespaceScopes = pUserProc->GetNamespaceScopes();
+    Smoothie::Temp::liveingNamespaceScopes = pUserProc->GetNamespaceScopes();
 
     // コンパイル中の関数でImportsされている名前空間
@@ -342 +347 @@
 
     //レキシカルスコープ情報を初期化
-    obj_LexScopes.Init(obp);
+    GetLexicalScopes().Init(obp);
 
 
@@ -377 +382 @@
 
         //レキシカルスコープ情報
-        pVar->ScopeLevel=obj_LexScopes.GetNowLevel();
-        pVar->ScopeStartAddress=obj_LexScopes.GetStartAddress();
+        pVar->ScopeLevel=GetLexicalScopes().GetNowLevel();
+        pVar->ScopeStartAddress=GetLexicalScopes().GetStartAddress();
         pVar->bLiving=TRUE;
 
@@ -504 +509 @@
     }
 
-    if(pobj_CompilingClass){
-        if( pUserProc->GetName() == pobj_CompilingClass->GetName() ){
+    if(Smoothie::Temp::pCompilingClass){
+        if( pUserProc->GetName() == Smoothie::Temp::pCompilingClass->GetName() ){
             ////////////////////////////////////
             // コンストラクタをコンパイルするとき
@@ -511 +516 @@
 
             //コンストラクタのコンパイル開始を通知
-            pobj_CompilingClass->NotifyStartConstructorCompile();
+            Smoothie::Temp::pCompilingClass->NotifyStartConstructorCompile();
 
             //基底クラスかどうかの識別
             //（継承元がインターフェイスの場合も基底クラスと見なす）
             BOOL bThisIsSuperClass;
-            if(pobj_CompilingClass->pobj_InheritsClass==0) bThisIsSuperClass=1;
-            else if( pobj_CompilingClass->pobj_InheritsClass->GetConstructorMethod() == NULL ){
+            if(Smoothie::Temp::pCompilingClass->pobj_InheritsClass==0) bThisIsSuperClass=1;
+            else if( Smoothie::Temp::pCompilingClass->pobj_InheritsClass->GetConstructorMethod() == NULL ){
                 //インターフェイスを継承したときはコンストラクタを持たない
                 bThisIsSuperClass=1;
@@ -536 +541 @@
                     temporary[i4]=basbuf[i3];
                 }
-                if( pobj_CompilingClass->pobj_InheritsClass->GetName() == temporary ){
+                if( Smoothie::Temp::pCompilingClass->pobj_InheritsClass->GetName() == temporary ){
                     //基底クラスのコンストラクタを呼び出す
                     cp=i3;
@@ -553 +558 @@
                     Type dummyType;
                     CallProc( PROC_DEFAULT
-                        , pobj_CompilingClass->pobj_InheritsClass->GetConstructorMethod()->pUserProc
-                        , pobj_CompilingClass->pobj_InheritsClass->GetConstructorMethod()->pUserProc->GetName().c_str()
+                        , Smoothie::Temp::pCompilingClass->pobj_InheritsClass->GetConstructorMethod()->pUserProc
+                        , Smoothie::Temp::pCompilingClass->pobj_InheritsClass->GetConstructorMethod()->pUserProc->GetName().c_str()
                         , temporary
                         , dummyType );
@@ -561 +566 @@
                     //基底クラスのコンストラクタを暗黙的に呼び出す
                     Opcode_CallProc("",
-                        pobj_CompilingClass->pobj_InheritsClass->GetConstructorMethod()->pUserProc,
+                        Smoothie::Temp::pCompilingClass->pobj_InheritsClass->GetConstructorMethod()->pUserProc,
                         0,
                         "",
@@ -569 +574 @@
 
             //仮想関数テーブルを初期化
-            if( pobj_CompilingClass->IsExistVirtualFunctions()
-                && !pobj_CompilingClass->IsAbstract() ){
+            if( Smoothie::Temp::pCompilingClass->IsExistVirtualFunctions()
+                && !Smoothie::Temp::pCompilingClass->IsAbstract() ){
                     //関数テーブルに値をセット
-                    int offset = (int)pobj_CompilingClass->GetVtblGlobalOffset();
+                    int offset = (int)Smoothie::Temp::pCompilingClass->GetVtblGlobalOffset();
 
                     //mov rax,offset
@@ -591 +596 @@
 
             //デストラクタのコンパイル開始を通知
-            pobj_CompilingClass->NotifyStartDestructorCompile();
+            Smoothie::Temp::pCompilingClass->NotifyStartDestructorCompile();
         }
     }
@@ -617 +622 @@
     //////////////////////////////////////////
 
-    if( pobj_CompilingClass ){
-
-        if( pobj_CompilingClass->IsCompilingConstructor() ){
+    if( Smoothie::Temp::pCompilingClass ){
+
+        if( Smoothie::Temp::pCompilingClass->IsCompilingConstructor() ){
             // コンストラクタをコンパイルしていたとき
 
             // コンストラクタのコンパイルが完了したことを通知
-            pobj_CompilingClass->NotifyFinishConstructorCompile();
+            Smoothie::Temp::pCompilingClass->NotifyFinishConstructorCompile();
         }
         else if( pUserProc->IsDestructor() ){
@@ -631 +636 @@
 
             // デストラクタのコンパイルが完了したことを通知
-            pobj_CompilingClass->NotifyFinishDestructorCompile();
-
-            if(pobj_CompilingClass->pobj_InheritsClass){
+            Smoothie::Temp::pCompilingClass->NotifyFinishDestructorCompile();
+
+            if(Smoothie::Temp::pCompilingClass->pobj_InheritsClass){
                 /* サブクラスのデストラクタをコンパイルしているときは、
                     基底クラスのデストラクタを呼び出す */
 
-                const CMethod *method = pobj_CompilingClass->pobj_InheritsClass->GetDestructorMethod();
+                const CMethod *method = Smoothie::Temp::pCompilingClass->pobj_InheritsClass->GetDestructorMethod();
                 if( method ){
                     Opcode_CallProc("",
@@ -677 +682 @@
 
     //ローカルオブジェクト（レキシカルスコープレベル=0）の解放処理
-    obj_LexScopes.CallDestructorsOfScopeEnd();
+    GetLexicalScopes().CallDestructorsOfScopeEnd();
 
     //プロシージャ抜け出しスケジュール（Exit Sub/Function）
@@ -738 +743 @@
     }
     HeapDefaultFree(pLocalVarAddrSchedule);
-    foreach( Variable *pVar, pUserProc->localVars ){
+    BOOST_FOREACH( Variable *pVar, pUserProc->localVars ){
         //後にデバッグで利用する
         pVar->offset = AllLocalVarSize + pobj_sf->GetFrameSize() - pVar->offset;

trunk/abdev/BasicCompiler64/Compile_Statement.cpp

@@ +1 @@
+#include <jenga/include/smoothie/LexicalAnalysis.h>
+
+#include <LexicalScopingImpl.h>
+#include <Compiler.h>
+
 #include "../BasicCompiler_Common/common.h"
 #include "Opcode.h"
@@ -131 +136 @@
     if(resultType.IsDouble()){
         double dbl=0;
-        offset=dataTable.Add( dbl );
+        offset=Compiler::GetNativeCode().GetDataTable().Add( dbl );
 
         //comisd xmm0,qword ptr[data table offset]
@@ -145 +150 @@
     else if(resultType.IsSingle()){
         float flt=0;
-        offset=dataTable.Add( flt );
+        offset=Compiler::GetNativeCode().GetDataTable().Add( flt );
 
         //comiss xmm0,dword ptr[data table offset]
@@ -195 +200 @@
 
     //レキシカルスコープをレベルアップ
-    obj_LexScopes.Start( obp, SCOPE_TYPE_IF );
+    GetLexicalScopes().Start( obp, SCOPE_TYPE_IF );
 
     i2=CompileBuffer(ESC_ENDIF,0);
 
     //レキシカルスコープをレベルダウン
-    obj_LexScopes.End();
+    GetLexicalScopes().End();
 
 
@@ -218 +223 @@
 
         //レキシカルスコープをレベルアップ
-        obj_LexScopes.Start( obp, SCOPE_TYPE_IF );
+        GetLexicalScopes().Start( obp, SCOPE_TYPE_IF );
 
         CompileBuffer(ESC_ENDIF,0);
 
         //レキシカルスコープをレベルダウン
-        obj_LexScopes.End();
+        GetLexicalScopes().End();
 
 
@@ -320 +325 @@
 
     //レキシカルスコープをレベルアップ
-    obj_LexScopes.Start( obp, SCOPE_TYPE_WHILE );
+    GetLexicalScopes().Start( obp, SCOPE_TYPE_WHILE );
 
     //While内をコンパイル
     CompileBuffer(0,COM_WEND);
 
-    obj_LexScopes.CallDestructorsOfScopeEnd();
+    GetLexicalScopes().CallDestructorsOfScopeEnd();
 
     //jmp ...
@@ -335 +340 @@
 
     //レキシカルスコープをレベルダウン
-    obj_LexScopes.End();
+    GetLexicalScopes().End();
 
     *((long *)(OpBuffer+je_schedule-sizeof(long)))=obp-je_schedule; //jeジャンプ先のオフセット値
@@ -457 +462 @@
 
     //レキシカルスコープをレベルアップ
-    obj_LexScopes.Start( obp, SCOPE_TYPE_FOR );
+    GetLexicalScopes().Start( obp, SCOPE_TYPE_FOR );
 
     //For内をコンパイル
     CompileBuffer(0,COM_NEXT);
 
-    obj_LexScopes.CallDestructorsOfScopeEnd();
+    GetLexicalScopes().CallDestructorsOfScopeEnd();
 
     if(szNextVariable[0]){
@@ -480 +485 @@
 
     //レキシカルスコープをレベルダウン
-    obj_LexScopes.End();
+    GetLexicalScopes().End();
 
     *((long *)(OpBuffer+je_schedule))=obp-(je_schedule+sizeof(long)); //jeジャンプ先のオフセット値
@@ -504 +509 @@
 
     //レキシカルスコープをレベルアップ
-    obj_LexScopes.Start( obp, SCOPE_TYPE_DO );
+    GetLexicalScopes().Start( obp, SCOPE_TYPE_DO );
 
     //Do内をコンパイル
     CompileBuffer(0,COM_LOOP);
 
-    obj_LexScopes.CallDestructorsOfScopeEnd();
+    GetLexicalScopes().CallDestructorsOfScopeEnd();
 
     extern char *basbuf;
@@ -565 +570 @@
 
     //レキシカルスコープをレベルダウン
-    obj_LexScopes.End();
+    GetLexicalScopes().End();
 
     *((long *)(OpBuffer+je_schedule))=obp-(je_schedule+sizeof(long)); //jmpジャンプ先のオフセット値
@@ -599 +604 @@
 
     //未解放のローカルオブジェクトのデストラクタを呼び出す
-    obj_LexScopes.CallDestructorsOfReturn();
+    GetLexicalScopes().CallDestructorsOfReturn();
 
     //jmp ...(End Sub/Function)
@@ -831 +836 @@
 
     //レキシカルスコープをレベルアップ
-    obj_LexScopes.Start( obp, SCOPE_TYPE_SELECT );
+    GetLexicalScopes().Start( obp, SCOPE_TYPE_SELECT );
 
     //Select Case内をコンパイル
@@ -848 +853 @@
 
     //レキシカルスコープをレベルダウン
-    obj_LexScopes.End();
+    GetLexicalScopes().End();
 
     pCaseSchedule=temp_pCaseSchedule;

trunk/abdev/BasicCompiler64/Compile_Var.cpp

@@ +1 @@
+#include <jenga/include/smoothie/Smoothie.h>
+#include <jenga/include/smoothie/LexicalAnalysis.h>
+
+#include <LexicalScopingImpl.h>
+#include <CodeGenerator.h>
+#include <Compiler.h>
+
 #include "../BasicCompiler_Common/common.h"
 #include "Opcode.h"
@@ -216 +223 @@
 
     //アクセシビリティをチェック
-    if(&objClass==pobj_CompilingClass){
+    if(&objClass==Smoothie::Temp::pCompilingClass){
         //同一クラスオブジェクトの場合はプライベートアクセスを容認する
         if(pMember->IsNoneAccess()){
@@ -388 +395 @@
     // 名前空間を分離
     char namespaceStr[VN_SIZE]="", simpleName[VN_SIZE];
-    Smoothie::meta.namespaceScopesCollection.SplitNamespace( variable, namespaceStr, simpleName );
+    Smoothie::GetMeta().namespaceScopesCollection.SplitNamespace( variable, namespaceStr, simpleName );
 
     // 先頭オブジェクトまたはクラス名と入れ子メンバに分割
@@ -446 +453 @@
 
 
-    if(pobj_CompilingClass){
+    if(Smoothie::Temp::pCompilingClass){
         //////////////////////
         // クラスメンバの参照
@@ -457 +464 @@
             pRelativeVar->dwKind=VAR_DIRECTMEM;
 
-            resultType.SetType( DEF_OBJECT, pobj_CompilingClass );
+            resultType.SetType( DEF_OBJECT, Smoothie::Temp::pCompilingClass );
             return true;
         }
@@ -470 +477 @@
 
             bool isFound = false;
-            BOOST_FOREACH( CMember *pMember, pobj_CompilingClass->GetDynamicMembers() ){
+            BOOST_FOREACH( CMember *pMember, Smoothie::Temp::pCompilingClass->GetDynamicMembers() ){
                 if( pMember->GetName() == VarName ){
                     isFound = true;
@@ -481 +488 @@
         //Const修飾子のメソッド内でメンバ書き込みアクセスが発生したとき
         //（コンストラクタ、デストラクタ内を除く）
-        const CMethod *pMethod = pobj_DBClass->GetNowCompilingMethodInfo();
+        const CMethod *pMethod = Smoothie::GetMeta().GetClasses().GetNowCompilingMethodInfo();
         if( isWriteAccess &&
             pMethod->IsConst() &&
-            pobj_CompilingClass->IsCompilingConstructor() == false &&
-            pobj_CompilingClass->IsCompilingDestructor() == false
+            Smoothie::Temp::pCompilingClass->IsCompilingConstructor() == false &&
+            Smoothie::Temp::pCompilingClass->IsCompilingDestructor() == false
             ){
                 SetError(131, NULL, cp );
@@ -497 +504 @@
             isErrorEnabled,
             isWriteAccess,
-            *pobj_CompilingClass,
+            *Smoothie::Temp::pCompilingClass,
             variable,
             pRelativeVar,
@@ -541 +548 @@
             }
 
-            int typeDefIndex = Smoothie::meta.typeDefs.GetIndex( VarName );
+            int typeDefIndex = Smoothie::GetMeta().typeDefs.GetIndex( VarName );
             if( typeDefIndex != -1 ){
                 // TypeDef後の型名だったとき
-                lstrcpy( VarName, Smoothie::meta.typeDefs[typeDefIndex].GetBaseName().c_str() );
+                lstrcpy( VarName, Smoothie::GetMeta().typeDefs[typeDefIndex].GetBaseName().c_str() );
             }
 
@@ -557 +564 @@
         }
 
-        if(pobj_CompilingClass){
+        if(Smoothie::Temp::pCompilingClass){
             //自身のクラスから静的メンバを参照する場合
             char temp2[VN_SIZE];
-            sprintf(temp2,"%s.%s",pobj_CompilingClass->GetName().c_str(),VarName);
+            sprintf(temp2,"%s.%s",Smoothie::Temp::pCompilingClass->GetName().c_str(),VarName);
             pVar = globalVars.Find( temp2 );
             if( pVar ){
@@ -844 +851 @@
             char *temp;
             temp=(char *)i64data;
-            i2=dataTable.AddString( temp );
+            i2=Compiler::GetNativeCode().GetDataTable().AddString( temp );
             HeapDefaultFree(temp);
 
@@ -994 +1001 @@
             char *temp;
             temp=(char *)i64data;
-            i2=dataTable.AddString( temp );
+            i2=Compiler::GetNativeCode().GetDataTable().AddString( temp );
             HeapDefaultFree(temp);
 
@@ -1086 +1093 @@
 
         //レキシカルスコープ
-        pVar->ScopeLevel=obj_LexScopes.GetNowLevel();
-        pVar->ScopeStartAddress=obj_LexScopes.GetStartAddress();
+        pVar->ScopeLevel=GetLexicalScopes().GetNowLevel();
+        pVar->ScopeStartAddress=GetLexicalScopes().GetStartAddress();
         pVar->bLiving=TRUE;
 
@@ -1121 +1128 @@
 
         //レキシカルスコープ
-        pVar->ScopeLevel=obj_LexScopes.GetNowLevel();
-        pVar->ScopeStartAddress=obj_LexScopes.GetStartAddress();
+        pVar->ScopeLevel=GetLexicalScopes().GetNowLevel();
+        pVar->ScopeStartAddress=GetLexicalScopes().GetStartAddress();
         pVar->bLiving=TRUE;
 

trunk/abdev/BasicCompiler64/MakePeHdr.cpp

@@ -1 +1 @@
 #include <jenga/include/common/Environment.h>
+
+#include <jenga/include/smoothie/Smoothie.h>
+
+#include <LexicalScopingImpl.h>
+#include <ClassImpl.h>
+#include <Compiler.h>
 
 #include "../BasicCompiler_Common/common.h"
@@ -119 +125 @@
     //////////////////
     // データテーブル
-    dataTable.Init();
+    Compiler::GetNativeCode().GetDataTable().Init();
     if(bDebugCompile){
-        dataTable.Add( (long)0x00000002 );
+        Compiler::GetNativeCode().GetDataTable().Add( (long)0x00000002 );
     }
 
@@ -145 +151 @@
 
     //関数ポインタ情報を初期化
-    Smoothie::meta.procPointers.clear();
+    Smoothie::GetMeta().GetProcPointers().clear();
 
     // 名前空間情報を取得
     NamespaceScopesCollection::CollectNamespaces(
         Smoothie::Lexical::source.GetBuffer(),
-        Smoothie::meta.namespaceScopesCollection
+        Smoothie::GetMeta().namespaceScopesCollection
     );
 
@@ -156 +162 @@
     //   GetSubInfo関数の中で参照されるオブジェクト名を事前に取得する。
     //     ※オブジェクトの内容までは取得しない
-    pobj_DBClass=new Classes();
-    pobj_DBClass->InitNames();
+    Smoothie::GetMeta().GetClasses().CollectClassesForNameOnly( Smoothie::Lexical::source );
 
     //TypeDef情報を初期化
-    Smoothie::meta.typeDefs.Init();
+    Smoothie::GetMeta().typeDefs.Init();
 
     //定数情報を取得
@@ -166 +171 @@
 
     //サブルーチン（ユーザー定義、DLL関数）の識別子、アドレスを取得
-    pobj_CompilingClass=0;
+    Smoothie::Temp::pCompilingClass = NULL;
     GetSubInfo();
 
     //クラス情報を取得（※注 - GetSubInfoの後に呼び出す）
-    pobj_DBClass->GetAllClassInfo();
+    Smoothie::GetMeta().GetClasses().GetAllClassInfo();
 
     //コードと行番号の関係
@@ -280 +285 @@
 
     obp_AllocSize=8192*2;
-    OpBuffer=(char *)HeapAlloc(hHeap,HEAP_ZERO_MEMORY,obp_AllocSize);
+    OpBuffer=(char *)calloc(obp_AllocSize,1);
     obp=0;
 
@@ -287 +292 @@
 
     //レキシカルスコープ情報を初期化
-    obj_LexScopes.Init(obp);
+    GetLexicalScopes().Init(obp);
 
 
@@ -311 +316 @@
     if(!bDll){
         // 名前空間が初期化されているかをチェック
-        if( Smoothie::Lexical::liveingNamespaceScopes.size() ){
+        if( Smoothie::Temp::liveingNamespaceScopes.size() ){
             SetError();
         }
@@ -362 +367 @@
 
         //クラスに属する静的メンバを定義
-        CMember::InitStaticMember();
+        Smoothie::GetMeta().GetClasses().InitStaticMember();
 
         //グローバル実行領域をコンパイル開始
@@ -426 +431 @@
 
         // 名前空間が正しく閉じられているかをチェック
-        if( Smoothie::Lexical::liveingNamespaceScopes.size() ){
+        if( Smoothie::Temp::liveingNamespaceScopes.size() ){
             SetError(63,NULL,-1);
         }
@@ -793 +798 @@
     //（デバッグ情報で利用される）
     extern int AllInitGlobalVarSize;
-    foreach( Variable *pVar, globalVars ){
+    BOOST_FOREACH( Variable *pVar, globalVars ){
         if(pVar->offset&0x80000000){
             pVar->offset=(pVar->offset&0x7FFFFFFF)+AllInitGlobalVarSize;
@@ -876 +881 @@
 
     //データセクションのファイル上のサイズ
-    if(dataTable.GetSize()%FILE_ALIGNMENT) FileSize_DataSection=dataTable.GetSize()+(FILE_ALIGNMENT-dataTable.GetSize()%FILE_ALIGNMENT);
-    else FileSize_DataSection=dataTable.GetSize();
+    if(Compiler::GetNativeCode().GetDataTable().GetSize()%FILE_ALIGNMENT) FileSize_DataSection=Compiler::GetNativeCode().GetDataTable().GetSize()+(FILE_ALIGNMENT-Compiler::GetNativeCode().GetDataTable().GetSize()%FILE_ALIGNMENT);
+    else FileSize_DataSection=Compiler::GetNativeCode().GetDataTable().GetSize();
     if(FileSize_DataSection) bUse_DataSection=1;
     else bUse_DataSection=0;
@@ -1066 +1071 @@
     ////////////////////////////////////////
     //仮想関数データテーブルスケジュール
-    pobj_DBClass->ActionVtblSchedule(ImageBase,MemPos_CodeSection);
+    Smoothie::GetMeta().GetClasses().ActionVtblSchedule(ImageBase,MemPos_CodeSection);
 
 
@@ -1602 +1607 @@
     if(bUse_DataSection){
         //データ テーブル
-        WriteFile(hFile,dataTable.GetPtr(),dataTable.GetSize(),(DWORD *)&i2,NULL);
+        WriteFile(hFile,Compiler::GetNativeCode().GetDataTable().GetPtr(),Compiler::GetNativeCode().GetDataTable().GetSize(),(DWORD *)&i2,NULL);
         i+=i2;
     }
@@ -1698 +1703 @@
 
     //コードバッファを解放
-    HeapDefaultFree(OpBuffer);
+    free(OpBuffer);
     OpBuffer=0;
 
@@ -1714 +1719 @@
 
     //クラスに関するメモリを解放
-    delete pobj_DBClass;
-    pobj_DBClass=0;
+    Smoothie::GetMeta().GetClasses().Clear();
 }

trunk/abdev/BasicCompiler64/NumOpe.cpp

@@ +1 @@
+#include <jenga/include/smoothie/Smoothie.h>
+#include <jenga/include/smoothie/LexicalAnalysis.h>
+
+#include <Compiler.h>
+
 #include "../BasicCompiler_Common/common.h"
 #include "Opcode.h"
@@ -18 +23 @@
         SetStringQuotes( parameter );
 
-        Operator_New( *pobj_DBClass->GetStringClassPtr(), "", parameter, Type( DEF_OBJECT, *pobj_DBClass->GetStringClassPtr() ) );
+        Operator_New( *Smoothie::GetMeta().GetClasses().GetStringClassPtr(), "", parameter, Type( DEF_OBJECT, *Smoothie::GetMeta().GetClasses().GetStringClassPtr() ) );
 
         free( parameter );
@@ -241 +246 @@
     char member[VN_SIZE];
     CClass::RefType refType;
-    if( SplitMemberName( termFull, termLeft, member, refType ) ){
+    if( CClass::SplitName( termFull, termLeft, member, refType ) ){
         ///////////////////////////////////////////////////////////////////
         // オブジェクトとメンバに分解できるとき
@@ -253 +258 @@
         Type leftType;
         if( GetTermType( termLeft, leftType, isLiteral, &isClassName ) ){
-            if( isClassName == false && Smoothie::meta.blittableTypes.IsExist( leftType ) ){
+            if( isClassName == false && Smoothie::GetMeta().blittableTypes.IsExist( leftType ) ){
                 // 左側のオブジェクト部分がBlittable型のとき
 
@@ -259 +264 @@
                 lstrcpy( temporary, termLeft );
                 sprintf( termLeft, "%s(%s)",
-                    Smoothie::meta.blittableTypes.Find( leftType ).GetCreateStaticMethodFullName().c_str(),
+                    Smoothie::GetMeta().blittableTypes.Find( leftType ).GetCreateStaticMethodFullName().c_str(),
                     temporary );
             }
@@ -287 +292 @@
 
     if( pIsClassName ){
-        if( pobj_DBClass->Find( termFull ) ){
+        if( Smoothie::GetMeta().GetClasses().Find( termFull ) ){
             *pIsClassName = true;
             return true;
@@ -304 +309 @@
     if(lstrcmpi(termFull,"This")==0 && isProcedureCallOnly == false ){
         //Thisオブジェクト
-        resultType.SetType( DEF_OBJECT, pobj_CompilingClass );
+        resultType.SetType( DEF_OBJECT, Smoothie::Temp::pCompilingClass );
 
         SetThisPtrToReg( UseReg );
@@ -588 +593 @@
         }
 
-        i2 = dataTable.AddBinary( binary, num * tempBaseType.GetSize() );
+        i2 = Compiler::GetNativeCode().GetDataTable().AddBinary( binary, num * tempBaseType.GetSize() );
 
         //mov reg,i2
@@ -768 +773 @@
 
                         type_stack[sp]=DEF_OBJECT;
-                        index_stack[sp]=(LONG_PTR)pobj_DBClass->GetStringClassPtr();
+                        index_stack[sp]=(LONG_PTR)Smoothie::GetMeta().GetClasses().GetStringClassPtr();
                         bLiteralCalculation=0;
 
@@ -781 +786 @@
                     bLiteralCalculation=0;
 
-                    i2 = dataTable.AddString( term, i3 );
+                    i2 = Compiler::GetNativeCode().GetDataTable().AddString( term, i3 );
 
                     //mov reg,i2
@@ -877 +882 @@
                         }
                         else{
-                            index_stack[sp] = (LONG_PTR)pobj_DBClass->GetObjectClassPtr();
+                            index_stack[sp] = (LONG_PTR)Smoothie::GetMeta().GetClasses().GetObjectClassPtr();
                         }
 
@@ -966 +971 @@
                         }
                         else{
-                            i3 = dataTable.Add( i64data );
+                            i3 = Compiler::GetNativeCode().GetDataTable().Add( i64data );
 
                             //movlpd xmm_reg,qword ptr[data table offset]
@@ -995 +1000 @@
                         }
                         else{
-                            i3=dataTable.Add( i32data );
+                            i3=Compiler::GetNativeCode().GetDataTable().Add( i32data );
 
                             //movss xmm_reg,dword ptr[data table offset]
@@ -1134 +1139 @@
 
             if(resultType.IsDouble()){
-                i3 = dataTable.Add( i64data );
+                i3 = Compiler::GetNativeCode().GetDataTable().Add( i64data );
 
                 //movlpd xmm_reg,qword ptr[data table offset]
@@ -1154 +1159 @@
                 memcpy(&i32data,&flt,sizeof(long));
 
-                i3 = dataTable.Add( i32data );
+                i3 = Compiler::GetNativeCode().GetDataTable().Add( i32data );
 
                 //movss xmm_reg,dword ptr[data table offset]

trunk/abdev/BasicCompiler64/NumOpe_Arithmetic.cpp

@@ +1 @@
+#include <Compiler.h>
+
 #include "../BasicCompiler_Common/common.h"
 #include "Opcode.h"
@@ -452 +454 @@
         double dbl;
         dbl=-1;
-        i32data = dataTable.Add( dbl );
+        i32data = Compiler::GetNativeCode().GetDataTable().Add( dbl );
 
         //mulsd xmm_reg,qword ptr[data table offset]   ※data = -1
@@ -474 +476 @@
         float flt;
         flt=-1;
-        i32data = dataTable.Add( flt );
+        i32data = Compiler::GetNativeCode().GetDataTable().Add( flt );
 
         //mulss xmm_reg,dword ptr[data table offset]   ※data = -1

trunk/abdev/BasicCompiler64/NumOpe_TypeOperation.cpp

@@ +1 @@
+#include <jenga/include/smoothie/Smoothie.h>
+
+#include <Compiler.h>
+
 #include "../BasicCompiler_Common/common.h"
 #include "Opcode.h"
@@ -10 +14 @@
         //and reg,00000000FFFFFFFFh
     }
-    else if(type==DEF_INTEGER || (isUnicode&&type==DEF_CHAR)){
+    else if(type==DEF_INTEGER || (Smoothie::IsUnicode()&&type==DEF_CHAR)){
         //movsx reg64,reg16
         op_movsx64_FromReg16(reg,reg);
@@ -18 +22 @@
         op_and64_value(reg,(int)0xFFFF);
     }
-    else if(type==DEF_SBYTE || (isUnicode==false&&type==DEF_CHAR)){
+    else if(type==DEF_SBYTE || (Smoothie::IsUnicode()==false&&type==DEF_CHAR)){
         //movsx reg64,reg8
         op_movsx64_FromReg8(reg,reg);
@@ -28 +32 @@
 }
 void ExtendTypeTo32(int type,int reg){
-    if(type==DEF_INTEGER || (isUnicode&&type==DEF_CHAR)){
+    if(type==DEF_INTEGER || (Smoothie::IsUnicode()&&type==DEF_CHAR)){
         //movsx reg32,reg16
         op_movsx32_FromReg16(reg,reg);
@@ -36 +40 @@
         op_and32_value(reg,(int)0xFFFF);
     }
-    else if(type==DEF_SBYTE || (isUnicode==false&&type==DEF_CHAR)){
+    else if(type==DEF_SBYTE || (Smoothie::IsUnicode()==false&&type==DEF_CHAR)){
         //movsx reg32,reg8
         op_movsx32_FromReg8(reg,reg);
@@ -46 +50 @@
 }
 void ExtendTypeTo16(int type,int reg){
-    if(type==DEF_SBYTE || (isUnicode==false&&type==DEF_CHAR)){
+    if(type==DEF_SBYTE || (Smoothie::IsUnicode()==false&&type==DEF_CHAR)){
         //movsx reg16,reg8
         op_movsx16_FromReg8(reg,reg);
@@ -85 +89 @@
             int temp;
             _int64 i64data=0x43f0000000000000;
-            temp=dataTable.Add( i64data );
+            temp=Compiler::GetNativeCode().GetDataTable().Add( i64data );
             OpBuffer[obp++]=(char)0xF2;
             OpBuffer[obp++]=(char)0x0F;
@@ -144 +148 @@
             int temp;
             long i32data=0x5f800000;
-            temp=dataTable.Add( i32data );
+            temp=Compiler::GetNativeCode().GetDataTable().Add( i32data );
             OpBuffer[obp++]=(char)0xF3;
             OpBuffer[obp++]=(char)0x0F;