Changeset 169 in dev
- Timestamp:
- Jun 18, 2007, 3:49:30 AM (17 years ago)
- Location:
- trunk/abdev
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/abdev/BasicCompiler64/BasicCompiler.vcproj
r159 r169 48 48 Name="VCCLCompilerTool" 49 49 Optimization="0" 50 AdditionalIncludeDirectories="..\..\ jenga\include\common;..\..\cpplibs\boost;..\BasicCompiler_Common\include"50 AdditionalIncludeDirectories="..\..\;..\..\cpplibs\boost;..\BasicCompiler_Common\include" 51 51 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;JPN;_AMD64_;_WIN64" 52 52 MinimalRebuild="true" … … 154 154 InlineFunctionExpansion="2" 155 155 FavorSizeOrSpeed="1" 156 AdditionalIncludeDirectories="..\..\ jenga\include\common;..\..\cpplibs\boost;..\BasicCompiler_Common\include"156 AdditionalIncludeDirectories="..\..\;..\..\cpplibs\boost;..\BasicCompiler_Common\include" 157 157 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;JPN;_AMD64_;_WIN64" 158 158 MinimalRebuild="false" … … 358 358 </Filter> 359 359 </Filter> 360 <Filter 361 Name="Application Classes" 362 > 363 <File 364 RelativePath="..\BasicCompiler_Common\include\Program.h" 365 > 366 </File> 367 </Filter> 360 368 </Filter> 361 369 <Filter … … 1126 1134 </Filter> 1127 1135 </Filter> 1136 <Filter 1137 Name="Application Classes" 1138 > 1139 <File 1140 RelativePath="..\BasicCompiler_Common\src\Program.cpp" 1141 > 1142 </File> 1143 </Filter> 1128 1144 </Filter> 1129 1145 </Files> -
trunk/abdev/BasicCompiler64/Compile_ProcOp.cpp
r143 r169 1 #include <Program.h> 2 1 3 #include "../BasicCompiler_Common/common.h" 2 4 #include "Opcode.h" … … 797 799 lstrcat( temporary, "------------------------------------------------------------------\n" ); 798 800 lstrcat( temporary, "\n" ); 799 Smoothie::Logger::Put( temporary );801 trace_for_size( temporary ); 800 802 } 801 803 void CompileLocal(){ -
trunk/abdev/BasicCompiler64/MakePeHdr.cpp
r159 r169 1 #include <jenga/include/common/Environment.h> 2 1 3 #include "../BasicCompiler_Common/common.h" 2 4 #include "Opcode.h" … … 1156 1158 char *DosStubBuffer; 1157 1159 int DosStubSize; 1158 extern char BasicSystemDir[MAX_PATH];1159 sprintf(temporary,"%sSubOperation\\dosstub.pgm",BasicSystemDir);1160 hFile=CreateFile(temporary,GENERIC_READ,0,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);1160 hFile=CreateFile( 1161 ( Jenga::Common::Environment::GetAppDir() + "\\SubOperation\\dosstub.pgm" ).c_str(), 1162 GENERIC_READ,0,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL); 1161 1163 if(hFile==INVALID_HANDLE_VALUE){ 1162 1164 MessageBox(hOwnerEditor,"dosstub.pgmの読み込みに失敗","error",MB_OK); -
trunk/abdev/BasicCompiler_Common/Class.cpp
r159 r169 785 785 temporary[i2]=basbuf[i]; 786 786 } 787 importedNamespaces.Imports( temporary ); 787 if( !importedNamespaces.Imports( temporary ) ) 788 { 789 SetError(64,temporary,cp ); 790 } 788 791 789 792 continue; -
trunk/abdev/BasicCompiler_Common/Subroutine.cpp
r159 r169 720 720 temporary[i2]=basbuf[i]; 721 721 } 722 importedNamespaces.Imports( temporary ); 722 if( !importedNamespaces.Imports( temporary ) ) 723 { 724 SetError(64,temporary,cp ); 725 } 723 726 724 727 continue; -
trunk/abdev/BasicCompiler_Common/TypeDef.cpp
r143 r169 192 192 temporary[i2]=basbuf[i]; 193 193 } 194 importedNamespaces.Imports( temporary ); 194 if( !importedNamespaces.Imports( temporary ) ) 195 { 196 SetError(64,temporary,cp ); 197 } 195 198 196 199 continue; -
trunk/abdev/BasicCompiler_Common/include/Namespace.h
r107 r169 130 130 void SplitNamespace( const char *fullName, char *namespaceStr, char *simpleName ) const; 131 131 132 voidImports( const string &namespaceStr );132 bool Imports( const string &namespaceStr ); 133 133 134 134 static bool CollectNamespaces( const char *source, NamespaceScopesCollection &namespaceScopesCollection ); -
trunk/abdev/BasicCompiler_Common/src/Namespace.cpp
r159 r169 101 101 lstrcpy( simpleName, fullName + lstrlen( namespaceStr ) + dotLength ); 102 102 } 103 voidNamespaceScopesCollection::Imports( const string &namespaceStr ){103 bool NamespaceScopesCollection::Imports( const string &namespaceStr ){ 104 104 NamespaceScopes namespaceScopes( namespaceStr ); 105 105 if( !Smoothie::meta.namespaceScopesCollection.IsExist( namespaceScopes ) ){ 106 SetError(64,namespaceStr.c_str(),cp ); 107 return; 106 return false; 108 107 } 109 108 110 109 this->push_back( namespaceScopes ); 110 111 return true; 111 112 } 112 113 bool NamespaceScopesCollection::CollectNamespaces( const char *source, NamespaceScopesCollection &namespaceScopesCollection )
Note:
See TracChangeset
for help on using the changeset viewer.