fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2006-07-18 12:00 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* harbour/source/vm/hvm.c
    ! fixed problems reported by Marek with EXIT procedures after my
      last commit
This commit is contained in:
Przemyslaw Czerpak
2006-07-18 09:59:23 +00:00
parent 2743947bbf
commit 294032d320
2 changed files with 37 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
harbour/ChangeLog
View File

@@ -8,6 +8,11 @@
2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
* utils/hbpptest/pretest.prg
* added more test cases (3 of them fails)
2006-07-18 12:00 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/source/vm/hvm.c
! fixed problems reported by Marek with EXIT procedures after my

62
harbour/source/vm/hvm.c
View File

@@ -229,8 +229,9 @@ HB_SYMB hb_symWithObjectPop = { "___WITHOBJECT", {HB_FS_MESSAGE}, {NULL}, NULL
static HB_ITEM s_aStatics; /* Harbour array to hold all application statics variables */
static int s_nErrorLevel; /* application exit errorlevel */
static PHB_SYMB s_pSymStart = NULL; /* start symbol of the application. MAIN() is not required */
static BOOL s_fDoExitProc = TRUE; /* execute EXIT procedures */
static int s_nErrorLevel; /* application exit errorlevel */
static PHB_SYMB s_pSymStart = NULL; /* start symbol of the application. MAIN() is not required */
static PHB_SYMBOLS s_pSymbols = NULL; /* to hold a linked list of all different modules symbol tables */
static ULONG s_ulFreeSymbols = 0;/* number of free module symbols */
@@ -546,6 +547,8 @@ HB_EXPORT int hb_vmQuit( void )
{
HB_TRACE(HB_TR_DEBUG, ("hb_vmQuit()"));
hb_vmDoExitFunctions(); /* process defined EXIT functions */
#ifdef HB_MACRO_STATEMENTS
hb_pp_Free();
#endif
@@ -5817,30 +5820,37 @@ static void hb_vmDoExitFunctions( void )
HB_TRACE(HB_TR_DEBUG, ("hb_vmDoExitFunctions()"));
while( pLastSymbols )
/* EXIT procedures should be processed? */
if( s_fDoExitProc )
{
/* only if module contains some EXIT functions */
if( pLastSymbols->fActive && pLastSymbols->hScope & HB_FS_EXIT )
s_fDoExitProc = FALSE;
s_uiActionRequest = 0;
while( pLastSymbols )
{
USHORT ui;
for( ui = 0; ui < pLastSymbols->uiModuleSymbols; ui++ )
/* only if module contains some EXIT functions */
if( pLastSymbols->fActive && pLastSymbols->hScope & HB_FS_EXIT )
{
HB_SYMBOLSCOPE scope = ( pLastSymbols->pModuleSymbols + ui )->scope.value & ( HB_FS_EXIT | HB_FS_INIT );
USHORT ui;
if( scope == HB_FS_EXIT )
for( ui = 0; ui < pLastSymbols->uiModuleSymbols; ui++ )
{
hb_vmPushSymbol( pLastSymbols->pModuleSymbols + ui );
hb_vmPushNil();
hb_vmDo( 0 );
if( s_uiActionRequest )
/* QUIT or BREAK was issued - stop processing
*/
return;
HB_SYMBOLSCOPE scope = ( pLastSymbols->pModuleSymbols + ui )->scope.value & ( HB_FS_EXIT | HB_FS_INIT );
if( scope == HB_FS_EXIT )
{
hb_vmPushSymbol( pLastSymbols->pModuleSymbols + ui );
hb_vmPushNil();
hb_vmDo( 0 );
if( s_uiActionRequest )
/* QUIT or BREAK was issued - stop processing
*/
return;
}
}
}
pLastSymbols = pLastSymbols->pNext;
}
pLastSymbols = pLastSymbols->pNext;
}
}
@@ -5918,18 +5928,9 @@ HB_FUNC( ERRORLEVEL )
void hb_vmRequestQuit( void )
{
static BOOL s_fDoExitProc = TRUE;
HB_TRACE(HB_TR_DEBUG, ("hb_vmRequestQuit()"));
/* EXIT procedures should be processed? */
if( s_fDoExitProc )
{
s_fDoExitProc = FALSE;
s_uiActionRequest = 0;
hb_vmDoExitFunctions(); /* process defined EXIT functions */
}
hb_vmDoExitFunctions(); /* process defined EXIT functions */
s_uiActionRequest = HB_QUIT_REQUESTED;
}
@@ -5954,7 +5955,8 @@ void hb_vmRequestBreak( PHB_ITEM pItem )
else
/*
* do not call hb_vmRequestQuit()
* Clipper does not execute EXIT procedures when quiting by BREAK()
* Clipper does not execute EXIT procedures now but after leaving all
* functions
*/
s_uiActionRequest = HB_QUIT_REQUESTED;
}
@@ -5988,9 +5990,9 @@ void hb_vmRequestCancel( void )
while( hb_procinfo( ++i, buffer, &uiLine, NULL ) );
/*
* do not call hb_vmRequestQuit()
* Clipper does not execute EXIT procedures when quiting using break key
*/
s_fDoExitProc = FALSE;
s_uiActionRequest = HB_QUIT_REQUESTED;
}
}