Index: trunk/jenga/src/smoothie/Member.cpp
===================================================================
--- trunk/jenga/src/smoothie/Member.cpp	(revision 170)
+++ 	(revision )
@@ -1,86 +1,0 @@
-#include <jenga/include/smoothie/Member.h>
-
-CMember::CMember( CClass *pobj_c, Prototype::Accessibility accessibility, bool isConst, bool isRef, char *buffer, int nowLine )
-	: MemberPrototype( accessibility )
-{
-	extern int cp;
-
-	//構文を解析
-	char VarName[VN_SIZE];
-	char initBuffer[VN_SIZE];
-	char lpszConstructParameter[VN_SIZE];
-	GetDimentionFormat(buffer,VarName,SubScripts,type,initBuffer,lpszConstructParameter);
-
-	//重複チェック
-	if(pobj_c->DupliCheckAll(VarName)){
-		SetError(15,VarName,cp);
-	}
-
-	//メンバ名
-	name = VarName;
-
-	//定数扱いかどうか
-	this->isConst = isConst;
-
-	//初期データ
-	initializeExpression = initBuffer;
-
-	//コンストラクタ用のパラメータ
-	constructParameter = lpszConstructParameter;
-
-	//ソースコードの位置
-	source_code_address=nowLine;
-}
-CMember::CMember(CMember &member)
-	: MemberPrototype( member.GetAccessibility() )
-	, name( member.GetName() )
-	, type( member.GetType() )
-	, isConst( member.IsConst() )
-{
-	//SubScripts
-	memcpy(SubScripts,member.SubScripts,MAX_ARRAYDIM*sizeof(int));
-
-	//ソースコードの位置
-	source_code_address=member.source_code_address;
-}
-CMember::~CMember(){
-}
-
-void CMember::InitStaticMember(void){
-	//静的メンバをグローバル領域に作成
-
-	//イテレータをリセット
-	extern Classes *pobj_DBClass;
-	pobj_DBClass->Iterator_Reset();
-
-	int back_cp=cp;
-
-	while(pobj_DBClass->Iterator_HasNext()){
-		CClass &objClass = *pobj_DBClass->Iterator_GetNext();
-
-		// 名前空間をセット
-		Smoothie::Lexical::liveingNamespaceScopes = objClass.GetNamespaceScopes();
-
-		int i=0;
-		BOOST_FOREACH( CMember *member, objClass.staticMembers ){
-			char temporary[VN_SIZE];
-			sprintf(temporary,"%s.%s",objClass.GetName().c_str(),member->GetName().c_str());
-			dim(
-				temporary,
-				member->SubScripts,
-				member->GetType(),
-				member->GetInitializeExpression().c_str(),
-				member->GetConstructParameter().c_str(),
-				0);
-
-			//ネイティブコードバッファの再確保
-			ReallocNativeCodeBuffer();
-
-			i++;
-		}
-	}
-
-	Smoothie::Lexical::liveingNamespaceScopes.clear();
-
-	cp=back_cp;
-}
Index: trunk/jenga/src/smoothie/Prototype.cpp
===================================================================
--- trunk/jenga/src/smoothie/Prototype.cpp	(revision 170)
+++ trunk/jenga/src/smoothie/Prototype.cpp	(revision 171)
@@ -1,5 +1,4 @@
-#include <jenga/include/smoothie/Prototype.h>
-#include <jenga/include/smoothie/Member.h>
 #include <jenga/include/smoothie/BasicFixed.h>
+#include <jenga/include/smoothie/Class.h>
 
 bool Prototype::IsEqualSymbol( const NamespaceScopes &namespaceScopes, const string &name ) const
@@ -19,5 +18,5 @@
 	char AreaName[VN_SIZE] = "";		//オブジェクト変数
 	char NestName[VN_SIZE] = "";		//入れ子メンバ
-	bool isNest = CMember::SplitName( fullName.c_str(), AreaName, NestName );
+	bool isNest = CClass::SplitName( fullName.c_str(), AreaName, NestName );
 
 	return IsEqualSymbol( NamespaceScopes( AreaName ), NestName );
Index: trunk/jenga/src/smoothie/Symbol.cpp
===================================================================
--- trunk/jenga/src/smoothie/Symbol.cpp	(revision 170)
+++ trunk/jenga/src/smoothie/Symbol.cpp	(revision 171)
@@ -1,5 +1,5 @@
 #include <jenga/include/smoothie/BasicFixed.h>
 #include <jenga/include/smoothie/Symbol.h>
-#include <jenga/include/smoothie/Member.h>
+#include <jenga/include/smoothie/Class.h>
 
 Symbol::Symbol( const char *fullName )
@@ -7,5 +7,5 @@
 	char areaName[VN_SIZE] = "";		//オブジェクト変数
 	char nestName[VN_SIZE] = "";		//入れ子メンバ
-	bool isNest = CMember::SplitName( fullName, areaName, nestName );
+	bool isNest = CClass::SplitName( fullName, areaName, nestName );
 
 	namespaceScopes = NamespaceScopes( areaName );
@@ -16,5 +16,5 @@
 	char areaName[VN_SIZE] = "";		//オブジェクト変数
 	char nestName[VN_SIZE] = "";		//入れ子メンバ
-	bool isNest = CMember::SplitName( fullName.c_str(), areaName, nestName );
+	bool isNest = CClass::SplitName( fullName.c_str(), areaName, nestName );
 
 	namespaceScopes = NamespaceScopes( areaName );