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

2008-08-01 03:06 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* harbour/include/hbpp.h
  * harbour/include/hbexprb.c
  * harbour/source/pp/ppcore.c
  * harbour/source/vm/evalhb.c
  * harbour/source/vm/runner.c
  * harbour/source/vm/hvm.c
  * harbour/source/vm/fm.c
  * harbour/source/vm/eval.c
  * harbour/source/vm/dynlibhb.c
  * harbour/source/vm/classes.c
  * harbour/source/rdd/hbsix/sxord.c
  * harbour/source/compiler/hbmain.c
  * harbour/source/compiler/harbour.y
    * pacified warnings
This commit is contained in:
Przemyslaw Czerpak
2008-08-01 01:06:47 +00:00
parent 9ef0571dd6
commit 29b52145d1
14 changed files with 80 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
harbour/ChangeLog
View File

@@ -8,6 +8,22 @@
2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
2008-08-01 03:06 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/include/hbpp.h
* harbour/include/hbexprb.c
* harbour/source/pp/ppcore.c
* harbour/source/vm/evalhb.c
* harbour/source/vm/runner.c
* harbour/source/vm/hvm.c
* harbour/source/vm/fm.c
* harbour/source/vm/eval.c
* harbour/source/vm/dynlibhb.c
* harbour/source/vm/classes.c
* harbour/source/rdd/hbsix/sxord.c
* harbour/source/compiler/hbmain.c
* harbour/source/compiler/harbour.y
* pacified warnings
2008-08-01 02:09 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* include/hbdefs.h
! Patch added to workaround following phoney warnings

28
harbour/include/hbexprb.c
View File

