Index: /trunk/abdev/BasicCompiler32/BasicCompiler.vcproj =================================================================== --- /trunk/abdev/BasicCompiler32/BasicCompiler.vcproj (revision 158) +++ /trunk/abdev/BasicCompiler32/BasicCompiler.vcproj (revision 159) @@ -48,5 +48,5 @@ Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\cpplibs\boost;..\BasicCompiler_Common\include" + AdditionalIncludeDirectories="..\..\jenga\include\common;..\..\cpplibs\boost;..\BasicCompiler_Common\include" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;JPN" MinimalRebuild="true" @@ -75,8 +75,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -835,12 +603,4 @@ /> - - - - - - @@ -895,12 +647,4 @@ /> - - - - - - - - - - - - - - - @@ -1058,12 +769,4 @@ /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1626,12 +1193,4 @@ /> - - - @@ -1658,12 +1217,4 @@ /> - - - @@ -1690,12 +1241,4 @@ /> - - - - - - - - - - - - - - - - - - - - Index: /trunk/abdev/BasicCompiler32/Compile_Calc.cpp =================================================================== --- /trunk/abdev/BasicCompiler32/Compile_Calc.cpp (revision 158) +++ /trunk/abdev/BasicCompiler32/Compile_Calc.cpp (revision 159) @@ -619,8 +619,8 @@ - if( varType.IsObject() && Smoothie::Meta::blittableTypes.IsExist( calcType ) ){ + if( varType.IsObject() && Smoothie::meta.blittableTypes.IsExist( calcType ) ){ // Blittable型をオブジェクトとして扱う vector userProcs; - Smoothie::Meta::blittableTypes.GetClass( calcType ).GetStaticMethods().Enum( "_Create", userProcs ); + Smoothie::meta.blittableTypes.GetClass( calcType ).GetStaticMethods().Enum( "_Create", userProcs ); if( userProcs.size() != 1 ){ SetError(); Index: /trunk/abdev/BasicCompiler32/Compile_Func.cpp =================================================================== --- /trunk/abdev/BasicCompiler32/Compile_Func.cpp (revision 158) +++ /trunk/abdev/BasicCompiler32/Compile_Func.cpp (revision 159) @@ -228,5 +228,5 @@ //オーバーロードを解決 - pUserProc=OverloadSolution(name,subs,Smoothie::Meta::procPointers[ProcPtr_BaseIndex]->Params(), Type() ); + pUserProc=OverloadSolution(name,subs,Smoothie::meta.procPointers[ProcPtr_BaseIndex]->Params(), Type() ); if(!pUserProc){ Index: /trunk/abdev/BasicCompiler32/Compile_Var.cpp =================================================================== --- /trunk/abdev/BasicCompiler32/Compile_Var.cpp (revision 158) +++ /trunk/abdev/BasicCompiler32/Compile_Var.cpp (revision 159) @@ -360,5 +360,5 @@ // 名前空間を分離 char namespaceStr[VN_SIZE]="", simpleName[VN_SIZE]; - Smoothie::Meta::namespaceScopesCollection.SplitNamespace( variable, namespaceStr, simpleName ); + Smoothie::meta.namespaceScopesCollection.SplitNamespace( variable, namespaceStr, simpleName ); // 先頭オブジェクトまたはクラス名と入れ子メンバに分割 @@ -517,8 +517,8 @@ } - int typeDefIndex = Smoothie::Meta::typeDefs.GetIndex( VarName ); + int typeDefIndex = Smoothie::meta.typeDefs.GetIndex( VarName ); if( typeDefIndex != -1 ){ // TypeDef後の型名だったとき - lstrcpy( VarName, Smoothie::Meta::typeDefs[typeDefIndex].GetBaseName().c_str() ); + lstrcpy( VarName, Smoothie::meta.typeDefs[typeDefIndex].GetBaseName().c_str() ); } Index: /trunk/abdev/BasicCompiler32/MakePeHdr.cpp =================================================================== --- /trunk/abdev/BasicCompiler32/MakePeHdr.cpp (revision 158) +++ /trunk/abdev/BasicCompiler32/MakePeHdr.cpp (revision 159) @@ -158,10 +158,10 @@ //関数ポインタ情報を初期化 - Smoothie::Meta::procPointers.clear(); + Smoothie::meta.procPointers.clear(); // 名前空間情報を取得 NamespaceScopesCollection::CollectNamespaces( Smoothie::Lexical::source.GetBuffer(), - Smoothie::Meta::namespaceScopesCollection + Smoothie::meta.namespaceScopesCollection ); @@ -169,9 +169,9 @@ // GetSubInfo関数の中で参照されるオブジェクト名を事前に取得する。 // ※オブジェクトの内容までは取得しない - pobj_DBClass=new CDBClass(); + pobj_DBClass=new Classes(); pobj_DBClass->InitNames(); //TypeDef情報を初期化 - Smoothie::Meta::typeDefs.Init(); + Smoothie::meta.typeDefs.Init(); //定数情報を取得 Index: /trunk/abdev/BasicCompiler32/NumOpe.cpp =================================================================== --- /trunk/abdev/BasicCompiler32/NumOpe.cpp (revision 158) +++ /trunk/abdev/BasicCompiler32/NumOpe.cpp (revision 159) @@ -256,5 +256,5 @@ Type leftType; if( GetTermType( termLeft, leftType, isLiteral, &isClassName ) ){ - if( isClassName == false && Smoothie::Meta::blittableTypes.IsExist( leftType ) ){ + if( isClassName == false && Smoothie::meta.blittableTypes.IsExist( leftType ) ){ // 左側のオブジェクト部分がBlittable型のとき @@ -262,5 +262,5 @@ lstrcpy( temporary, termLeft ); sprintf( termLeft, "%s(%s)", - Smoothie::Meta::blittableTypes.Find( leftType ).GetCreateStaticMethodFullName().c_str(), + Smoothie::meta.blittableTypes.Find( leftType ).GetCreateStaticMethodFullName().c_str(), temporary ); } Index: /trunk/abdev/BasicCompiler64/BasicCompiler.vcproj =================================================================== --- /trunk/abdev/BasicCompiler64/BasicCompiler.vcproj (revision 158) +++ /trunk/abdev/BasicCompiler64/BasicCompiler.vcproj (revision 159) @@ -48,5 +48,5 @@ Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\cpplibs\boost;..\BasicCompiler_Common\include" + AdditionalIncludeDirectories="..\..\jenga\include\common;..\..\cpplibs\boost;..\BasicCompiler_Common\include" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;JPN;_AMD64_;_WIN64" MinimalRebuild="true" @@ -79,8 +79,9 @@ Name="VCLinkerTool" AdditionalOptions="/MACHINE:AMD64" - AdditionalDependencies="comctl32.lib psapi.lib bufferoverflowu.lib" + AdditionalDependencies="comctl32.lib psapi.lib bufferoverflowu.lib commond.lib" OutputFile="../ActiveBasic/BasicCompiler64.exe" LinkIncremental="2" SuppressStartupBanner="true" + AdditionalLibraryDirectories="..\..\jenga\lib\amd64" IgnoreDefaultLibraryNames="" GenerateDebugInformation="true" @@ -104,203 +105,4 @@ SuppressStartupBanner="true" OutputFile="$(OutDir)/$(ProjectName).bsc" - /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -516,4 +315,8 @@ Name="Prototype" > + + + + + + @@ -594,20 +405,4 @@ Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG;JPN;$(NoInherit)" - /> - - - - - - @@ -638,5 +433,19 @@ + + + + + - - - @@ -668,5 +468,5 @@ + + + + + - - - @@ -710,90 +515,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -857,23 +556,4 @@ - - - - - - @@ -900,23 +580,4 @@ - - - - - - @@ -947,23 +608,4 @@ - - - - - - @@ -990,23 +632,4 @@ - - - - - - @@ -1033,23 +656,4 @@ - - - - - - @@ -1076,23 +680,4 @@ - - - - - - @@ -1119,23 +704,4 @@ - - - - - - @@ -1178,23 +744,4 @@ - - - - - - @@ -1237,23 +784,4 @@ - - - - - - @@ -1277,23 +805,4 @@ UsePrecompiledHeader="0" BrowseInformation="0" - /> - - - - - - @@ -1454,22 +963,4 @@ - - - - - - userProcs; - Smoothie::Meta::blittableTypes.GetClass( calcType ).GetStaticMethods().Enum( "_Create", userProcs ); + Smoothie::meta.blittableTypes.GetClass( calcType ).GetStaticMethods().Enum( "_Create", userProcs ); if( userProcs.size() != 1 ){ SetError(); Index: /trunk/abdev/BasicCompiler64/Compile_Func.cpp =================================================================== --- /trunk/abdev/BasicCompiler64/Compile_Func.cpp (revision 158) +++ /trunk/abdev/BasicCompiler64/Compile_Func.cpp (revision 159) @@ -78,5 +78,5 @@ //オーバーロードを解決 - pUserProc=OverloadSolution(name,subs,Smoothie::Meta::procPointers[ProcPtr_BaseIndex]->Params(), Type() ); + pUserProc=OverloadSolution(name,subs,Smoothie::meta.procPointers[ProcPtr_BaseIndex]->Params(), Type() ); if(!pUserProc){ Index: /trunk/abdev/BasicCompiler64/Compile_Var.cpp =================================================================== --- /trunk/abdev/BasicCompiler64/Compile_Var.cpp (revision 158) +++ /trunk/abdev/BasicCompiler64/Compile_Var.cpp (revision 159) @@ -388,5 +388,5 @@ // 名前空間を分離 char namespaceStr[VN_SIZE]="", simpleName[VN_SIZE]; - Smoothie::Meta::namespaceScopesCollection.SplitNamespace( variable, namespaceStr, simpleName ); + Smoothie::meta.namespaceScopesCollection.SplitNamespace( variable, namespaceStr, simpleName ); // 先頭オブジェクトまたはクラス名と入れ子メンバに分割 @@ -541,8 +541,8 @@ } - int typeDefIndex = Smoothie::Meta::typeDefs.GetIndex( VarName ); + int typeDefIndex = Smoothie::meta.typeDefs.GetIndex( VarName ); if( typeDefIndex != -1 ){ // TypeDef後の型名だったとき - lstrcpy( VarName, Smoothie::Meta::typeDefs[typeDefIndex].GetBaseName().c_str() ); + lstrcpy( VarName, Smoothie::meta.typeDefs[typeDefIndex].GetBaseName().c_str() ); } Index: /trunk/abdev/BasicCompiler64/MakePeHdr.cpp =================================================================== --- /trunk/abdev/BasicCompiler64/MakePeHdr.cpp (revision 158) +++ /trunk/abdev/BasicCompiler64/MakePeHdr.cpp (revision 159) @@ -143,10 +143,10 @@ //関数ポインタ情報を初期化 - Smoothie::Meta::procPointers.clear(); + Smoothie::meta.procPointers.clear(); // 名前空間情報を取得 NamespaceScopesCollection::CollectNamespaces( Smoothie::Lexical::source.GetBuffer(), - Smoothie::Meta::namespaceScopesCollection + Smoothie::meta.namespaceScopesCollection ); @@ -154,9 +154,9 @@ // GetSubInfo関数の中で参照されるオブジェクト名を事前に取得する。 // ※オブジェクトの内容までは取得しない - pobj_DBClass=new CDBClass(); + pobj_DBClass=new Classes(); pobj_DBClass->InitNames(); //TypeDef情報を初期化 - Smoothie::Meta::typeDefs.Init(); + Smoothie::meta.typeDefs.Init(); //定数情報を取得 Index: /trunk/abdev/BasicCompiler64/NumOpe.cpp =================================================================== --- /trunk/abdev/BasicCompiler64/NumOpe.cpp (revision 158) +++ /trunk/abdev/BasicCompiler64/NumOpe.cpp (revision 159) @@ -253,5 +253,5 @@ Type leftType; if( GetTermType( termLeft, leftType, isLiteral, &isClassName ) ){ - if( isClassName == false && Smoothie::Meta::blittableTypes.IsExist( leftType ) ){ + if( isClassName == false && Smoothie::meta.blittableTypes.IsExist( leftType ) ){ // 左側のオブジェクト部分がBlittable型のとき @@ -259,5 +259,5 @@ lstrcpy( temporary, termLeft ); sprintf( termLeft, "%s(%s)", - Smoothie::Meta::blittableTypes.Find( leftType ).GetCreateStaticMethodFullName().c_str(), + Smoothie::meta.blittableTypes.Find( leftType ).GetCreateStaticMethodFullName().c_str(), temporary ); } Index: /trunk/abdev/BasicCompiler_Common/Class.cpp =================================================================== --- /trunk/abdev/BasicCompiler_Common/Class.cpp (revision 158) +++ /trunk/abdev/BasicCompiler_Common/Class.cpp (revision 159) @@ -7,5 +7,5 @@ #endif -CDBClass *pobj_DBClass; +Classes *pobj_DBClass; const CClass *pobj_CompilingClass; @@ -588,5 +588,5 @@ -int CDBClass::hash(const char *name) const{ +int Classes::hash(const char *name) const{ int key; @@ -598,5 +598,5 @@ } -void CDBClass::DestroyClass(CClass *pobj_c){ +void Classes::DestroyClass(CClass *pobj_c){ if(pobj_c->pobj_NextClass){ DestroyClass(pobj_c->pobj_NextClass); @@ -606,5 +606,5 @@ } -CDBClass::CDBClass(): +Classes::Classes(): pStringClass( NULL ), pObjectClass( NULL ), @@ -617,5 +617,5 @@ memset( pobj_ClassHash, 0, MAX_CLASS_HASH * sizeof(CClass *) ); } -CDBClass::~CDBClass(){ +Classes::~Classes(){ int i; for(i=0;iGetParentClassPtr(); if( pCompilingClass ){ @@ -1638,9 +1638,9 @@ } } -const CClass *CDBClass::GetNowCompilingClass() const +const CClass *Classes::GetNowCompilingClass() const { return pCompilingClass; } -const CMethod *CDBClass::GetNowCompilingMethodInfo(){ +const CMethod *Classes::GetNowCompilingMethodInfo(){ return pCompilingMethod; } @@ -1653,5 +1653,5 @@ ////////////////////// -void CDBClass::Iterator_Init(void){ +void Classes::Iterator_Init(void){ if(ppobj_IteClass) HeapDefaultFree(ppobj_IteClass); @@ -1676,12 +1676,12 @@ } } -void CDBClass::Iterator_Reset(void){ +void Classes::Iterator_Reset(void){ iIteNextNum = 0; } -BOOL CDBClass::Iterator_HasNext(void){ +BOOL Classes::Iterator_HasNext(void){ if(iIteNextNumIterator_Reset(); @@ -136,11 +136,11 @@ // TypeDef情報 ////////////////// - *(long *)(buffer+i2)=(int)Smoothie::Meta::typeDefs.size(); - i2+=sizeof(long); - for(i3=0;i3<(int)Smoothie::Meta::typeDefs.size();i3++){ - lstrcpy(buffer+i2,Smoothie::Meta::typeDefs[i3].GetName().c_str() ); - i2+=lstrlen(buffer+i2)+1; - - lstrcpy(buffer+i2,Smoothie::Meta::typeDefs[i3].GetBaseName().c_str() ); + *(long *)(buffer+i2)=(int)Smoothie::meta.typeDefs.size(); + i2+=sizeof(long); + for(i3=0;i3<(int)Smoothie::meta.typeDefs.size();i3++){ + lstrcpy(buffer+i2,Smoothie::meta.typeDefs[i3].GetName().c_str() ); + i2+=lstrlen(buffer+i2)+1; + + lstrcpy(buffer+i2,Smoothie::meta.typeDefs[i3].GetBaseName().c_str() ); i2+=lstrlen(buffer+i2)+1; @@ -482,5 +482,5 @@ /////////////////////////////////////////// - this->pobj_DBClass=new CDBClass(); + this->pobj_DBClass=new Classes(); int iMaxClassCount; @@ -494,5 +494,5 @@ } - extern CDBClass *pobj_DBClass; + extern Classes *pobj_DBClass; pobj_DBClass=this->pobj_DBClass; @@ -503,5 +503,5 @@ //初期化 - Smoothie::Meta::typeDefs.clear(); + Smoothie::meta.typeDefs.clear(); //個数を取得 @@ -513,5 +513,5 @@ // 名前空間に未対応 - Smoothie::Meta::typeDefs.push_back( TypeDef( NamespaceScopes(), temp5, buffer+i2 ) ); + Smoothie::meta.typeDefs.push_back( TypeDef( NamespaceScopes(), temp5, buffer+i2 ) ); i2+=lstrlen(buffer+i2)+1; @@ -943,5 +943,5 @@ // クラス情報 - extern CDBClass *pobj_DBClass; + extern Classes *pobj_DBClass; pobj_DBClass=this->pobj_DBClass; Index: /trunk/abdev/BasicCompiler_Common/DebugSection.h =================================================================== --- /trunk/abdev/BasicCompiler_Common/DebugSection.h (revision 158) +++ /trunk/abdev/BasicCompiler_Common/DebugSection.h (revision 159) @@ -32,5 +32,5 @@ // クラス情報 - CDBClass *pobj_DBClass; + Classes *pobj_DBClass; //定数を取得 Index: /trunk/abdev/BasicCompiler_Common/Diagnose.cpp =================================================================== --- /trunk/abdev/BasicCompiler_Common/Diagnose.cpp (revision 158) +++ /trunk/abdev/BasicCompiler_Common/Diagnose.cpp (revision 159) @@ -63,5 +63,5 @@ // イテレータをリセット - extern CDBClass *pobj_DBClass; + extern Classes *pobj_DBClass; pobj_DBClass->Iterator_Reset(); @@ -103,5 +103,5 @@ // イテレータをリセット - extern CDBClass *pobj_DBClass; + extern Classes *pobj_DBClass; pobj_DBClass->Iterator_Reset(); Index: /trunk/abdev/BasicCompiler_Common/NumOpe_GetType.cpp =================================================================== --- /trunk/abdev/BasicCompiler_Common/NumOpe_GetType.cpp (revision 158) +++ /trunk/abdev/BasicCompiler_Common/NumOpe_GetType.cpp (revision 159) @@ -323,5 +323,5 @@ Type leftType; if( GetTermType( termLeft, leftType, isLiteral, &isClassName ) ){ - if( isClassName == false && Smoothie::Meta::blittableTypes.IsExist( leftType ) ){ + if( isClassName == false && Smoothie::meta.blittableTypes.IsExist( leftType ) ){ // 左側のオブジェクト部分がBlittable型のとき @@ -329,5 +329,5 @@ lstrcpy( temporary, termLeft ); sprintf( termLeft, "%s(%s)", - Smoothie::Meta::blittableTypes.Find( leftType ).GetCreateStaticMethodFullName().c_str(), + Smoothie::meta.blittableTypes.Find( leftType ).GetCreateStaticMethodFullName().c_str(), temporary ); Index: /trunk/abdev/BasicCompiler_Common/Subroutine.cpp =================================================================== --- /trunk/abdev/BasicCompiler_Common/Subroutine.cpp (revision 158) +++ /trunk/abdev/BasicCompiler_Common/Subroutine.cpp (revision 159) @@ -199,5 +199,5 @@ GetVarType(fullCallName,type,false); - ProcPointer *pProcPtr = Smoothie::Meta::procPointers[type.GetIndex()]; + ProcPointer *pProcPtr = Smoothie::meta.procPointers[type.GetIndex()]; resultType = pProcPtr->ReturnType(); @@ -869,14 +869,14 @@ pProcPointer->SetParamsAndReturnType( paramStr.c_str(), nowLine ); - Smoothie::Meta::procPointers.push_back( pProcPointer ); - - return (int)Smoothie::Meta::procPointers.size()-1; + Smoothie::meta.procPointers.push_back( pProcPointer ); + + return (int)Smoothie::meta.procPointers.size()-1; } void DeleteProcPtrInfo(void){ - BOOST_FOREACH( ProcPointer *pProcPointer, Smoothie::Meta::procPointers ){ + BOOST_FOREACH( ProcPointer *pProcPointer, Smoothie::meta.procPointers ){ delete pProcPointer; } - Smoothie::Meta::procPointers.clear(); + Smoothie::meta.procPointers.clear(); } Index: /trunk/abdev/BasicCompiler_Common/Type.cpp =================================================================== --- /trunk/abdev/BasicCompiler_Common/Type.cpp (revision 158) +++ /trunk/abdev/BasicCompiler_Common/Type.cpp (revision 159) @@ -102,7 +102,7 @@ // TypeDefされた型 //////////////////// - int i=Smoothie::Meta::typeDefs.GetIndex( typeName ); + int i=Smoothie::meta.typeDefs.GetIndex( typeName ); if(i!=-1){ - type = Smoothie::Meta::typeDefs[i].GetBaseType(); + type = Smoothie::meta.typeDefs[i].GetBaseType(); return true; } @@ -502,5 +502,5 @@ } else{ - if( Smoothie::Meta::procPointers[index]->ReturnType().IsNull() ){ + if( Smoothie::meta.procPointers[index]->ReturnType().IsNull() ){ return "*Sub"; } Index: /trunk/abdev/BasicCompiler_Common/VariableOpe.cpp =================================================================== --- /trunk/abdev/BasicCompiler_Common/VariableOpe.cpp (revision 158) +++ /trunk/abdev/BasicCompiler_Common/VariableOpe.cpp (revision 159) @@ -220,5 +220,5 @@ if(lpIndex==-1) lstrcpy(name,"VoidPtr"); else{ - if( Smoothie::Meta::procPointers[lpIndex]->ReturnType().IsNull() ) + if( Smoothie::meta.procPointers[lpIndex]->ReturnType().IsNull() ) lstrcpy(name,"*Sub"); else lstrcpy(name,"*Function"); @@ -645,5 +645,5 @@ // 名前空間を分離 char namespaceStr[VN_SIZE]="", simpleName[VN_SIZE]; - Smoothie::Meta::namespaceScopesCollection.SplitNamespace( variable, namespaceStr, simpleName ); + Smoothie::meta.namespaceScopesCollection.SplitNamespace( variable, namespaceStr, simpleName ); // 先頭オブジェクトまたはクラス名と入れ子メンバに分割 @@ -738,8 +738,8 @@ } - int typeDefIndex = Smoothie::Meta::typeDefs.GetIndex( VarName ); + int typeDefIndex = Smoothie::meta.typeDefs.GetIndex( VarName ); if( typeDefIndex != -1 ){ // TypeDef後の型名だったとき - lstrcpy( VarName, Smoothie::Meta::typeDefs[typeDefIndex].GetBaseName().c_str() ); + lstrcpy( VarName, Smoothie::meta.typeDefs[typeDefIndex].GetBaseName().c_str() ); } Index: /trunk/abdev/BasicCompiler_Common/include/Smoothie.h =================================================================== --- /trunk/abdev/BasicCompiler_Common/include/Smoothie.h (revision 158) +++ /trunk/abdev/BasicCompiler_Common/include/Smoothie.h (revision 159) @@ -2,6 +2,5 @@ #include "Source.h" -#include "../TypeDef.h" -#include "Namespace.h" +#include "ObjectModule.h" class Smoothie{ @@ -33,22 +32,4 @@ }; - // プロジェクト中に存在するメタ情報 - class Meta{ - public: - // 名前空間 - static NamespaceScopesCollection namespaceScopesCollection; - - // クラス - - // TypeDef - static TypeDefCollection typeDefs; - - // 関数ポインタ - static vector procPointers; - - // blittable型 - static BlittableTypes blittableTypes; - }; - // コンパイル中に一時的に利用する class Temp{ @@ -58,4 +39,7 @@ }; + // プロジェクト中に存在するメタ情報 + static Meta meta; + static bool isFullCompile; }; Index: unk/abdev/BasicCompiler_Common/include/logger.h =================================================================== --- /trunk/abdev/BasicCompiler_Common/include/logger.h (revision 158) +++ (revision ) @@ -1,82 +1,0 @@ -#pragma once - -#include -#include //streamsize -#include //basic_streambuf -#include //char_traits, basic_string -#include //char_traits, basic_string -#include - -#include -#include - -#define STDX_DSTREAM_BUFFERING - -using namespace std; - -extern char BasicSystemDir[MAX_PATH]; - - -// VC++ で STLport だと using std::char_traits; みたいなのが必要かも -template > -class basic_dbg_streambuf: public std::basic_stringbuf -{ -public: - basic_dbg_streambuf() - { -#ifndef STDX_DSTREAM_BUFFERING - setbuf(0,0); -#endif - } - - virtual ~basic_dbg_streambuf() - { - sync(); - } - -protected: - int sync(void) - { - dbg_out(str().c_str()); - pbump(static_cast(pbase() - pptr())); - return 0; - } - - void dbg_out(const Ch_T*); -}; - -template <> -inline void basic_dbg_streambuf::dbg_out(const char *str) -{ - ofstream ofs( ( (string)BasicSystemDir + "logger.log" ).c_str(), ios_base::app ); - ofs << str ; - ofs.close(); -} - -template > -class basic_dbg_ostream: public std::basic_ostream -{ -public: -basic_dbg_ostream() : std::basic_ostream(new \ - basic_dbg_streambuf()) - { - ofstream ofs( ( (string)BasicSystemDir + "logger.log" ).c_str(), ios_base::trunc ); - ofs.close(); - } - - virtual ~basic_dbg_ostream() - { - // flush(); // 不要らしい．http://www.tietew.jp/cppll/archive/607 - delete rdbuf(); - } -}; - -// ログ生成しない場合はこの下の行をコメントアウトする -#define USE_TRACE - -#ifdef USE_TRACE -static basic_dbg_ostream<_TCHAR> logger; -#define trace(s) logger << s << endl -#else -#define trace(s) -#endif Index: /trunk/abdev/BasicCompiler_Common/src/Member.cpp =================================================================== --- /trunk/abdev/BasicCompiler_Common/src/Member.cpp (revision 158) +++ /trunk/abdev/BasicCompiler_Common/src/Member.cpp (revision 159) @@ -57,5 +57,5 @@ //イテレータをリセット - extern CDBClass *pobj_DBClass; + extern Classes *pobj_DBClass; pobj_DBClass->Iterator_Reset(); Index: /trunk/abdev/BasicCompiler_Common/src/Namespace.cpp =================================================================== --- /trunk/abdev/BasicCompiler_Common/src/Namespace.cpp (revision 158) +++ /trunk/abdev/BasicCompiler_Common/src/Namespace.cpp (revision 159) @@ -103,5 +103,5 @@ void NamespaceScopesCollection::Imports( const string &namespaceStr ){ NamespaceScopes namespaceScopes( namespaceStr ); - if( !Smoothie::Meta::namespaceScopesCollection.IsExist( namespaceScopes ) ){ + if( !Smoothie::meta.namespaceScopesCollection.IsExist( namespaceScopes ) ){ SetError(64,namespaceStr.c_str(),cp ); return; Index: /trunk/abdev/BasicCompiler_Common/src/Smoothie.cpp =================================================================== --- /trunk/abdev/BasicCompiler_Common/src/Smoothie.cpp (revision 158) +++ /trunk/abdev/BasicCompiler_Common/src/Smoothie.cpp (revision 159) @@ -19,9 +19,6 @@ NamespaceScopes Smoothie::Lexical::liveingNamespaceScopes; -TypeDefCollection Smoothie::Meta::typeDefs; -vector Smoothie::Meta::procPointers; -NamespaceScopesCollection Smoothie::Meta::namespaceScopesCollection; +Meta Smoothie::meta; NamespaceScopesCollection Smoothie::Temp::importedNamespaces; -BlittableTypes Smoothie::Meta::blittableTypes; bool Smoothie::isFullCompile = false; Index: /trunk/abdev/abcompiler32.sln =================================================================== --- /trunk/abdev/abcompiler32.sln (revision 159) +++ /trunk/abdev/abcompiler32.sln (revision 159) @@ -0,0 +1,26 @@ + +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual C++ Express 2005 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "..\jenga\projects\common\common.vcproj", "{F01805B6-65B4-4708-88F4-A5E07DEA9FBD}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BasicCompiler32", "BasicCompiler32\BasicCompiler.vcproj", "{11F0E9AB-EAEC-4616-A9DD-838073342CBB}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {F01805B6-65B4-4708-88F4-A5E07DEA9FBD}.Debug|Win32.ActiveCfg = Debug(x86)|Win32 + {F01805B6-65B4-4708-88F4-A5E07DEA9FBD}.Debug|Win32.Build.0 = Debug(x86)|Win32 + {F01805B6-65B4-4708-88F4-A5E07DEA9FBD}.Release|Win32.ActiveCfg = Release(x86)|Win32 + {F01805B6-65B4-4708-88F4-A5E07DEA9FBD}.Release|Win32.Build.0 = Release(x86)|Win32 + {11F0E9AB-EAEC-4616-A9DD-838073342CBB}.Debug|Win32.ActiveCfg = Debug|Win32 + {11F0E9AB-EAEC-4616-A9DD-838073342CBB}.Debug|Win32.Build.0 = Debug|Win32 + {11F0E9AB-EAEC-4616-A9DD-838073342CBB}.Release|Win32.ActiveCfg = Release|Win32 + {11F0E9AB-EAEC-4616-A9DD-838073342CBB}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal Index: /trunk/abdev/abcompiler64.sln =================================================================== --- /trunk/abdev/abcompiler64.sln (revision 159) +++ /trunk/abdev/abcompiler64.sln (revision 159) @@ -0,0 +1,26 @@ + +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual C++ Express 2005 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BasicCompiler", "BasicCompiler64\BasicCompiler.vcproj", "{864B921B-423B-4F9E-9E6B-31B15968EDF9}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "..\jenga\projects\common\common.vcproj", "{F01805B6-65B4-4708-88F4-A5E07DEA9FBD}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {864B921B-423B-4F9E-9E6B-31B15968EDF9}.Debug|Win32.ActiveCfg = Debug|Win32 + {864B921B-423B-4F9E-9E6B-31B15968EDF9}.Debug|Win32.Build.0 = Debug|Win32 + {864B921B-423B-4F9E-9E6B-31B15968EDF9}.Release|Win32.ActiveCfg = Release|Win32 + {864B921B-423B-4F9E-9E6B-31B15968EDF9}.Release|Win32.Build.0 = Release|Win32 + {F01805B6-65B4-4708-88F4-A5E07DEA9FBD}.Debug|Win32.ActiveCfg = Debug(amd64)|Win32 + {F01805B6-65B4-4708-88F4-A5E07DEA9FBD}.Debug|Win32.Build.0 = Debug(amd64)|Win32 + {F01805B6-65B4-4708-88F4-A5E07DEA9FBD}.Release|Win32.ActiveCfg = Release(amd64)|Win32 + {F01805B6-65B4-4708-88F4-A5E07DEA9FBD}.Release|Win32.Build.0 = Release(amd64)|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal