From 53093e704f864a72497708e7f2fea38cd5916f03 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Thu, 8 Jul 2010 07:24:58 +0000 Subject: [PATCH] 2010-07-08 09:24 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * src/vm/macro.c * src/vm/hashes.c * src/vm/itemapi.c * src/vm/hvm.c * src/vm/arrays.c * src/vm/extend.c * src/common/expropt1.c * src/common/expropt2.c * src/rtl/hbgtcore.c * src/compiler/hbmain.c * include/hbgtcore.h * include/hbmacro.h * include/hbapi.h * include/hbapiitm.h * include/hbvm.h * include/hbcomp.h * include/hbexprop.h * Variable name cleanups. * Corrections/completions in declarations. --- harbour/ChangeLog | 21 +++++++++ harbour/include/hbapi.h | 10 ++--- harbour/include/hbapiitm.h | 4 +- harbour/include/hbcomp.h | 6 +-- harbour/include/hbexprop.h | 4 +- harbour/include/hbgtcore.h | 6 +-- harbour/include/hbmacro.h | 2 +- harbour/include/hbvm.h | 4 +- harbour/src/common/expropt1.c | 6 +-- harbour/src/common/expropt2.c | 6 +-- harbour/src/compiler/hbmain.c | 34 +++++++------- harbour/src/rtl/hbgtcore.c | 12 ++--- harbour/src/vm/arrays.c | 6 +-- harbour/src/vm/extend.c | 18 ++++---- harbour/src/vm/hashes.c | 6 +-- harbour/src/vm/hvm.c | 84 +++++++++++++++++------------------ harbour/src/vm/itemapi.c | 48 ++++++++++---------- harbour/src/vm/macro.c | 28 ++++++------ 18 files changed, 163 insertions(+), 142 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index b398ac6d1d..1a385f3e29 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,27 @@ The license applies to all entries newer than 2009-04-28. */ +2010-07-08 09:24 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * src/vm/macro.c + * src/vm/hashes.c + * src/vm/itemapi.c + * src/vm/hvm.c + * src/vm/arrays.c + * src/vm/extend.c + * src/common/expropt1.c + * src/common/expropt2.c + * src/rtl/hbgtcore.c + * src/compiler/hbmain.c + * include/hbgtcore.h + * include/hbmacro.h + * include/hbapi.h + * include/hbapiitm.h + * include/hbvm.h + * include/hbcomp.h + * include/hbexprop.h + * Variable name cleanups. + * Corrections/completions in declarations. + 2010-07-08 08:50 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * src/rtl/filesys.c * src/rtl/filebuf.c diff --git a/harbour/include/hbapi.h b/harbour/include/hbapi.h index 7b42c3e3e6..f52063aaea 100644 --- a/harbour/include/hbapi.h +++ b/harbour/include/hbapi.h @@ -642,7 +642,7 @@ extern HB_EXPORT long hb_parnldef( int iParam, long lDefValue ); /* retr extern HB_EXPORT HB_ISIZ hb_parns( int iParam ); /* retrieve a numeric parameter as a HB_SIZE */ extern HB_EXPORT HB_ISIZ hb_parnsdef( int iParam, HB_ISIZ nDefValue ); /* retrieve a numeric parameter as a HB_SIZE, return default value if parameter isn't numeric */ extern HB_EXPORT HB_MAXINT hb_parnint( int iParam ); /* retrieve a numeric parameter as a HB_MAXINT */ -extern HB_EXPORT HB_MAXINT hb_parnintdef( int iParam, HB_MAXINT lDefValue ); /* retrieve a numeric parameter as a HB_MAXINT, return default value if parameter isn't numeric */ +extern HB_EXPORT HB_MAXINT hb_parnintdef( int iParam, HB_MAXINT nDefValue ); /* retrieve a numeric parameter as a HB_MAXINT, return default value if parameter isn't numeric */ extern HB_EXPORT void * hb_parptr( int iParam ); /* retrieve a parameter as a pointer */ extern HB_EXPORT void * hb_parptrGC( const HB_GC_FUNCS * pFuncs, int iParam ); /* retrieve a parameter as a pointer if it's a pointer to GC allocated block */ #ifndef HB_LONG_LONG_OFF @@ -689,12 +689,12 @@ extern HB_EXPORT void hb_retnd( double dNumber ); /* returns a double */ extern HB_EXPORT void hb_retni( int iNumber ); /* returns a integer number */ extern HB_EXPORT void hb_retnl( long lNumber );/* returns a long number */ extern HB_EXPORT void hb_retns( HB_ISIZ nNumber );/* returns a size */ -extern HB_EXPORT void hb_retnint( HB_MAXINT lNumber );/* returns a long number */ +extern HB_EXPORT void hb_retnint( HB_MAXINT nNumber );/* returns a long number */ extern HB_EXPORT void hb_retnlen( double dNumber, int iWidth, int iDec ); /* returns a double, with specific width and decimals */ extern HB_EXPORT void hb_retndlen( double dNumber, int iWidth, int iDec ); /* returns a double, with specific width and decimals */ extern HB_EXPORT void hb_retnilen( int iNumber, int iWidth ); /* returns a integer number, with specific width */ extern HB_EXPORT void hb_retnllen( long lNumber, int iWidth ); /* returns a long number, with specific width */ -extern HB_EXPORT void hb_retnintlen( HB_MAXINT lNumber, int iWidth ); /* returns a long long number, with specific width */ +extern HB_EXPORT void hb_retnintlen( HB_MAXINT nNumber, int iWidth ); /* returns a long long number, with specific width */ extern HB_EXPORT void hb_reta( HB_SIZE nLen ); /* returns an array with a specific length */ extern HB_EXPORT void hb_retptr( void * ptr ); /* returns a pointer */ extern HB_EXPORT void hb_retptrGC( void * ptr ); /* returns a pointer to an allocated memory, collected by GC */ @@ -827,7 +827,7 @@ extern HB_EXPORT HB_BOOL hb_arraySetNS( PHB_ITEM pArray, HB_SIZE nIndex, HB #ifndef HB_LONG_LONG_OFF extern HB_EXPORT HB_BOOL hb_arraySetNLL( PHB_ITEM pArray, HB_SIZE nIndex, HB_LONGLONG llNumber ); #endif -extern HB_EXPORT HB_BOOL hb_arraySetNInt( PHB_ITEM pArray, HB_SIZE nIndex, HB_MAXINT lNumber ); +extern HB_EXPORT HB_BOOL hb_arraySetNInt( PHB_ITEM pArray, HB_SIZE nIndex, HB_MAXINT nNumber ); extern HB_EXPORT HB_BOOL hb_arraySetND( PHB_ITEM pArray, HB_SIZE nIndex, double dNumber ); extern HB_EXPORT HB_BOOL hb_arraySetC( PHB_ITEM pArray, HB_SIZE nIndex, const char * szText ); extern HB_EXPORT HB_BOOL hb_arraySetCL( PHB_ITEM pArray, HB_SIZE nIndex, const char * szText, HB_SIZE nLen ); @@ -965,7 +965,7 @@ extern HB_EXPORT HB_SIZE hb_strRTrimLen( const char * szText, HB_SIZE nLen, HB extern HB_EXPORT double hb_strVal( const char * szText, HB_SIZE nLen ); extern HB_EXPORT HB_MAXINT hb_strValInt( const char * szText, int * iOverflow ); extern HB_EXPORT char * hb_strRemEscSeq( char * szText, HB_SIZE * nLen ); /* remove C ESC sequences and converts them to Clipper chars */ -extern HB_EXPORT char * hb_numToStr( char * szBuf, HB_SIZE nSize, HB_MAXINT lNumber ); +extern HB_EXPORT char * hb_numToStr( char * szBuf, HB_SIZE nSize, HB_MAXINT nNumber ); extern HB_EXPORT double hb_numRound( double dResult, int iDec ); /* round a number to a specific number of digits */ extern HB_EXPORT double hb_numInt( double dNum ); /* take the integer part of the number */ extern HB_EXPORT double hb_random_num( void ); diff --git a/harbour/include/hbapiitm.h b/harbour/include/hbapiitm.h index c9ddf44c20..6f0a446cf1 100644 --- a/harbour/include/hbapiitm.h +++ b/harbour/include/hbapiitm.h @@ -125,8 +125,8 @@ extern HB_EXPORT PHB_ITEM hb_itemPutND ( PHB_ITEM pItem, double dNumber extern HB_EXPORT PHB_ITEM hb_itemPutNI ( PHB_ITEM pItem, int iNumber ); extern HB_EXPORT PHB_ITEM hb_itemPutNL ( PHB_ITEM pItem, long lNumber ); extern HB_EXPORT PHB_ITEM hb_itemPutNS ( PHB_ITEM pItem, HB_ISIZ nNumber ); -extern HB_EXPORT PHB_ITEM hb_itemPutNInt ( PHB_ITEM pItem, HB_MAXINT lNumber ); -extern HB_EXPORT PHB_ITEM hb_itemPutNIntLen( PHB_ITEM pItem, HB_MAXINT lNumber, int iWidth ); +extern HB_EXPORT PHB_ITEM hb_itemPutNInt ( PHB_ITEM pItem, HB_MAXINT nNumber ); +extern HB_EXPORT PHB_ITEM hb_itemPutNIntLen( PHB_ITEM pItem, HB_MAXINT nNumber, int iWidth ); extern HB_EXPORT PHB_ITEM hb_itemPutNLen ( PHB_ITEM pItem, double dNumber, int iWidth, int iDec ); extern HB_EXPORT PHB_ITEM hb_itemPutNDLen ( PHB_ITEM pItem, double dNumber, int iWidth, int iDec ); extern HB_EXPORT PHB_ITEM hb_itemPutNDDec ( PHB_ITEM pItem, double dNumber, int iDec ); diff --git a/harbour/include/hbcomp.h b/harbour/include/hbcomp.h index 82684c0013..16a19335bf 100644 --- a/harbour/include/hbcomp.h +++ b/harbour/include/hbcomp.h @@ -204,14 +204,14 @@ extern void hb_compGenPushVarRef( const char * szVarName, HB_COMP_DECL ); extern void hb_compGenPushMemvarRef( const char * szVarName, HB_COMP_DECL ); /* generates the pcode to push memvar variable by reference to the virtual machine stack */ extern void hb_compGenPushInteger( int iNumber, HB_COMP_DECL ); /* Pushes a integer number on the virtual machine stack */ extern void hb_compGenPushLogical( int iTrueFalse, HB_COMP_DECL ); /* pushes a logical value on the virtual machine stack */ -extern void hb_compGenPushLong( HB_MAXINT lNumber, HB_COMP_DECL ); /* Pushes a long number on the virtual machine stack */ +extern void hb_compGenPushLong( HB_MAXINT nNumber, HB_COMP_DECL ); /* Pushes a long number on the virtual machine stack */ extern void hb_compGenPushDate( long lDate, HB_COMP_DECL ); /* Pushes a date constant on the virtual machine stack */ extern void hb_compGenPushTimeStamp( long lDate, long lTime, HB_COMP_DECL ); /* Pushes a timestamp constant on the virtual machine stack */ extern void hb_compGenPushNil( HB_COMP_DECL ); /* Pushes nil on the virtual machine stack */ extern void hb_compGenPushString( const char * szText, HB_SIZE nLen, HB_COMP_DECL ); /* Pushes a string on the virtual machine stack */ extern void hb_compGenPushSymbol( const char * szSymbolName, HB_BOOL bFunction, HB_COMP_DECL ); /* Pushes a symbol on to the Virtual machine stack */ -extern void hb_compGenPushAliasedVar( const char *, HB_BOOL, const char *, HB_MAXINT, HB_COMP_DECL ); -extern void hb_compGenPopAliasedVar( const char *, HB_BOOL, const char *, HB_MAXINT, HB_COMP_DECL ); +extern void hb_compGenPushAliasedVar( const char * szVarName, HB_BOOL bPushAliasValue, const char * szAlias, HB_MAXINT nWorkarea, HB_COMP_DECL ); +extern void hb_compGenPopAliasedVar( const char * szVarName, HB_BOOL bPushAliasValue, const char * szAlias, HB_MAXINT nWorkarea, HB_COMP_DECL ); extern void hb_compGenPCode1( HB_BYTE, HB_COMP_DECL ); /* generates 1 byte of pcode */ extern void hb_compGenPCode2( HB_BYTE, HB_BYTE, HB_COMP_DECL ); /* generates 2 bytes of pcode + flag for optional StrongType(). */ extern void hb_compGenPCode3( HB_BYTE, HB_BYTE, HB_BYTE, HB_COMP_DECL ); /* generates 3 bytes of pcode + flag for optional StrongType() */ diff --git a/harbour/include/hbexprop.h b/harbour/include/hbexprop.h index 5925c80c92..afa33c35c5 100644 --- a/harbour/include/hbexprop.h +++ b/harbour/include/hbexprop.h @@ -79,7 +79,7 @@ extern const HB_EXPR_FUNC_PTR hb_comp_ExprTable[ HB_EXPR_COUNT ]; extern HB_EXPR_PTR hb_compExprNewEmpty( HB_COMP_DECL ); extern HB_EXPR_PTR hb_compExprNewNil( HB_COMP_DECL ); extern HB_EXPR_PTR hb_compExprNewDouble( double, HB_BYTE, HB_BYTE, HB_COMP_DECL ); -extern HB_EXPR_PTR hb_compExprNewLong( HB_MAXINT lValue, HB_COMP_DECL ); +extern HB_EXPR_PTR hb_compExprNewLong( HB_MAXINT nValue, HB_COMP_DECL ); extern HB_EXPR_PTR hb_compExprNewDate( long lDate, HB_COMP_DECL ); extern HB_EXPR_PTR hb_compExprNewTimeStamp( long lDate, long lTime, HB_COMP_DECL ); extern HB_EXPR_PTR hb_compExprNewString( const char * szValue, HB_SIZE nLen, HB_BOOL fDealloc, HB_COMP_DECL ); @@ -202,7 +202,7 @@ extern HB_BOOL hb_compExprReduceCTOD( HB_EXPR_PTR, HB_COMP_DECL ); extern HB_BOOL hb_compExprReduceUPPER( HB_EXPR_PTR, HB_COMP_DECL ); extern HB_BOOL hb_compExprReduceMIN( HB_EXPR_PTR, HB_COMP_DECL ); extern HB_BOOL hb_compExprReduceMAX( HB_EXPR_PTR, HB_COMP_DECL ); -extern HB_BOOL hb_compExprReduceBitFunc( HB_EXPR_PTR, HB_MAXINT lResult, HB_BOOL fBool, HB_COMP_DECL ); +extern HB_BOOL hb_compExprReduceBitFunc( HB_EXPR_PTR, HB_MAXINT nResult, HB_BOOL fBool, HB_COMP_DECL ); HB_EXTERN_END diff --git a/harbour/include/hbgtcore.h b/harbour/include/hbgtcore.h index 070866a905..ea5d9ce83b 100644 --- a/harbour/include/hbgtcore.h +++ b/harbour/include/hbgtcore.h @@ -316,9 +316,9 @@ typedef struct _HB_GT_BASE HB_BOOL fMouseVisible; int iMouseLastRow; int iMouseLastCol; - HB_MAXINT iMouseLeftTimer; - HB_MAXINT iMouseRightTimer; - HB_MAXINT iMouseMiddleTimer; + HB_MAXINT nMouseLeftTimer; + HB_MAXINT nMouseRightTimer; + HB_MAXINT nMouseMiddleTimer; int defaultKeyBuffer[ HB_DEFAULT_INKEY_BUFSIZE + 1 ]; diff --git a/harbour/include/hbmacro.h b/harbour/include/hbmacro.h index 8de23b3918..71bafe5a6f 100644 --- a/harbour/include/hbmacro.h +++ b/harbour/include/hbmacro.h @@ -140,7 +140,7 @@ extern void hb_macroGenPopMemvar( const char * szVarName, HB_COMP_DECL ); extern void hb_macroGenPopAliasedVar( const char * szVarName, HB_BOOL bPushAliasValue, const char * szAlias, - HB_MAXINT lWorkarea, HB_COMP_DECL ); + HB_MAXINT nWorkarea, HB_COMP_DECL ); extern void hb_macroGenPushVar( const char * szVarName, HB_BOOL bMacroVar, HB_COMP_DECL ); extern void hb_macroGenPushVarRef( const char * szVarName, HB_COMP_DECL ); extern void hb_macroGenPushMemvarRef( const char * szVarName, HB_COMP_DECL ); diff --git a/harbour/include/hbvm.h b/harbour/include/hbvm.h index 8a0811ff70..3b1fdf3a8c 100644 --- a/harbour/include/hbvm.h +++ b/harbour/include/hbvm.h @@ -155,9 +155,9 @@ extern HB_EXPORT void hb_vmPushNil( void ); /* in this case it pl extern HB_EXPORT void hb_vmPushNumber( double dNumber, int iDec ); /* pushes a number on to the stack and decides if it is integer, long or double */ extern HB_EXPORT void hb_vmPushInteger( int iNumber ); /* pushes a integer number onto the stack */ extern HB_EXPORT void hb_vmPushLong( long lNumber ); /* pushes a long number onto the stack */ -extern HB_EXPORT void hb_vmPushDouble( double lNumber, int iDec ); /* pushes a double number onto the stack */ +extern HB_EXPORT void hb_vmPushDouble( double dNumber, int iDec ); /* pushes a double number onto the stack */ extern HB_EXPORT void hb_vmPushSize( HB_ISIZ nNumber ); /* pushes a HB_SIZE number onto the stack */ -extern HB_EXPORT void hb_vmPushNumInt( HB_MAXINT lNumber ); /* pushes a number on to the stack and decides if it is integer or HB_MAXINT */ +extern HB_EXPORT void hb_vmPushNumInt( HB_MAXINT nNumber ); /* pushes a number on to the stack and decides if it is integer or HB_MAXINT */ extern HB_EXPORT void hb_vmPushLogical( HB_BOOL bValue ); /* pushes a logical value onto the stack */ extern HB_EXPORT void hb_vmPushString( const char * szText, HB_SIZE length ); /* pushes a string on to the stack */ extern HB_EXPORT void hb_vmPushStringPcode( const char * szText, HB_SIZE length ); /* pushes a string from pcode on to the stack */ diff --git a/harbour/src/common/expropt1.c b/harbour/src/common/expropt1.c index caf71018ab..7ca95fcad9 100644 --- a/harbour/src/common/expropt1.c +++ b/harbour/src/common/expropt1.c @@ -314,15 +314,15 @@ HB_EXPR_PTR hb_compExprNewDouble( double dValue, HB_BYTE ucWidth, HB_BYTE ucDec, return pExpr; } -HB_EXPR_PTR hb_compExprNewLong( HB_MAXINT lValue, HB_COMP_DECL ) +HB_EXPR_PTR hb_compExprNewLong( HB_MAXINT nValue, HB_COMP_DECL ) { HB_EXPR_PTR pExpr; - HB_TRACE(HB_TR_DEBUG, ("hb_compExprNewLong(%" PFHL "d, %p)", lValue, HB_COMP_PARAM)); + HB_TRACE(HB_TR_DEBUG, ("hb_compExprNewLong(%" PFHL "d, %p)", nValue, HB_COMP_PARAM)); pExpr = HB_COMP_EXPR_NEW( HB_ET_NUMERIC ); - pExpr->value.asNum.val.l = lValue; + pExpr->value.asNum.val.l = nValue; pExpr->value.asNum.bWidth = HB_DEFAULT_WIDTH; pExpr->value.asNum.bDec = 0; pExpr->value.asNum.NumType = HB_ET_LONG; diff --git a/harbour/src/common/expropt2.c b/harbour/src/common/expropt2.c index 41965805e3..8f73687c9e 100644 --- a/harbour/src/common/expropt2.c +++ b/harbour/src/common/expropt2.c @@ -2513,11 +2513,11 @@ HB_BOOL hb_compExprReduceMAX( HB_EXPR_PTR pSelf, HB_COMP_DECL ) return HB_FALSE; } -HB_BOOL hb_compExprReduceBitFunc( HB_EXPR_PTR pSelf, HB_MAXINT lResult, HB_BOOL fBool, HB_COMP_DECL ) +HB_BOOL hb_compExprReduceBitFunc( HB_EXPR_PTR pSelf, HB_MAXINT nResult, HB_BOOL fBool, HB_COMP_DECL ) { HB_EXPR_PTR pParms = pSelf->value.asFunCall.pParms; - HB_EXPR_PTR pExpr = fBool ? hb_compExprNewLogical( lResult != 0, HB_COMP_PARAM ) : - hb_compExprNewLong( lResult, HB_COMP_PARAM ); + HB_EXPR_PTR pExpr = fBool ? hb_compExprNewLogical( nResult != 0, HB_COMP_PARAM ) : + hb_compExprNewLong( nResult, HB_COMP_PARAM ); HB_COMP_EXPR_FREE( pParms ); HB_COMP_EXPR_FREE( pSelf->value.asFunCall.pFunName ); diff --git a/harbour/src/compiler/hbmain.c b/harbour/src/compiler/hbmain.c index 1ec382a2e9..95d6b3f7f9 100644 --- a/harbour/src/compiler/hbmain.c +++ b/harbour/src/compiler/hbmain.c @@ -2792,7 +2792,7 @@ void hb_compGenPushMemvarRef( const char * szVarName, HB_COMP_DECL ) /* generate void hb_compGenPopAliasedVar( const char * szVarName, HB_BOOL bPushAliasValue, const char * szAlias, - HB_MAXINT lWorkarea, + HB_MAXINT nWorkarea, HB_COMP_DECL ) { if( bPushAliasValue ) @@ -2819,7 +2819,7 @@ void hb_compGenPopAliasedVar( const char * szVarName, } else { - hb_compGenPushLong( lWorkarea, HB_COMP_PARAM ); + hb_compGenPushLong( nWorkarea, HB_COMP_PARAM ); hb_compGenVarPCode( HB_P_POPALIASEDFIELD, szVarName, HB_COMP_PARAM ); } } @@ -2837,7 +2837,7 @@ void hb_compGenPopAliasedVar( const char * szVarName, void hb_compGenPushAliasedVar( const char * szVarName, HB_BOOL bPushAliasValue, const char * szAlias, - HB_MAXINT lWorkarea, + HB_MAXINT nWorkarea, HB_COMP_DECL ) { if( bPushAliasValue ) @@ -2868,7 +2868,7 @@ void hb_compGenPushAliasedVar( const char * szVarName, } else { - hb_compGenPushLong( lWorkarea, HB_COMP_PARAM ); + hb_compGenPushLong( nWorkarea, HB_COMP_PARAM ); hb_compGenVarPCode( HB_P_PUSHALIASEDFIELD, szVarName, HB_COMP_PARAM ); } } @@ -2943,47 +2943,47 @@ void hb_compGenPushSymbol( const char * szSymbolName, HB_BOOL bFunction, HB_COMP } /* generates the pcode to push a long number on the virtual machine stack */ -void hb_compGenPushLong( HB_MAXINT lNumber, HB_COMP_DECL ) +void hb_compGenPushLong( HB_MAXINT nNumber, HB_COMP_DECL ) { if( HB_COMP_PARAM->fLongOptimize ) { - if( lNumber == 0 ) + if( nNumber == 0 ) hb_compGenPCode1( HB_P_ZERO, HB_COMP_PARAM ); - else if( lNumber == 1 ) + else if( nNumber == 1 ) hb_compGenPCode1( HB_P_ONE, HB_COMP_PARAM ); - else if( HB_LIM_INT8( lNumber ) ) - hb_compGenPCode2( HB_P_PUSHBYTE, ( HB_BYTE ) lNumber, HB_COMP_PARAM ); - else if( HB_LIM_INT16( lNumber ) ) - hb_compGenPCode3( HB_P_PUSHINT, HB_LOBYTE( lNumber ), HB_HIBYTE( lNumber ), HB_COMP_PARAM ); - else if( HB_LIM_INT32( lNumber ) ) + else if( HB_LIM_INT8( nNumber ) ) + hb_compGenPCode2( HB_P_PUSHBYTE, ( HB_BYTE ) nNumber, HB_COMP_PARAM ); + else if( HB_LIM_INT16( nNumber ) ) + hb_compGenPCode3( HB_P_PUSHINT, HB_LOBYTE( nNumber ), HB_HIBYTE( nNumber ), HB_COMP_PARAM ); + else if( HB_LIM_INT32( nNumber ) ) { HB_BYTE pBuffer[ 5 ]; pBuffer[ 0 ] = HB_P_PUSHLONG; - HB_PUT_LE_UINT32( pBuffer + 1, lNumber ); + HB_PUT_LE_UINT32( pBuffer + 1, nNumber ); hb_compGenPCodeN( pBuffer, sizeof( pBuffer ), HB_COMP_PARAM ); } else { HB_BYTE pBuffer[ 9 ]; pBuffer[ 0 ] = HB_P_PUSHLONGLONG; - HB_PUT_LE_UINT64( pBuffer + 1, lNumber ); + HB_PUT_LE_UINT64( pBuffer + 1, nNumber ); hb_compGenPCodeN( pBuffer, sizeof( pBuffer ), HB_COMP_PARAM ); } } else { - if( HB_LIM_INT32( lNumber ) ) + if( HB_LIM_INT32( nNumber ) ) { HB_BYTE pBuffer[ 5 ]; pBuffer[ 0 ] = HB_P_PUSHLONG; - HB_PUT_LE_UINT32( pBuffer + 1, lNumber ); + HB_PUT_LE_UINT32( pBuffer + 1, nNumber ); hb_compGenPCodeN( pBuffer, sizeof( pBuffer ), HB_COMP_PARAM ); } else { HB_BYTE pBuffer[ 9 ]; pBuffer[ 0 ] = HB_P_PUSHLONGLONG; - HB_PUT_LE_UINT64( pBuffer + 1, lNumber ); + HB_PUT_LE_UINT64( pBuffer + 1, nNumber ); hb_compGenPCodeN( pBuffer, sizeof( pBuffer ), HB_COMP_PARAM ); } } diff --git a/harbour/src/rtl/hbgtcore.c b/harbour/src/rtl/hbgtcore.c index 8ede33afdd..a8a3a4e913 100644 --- a/harbour/src/rtl/hbgtcore.c +++ b/harbour/src/rtl/hbgtcore.c @@ -2842,11 +2842,11 @@ static int hb_gt_def_MouseReadKey( PHB_GT pGT, int iEventMask ) if( iEventMask & INKEY_LDOWN && HB_GTSELF_MOUSEBUTTONPRESSED( pGT, 0, &iRow, &iCol ) ) { HB_MAXUINT timer = hb_dateMilliSeconds(); - if( timer - pGT->iMouseLeftTimer <= ( HB_MAXUINT ) HB_GTSELF_MOUSEGETDOUBLECLICKSPEED( pGT ) ) + if( timer - pGT->nMouseLeftTimer <= ( HB_MAXUINT ) HB_GTSELF_MOUSEGETDOUBLECLICKSPEED( pGT ) ) iKey = K_LDBLCLK; else iKey = K_LBUTTONDOWN; - pGT->iMouseLeftTimer = timer; + pGT->nMouseLeftTimer = timer; } else if( iEventMask & INKEY_LUP && HB_GTSELF_MOUSEBUTTONRELEASED( pGT, 0, &iRow, &iCol ) ) { @@ -2855,11 +2855,11 @@ static int hb_gt_def_MouseReadKey( PHB_GT pGT, int iEventMask ) else if( iEventMask & INKEY_RDOWN && HB_GTSELF_MOUSEBUTTONPRESSED( pGT, 1, &iRow, &iCol ) ) { HB_MAXUINT timer = hb_dateMilliSeconds(); - if( timer - pGT->iMouseRightTimer <= ( HB_MAXUINT ) HB_GTSELF_MOUSEGETDOUBLECLICKSPEED( pGT ) ) + if( timer - pGT->nMouseRightTimer <= ( HB_MAXUINT ) HB_GTSELF_MOUSEGETDOUBLECLICKSPEED( pGT ) ) iKey = K_RDBLCLK; else iKey = K_RBUTTONDOWN; - pGT->iMouseRightTimer = timer; + pGT->nMouseRightTimer = timer; } else if( iEventMask & INKEY_RUP && HB_GTSELF_MOUSEBUTTONRELEASED( pGT, 1, &iRow, &iCol ) ) { @@ -2868,11 +2868,11 @@ static int hb_gt_def_MouseReadKey( PHB_GT pGT, int iEventMask ) else if( iEventMask & INKEY_MMIDDLE && HB_GTSELF_MOUSEBUTTONPRESSED( pGT, 2, &iRow, &iCol ) ) { HB_MAXUINT timer = hb_dateMilliSeconds(); - if( timer - pGT->iMouseMiddleTimer <= ( HB_MAXUINT ) HB_GTSELF_MOUSEGETDOUBLECLICKSPEED( pGT ) ) + if( timer - pGT->nMouseMiddleTimer <= ( HB_MAXUINT ) HB_GTSELF_MOUSEGETDOUBLECLICKSPEED( pGT ) ) iKey = K_MDBLCLK; else iKey = K_MBUTTONDOWN; - pGT->iMouseMiddleTimer = timer; + pGT->nMouseMiddleTimer = timer; } else if( iEventMask & INKEY_MMIDDLE && HB_GTSELF_MOUSEBUTTONRELEASED( pGT, 2, &iRow, &iCol ) ) { diff --git a/harbour/src/vm/arrays.c b/harbour/src/vm/arrays.c index b37053b537..63f4905ddb 100644 --- a/harbour/src/vm/arrays.c +++ b/harbour/src/vm/arrays.c @@ -826,13 +826,13 @@ HB_BOOL hb_arraySetNLL( PHB_ITEM pArray, HB_SIZE nIndex, HB_LONGLONG llNumber ) } #endif -HB_BOOL hb_arraySetNInt( PHB_ITEM pArray, HB_SIZE nIndex, HB_MAXINT lNumber ) +HB_BOOL hb_arraySetNInt( PHB_ITEM pArray, HB_SIZE nIndex, HB_MAXINT nNumber ) { - HB_TRACE(HB_TR_DEBUG, ("hb_arraySetNInt(%p, %" HB_PFS "u, %" PFHL "d)", pArray, nIndex, lNumber)); + HB_TRACE(HB_TR_DEBUG, ("hb_arraySetNInt(%p, %" HB_PFS "u, %" PFHL "d)", pArray, nIndex, nNumber)); if( HB_IS_ARRAY( pArray ) && nIndex > 0 && nIndex <= pArray->item.asArray.value->nLen ) { - hb_itemPutNInt( pArray->item.asArray.value->pItems + nIndex - 1, lNumber ); + hb_itemPutNInt( pArray->item.asArray.value->pItems + nIndex - 1, nNumber ); return HB_TRUE; } else diff --git a/harbour/src/vm/extend.c b/harbour/src/vm/extend.c index a2ad7bba1b..412d6f6819 100644 --- a/harbour/src/vm/extend.c +++ b/harbour/src/vm/extend.c @@ -693,11 +693,11 @@ HB_MAXINT hb_parnint( int iParam ) return 0; } -HB_MAXINT hb_parnintdef( int iParam, HB_MAXINT lDefValue ) +HB_MAXINT hb_parnintdef( int iParam, HB_MAXINT nDefValue ) { HB_STACK_TLS_PRELOAD - HB_TRACE(HB_TR_DEBUG, ("hb_parnintdef(%d, %" PFHL "d)", iParam, lDefValue)); + HB_TRACE(HB_TR_DEBUG, ("hb_parnintdef(%d, %" PFHL "d)", iParam, nDefValue)); if( iParam >= -1 && iParam <= hb_pcount() ) { @@ -718,7 +718,7 @@ HB_MAXINT hb_parnintdef( int iParam, HB_MAXINT lDefValue ) #endif } - return lDefValue; + return nDefValue; } void * hb_parptr( int iParam ) @@ -1610,13 +1610,13 @@ void hb_retnll( HB_LONGLONG llNumber ) #endif #undef hb_retnint -void hb_retnint( HB_MAXINT lNumber ) +void hb_retnint( HB_MAXINT nNumber ) { HB_STACK_TLS_PRELOAD - HB_TRACE(HB_TR_DEBUG, ("hb_retnl(%" PFHL "d )", lNumber)); + HB_TRACE(HB_TR_DEBUG, ("hb_retnl(%" PFHL "d )", nNumber)); - hb_itemPutNInt( hb_stackReturnItem(), lNumber ); + hb_itemPutNInt( hb_stackReturnItem(), nNumber ); } #undef hb_retnlen @@ -1672,13 +1672,13 @@ void hb_retnlllen( HB_LONGLONG llNumber, int iWidth ) #endif #undef hb_retnintlen -void hb_retnintlen( HB_MAXINT lNumber, int iWidth ) +void hb_retnintlen( HB_MAXINT nNumber, int iWidth ) { HB_STACK_TLS_PRELOAD - HB_TRACE(HB_TR_DEBUG, ("hb_retnintlen(%" PFHL "d, %d)", lNumber, iWidth)); + HB_TRACE(HB_TR_DEBUG, ("hb_retnintlen(%" PFHL "d, %d)", nNumber, iWidth)); - hb_itemPutNIntLen( hb_stackReturnItem(), lNumber, iWidth ); + hb_itemPutNIntLen( hb_stackReturnItem(), nNumber, iWidth ); } #undef hb_retptr diff --git a/harbour/src/vm/hashes.c b/harbour/src/vm/hashes.c index 915b5c12aa..aba9865b2e 100644 --- a/harbour/src/vm/hashes.c +++ b/harbour/src/vm/hashes.c @@ -199,9 +199,9 @@ static int hb_hashItemCmp( PHB_ITEM pKey1, PHB_ITEM pKey2, int iFlags ) } else if( HB_IS_NUMINT( pKey1 ) && HB_IS_NUMINT( pKey2 ) ) { - HB_MAXINT l1 = HB_ITEM_GET_NUMINTRAW( pKey1 ), - l2 = HB_ITEM_GET_NUMINTRAW( pKey2 ); - return l1 < l2 ? -1 : ( l1 > l2 ? 1 : 0 ); + HB_MAXINT n1 = HB_ITEM_GET_NUMINTRAW( pKey1 ), + n2 = HB_ITEM_GET_NUMINTRAW( pKey2 ); + return n1 < n2 ? -1 : ( n1 > n2 ? 1 : 0 ); } else if( HB_IS_NUMERIC( pKey2 ) ) { diff --git a/harbour/src/vm/hvm.c b/harbour/src/vm/hvm.c index 95245c81d4..a4d6bfc2be 100644 --- a/harbour/src/vm/hvm.c +++ b/harbour/src/vm/hvm.c @@ -176,7 +176,7 @@ static void hb_vmPushMacroBlock( const HB_BYTE * pCode, HB_SIZE nSize, HB_USH static void hb_vmPushDoubleConst( double dNumber, int iWidth, int iDec ); /* Pushes a double constant (pcode) */ static void hb_vmPushLocal( int iLocal ); /* pushes the containts of a local onto the stack */ static void hb_vmPushLocalByRef( int iLocal ); /* pushes a local by refrence onto the stack */ -static void hb_vmPushHBLong( HB_MAXINT lNumber ); /* pushes a HB_MAXINT number onto the stack */ +static void hb_vmPushHBLong( HB_MAXINT nNumber ); /* pushes a HB_MAXINT number onto the stack */ #if !defined( HB_LONG_LONG_OFF ) static void hb_vmPushLongLongConst( HB_LONGLONG lNumber ); /* Pushes a long long constant (pcode) */ #endif @@ -2964,18 +2964,18 @@ static void hb_vmAddInt( HB_ITEM_PTR pResult, HB_LONG lAdd ) if( HB_IS_NUMINT( pResult ) ) { - HB_MAXINT lVal = HB_ITEM_GET_NUMINTRAW( pResult ), lResult; + HB_MAXINT nVal = HB_ITEM_GET_NUMINTRAW( pResult ), nResult; - lResult = lVal + lAdd; + nResult = nVal + lAdd; - if( lAdd >= 0 ? lResult >= lVal : lResult < lVal ) + if( lAdd >= 0 ? nResult >= nVal : nResult < nVal ) { - HB_ITEM_PUT_NUMINTRAW( pResult, lResult ); + HB_ITEM_PUT_NUMINTRAW( pResult, nResult ); } else { pResult->type = HB_IT_DOUBLE; - pResult->item.asDouble.value = ( double ) lVal + lAdd;; + pResult->item.asDouble.value = ( double ) nVal + lAdd;; pResult->item.asDouble.length = HB_DBL_LENGTH( pResult->item.asDouble.value ); pResult->item.asDouble.decimal = 0; } @@ -3030,10 +3030,10 @@ static void hb_vmNegate( void ) if( pItem->item.asInteger.value < -HB_VMINT_MAX ) { #if HB_VMLONG_MAX > HB_VMINT_MAX - HB_MAXINT lValue = ( HB_MAXINT ) pItem->item.asInteger.value; + HB_MAXINT nValue = ( HB_MAXINT ) pItem->item.asInteger.value; pItem->type = HB_IT_LONG; - pItem->item.asLong.value = -lValue; - pItem->item.asLong.length = HB_LONG_EXPLENGTH( -lValue ); + pItem->item.asLong.value = -nValue; + pItem->item.asLong.length = HB_LONG_EXPLENGTH( -nValue ); #else double dValue = ( double ) pItem->item.asInteger.value; pItem->type = HB_IT_DOUBLE; @@ -3152,20 +3152,20 @@ static void hb_vmPlus( HB_ITEM_PTR pResult, HB_ITEM_PTR pItem1, HB_ITEM_PTR pIte if( HB_IS_NUMINT( pItem1 ) && HB_IS_NUMINT( pItem2 ) ) { - HB_MAXINT lNumber1 = HB_ITEM_GET_NUMINTRAW( pItem1 ); - HB_MAXINT lNumber2 = HB_ITEM_GET_NUMINTRAW( pItem2 ); - HB_MAXINT lResult = lNumber1 + lNumber2; + HB_MAXINT nNumber1 = HB_ITEM_GET_NUMINTRAW( pItem1 ); + HB_MAXINT nNumber2 = HB_ITEM_GET_NUMINTRAW( pItem2 ); + HB_MAXINT nResult = nNumber1 + nNumber2; if( HB_IS_COMPLEX( pResult ) ) hb_itemClear( pResult ); - if( lNumber2 >= 0 ? lResult >= lNumber1 : lResult < lNumber1 ) + if( nNumber2 >= 0 ? nResult >= nNumber1 : nResult < nNumber1 ) { - HB_ITEM_PUT_NUMINTRAW( pResult, lResult ); + HB_ITEM_PUT_NUMINTRAW( pResult, nResult ); } else { - double dResult = ( double ) lNumber1 + ( double ) lNumber2; + double dResult = ( double ) nNumber1 + ( double ) nNumber2; pResult->type = HB_IT_DOUBLE; pResult->item.asDouble.value = dResult; pResult->item.asDouble.length = HB_DBL_LENGTH( dResult ); @@ -3268,20 +3268,20 @@ static void hb_vmMinus( HB_ITEM_PTR pResult, HB_ITEM_PTR pItem1, HB_ITEM_PTR pIt if( HB_IS_NUMINT( pItem1 ) && HB_IS_NUMINT( pItem2 ) ) { - HB_MAXINT lNumber1 = HB_ITEM_GET_NUMINTRAW( pItem1 ); - HB_MAXINT lNumber2 = HB_ITEM_GET_NUMINTRAW( pItem2 ); - HB_MAXINT lResult = lNumber1 - lNumber2; + HB_MAXINT nNumber1 = HB_ITEM_GET_NUMINTRAW( pItem1 ); + HB_MAXINT nNumber2 = HB_ITEM_GET_NUMINTRAW( pItem2 ); + HB_MAXINT nResult = nNumber1 - nNumber2; if( HB_IS_COMPLEX( pResult ) ) hb_itemClear( pResult ); - if( lNumber2 <= 0 ? lResult >= lNumber1 : lResult < lNumber1 ) + if( nNumber2 <= 0 ? nResult >= nNumber1 : nResult < nNumber1 ) { - HB_ITEM_PUT_NUMINTRAW( pResult, lResult ); + HB_ITEM_PUT_NUMINTRAW( pResult, nResult ); } else { - double dResult = ( double ) lNumber1 - ( double ) lNumber2; + double dResult = ( double ) nNumber1 - ( double ) nNumber2; pResult->type = HB_IT_DOUBLE; pResult->item.asDouble.value = dResult; pResult->item.asDouble.length = HB_DBL_LENGTH( dResult ); @@ -3379,11 +3379,11 @@ static void hb_vmMult( HB_ITEM_PTR pResult, HB_ITEM_PTR pItem1, HB_ITEM_PTR pIte HB_VMLONG_MIN / HB_VMINT_MIN >= -HB_VMINT_MIN && 1 if( HB_IS_INTEGER( pItem1 ) && HB_IS_INTEGER( pItem2 ) ) { - HB_MAXINT lResult = ( HB_MAXINT ) pItem1->item.asInteger.value * + HB_MAXINT nResult = ( HB_MAXINT ) pItem1->item.asInteger.value * ( HB_MAXINT ) pItem2->item.asInteger.value; if( HB_IS_COMPLEX( pResult ) ) hb_itemClear( pResult ); - HB_ITEM_PUT_NUMINTRAW( pResult, lResult ); + HB_ITEM_PUT_NUMINTRAW( pResult, nResult ); } else #endif @@ -3415,9 +3415,9 @@ static void hb_vmDivide( HB_ITEM_PTR pResult, HB_ITEM_PTR pItem1, HB_ITEM_PTR pI if( HB_IS_NUMINT( pItem1 ) && HB_IS_NUMINT( pItem2 ) ) { - HB_MAXINT lDivisor = HB_ITEM_GET_NUMINTRAW( pItem2 ); + HB_MAXINT nDivisor = HB_ITEM_GET_NUMINTRAW( pItem2 ); - if( lDivisor == 0 ) + if( nDivisor == 0 ) { PHB_ITEM pSubst = hb_errRT_BASE_Subst( EG_ZERODIV, 1340, NULL, "/", 2, pItem1, pItem2 ); @@ -3429,8 +3429,8 @@ static void hb_vmDivide( HB_ITEM_PTR pResult, HB_ITEM_PTR pItem1, HB_ITEM_PTR pI } else { - HB_MAXINT lNumber1 = HB_ITEM_GET_NUMINTRAW( pItem1 ); - hb_itemPutND( pResult, ( double ) lNumber1 / ( double ) lDivisor ); + HB_MAXINT nNumber1 = HB_ITEM_GET_NUMINTRAW( pItem1 ); + hb_itemPutND( pResult, ( double ) nNumber1 / ( double ) nDivisor ); } } else if( HB_IS_NUMERIC( pItem1 ) && HB_IS_NUMERIC( pItem2 ) ) @@ -3477,9 +3477,9 @@ static void hb_vmModulus( HB_ITEM_PTR pResult, HB_ITEM_PTR pItem1, HB_ITEM_PTR p if( HB_IS_NUMINT( pItem1 ) && HB_IS_NUMINT( pItem2 ) ) { - HB_MAXINT lDivisor = HB_ITEM_GET_NUMINTRAW( pItem2 ); + HB_MAXINT nDivisor = HB_ITEM_GET_NUMINTRAW( pItem2 ); - if( lDivisor == 0 ) + if( nDivisor == 0 ) { PHB_ITEM pSubst = hb_errRT_BASE_Subst( EG_ZERODIV, 1341, NULL, "%", 2, pItem1, pItem2 ); @@ -3493,7 +3493,7 @@ static void hb_vmModulus( HB_ITEM_PTR pResult, HB_ITEM_PTR pItem1, HB_ITEM_PTR p { /* NOTE: Clipper always returns the result of modulus with the SET number of decimal places. */ - hb_itemPutND( pResult, ( double ) ( HB_ITEM_GET_NUMINTRAW( pItem1 ) % lDivisor ) ); + hb_itemPutND( pResult, ( double ) ( HB_ITEM_GET_NUMINTRAW( pItem1 ) % nDivisor ) ); } } else if( HB_IS_NUMERIC( pItem1 ) && HB_IS_NUMERIC( pItem2 ) ) @@ -6589,21 +6589,21 @@ void hb_vmPushNumber( double dNumber, int iDec ) hb_vmPushDouble( dNumber, hb_stackSetStruct()->HB_SET_DECIMALS ); } -static int hb_vmCalcIntWidth( HB_MAXINT lNumber ) +static int hb_vmCalcIntWidth( HB_MAXINT nNumber ) { int iWidth; - if( lNumber <= -1000000000L ) + if( nNumber <= -1000000000L ) { iWidth = 20; } else { iWidth = 10; - while( lNumber >= 1000000000L ) + while( nNumber >= 1000000000L ) { iWidth++; - lNumber /= 10; + nNumber /= 10; } } return iWidth; @@ -6670,16 +6670,16 @@ void hb_vmPushSize( HB_ISIZ nNumber ) #endif } -static void hb_vmPushHBLong( HB_MAXINT lNumber ) +static void hb_vmPushHBLong( HB_MAXINT nNumber ) { HB_STACK_TLS_PRELOAD PHB_ITEM pItem = hb_stackAllocItem(); - HB_TRACE(HB_TR_DEBUG, ("hb_vmPushHBLong(%" PFHL "d)", lNumber)); + HB_TRACE(HB_TR_DEBUG, ("hb_vmPushHBLong(%" PFHL "d)", nNumber)); pItem->type = HB_IT_LONG; - pItem->item.asLong.value = lNumber; - pItem->item.asLong.length = HB_LONG_LENGTH( lNumber ); + pItem->item.asLong.value = nNumber; + pItem->item.asLong.length = HB_LONG_LENGTH( nNumber ); } #if !defined( HB_LONG_LONG_OFF ) @@ -6696,12 +6696,12 @@ static void hb_vmPushLongLongConst( HB_LONGLONG llNumber ) } #endif -void hb_vmPushNumInt( HB_MAXINT lNumber ) +void hb_vmPushNumInt( HB_MAXINT nNumber ) { - if( HB_LIM_INT( lNumber ) ) - hb_vmPushInteger( ( int ) lNumber ); + if( HB_LIM_INT( nNumber ) ) + hb_vmPushInteger( ( int ) nNumber ); else - hb_vmPushHBLong( lNumber ); + hb_vmPushHBLong( nNumber ); } void hb_vmPushDouble( double dNumber, int iDec ) diff --git a/harbour/src/vm/itemapi.c b/harbour/src/vm/itemapi.c index a3562995be..c9b089f2e2 100644 --- a/harbour/src/vm/itemapi.c +++ b/harbour/src/vm/itemapi.c @@ -1041,9 +1041,9 @@ PHB_ITEM hb_itemPutNLL( PHB_ITEM pItem, HB_LONGLONG llNumber ) } #endif -PHB_ITEM hb_itemPutNInt( PHB_ITEM pItem, HB_MAXINT lNumber ) +PHB_ITEM hb_itemPutNInt( PHB_ITEM pItem, HB_MAXINT nNumber ) { - HB_TRACE(HB_TR_DEBUG, ("hb_itemPutNInt(%p, %" PFHL "d)", pItem, lNumber)); + HB_TRACE(HB_TR_DEBUG, ("hb_itemPutNInt(%p, %" PFHL "d)", pItem, nNumber)); if( pItem ) { @@ -1053,37 +1053,37 @@ PHB_ITEM hb_itemPutNInt( PHB_ITEM pItem, HB_MAXINT lNumber ) else pItem = hb_itemNew( NULL ); - if( HB_LIM_INT( lNumber ) ) + if( HB_LIM_INT( nNumber ) ) { pItem->type = HB_IT_INTEGER; - pItem->item.asInteger.value = ( int ) lNumber; + pItem->item.asInteger.value = ( int ) nNumber; /* EXP limit used intentionally */ - pItem->item.asInteger.length = HB_INT_EXPLENGTH( lNumber ); + pItem->item.asInteger.length = HB_INT_EXPLENGTH( nNumber ); } else { pItem->type = HB_IT_LONG; - pItem->item.asLong.value = lNumber; - pItem->item.asLong.length = HB_LONG_LENGTH( lNumber ); + pItem->item.asLong.value = nNumber; + pItem->item.asLong.length = HB_LONG_LENGTH( nNumber ); } return pItem; } -PHB_ITEM hb_itemPutNIntLen( PHB_ITEM pItem, HB_MAXINT lNumber, int iWidth ) +PHB_ITEM hb_itemPutNIntLen( PHB_ITEM pItem, HB_MAXINT nNumber, int iWidth ) { - HB_TRACE(HB_TR_DEBUG, ("hb_itemPutNIntLen(%p, %" PFHL "d, %d)", pItem, lNumber, iWidth)); + HB_TRACE(HB_TR_DEBUG, ("hb_itemPutNIntLen(%p, %" PFHL "d, %d)", pItem, nNumber, iWidth)); - if( HB_LIM_INT( lNumber ) ) + if( HB_LIM_INT( nNumber ) ) { - return hb_itemPutNILen( pItem, ( int ) lNumber, iWidth ); + return hb_itemPutNILen( pItem, ( int ) nNumber, iWidth ); } else { #ifdef HB_LONG_LONG_OFF - return hb_itemPutNLLen( pItem, ( long ) lNumber, iWidth ); + return hb_itemPutNLLen( pItem, ( long ) nNumber, iWidth ); #else - return hb_itemPutNLLLen( pItem, ( HB_LONGLONG ) lNumber, iWidth ); + return hb_itemPutNLLLen( pItem, ( HB_LONGLONG ) nNumber, iWidth ); #endif } } @@ -1100,14 +1100,14 @@ PHB_ITEM hb_itemPutNLen( PHB_ITEM pItem, double dNumber, int iWidth, int iDec ) if( iDec == 0 ) { - HB_MAXINT lNumber = ( HB_MAXINT ) dNumber; + HB_MAXINT nNumber = ( HB_MAXINT ) dNumber; - if( ( double ) lNumber == dNumber ) + if( ( double ) nNumber == dNumber ) { if( iWidth <= 0 || iWidth > 99 ) iWidth = HB_DBL_LENGTH( dNumber ); - return hb_itemPutNIntLen( pItem, lNumber, iWidth ); + return hb_itemPutNIntLen( pItem, nNumber, iWidth ); } } @@ -2421,26 +2421,26 @@ HB_BOOL hb_itemStrBuf( char * szResult, PHB_ITEM pNumber, int iSize, int iDec ) } else { - HB_MAXINT lNumber; + HB_MAXINT nNumber; if( HB_IS_INTEGER( pNumber ) ) - lNumber = pNumber->item.asInteger.value; + nNumber = pNumber->item.asInteger.value; else if( HB_IS_LONG( pNumber ) ) - lNumber = pNumber->item.asLong.value; + nNumber = pNumber->item.asLong.value; else { - lNumber = 0; + nNumber = 0; iPos = -1; } - fNeg = ( lNumber < 0 ); + fNeg = ( nNumber < 0 ); while ( iPos-- > 0 ) { - szResult[ iPos ] = '0' + ( char ) ( fNeg ? -( lNumber % 10 ) : ( lNumber % 10 ) ); - lNumber /= 10; - if( lNumber == 0 ) + szResult[ iPos ] = '0' + ( char ) ( fNeg ? -( nNumber % 10 ) : ( nNumber % 10 ) ); + nNumber /= 10; + if( nNumber == 0 ) break; } if( fNeg && iPos-- > 0 ) diff --git a/harbour/src/vm/macro.c b/harbour/src/vm/macro.c index 54310889f5..c6e478c880 100644 --- a/harbour/src/vm/macro.c +++ b/harbour/src/vm/macro.c @@ -1241,36 +1241,36 @@ void hb_macroGenPushSymbol( const char * szSymbolName, HB_BOOL bFunction, HB_COM } /* generates the pcode to push a long number on the virtual machine stack */ -void hb_macroGenPushLong( HB_MAXINT lNumber, HB_COMP_DECL ) +void hb_macroGenPushLong( HB_MAXINT nNumber, HB_COMP_DECL ) { - if( lNumber == 0 ) + if( nNumber == 0 ) { hb_macroGenPCode1( HB_P_ZERO, HB_COMP_PARAM ); } - else if( lNumber == 1 ) + else if( nNumber == 1 ) { hb_macroGenPCode1( HB_P_ONE, HB_COMP_PARAM ); } - else if( HB_LIM_INT8( lNumber ) ) + else if( HB_LIM_INT8( nNumber ) ) { - hb_macroGenPCode2( HB_P_PUSHBYTE, ( HB_BYTE ) lNumber, HB_COMP_PARAM ); + hb_macroGenPCode2( HB_P_PUSHBYTE, ( HB_BYTE ) nNumber, HB_COMP_PARAM ); } - else if( HB_LIM_INT16( lNumber ) ) + else if( HB_LIM_INT16( nNumber ) ) { - hb_macroGenPCode3( HB_P_PUSHINT, HB_LOBYTE( lNumber ), HB_HIBYTE( lNumber ), HB_COMP_PARAM ); + hb_macroGenPCode3( HB_P_PUSHINT, HB_LOBYTE( nNumber ), HB_HIBYTE( nNumber ), HB_COMP_PARAM ); } - else if( HB_LIM_INT32( lNumber ) ) + else if( HB_LIM_INT32( nNumber ) ) { HB_BYTE pBuffer[ 5 ]; pBuffer[ 0 ] = HB_P_PUSHLONG; - HB_PUT_LE_UINT32( pBuffer + 1, lNumber ); + HB_PUT_LE_UINT32( pBuffer + 1, nNumber ); hb_macroGenPCodeN( pBuffer, sizeof( pBuffer ), HB_COMP_PARAM ); } else { HB_BYTE pBuffer[ 9 ]; pBuffer[ 0 ] = HB_P_PUSHLONGLONG; - HB_PUT_LE_UINT64( pBuffer + 1, lNumber ); + HB_PUT_LE_UINT64( pBuffer + 1, nNumber ); hb_macroGenPCodeN( pBuffer, sizeof( pBuffer ), HB_COMP_PARAM ); } } @@ -1362,7 +1362,7 @@ void hb_macroGenPopMemvar( const char * szVarName, HB_COMP_DECL ) void hb_macroGenPopAliasedVar( const char * szVarName, HB_BOOL bPushAliasValue, const char * szAlias, - HB_MAXINT lWorkarea, HB_COMP_DECL ) + HB_MAXINT nWorkarea, HB_COMP_DECL ) { HB_TRACE(HB_TR_DEBUG, ("hb_macroGenPopAliasedVar(%s->%s)",szAlias,szVarName)); @@ -1392,7 +1392,7 @@ void hb_macroGenPopAliasedVar( const char * szVarName, } else { - hb_macroGenPushLong( lWorkarea, HB_COMP_PARAM ); + hb_macroGenPushLong( nWorkarea, HB_COMP_PARAM ); hb_macroMemvarGenPCode( HB_P_MPOPALIASEDFIELD, szVarName, HB_COMP_PARAM ); } } @@ -1454,7 +1454,7 @@ void hb_macroGenPushMemvarRef( const char * szVarName, HB_COMP_DECL ) void hb_macroGenPushAliasedVar( const char * szVarName, HB_BOOL bPushAliasValue, const char * szAlias, - HB_MAXINT lWorkarea, HB_COMP_DECL ) + HB_MAXINT nWorkarea, HB_COMP_DECL ) { HB_TRACE(HB_TR_DEBUG, ("hb_macroGenPushAliasedVar(%s->%s)",szAlias,szVarName)); @@ -1487,7 +1487,7 @@ void hb_macroGenPushAliasedVar( const char * szVarName, } else { - hb_macroGenPushLong( lWorkarea, HB_COMP_PARAM ); + hb_macroGenPushLong( nWorkarea, HB_COMP_PARAM ); hb_macroMemvarGenPCode( HB_P_MPUSHALIASEDFIELD, szVarName, HB_COMP_PARAM ); } }