@@ -1519,7 +1519,7 @@ static HB_EXPR_FUNC( hb_compExprUseMacro )
HB_GEN_FUNC1( PCode1, HB_P_MACROPUSH );
/* Always add byte to pcode indicating requested macro compiler flag. */
HB_GEN_FUNC1( PCode1, HB_MACRO_GENFLAGS );
HB_GEN_FUNC1( PCode1, ( BYTE ) HB_MACRO_GENFLAGS );
}
/* NOTE: pcode for alias context is generated in
@@ -1570,7 +1570,7 @@ static HB_EXPR_FUNC( hb_compExprUseMacro )
HB_GEN_FUNC1( PCode1, HB_P_MACROPOP );
/* Always add byte to pcode indicating requested macro compiler flag. */
HB_GEN_FUNC1( PCode1, HB_MACRO_GENFLAGS );
HB_GEN_FUNC1( PCode1, ( BYTE ) HB_MACRO_GENFLAGS );
}
break;
@@ -4700,7 +4700,7 @@ static void hb_compExprPushPreOp( HB_EXPR_PTR pSelf, BYTE bOper, HB_COMP_DECL )
pSelf->value.asOperator.pLeft->value.asMacro.SubType = usType;
/* increase/decrease operation, leave unreferenced value on stack */
HB_GEN_FUNC1( PCode1, ( bOper == HB_P_INC ) ? HB_P_INCEQ : HB_P_DECEQ );
HB_GEN_FUNC1( PCode1, ( BYTE ) ( bOper == HB_P_INC ? HB_P_INCEQ : HB_P_DECEQ ) );
return;
}
#ifdef HB_USE_ARRAYAT_REF
@@ -4714,7 +4714,7 @@ static void hb_compExprPushPreOp( HB_EXPR_PTR pSelf, BYTE bOper, HB_COMP_DECL )
pSelf->value.asOperator.pLeft->value.asList.reference = FALSE;
/* increase/decrease operation, leave unreferenced value on stack */
HB_GEN_FUNC1( PCode1, ( bOper == HB_P_INC ) ? HB_P_INCEQ : HB_P_DECEQ );
HB_GEN_FUNC1( PCode1, ( BYTE ) ( bOper == HB_P_INC ? HB_P_INCEQ : HB_P_DECEQ ) );
return;
}
#endif
@@ -4746,7 +4746,7 @@ static void hb_compExprPushPreOp( HB_EXPR_PTR pSelf, BYTE bOper, HB_COMP_DECL )
HB_EXPRTYPE iOldType = pSelf->value.asOperator.pLeft->ExprType;
pSelf->value.asOperator.pLeft->ExprType = HB_ET_VARREF;
HB_EXPR_USE( pSelf->value.asOperator.pLeft, HB_EA_PUSH_PCODE );
HB_GEN_FUNC1( PCode1, ( bOper == HB_P_INC ) ? HB_P_INCEQ : HB_P_DECEQ );
HB_GEN_FUNC1( PCode1, ( BYTE ) ( bOper == HB_P_INC ? HB_P_INCEQ : HB_P_DECEQ ) );
pSelf->value.asOperator.pLeft->ExprType = iOldType;
}
return;
@@ -4814,7 +4814,7 @@ static void hb_compExprPushPostOp( HB_EXPR_PTR pSelf, BYTE bOper, HB_COMP_DECL )
*/
HB_GEN_FUNC1( PCode1, HB_P_DUPLUNREF );
/* increase/decrease operation */
HB_GEN_FUNC1( PCode1, ( bOper == HB_P_INC ) ? HB_P_INCEQPOP : HB_P_DECEQPOP );
HB_GEN_FUNC1( PCode1, ( BYTE ) ( bOper == HB_P_INC ? HB_P_INCEQPOP : HB_P_DECEQPOP ) );
return;
}
#ifdef HB_USE_ARRAYAT_REF
@@ -4832,7 +4832,7 @@ static void hb_compExprPushPostOp( HB_EXPR_PTR pSelf, BYTE bOper, HB_COMP_DECL )
*/
HB_GEN_FUNC1( PCode1, HB_P_DUPLUNREF );
/* increase/decrease operation */
HB_GEN_FUNC1( PCode1, ( bOper == HB_P_INC ) ? HB_P_INCEQPOP : HB_P_DECEQPOP );
HB_GEN_FUNC1( PCode1, ( BYTE ) ( bOper == HB_P_INC ? HB_P_INCEQPOP : HB_P_DECEQPOP ) );
return;
}
#endif
@@ -4849,7 +4849,7 @@ static void hb_compExprPushPostOp( HB_EXPR_PTR pSelf, BYTE bOper, HB_COMP_DECL )
{
/* Push current value */
HB_EXPR_USE( pSelf->value.asOperator.pLeft, HB_EA_PUSH_PCODE );
HB_GEN_FUNC3( PCode3, ( bOper == HB_P_INC ) ? HB_P_LOCALINC : HB_P_LOCALDEC,
HB_GEN_FUNC3( PCode3, ( BYTE ) ( bOper == HB_P_INC ? HB_P_LOCALINC : HB_P_LOCALDEC ),
HB_LOBYTE( iVar ), HB_HIBYTE( iVar ) );
}
else
@@ -4859,7 +4859,7 @@ static void hb_compExprPushPostOp( HB_EXPR_PTR pSelf, BYTE bOper, HB_COMP_DECL )
pSelf->value.asOperator.pLeft->ExprType = HB_ET_VARREF;
HB_EXPR_USE( pSelf->value.asOperator.pLeft, HB_EA_PUSH_PCODE );
HB_GEN_FUNC1( PCode1, HB_P_DUPLUNREF );
HB_GEN_FUNC1( PCode1, ( bOper == HB_P_INC ) ? HB_P_INCEQPOP : HB_P_DECEQPOP );
HB_GEN_FUNC1( PCode1, ( BYTE ) ( bOper == HB_P_INC ? HB_P_INCEQPOP : HB_P_DECEQPOP ) );
pSelf->value.asOperator.pLeft->ExprType = iOldType;
}
return;
@@ -4922,7 +4922,7 @@ static void hb_compExprUsePreOp( HB_EXPR_PTR pSelf, BYTE bOper, HB_COMP_DECL )
pSelf->value.asOperator.pLeft->value.asMacro.SubType = usType;
/* increase/decrease operation */
HB_GEN_FUNC1( PCode1, ( bOper == HB_P_INC ) ? HB_P_INCEQPOP : HB_P_DECEQPOP );
HB_GEN_FUNC1( PCode1, ( BYTE ) ( bOper == HB_P_INC ? HB_P_INCEQPOP : HB_P_DECEQPOP ) );
return;
}
#ifdef HB_USE_ARRAYAT_REF
@@ -4935,7 +4935,7 @@ static void hb_compExprUsePreOp( HB_EXPR_PTR pSelf, BYTE bOper, HB_COMP_DECL )
HB_EXPR_USE( pSelf->value.asOperator.pLeft, HB_EA_PUSH_PCODE );
pSelf->value.asOperator.pLeft->value.asList.reference = FALSE;
/* increase/decrease operation */
HB_GEN_FUNC1( PCode1, ( bOper == HB_P_INC ) ? HB_P_INCEQPOP : HB_P_DECEQPOP );
HB_GEN_FUNC1( PCode1, ( BYTE ) ( bOper == HB_P_INC ? HB_P_INCEQPOP : HB_P_DECEQPOP ) );
return;
}
#endif
@@ -4950,7 +4950,7 @@ static void hb_compExprUsePreOp( HB_EXPR_PTR pSelf, BYTE bOper, HB_COMP_DECL )
{
if( iScope == HB_VS_LOCAL_VAR )
{
HB_GEN_FUNC3( PCode3, ( bOper == HB_P_INC ) ? HB_P_LOCALINC : HB_P_LOCALDEC,
HB_GEN_FUNC3( PCode3, ( BYTE ) ( bOper == HB_P_INC ? HB_P_LOCALINC : HB_P_LOCALDEC ),
HB_LOBYTE( iVar ), HB_HIBYTE( iVar ) );
}
else
@@ -4959,7 +4959,7 @@ static void hb_compExprUsePreOp( HB_EXPR_PTR pSelf, BYTE bOper, HB_COMP_DECL )
HB_EXPRTYPE iOldType = pSelf->value.asOperator.pLeft->ExprType;
pSelf->value.asOperator.pLeft->ExprType = HB_ET_VARREF;
HB_EXPR_USE( pSelf->value.asOperator.pLeft, HB_EA_PUSH_PCODE );
HB_GEN_FUNC1( PCode1, ( bOper == HB_P_INC ) ? HB_P_INCEQPOP : HB_P_DECEQPOP );
HB_GEN_FUNC1( PCode1, ( BYTE ) ( bOper == HB_P_INC ? HB_P_INCEQPOP : HB_P_DECEQPOP ) );
pSelf->value.asOperator.pLeft->ExprType = iOldType;
}
return;
@@ -5027,7 +5027,7 @@ static void hb_compExprUseAliasMacro( HB_EXPR_PTR pAliasedVar, BYTE bAction, HB_
}
/* Always add byte to pcode indicating requested macro compiler flag. */
HB_GEN_FUNC1( PCode1, HB_MACRO_GENFLAGS );
HB_GEN_FUNC1( PCode1, ( BYTE ) HB_MACRO_GENFLAGS );
}

2
harbour/include/hbpp.h
View File

@@ -597,7 +597,7 @@ typedef struct
int iSpaces; /* leading spaces for next token */
int iSpacesNL; /* leading spaces ';' token (fCanNextLine) if it will not be line concatenator */
int iSpacesMin; /* minimal number of leading spaces for next token */
int iLastType; /* last token type */
USHORT usLastType; /* last token type */
BOOL fCanNextLine; /* ';' token found and we do not know yet if it's command separator or line concatenator */
BOOL fDirective; /* # directives is parsed */
BOOL fNewStatement; /* set to TRUE at line begining or after each ';' token */

30
harbour/source/compiler/harbour.y
View File

@@ -1357,20 +1357,20 @@ DummyArgList : DummyArgument
DummyArgument : EmptyExpression { HB_COMP_EXPR_DELETE( $1 ); }
;
FormalList : IdentName AsType { hb_compDeclaredParameterAdd( HB_COMP_PARAM, $1, HB_COMP_PARAM->cVarType ); }
| '@' IdentName AsType { hb_compDeclaredParameterAdd( HB_COMP_PARAM, $2, HB_COMP_PARAM->cVarType + VT_OFFSET_BYREF ); }
| '@' IdentName '(' DummyArgList ')' { hb_compDeclaredParameterAdd( HB_COMP_PARAM, $2, 'F' ); }
| FormalList ',' IdentName AsType { hb_compDeclaredParameterAdd( HB_COMP_PARAM, $3, HB_COMP_PARAM->cVarType ); }
| FormalList ',' '@' IdentName AsType { hb_compDeclaredParameterAdd( HB_COMP_PARAM, $4, HB_COMP_PARAM->cVarType + VT_OFFSET_BYREF ); }
| FormalList ',' '@' IdentName '(' DummyArgList ')' { hb_compDeclaredParameterAdd( HB_COMP_PARAM, $4, 'F' ); }
FormalList : IdentName AsType { hb_compDeclaredParameterAdd( HB_COMP_PARAM, $1, ( BYTE ) ( HB_COMP_PARAM->cVarType ) ); }
| '@' IdentName AsType { hb_compDeclaredParameterAdd( HB_COMP_PARAM, $2, ( BYTE ) ( HB_COMP_PARAM->cVarType + VT_OFFSET_BYREF ) ); }
| '@' IdentName '(' DummyArgList ')' { hb_compDeclaredParameterAdd( HB_COMP_PARAM, $2, ( BYTE ) 'F' ); }
| FormalList ',' IdentName AsType { hb_compDeclaredParameterAdd( HB_COMP_PARAM, $3, ( BYTE ) ( HB_COMP_PARAM->cVarType ) ); }
| FormalList ',' '@' IdentName AsType { hb_compDeclaredParameterAdd( HB_COMP_PARAM, $4, ( BYTE ) ( HB_COMP_PARAM->cVarType + VT_OFFSET_BYREF ) ); }
| FormalList ',' '@' IdentName '(' DummyArgList ')' { hb_compDeclaredParameterAdd( HB_COMP_PARAM, $4, ( BYTE ) 'F' ); }
;
OptList : OPTIONAL IdentName AsType { hb_compDeclaredParameterAdd( HB_COMP_PARAM, $2, HB_COMP_PARAM->cVarType + VT_OFFSET_OPTIONAL ); }
| OPTIONAL '@' IdentName AsType { hb_compDeclaredParameterAdd( HB_COMP_PARAM, $3, HB_COMP_PARAM->cVarType + VT_OFFSET_OPTIONAL + VT_OFFSET_BYREF ); }
| OPTIONAL '@' IdentName '(' DummyArgList ')' { hb_compDeclaredParameterAdd( HB_COMP_PARAM, $3, HB_COMP_PARAM->cVarType + VT_OFFSET_OPTIONAL + VT_OFFSET_BYREF ); }
| OptList ',' OPTIONAL IdentName AsType { hb_compDeclaredParameterAdd( HB_COMP_PARAM, $4, HB_COMP_PARAM->cVarType + VT_OFFSET_OPTIONAL ); }
| OptList ',' OPTIONAL '@' IdentName AsType { hb_compDeclaredParameterAdd( HB_COMP_PARAM, $5, HB_COMP_PARAM->cVarType + VT_OFFSET_OPTIONAL + VT_OFFSET_BYREF ); }
| OptList ',' OPTIONAL '@' IdentName '(' DummyArgList ')' { hb_compDeclaredParameterAdd( HB_COMP_PARAM, $5, HB_COMP_PARAM->cVarType + VT_OFFSET_OPTIONAL + VT_OFFSET_BYREF ); }
OptList : OPTIONAL IdentName AsType { hb_compDeclaredParameterAdd( HB_COMP_PARAM, $2, ( BYTE ) ( HB_COMP_PARAM->cVarType + VT_OFFSET_OPTIONAL ) ); }
| OPTIONAL '@' IdentName AsType { hb_compDeclaredParameterAdd( HB_COMP_PARAM, $3, ( BYTE ) ( HB_COMP_PARAM->cVarType + VT_OFFSET_OPTIONAL + VT_OFFSET_BYREF ) ); }
| OPTIONAL '@' IdentName '(' DummyArgList ')' { hb_compDeclaredParameterAdd( HB_COMP_PARAM, $3, ( BYTE ) ( HB_COMP_PARAM->cVarType + VT_OFFSET_OPTIONAL + VT_OFFSET_BYREF ) ); }
| OptList ',' OPTIONAL IdentName AsType { hb_compDeclaredParameterAdd( HB_COMP_PARAM, $4, ( BYTE ) ( HB_COMP_PARAM->cVarType + VT_OFFSET_OPTIONAL ) ); }
| OptList ',' OPTIONAL '@' IdentName AsType { hb_compDeclaredParameterAdd( HB_COMP_PARAM, $5, ( BYTE ) ( HB_COMP_PARAM->cVarType + VT_OFFSET_OPTIONAL + VT_OFFSET_BYREF ) ); }
| OptList ',' OPTIONAL '@' IdentName '(' DummyArgList ')' { hb_compDeclaredParameterAdd( HB_COMP_PARAM, $5, ( BYTE ) ( HB_COMP_PARAM->cVarType + VT_OFFSET_OPTIONAL + VT_OFFSET_BYREF ) ); }
;
ExecFlow : IfEndif
@@ -1590,7 +1590,7 @@ ForNext : FOR LValue ForAssign Expression /* 1 2 3 4 */
HB_COMP_EXPR_DELETE( hb_compExprGenPush( $7, HB_COMP_PARAM ) ); /* end */
if( iSign )
{
hb_compGenPCode1( iSign > 0 ? HB_P_GREATER : HB_P_LESS, HB_COMP_PARAM );
hb_compGenPCode1( ( BYTE ) ( iSign > 0 ? HB_P_GREATER : HB_P_LESS ), HB_COMP_PARAM );
if( $<asExpr>8 )
HB_COMP_EXPR_DELETE( $<asExpr>8 );
}
@@ -2535,9 +2535,7 @@ static void hb_compEnumStart( HB_COMP_DECL, HB_EXPR_PTR pVars, HB_EXPR_PTR pExpr
}
else
{
BYTE Len;
Len = (BYTE) (ulLen & 0xFF);
hb_compGenPCode3( HB_P_ENUMSTART, Len, descend > 0 ? 1 : 0, HB_COMP_PARAM );
hb_compGenPCode3( HB_P_ENUMSTART, ( BYTE ) ( ulLen & 0xFF ), ( BYTE ) ( descend > 0 ? 1 : 0 ), HB_COMP_PARAM );
}
}

