Index: trunk/abdev/BasicCompiler64/BasicCompiler.vcproj
===================================================================
--- trunk/abdev/BasicCompiler64/BasicCompiler.vcproj	(revision 168)
+++ trunk/abdev/BasicCompiler64/BasicCompiler.vcproj	(revision 169)
@@ -48,5 +48,5 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\jenga\include\common;..\..\cpplibs\boost;..\BasicCompiler_Common\include"
+				AdditionalIncludeDirectories="..\..\;..\..\cpplibs\boost;..\BasicCompiler_Common\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;JPN;_AMD64_;_WIN64"
 				MinimalRebuild="true"
@@ -154,5 +154,5 @@
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="..\..\jenga\include\common;..\..\cpplibs\boost;..\BasicCompiler_Common\include"
+				AdditionalIncludeDirectories="..\..\;..\..\cpplibs\boost;..\BasicCompiler_Common\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;JPN;_AMD64_;_WIN64"
 				MinimalRebuild="false"
@@ -358,4 +358,12 @@
 				</Filter>
 			</Filter>
+			<Filter
+				Name="Application Classes"
+				>
+				<File
+					RelativePath="..\BasicCompiler_Common\include\Program.h"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
@@ -1126,4 +1134,12 @@
 				</Filter>
 			</Filter>
+			<Filter
+				Name="Application Classes"
+				>
+				<File
+					RelativePath="..\BasicCompiler_Common\src\Program.cpp"
+					>
+				</File>
+			</Filter>
 		</Filter>
 	</Files>
Index: trunk/abdev/BasicCompiler64/Compile_ProcOp.cpp
===================================================================
--- trunk/abdev/BasicCompiler64/Compile_ProcOp.cpp	(revision 168)
+++ trunk/abdev/BasicCompiler64/Compile_ProcOp.cpp	(revision 169)
@@ -1,2 +1,4 @@
+#include <Program.h>
+
 #include "../BasicCompiler_Common/common.h"
 #include "Opcode.h"
@@ -797,5 +799,5 @@
 	lstrcat( temporary, "------------------------------------------------------------------\n" );
 	lstrcat( temporary, "\n" );
-	Smoothie::Logger::Put( temporary );
+	trace_for_size( temporary );
 }
 void CompileLocal(){
Index: trunk/abdev/BasicCompiler64/MakePeHdr.cpp
===================================================================
--- trunk/abdev/BasicCompiler64/MakePeHdr.cpp	(revision 168)
+++ trunk/abdev/BasicCompiler64/MakePeHdr.cpp	(revision 169)
@@ -1,2 +1,4 @@
+#include <jenga/include/common/Environment.h>
+
 #include "../BasicCompiler_Common/common.h"
 #include "Opcode.h"
@@ -1156,7 +1158,7 @@
 	char *DosStubBuffer;
 	int DosStubSize;
-	extern char BasicSystemDir[MAX_PATH];
-	sprintf(temporary,"%sSubOperation\\dosstub.pgm",BasicSystemDir);
-	hFile=CreateFile(temporary,GENERIC_READ,0,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
+	hFile=CreateFile(
+		( Jenga::Common::Environment::GetAppDir() + "\\SubOperation\\dosstub.pgm" ).c_str(),
+		GENERIC_READ,0,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
 	if(hFile==INVALID_HANDLE_VALUE){
 		MessageBox(hOwnerEditor,"dosstub.pgmの読み込みに失敗","error",MB_OK);
Index: trunk/abdev/BasicCompiler_Common/Class.cpp
===================================================================
--- trunk/abdev/BasicCompiler_Common/Class.cpp	(revision 168)
+++ trunk/abdev/BasicCompiler_Common/Class.cpp	(revision 169)
@@ -785,5 +785,8 @@
 				temporary[i2]=basbuf[i];
 			}
-			importedNamespaces.Imports( temporary );
+			if( !importedNamespaces.Imports( temporary ) )
+			{
+				SetError(64,temporary,cp );
+			}
 
 			continue;
Index: trunk/abdev/BasicCompiler_Common/Subroutine.cpp
===================================================================
--- trunk/abdev/BasicCompiler_Common/Subroutine.cpp	(revision 168)
+++ trunk/abdev/BasicCompiler_Common/Subroutine.cpp	(revision 169)
@@ -720,5 +720,8 @@
 				temporary[i2]=basbuf[i];
 			}
-			importedNamespaces.Imports( temporary );
+			if( !importedNamespaces.Imports( temporary ) )
+			{
+				SetError(64,temporary,cp );
+			}
 
 			continue;
Index: trunk/abdev/BasicCompiler_Common/TypeDef.cpp
===================================================================
--- trunk/abdev/BasicCompiler_Common/TypeDef.cpp	(revision 168)
+++ trunk/abdev/BasicCompiler_Common/TypeDef.cpp	(revision 169)
@@ -192,5 +192,8 @@
 				temporary[i2]=basbuf[i];
 			}
-			importedNamespaces.Imports( temporary );
+			if( !importedNamespaces.Imports( temporary ) )
+			{
+				SetError(64,temporary,cp );
+			}
 
 			continue;
Index: trunk/abdev/BasicCompiler_Common/include/Namespace.h
===================================================================
--- trunk/abdev/BasicCompiler_Common/include/Namespace.h	(revision 168)
+++ trunk/abdev/BasicCompiler_Common/include/Namespace.h	(revision 169)
@@ -130,5 +130,5 @@
 	void SplitNamespace( const char *fullName, char *namespaceStr, char *simpleName ) const;
 
-	void Imports( const string &namespaceStr );
+	bool Imports( const string &namespaceStr );
 
 	static bool CollectNamespaces( const char *source, NamespaceScopesCollection &namespaceScopesCollection );
Index: trunk/abdev/BasicCompiler_Common/src/Namespace.cpp
===================================================================
--- trunk/abdev/BasicCompiler_Common/src/Namespace.cpp	(revision 168)
+++ trunk/abdev/BasicCompiler_Common/src/Namespace.cpp	(revision 169)
@@ -101,12 +101,13 @@
 	lstrcpy( simpleName, fullName + lstrlen( namespaceStr ) + dotLength );
 }
-void NamespaceScopesCollection::Imports( const string &namespaceStr ){
+bool NamespaceScopesCollection::Imports( const string &namespaceStr ){
 	NamespaceScopes namespaceScopes( namespaceStr );
 	if( !Smoothie::meta.namespaceScopesCollection.IsExist( namespaceScopes ) ){
-		SetError(64,namespaceStr.c_str(),cp );
-		return;
+		return false;
 	}
 
 	this->push_back( namespaceScopes );
+
+	return true;
 }
 bool NamespaceScopesCollection::CollectNamespaces( const char *source, NamespaceScopesCollection &namespaceScopesCollection )
