Changeset 641 in dev for trunk/ab5.0/abdev/BasicCompiler_Common/src
- Timestamp:
- Jun 15, 2008, 11:59:46 PM (16 years ago)
- Location:
- trunk/ab5.0/abdev/BasicCompiler_Common/src
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ab5.0/abdev/BasicCompiler_Common/src/Compiler.cpp
r637 r641 402 402 bool Compiler::IsGlobalAreaCompiling() 403 403 { 404 return ( pCompilingUserProc == NULL ); 404 if( pCompilingUserProc == NULL ) 405 { 406 return true; 407 } 408 return ( pCompilingUserProc->GetName() == this->globalAreaProcName ); 405 409 } 406 410 bool Compiler::IsLocalAreaCompiling() 407 411 { 408 return ( pCompilingUserProc != NULL);412 return !IsGlobalAreaCompiling(); 409 413 } 410 414 const UserProc &Compiler::GetCompilingUserProc() 411 415 { 412 if( !this->IsGlobalAreaCompiling() ) 413 { 414 return *pCompilingUserProc; 416 if( pCompilingUserProc == NULL ) 417 { 418 _ASSERTE( false ); 419 throw; 420 } 421 return *pCompilingUserProc; 422 } 423 424 bool Compiler::IsCompilingClass() 425 { 426 return ( pCompilingClass != NULL ); 427 } 428 const CClass &Compiler::GetCompilingClass() 429 { 430 if( this->IsCompilingClass() ) 431 { 432 return *pCompilingClass; 415 433 } 416 434 417 435 throw; 418 436 } 419 420 bool Compiler::IsCompilingClass()421 {422 return ( pCompilingClass != NULL );423 }424 const CClass &Compiler::GetCompilingClass()425 {426 if( this->IsCompilingClass() )427 {428 return *pCompilingClass;429 }430 431 throw;432 } -
trunk/ab5.0/abdev/BasicCompiler_Common/src/LexicalAnalyzer_Procedure.cpp
r637 r641 915 915 importedNamespaces.clear(); 916 916 917 compiler.globalAreaProcName = "_ System_GlobalArea_" + compiler.GetModuleName();917 compiler.globalAreaProcName = "_GlobalArea_" + compiler.GetModuleName(); 918 918 sprintf(temporary,"%c%c%s()",1,ESC_SUB,compiler.globalAreaProcName.c_str()); 919 919 UserProc *pUserProc = ParseUserProc( namespaceScopes, importedNamespaces, temporary, 0, false, NULL, false );
Note:
See TracChangeset
for help on using the changeset viewer.