4
harbour/source/compiler/hbmain.c
View File

@@ -900,7 +900,7 @@ char * hb_compStaticVariableName( HB_COMP_DECL, USHORT wVar )
while( pTmp->pNext && pTmp->pNext->iStaticsBase < wVar )
pTmp = pTmp->pNext;
pVar = hb_compVariableGetVar( pTmp->pStatics, wVar - pTmp->iStaticsBase );
pVar = hb_compVariableGetVar( pTmp->pStatics, ( USHORT ) ( wVar - pTmp->iStaticsBase ) );
return pVar ? pVar->szName : NULL;
}
@@ -3322,7 +3322,7 @@ void hb_compGenPushAliasedVar( char * szVarName,
void hb_compGenPushLogical( int iTrueFalse, HB_COMP_DECL ) /* pushes a logical value on the virtual machine stack */
{
hb_compGenPCode1( iTrueFalse ? HB_P_TRUE : HB_P_FALSE, HB_COMP_PARAM );
hb_compGenPCode1( ( BYTE ) ( iTrueFalse ? HB_P_TRUE : HB_P_FALSE ), HB_COMP_PARAM );
}
void hb_compGenPushNil( HB_COMP_DECL )

26
harbour/source/pp/ppcore.c
View File

@@ -561,7 +561,7 @@ static void hb_pp_tokenAddNext( PHB_PP_STATE pState, const char * value, ULONG u
pState->iBlockState = 0;
pState->iNestedBlock--;
}
else if( pState->iLastType == HB_PP_TOKEN_LEFT_CB &&
else if( pState->usLastType == HB_PP_TOKEN_LEFT_CB &&
HB_PP_TOKEN_TYPE( type ) == HB_PP_TOKEN_PIPE )
{
pState->iBlockState = 1;
@@ -603,21 +603,21 @@ static void hb_pp_tokenAddNext( PHB_PP_STATE pState, const char * value, ULONG u
pState->fNewStatement = FALSE;
pState->iSpaces = pState->iSpacesMin = 0;
pState->iLastType = HB_PP_TOKEN_TYPE( type );
pState->usLastType = HB_PP_TOKEN_TYPE( type );
if( pState->iInLineState != HB_PP_INLINE_OFF )
{
if( pState->iInLineState == HB_PP_INLINE_START &&
pState->iLastType == HB_PP_TOKEN_LEFT_PB )
pState->usLastType == HB_PP_TOKEN_LEFT_PB )
{
pState->iInLineState = HB_PP_INLINE_PARAM;
pState->iInLineBraces = 1;
}
else if( pState->iInLineState == HB_PP_INLINE_PARAM )
{
if( pState->iLastType == HB_PP_TOKEN_LEFT_PB )
if( pState->usLastType == HB_PP_TOKEN_LEFT_PB )
pState->iInLineBraces++;
else if( pState->iLastType == HB_PP_TOKEN_RIGHT_PB )
else if( pState->usLastType == HB_PP_TOKEN_RIGHT_PB )
{
if( --pState->iInLineBraces == 0 )
pState->iInLineState = HB_PP_INLINE_BODY;
@@ -867,7 +867,7 @@ static void hb_pp_getLine( PHB_PP_STATE pState )
pState->pFile->iTokens = pState->iSpaces = pState->iSpacesMin = 0;
pState->fCanNextLine = pState->fDirective = FALSE;
pState->fNewStatement = TRUE;
pState->iLastType = HB_PP_TOKEN_NUL;
pState->usLastType = HB_PP_TOKEN_NUL;
pState->iInLineState = HB_PP_INLINE_OFF;
pState->iInLineBraces = 0;
pState->iBlockState = pState->iNestedBlock = 0;
@@ -1181,7 +1181,7 @@ static void hb_pp_getLine( PHB_PP_STATE pState )
}
else if( ch == '[' && !pState->fDirective &&
hb_pp_canQuote( pState->fCanNextLine ||
HB_PP_TOKEN_CANQUOTE( pState->iLastType ),
HB_PP_TOKEN_CANQUOTE( pState->usLastType ),
pBuffer, ulLen, 1, &ul ) )
{
hb_pp_tokenAddNext( pState, pBuffer + 1, ul - 1, HB_PP_TOKEN_STRING );
@@ -5074,12 +5074,12 @@ PHB_PP_TOKEN hb_pp_tokenGet( PHB_PP_STATE pState )
}
pState->pFile->iLastLine = pState->pFile->iCurrentLine +
hb_pp_tokenStr( pState->pTokenOut, pState->pBuffer, TRUE, TRUE,
pState->iLastType );
pState->usLastType );
#else
hb_pp_tokenStr( pState->pTokenOut, pState->pBuffer, TRUE, TRUE,
pState->iLastType );
pState->usLastType );
#endif
pState->iLastType = HB_PP_TOKEN_TYPE( pState->pTokenOut->type );
pState->usLastType = HB_PP_TOKEN_TYPE( pState->pTokenOut->type );
fwrite( hb_membufPtr( pState->pBuffer ), sizeof( char ),
hb_membufLen( pState->pBuffer ), pState->file_out );
}
@@ -5289,7 +5289,7 @@ void hb_pp_readRules( PHB_PP_STATE pState, const char * szRulesFile )
else
{
pState->iFiles++;
pState->iLastType = HB_PP_TOKEN_NUL;
pState->usLastType = HB_PP_TOKEN_NUL;
while( hb_pp_tokenGet( pState ) )
{
if( pState->fError )
@@ -5577,7 +5577,7 @@ char * hb_pp_nextLine( PHB_PP_STATE pState, ULONG * pulLen )
else
hb_membufFlush( pState->pOutputBuffer );
pState->iLastType = ltype = HB_PP_TOKEN_NUL;
pState->usLastType = ltype = HB_PP_TOKEN_NUL;
while( ( pToken = hb_pp_tokenGet( pState ) ) != NULL )
{
if( pState->fError )
@@ -5627,7 +5627,7 @@ char * hb_pp_parseLine( PHB_PP_STATE pState, const char * pLine, ULONG * pulLen
pState->pFile = pFile;
pState->iFiles++;
pState->iLastType = ltype = HB_PP_TOKEN_NUL;
pState->usLastType = ltype = HB_PP_TOKEN_NUL;
while( ( pToken = hb_pp_tokenGet( pState ) ) != NULL )
{
if( pState->fError )

4
harbour/source/rdd/hbsix/sxord.c
View File

@@ -267,7 +267,7 @@ HB_FUNC( SX_THERMOMETER )
i = hb_itemGetNI( Info.itmResult );
if( i )
{
static const int s_iStates[] =
static const USHORT s_iStates[] =
{ DBOI_CUSTOM, DBOI_CHGONLY, DBOI_PARTIAL };
iTemperature = 4;
for( i = 0; i < 3; ++i, --iTemperature )
@@ -321,7 +321,7 @@ HB_FUNC( SX_SETSCOPE )
Info.itmResult = hb_itemNew( NULL );
if( !ISNIL( 2 ) )
Info.itmNewVal = hb_param( 2, HB_IT_ANY );
SELF_ORDINFO( pArea, iScope ? DBOI_SCOPEBOTTOM : DBOI_SCOPETOP, &Info );
SELF_ORDINFO( pArea, ( USHORT ) ( iScope ? DBOI_SCOPEBOTTOM : DBOI_SCOPETOP ), &Info );
hb_itemReturnRelease( Info.itmResult );
}
}

12
harbour/source/vm/classes.c
View File

@@ -2925,13 +2925,15 @@ HB_FUNC( __CLSADDMSG )
if( nType == HB_OO_MSG_PROPERTY )
{
hb_clsAddMsg( uiClass, szAssign, HB_OO_MSG_ASSIGN,
uiScope & ~HB_OO_CLSTP_PERSIST, pFunction, pInit );
( USHORT ) ( uiScope & ~HB_OO_CLSTP_PERSIST ),
pFunction, pInit );
nType = HB_OO_MSG_ACCESS;
}
else
{
hb_clsAddMsg( uiClass, szAssign, HB_OO_MSG_CLSASSIGN,
uiScope & ~HB_OO_CLSTP_PERSIST, pFunction, pInit );
( USHORT ) ( uiScope & ~HB_OO_CLSTP_PERSIST ),
pFunction, pInit );
nType = HB_OO_MSG_CLSACCESS;
}
}
@@ -3780,7 +3782,7 @@ HB_FUNC( __GETMESSAGE )
HB_FUNC( __CLSPARENT )
{
hb_retl( hb_clsIsParent( hb_parni( 1 ) , hb_parc( 2 ) ) );
hb_retl( hb_clsIsParent( ( USHORT ) hb_parni( 1 ) , hb_parc( 2 ) ) );
}
HB_FUNC( __SENDER )
@@ -3973,7 +3975,7 @@ static HARBOUR hb___msgEvalInline( void )
hb_vmPush( hb_stackItemFromBase( uiParam ) );
}
hb_vmSend( uiPCount + 1 );
hb_vmSend( ( USHORT ) ( uiPCount + 1 ) );
}
static HARBOUR hb___msgPerform( void )
@@ -4006,7 +4008,7 @@ static HARBOUR hb___msgPerform( void )
{
hb_vmPush( hb_stackItemFromBase( uiParam ) );
}
hb_vmSend( uiPCount - 1 );
hb_vmSend( ( USHORT ) ( uiPCount - 1 ) );
}
}
}

