- Timestamp:
- May 1, 2008, 11:26:31 AM (17 years ago)
- Location:
- trunk/ab5.0/abdev
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ab5.0/abdev/compiler_x64/Compile_CallProc.cpp
r468 r514 5 5 #include "../BasicCompiler_Common/common.h" 6 6 #include "Opcode.h" 7 8 using namespace ActiveBasic::Compiler; 7 9 8 10 void Call_DebugSys_SaveContext(){ … … 462 464 463 465 extern BOOL bDebugSupportProc; 464 if( compiler.IsDebug() && bDebugSupportProc == 0 && pDllProc->GetName() != "DebugBreak")466 if( compiler.IsDebug() && bDebugSupportProc==0 && pDllProc->IsEqualSymbol( LexicalAnalyzer::FullNameToSymbol( "DebugBreak" ) ) ) 465 467 { 466 468 Call_DebugSys_SaveContext(); -
trunk/ab5.0/abdev/compiler_x64/Compile_Var.cpp
r468 r514 12 12 int AllLocalVarSize; 13 13 14 using namespace ActiveBasic::Compiler; 14 15 15 16 void SetRelativeOffset( Type &resultType, RELATIVE_VAR *pRelativeVar,const char *lpPtrOffset){ … … 416 417 ////////////////// 417 418 418 const Variable *pVar = UserProc::CompilingUserProc().GetLocalVars().BackSearch( Symbol( VarName ) );419 const Variable *pVar = UserProc::CompilingUserProc().GetLocalVars().BackSearch( LexicalAnalyzer::FullNameToSymbol( VarName ) ); 419 420 if( pVar ){ 420 421 //ポインタ変数の場合 … … 538 539 GetNowStaticVarFullName(VarName,temporary); 539 540 540 pVar = compiler.GetObjectModule().meta.GetGlobalVars().Find( Symbol( temporary ) );541 pVar = compiler.GetObjectModule().meta.GetGlobalVars().Find( LexicalAnalyzer::FullNameToSymbol( temporary ) ); 541 542 if( pVar ){ 542 543 goto GlobalOk; … … 569 570 char temp2[VN_SIZE]; 570 571 sprintf(temp2,"%s.%s",VarName,temporary); 571 pVar = compiler.GetObjectModule().meta.GetGlobalVars().Find( Symbol( temp2 ) );572 pVar = compiler.GetObjectModule().meta.GetGlobalVars().Find( LexicalAnalyzer::FullNameToSymbol( temp2 ) ); 572 573 if( pVar ){ 573 574 lstrcpy(member,tempMember); … … 581 582 char temp2[VN_SIZE]; 582 583 sprintf(temp2,"%s.%s",compiler.pCompilingClass->GetName().c_str(),VarName); 583 pVar = compiler.GetObjectModule().meta.GetGlobalVars().Find( Symbol( temp2 ) );584 pVar = compiler.GetObjectModule().meta.GetGlobalVars().Find( LexicalAnalyzer::FullNameToSymbol( temp2 ) ); 584 585 if( pVar ){ 585 586 goto GlobalOk; … … 591 592 ///////////////////// 592 593 593 pVar = compiler.GetObjectModule().meta.GetGlobalVars().BackSearch( Symbol( VarName ) );594 pVar = compiler.GetObjectModule().meta.GetGlobalVars().BackSearch( LexicalAnalyzer::FullNameToSymbol( VarName ) ); 594 595 if( pVar ){ 595 596 goto GlobalOk; … … 1111 1112 ///////////////// 1112 1113 1113 if( UserProc::CompilingUserProc().GetLocalVars().DuplicateCheck( VarName) ){1114 if( UserProc::CompilingUserProc().GetLocalVars().DuplicateCheck( LexicalAnalyzer::FullNameToSymbol( VarName ) ) ){ 1114 1115 //2重定義のエラー 1115 1116 compiler.errorMessenger.Output(15,VarName,cp); -
trunk/ab5.0/abdev/compiler_x64/MakePeHdr.cpp
r477 r514 143 143 144 144 // 名前空間情報を取得 145 NamespaceSupporter::CollectNamespaces(145 ActiveBasic::Compiler::LexicalAnalyzer::CollectNamespaces( 146 146 compiler.GetObjectModule().GetCurrentSource().GetBuffer(), 147 147 compiler.GetObjectModule().meta.GetNamespaces() … … 161 161 } 162 162 163 //クラス名を取得(詳細情報は GetAllClassInfoで取得)163 //クラス名を取得(詳細情報はCollectClassesで取得) 164 164 // CollectProcedures関数の中で参照されるオブジェクト名を事前に取得する。 165 165 // ※オブジェクトの内容までは取得しない 166 compiler.GetObjectModule().meta.GetClasses().CollectClassesForNameOnly( compiler.GetObjectModule().GetCurrentSource() ); 166 ActiveBasic::Compiler::LexicalAnalyzer::CollectClassesForNameOnly( 167 compiler.GetObjectModule().GetCurrentSource().GetBuffer(), 168 compiler.GetObjectModule().meta.GetClasses() 169 ); 167 170 168 171 //TypeDef情報を初期化 … … 181 184 //サブルーチン(ユーザー定義、DLL関数)の識別子、アドレスを取得 182 185 compiler.pCompilingClass = NULL; 183 CollectProcedures(186 ActiveBasic::Compiler::LexicalAnalyzer::CollectProcedures( 184 187 compiler.GetObjectModule().GetCurrentSource(), 185 188 compiler.GetObjectModule().meta.GetUserProcs(), … … 188 191 189 192 // クラス情報を取得(※注 - CollectProceduresの後に呼び出す) 190 compiler.GetObjectModule().meta.GetClasses().GetAllClassInfo(); 193 ActiveBasic::Compiler::LexicalAnalyzer::CollectClasses( 194 compiler.GetObjectModule().GetCurrentSource().GetBuffer(), 195 compiler.GetObjectModule().meta.GetClasses() 196 ); 191 197 192 198 // サブルーチン(ユーザー定義、DLL関数)のイテレータの準備 -
trunk/ab5.0/abdev/compiler_x64/compiler_x64.vcproj
r490 r514 334 334 </File> 335 335 <File 336 RelativePath="..\BasicCompiler_Common\include\LexicalAnalyzer.h" 337 > 338 </File> 339 <File 336 340 RelativePath="..\BasicCompiler_Common\include\Linker.h" 337 341 > … … 369 373 </File> 370 374 <File 375 RelativePath="..\BasicCompiler_Common\include\Interface.h" 376 > 377 </File> 378 <File 371 379 RelativePath="..\BasicCompiler_Common\include\LexicalScope.h" 372 380 > … … 385 393 </File> 386 394 <File 387 RelativePath="..\BasicCompiler_Common\include\Namespace.h"388 >389 </File>390 <File391 RelativePath="..\BasicCompiler_Common\include\NamespaceSupporter.h"392 >393 </File>394 <File395 395 RelativePath="..\BasicCompiler_Common\include\NativeCode.h" 396 396 > … … 409 409 </File> 410 410 <File 411 RelativePath="..\BasicCompiler_Common\include\Prototype.h"412 >413 </File>414 <File415 411 RelativePath="..\BasicCompiler_Common\include\Source.h" 416 >417 </File>418 <File419 RelativePath="..\BasicCompiler_Common\include\Symbol.h"420 412 > 421 413 </File> … … 1250 1242 </File> 1251 1243 <File 1244 RelativePath="..\BasicCompiler_Common\src\CommonCodeGenerator.cpp" 1245 > 1246 </File> 1247 <File 1252 1248 RelativePath="..\BasicCompiler_Common\src\Compiler.cpp" 1249 > 1250 </File> 1251 <File 1252 RelativePath="..\BasicCompiler_Common\src\LexicalAnalyzer.cpp" 1253 > 1254 </File> 1255 <File 1256 RelativePath="..\BasicCompiler_Common\src\LexicalAnalyzer_Class.cpp" 1253 1257 > 1254 1258 </File> … … 1269 1273 </File> 1270 1274 <File 1271 RelativePath="..\BasicCompiler_Common\src\Class_Collect.cpp"1272 >1273 </File>1274 <File1275 RelativePath="..\BasicCompiler_Common\src\CommonCodeGenerator.cpp"1276 >1277 </File>1278 <File1279 1275 RelativePath="..\BasicCompiler_Common\src\Const.cpp" 1280 1276 > … … 1297 1293 </File> 1298 1294 <File 1295 RelativePath="..\BasicCompiler_Common\src\Interface.cpp" 1296 > 1297 </File> 1298 <File 1299 1299 RelativePath="..\BasicCompiler_Common\src\LexicalScope.cpp" 1300 1300 > … … 1309 1309 </File> 1310 1310 <File 1311 RelativePath="..\BasicCompiler_Common\src\Namespace.cpp"1312 >1313 </File>1314 <File1315 RelativePath="..\BasicCompiler_Common\src\NamespaceSupporter.cpp"1316 >1317 </File>1318 <File1319 1311 RelativePath="..\BasicCompiler_Common\src\NativeCode.cpp" 1320 1312 > … … 1350 1342 <File 1351 1343 RelativePath="..\BasicCompiler_Common\src\Source.cpp" 1352 >1353 </File>1354 <File1355 RelativePath="..\BasicCompiler_Common\src\Symbol.cpp"1356 1344 > 1357 1345 </File> -
trunk/ab5.0/abdev/compiler_x64/stdafx.h
r477 r514 21 21 //boost libraries 22 22 #include <boost/foreach.hpp> 23 #include <boost/serialization/serialization.hpp> 24 #include <boost/serialization/nvp.hpp> 25 #include <boost/serialization/export.hpp> 23 26 24 27 #include <jenga/include/common/CmdLine.h> … … 29 32 30 33 #include <abdev/ab_common/Environment.h> 34 #include <abdev/ab_common/include/Namespace.h> 35 #include <abdev/ab_common/include/NamespaceSupporter.h> 36 #include <abdev/ab_common/include/Symbol.h> 37 #include <abdev/ab_common/include/Prototype.h> 38 39 using namespace ActiveBasic::Common::Lexical; 31 40 32 41 #include "../BasicCompiler_Common/common.h" … … 35 44 #include <Hashmap.h> 36 45 #include <Configuration.h> 46 #include <Type.h> 47 #include <Method.h> 48 #include <Interface.h> 49 #include <Class.h> 50 #include <Procedure.h> 51 #include <LexicalAnalyzer.h> 37 52 #include <Program.h> 38 53 #include <Compiler.h> -
trunk/ab5.0/abdev/compiler_x86/compiler_x86.vcproj
r513 r514 1257 1257 </File> 1258 1258 <File 1259 RelativePath="..\BasicCompiler_Common\src\LexicalAnalyzer_Class.cpp" 1260 > 1261 </File> 1262 <File 1259 1263 RelativePath="..\BasicCompiler_Common\src\Linker.cpp" 1260 1264 > … … 1293 1297 <File 1294 1298 RelativePath="..\BasicCompiler_Common\src\Interface.cpp" 1295 >1296 </File>1297 <File1298 RelativePath="..\BasicCompiler_Common\src\LexicalAnalyzer_Class.cpp"1299 1299 > 1300 1300 </File>
Note:
See TracChangeset
for help on using the changeset viewer.