diff --git a/harbour/ChangeLog b/harbour/ChangeLog index de60c559b8..222b58791b 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,20 @@ +19991006-03:02 GMT+1 Victor Szel + * include/extend.h + source/rtl/arrays.c + source/rtl/classes.c + source/rtl/do.c + source/rtl/itemapi.c + source/vm/hvm.c + * hb_g_symEval -> hb_symEval + * source/vm/mainwin.c + * hb_g_* -> hb_* + * source/vm/hvm.c + ! aStatics made static now for sure. + * source/rtl/strings.c + ! Typo fixed. + * source/rtl/memoline.c + ! Formatting fix. + 19991005-20:35 EDT Paul Tucker * source/rtl/memoline.c * add a cast on xgrab call. diff --git a/harbour/include/extend.h b/harbour/include/extend.h index 88812449fe..31b4b9203f 100644 --- a/harbour/include/extend.h +++ b/harbour/include/extend.h @@ -237,7 +237,7 @@ typedef USHORT ERRCODE; #define FAILURE 1 extern STACK stack; -extern HB_SYMB hb_g_symEval; +extern HB_SYMB hb_symEval; /* Extend API */ extern char * hb_parc( int iParam, ... ); /* retrieve a string parameter */ diff --git a/harbour/source/rtl/arrays.c b/harbour/source/rtl/arrays.c index 3fdaabff44..4bcaab8f04 100644 --- a/harbour/source/rtl/arrays.c +++ b/harbour/source/rtl/arrays.c @@ -462,7 +462,7 @@ ULONG hb_arrayScan( PHB_ITEM pArray, PHB_ITEM pValue, ULONG * pulStart, ULONG * { for( ulStart--; ulCount > 0; ulCount--, ulStart++ ) { - hb_vmPushSymbol( &hb_g_symEval ); + hb_vmPushSymbol( &hb_symEval ); hb_vmPush( pValue ); hb_vmPush( pBaseArray->pItems + ulStart ); hb_vmDo( 1 ); @@ -562,7 +562,7 @@ BOOL hb_arrayEval( PHB_ITEM pArray, PHB_ITEM bBlock, ULONG * pulStart, ULONG * p { PHB_ITEM pItem = pBaseArray->pItems + ulStart; - hb_vmPushSymbol( &hb_g_symEval ); + hb_vmPushSymbol( &hb_symEval ); hb_vmPush( bBlock ); hb_vmPush( pItem ); hb_vmPushNumber( ( double ) ( ulStart + 1 ), 0 ); diff --git a/harbour/source/rtl/classes.c b/harbour/source/rtl/classes.c index 35095116ce..6cff75b855 100644 --- a/harbour/source/rtl/classes.c +++ b/harbour/source/rtl/classes.c @@ -954,7 +954,7 @@ static HARBOUR hb___msgEvalInline( void ) hb_arrayGet( s_pClasses[ uiClass - 1 ].pInlines, s_pMethod->uiData, &block ); - hb_vmPushSymbol( &hb_g_symEval ); + hb_vmPushSymbol( &hb_symEval ); hb_vmPush( &block ); hb_vmPush( stack.pBase + 1 ); /* Push self */ for( uiParam = 1; uiParam <= hb_pcount(); uiParam++ ) @@ -976,7 +976,7 @@ static HARBOUR hb___msgEval( void ) { USHORT uiParam; - hb_vmPushSymbol( &hb_g_symEval ); + hb_vmPushSymbol( &hb_symEval ); hb_vmPush( stack.pBase + 1 ); /* Push block */ for( uiParam = 1; uiParam <= hb_pcount(); uiParam++ ) hb_vmPush( hb_param( uiParam, IT_ANY ) ); diff --git a/harbour/source/rtl/do.c b/harbour/source/rtl/do.c index 4811c23a19..f096d0f80f 100644 --- a/harbour/source/rtl/do.c +++ b/harbour/source/rtl/do.c @@ -112,7 +112,7 @@ HARBOUR HB_DO( void ) { USHORT uiParam; - hb_vmPushSymbol( &hb_g_symEval ); + hb_vmPushSymbol( &hb_symEval ); hb_vmPush( pItem ); for( uiParam = 2; uiParam <= uiPCount; uiParam++ ) hb_vmPush( hb_param( uiParam, IT_ANY ) ); @@ -155,7 +155,7 @@ HARBOUR HB_EVAL( void ) { USHORT uiParam; - hb_vmPushSymbol( &hb_g_symEval ); + hb_vmPushSymbol( &hb_symEval ); hb_vmPush( pItem ); for( uiParam = 2; uiParam <= uiPCount; uiParam++ ) hb_vmPush( hb_param( uiParam, IT_ANY ) ); diff --git a/harbour/source/rtl/itemapi.c b/harbour/source/rtl/itemapi.c index 31b6228e1d..1275452cb3 100644 --- a/harbour/source/rtl/itemapi.c +++ b/harbour/source/rtl/itemapi.c @@ -124,7 +124,7 @@ PHB_ITEM hb_evalLaunch( PEVALINFO pEvalInfo ) } else if( IS_BLOCK( pEvalInfo->pItems[ 0 ] ) ) { - hb_vmPushSymbol( &hb_g_symEval ); + hb_vmPushSymbol( &hb_symEval ); hb_vmPush( pEvalInfo->pItems[ 0 ] ); while( uiParam <= pEvalInfo->paramCount ) hb_vmPush( pEvalInfo->pItems[ uiParam++ ] ); @@ -209,7 +209,7 @@ PHB_ITEM hb_itemDo( PHB_ITEM pItem, USHORT uiPCount, PHB_ITEM pItemArg1, ... ) va_list va; va_start( va, pItemArg1 ); - hb_vmPushSymbol( &hb_g_symEval ); + hb_vmPushSymbol( &hb_symEval ); hb_vmPush( pItem ); if( uiPCount >= 1 ) hb_vmPush( pItemArg1 ); for( uiParam = 2; uiParam <= uiPCount; uiParam++ ) diff --git a/harbour/source/rtl/memoline.c b/harbour/source/rtl/memoline.c index 5ded8df36d..aa11cd9087 100644 --- a/harbour/source/rtl/memoline.c +++ b/harbour/source/rtl/memoline.c @@ -139,7 +139,7 @@ HARBOUR HB_MEMOLINE( void ) } else { - char * pszLine = (char *)hb_xgrab( uiLineLength ); + char * pszLine = ( char * ) hb_xgrab( uiLineLength ); memset( pszLine, ' ', uiLineLength ); memcpy( pszLine, ( pszString + ulLineBegin ), ( ulLineEnd - ulLineBegin + 1 ) ); hb_retclen( pszLine, uiLineLength ); diff --git a/harbour/source/rtl/strings.c b/harbour/source/rtl/strings.c index 8b87667322..aa1552192e 100644 --- a/harbour/source/rtl/strings.c +++ b/harbour/source/rtl/strings.c @@ -1027,7 +1027,7 @@ HARBOUR HB_STUFF( void ) StrTran( "...", ".", Replicate( "A", 32000 ) ) */ /* replaces lots of characters in a string */ -/* Note: Will not work with a search string of > 64 KB on some platforms */ +/* NOTE: Will not work with a search string of > 64 KB on some platforms */ HARBOUR HB_STRTRAN( void ) { PHB_ITEM pText = hb_param( 1, IT_STRING ); diff --git a/harbour/source/vm/hvm.c b/harbour/source/vm/hvm.c index 300410c711..19604acb34 100644 --- a/harbour/source/vm/hvm.c +++ b/harbour/source/vm/hvm.c @@ -199,12 +199,12 @@ extern POBJSYMBOLS HB_FIRSTSYMBOL, HB_LASTSYMBOL; /* virtual machine state */ STACK stack; -HB_SYMB hb_g_symEval = { "__EVAL", FS_PUBLIC, hb_vmDoBlock, 0 }; /* symbol to evaluate codeblocks */ -HB_ITEM s_aStatics; /* Harbour array to hold all application statics variables */ +HB_SYMB hb_symEval = { "__EVAL", FS_PUBLIC, hb_vmDoBlock, 0 }; /* symbol to evaluate codeblocks */ +static HB_ITEM s_aStatics; /* Harbour array to hold all application statics variables */ static BOOL s_bDebugging = FALSE; static BOOL s_bDebugShowLines = FALSE; /* update source code line on the debugger display */ -static PHB_SYMB s_pSymStart = NULL; /* start symbol of the application. MAIN() is not required */ +static PHB_SYMB s_pSymStart = NULL; /* start symbol of the application. MAIN() is not required */ static PSYMBOLS s_pSymbols = NULL; /* to hold a linked list of all different modules symbol tables */ static BYTE s_byErrorLevel = 0; /* application exit errorlevel */ @@ -245,7 +245,7 @@ void hb_vmInit( void ) hb_xinit(); hb_errInit(); hb_stackInit(); - hb_dynsymNew( &hb_g_symEval ); /* initialize dynamic symbol for evaluating codeblocks */ + hb_dynsymNew( &hb_symEval ); /* initialize dynamic symbol for evaluating codeblocks */ hb_setInitialize(); /* initialize Sets */ hb_consoleInitialize(); /* initialize Console */ hb_memvarsInit(); @@ -2184,7 +2184,7 @@ void hb_vmDo( USHORT uiParams ) if( ! IS_NIL( pSelf ) ) /* are we sending a message ? */ { - if( pSym == &( hb_g_symEval ) && IS_BLOCK( pSelf ) ) + if( pSym == &( hb_symEval ) && IS_BLOCK( pSelf ) ) pFunc = pSym->pFunPtr; /* __EVAL method = function */ else pFunc = hb_objGetMethod( pSelf, pSym ); diff --git a/harbour/source/vm/mainwin.c b/harbour/source/vm/mainwin.c index f8ec03e81f..7613c255a3 100644 --- a/harbour/source/vm/mainwin.c +++ b/harbour/source/vm/mainwin.c @@ -39,8 +39,8 @@ void hb_cmdargInit( int argc, char * argv[] ); void hb_vmInit( void ); void hb_vmQuit( void ); -HANDLE hb_g_hInstance = 0; -HANDLE hb_g_hPrevInstance = 0; +HANDLE hb_hInstance = 0; +HANDLE hb_hPrevInstance = 0; int WINAPI WinMain( HINSTANCE hInstance, /* handle to current instance */ HINSTANCE hPrevInstance, /* handle to previous instance */