2
harbour/source/vm/dynlibhb.c
View File

@@ -208,7 +208,7 @@ HB_FUNC( HB_LIBDO )
hb_vmPush( hb_stackItemFromBase( uiParam ) );
}
hb_vmDo( uiPCount - 1 );
hb_vmDo( ( USHORT ) ( uiPCount - 1 ) );
}
}
}

2
harbour/source/vm/eval.c
View File

@@ -331,7 +331,7 @@ void hb_evalBlock1( PHB_ITEM pCodeBlock, PHB_ITEM pParam )
void hb_evalBlock( PHB_ITEM pCodeBlock, ... )
{
va_list args;
unsigned int uiParams = 0;
USHORT uiParams = 0;
PHB_ITEM pParam;
hb_vmPushSymbol( &hb_symEval );

2
harbour/source/vm/evalhb.c
View File

@@ -77,7 +77,7 @@ HB_FUNC( EVAL )
hb_vmPush( hb_stackItemFromBase( uiParam ) );
}
hb_vmDo( uiPCount - 1 );
hb_vmDo( ( USHORT ) ( uiPCount - 1 ) );
}
else
{

2
harbour/source/vm/fm.c
View File

@@ -992,7 +992,7 @@ ULONG hb_xquery( USHORT uiMode )
HB_FUNC( MEMORY )
{
hb_retnl( hb_xquery( hb_parni( 1 ) ) );
hb_retnint( hb_xquery( ( USHORT ) hb_parni( 1 ) ) );
}
#ifdef HB_FM_STATISTICS

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

@@ -487,7 +487,7 @@ HB_EXPORT void hb_vmInit( BOOL bStartMainProc )
}
}
hb_vmDo( iArgCount ); /* invoke it with number of supplied parameters */
hb_vmDo( ( USHORT ) iArgCount ); /* invoke it with number of supplied parameters */
}
hb_vmUnsetExceptionHandler();
@@ -6338,7 +6338,7 @@ void hb_vmInitSymbolGroup( void * hNewDynLib, int argc, char * argv[] )
{
hb_vmPushString( argv[i], strlen( argv[i] ) );
}
hb_vmDo( argc );
hb_vmDo( ( USHORT ) argc );
}
}
}
@@ -6699,7 +6699,7 @@ static void hb_vmDoInitFunctions( void )
}
}
hb_vmDo( iArgCount );
hb_vmDo( ( USHORT ) iArgCount );
}
}
}

8
harbour/source/vm/runner.c
View File

@@ -232,7 +232,7 @@ static void hb_hrbInit( PHRB_BODY pHrbBody, int iPCount, PHB_ITEM * pParams )
hb_vmPushNil();
for( i = 0; i < iPCount; i++ )
hb_vmPush( pParams[ i ] );
hb_vmDo( iPCount );
hb_vmDo( ( USHORT ) iPCount );
if( hb_vmRequestQuery() != 0 )
break;
}
@@ -561,10 +561,10 @@ static void hb_hrbDo( PHRB_BODY pHrbBody, int iPCount, PHB_ITEM * pParams )
for( i = 0; i < ( hb_pcount() - 1 ); i++ )
{
hb_vmPush( hb_param( i + 2, HB_IT_ANY ) ); /* Push other cmdline params*/
hb_vmPush( hb_param( i + 2, HB_IT_ANY ) ); /* Push other cmdline params*/
}
hb_vmDo( hb_pcount() - 1 ); /* Run the thing !!! */
hb_vmDo( ( USHORT ) ( hb_pcount() - 1 ) );
pRetVal = hb_itemNew( NULL );
hb_itemMove( pRetVal, hb_stackReturnItem() );
@@ -778,7 +778,7 @@ HB_FUNC( __HRBDOFU )
for( i = 0; i < iPCount; i++ )
hb_vmPush( hb_stackItemFromBase( i + 2 ) );
hb_vmDo( iPCount );
hb_vmDo( ( USHORT ) iPCount );
}
else
hb_errRT_BASE( EG_ARG, 6107, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );