2014-01-30 10:34 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)

* contrib/hbtip/utils.c
  * src/rtl/gtwvt/gtwvt.c
    * casting to pacify some warnings

  * src/compiler/harbour.y
  * src/compiler/harbour.yyc
  * src/compiler/harbour.yyh
    * changed type of valChar.length from int to HB_SIZE

  * include/hbpp.h
  * src/pp/ppcore.c
    * changed type of last hb_pp_tokenBlockString() parameter
      from int * to HB_SIZE *

  * src/compiler/complex.c
    * removed unnecessary casting
This commit is contained in:
Przemysław Czerpak
2014-01-30 10:34:22 +01:00
parent c5d3403da5
commit ca49407a60
9 changed files with 31 additions and 13 deletions

View File

@@ -10,6 +10,24 @@
* Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
*/
2014-01-30 10:34 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* contrib/hbtip/utils.c
* src/rtl/gtwvt/gtwvt.c
* casting to pacify some warnings
* src/compiler/harbour.y
* src/compiler/harbour.yyc
* src/compiler/harbour.yyh
* changed type of valChar.length from int to HB_SIZE
* include/hbpp.h
* src/pp/ppcore.c
* changed type of last hb_pp_tokenBlockString() parameter
from int * to HB_SIZE *
* src/compiler/complex.c
* removed unnecessary casting
2014-01-29 09:38 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* include/harbour.hbx
* src/vm/dynsym.c

View File

@@ -84,7 +84,7 @@ HB_FUNC( TIP_TIMESTAMP )
/* For compatibility, seconds() value */
if( HB_ISNUM( 2 ) )
hb_timeDecode( hb_parnd( 2 ) * 1000,
hb_timeDecode( ( long ) ( hb_parnd( 2 ) * 1000 ),
&iHour, &iMinute, &iSecond, &iMSec );
else
iHour = iMinute = iSecond = 0;

View File

@@ -680,7 +680,7 @@ extern HB_EXPORT int hb_pp_errorCount( PHB_PP_STATE pState );
extern HB_EXPORT void hb_pp_tokenUpper( PHB_PP_TOKEN pToken );
extern HB_EXPORT void hb_pp_tokenToString( PHB_PP_STATE pState, PHB_PP_TOKEN pToken );
extern HB_EXPORT char * hb_pp_tokenBlockString( PHB_PP_STATE pState, PHB_PP_TOKEN pToken, int * piType, int * piLen );
extern HB_EXPORT char * hb_pp_tokenBlockString( PHB_PP_STATE pState, PHB_PP_TOKEN pToken, int * piType, HB_SIZE * pnLen );
extern HB_EXPORT PHB_PP_STATE hb_pp_lexNew( const char * pString, HB_SIZE nLen );
extern HB_EXPORT PHB_PP_TOKEN hb_pp_lexGet( PHB_PP_STATE pState );
extern HB_EXPORT PHB_PP_TOKEN hb_pp_tokenGet( PHB_PP_STATE pState );

View File

@@ -269,12 +269,12 @@ static const char * hb_comp_tokenIdentifer( HB_COMP_DECL, PHB_PP_TOKEN pToken )
static const char * hb_comp_tokenString( YYSTYPE * yylval_ptr, HB_COMP_DECL, PHB_PP_TOKEN pToken )
{
yylval_ptr->valChar.length = ( HB_SIZE ) pToken->len;
yylval_ptr->valChar.length = pToken->len;
yylval_ptr->valChar.string = ( char * ) pToken->value;
yylval_ptr->valChar.dealloc = HB_FALSE;
if( HB_PP_TOKEN_ALLOC( pToken->type ) )
{
yylval_ptr->valChar.dealloc = ( HB_SIZE ) pToken->len != strlen( pToken->value );
yylval_ptr->valChar.dealloc = pToken->len != strlen( pToken->value );
pToken->value = hb_compIdentifierNew( HB_COMP_PARAM, pToken->value,
yylval_ptr->valChar.dealloc ? HB_IDENT_COPY : HB_IDENT_FREE );
if( ! yylval_ptr->valChar.dealloc )

View File

@@ -145,13 +145,13 @@ static void hb_compDebugStart( void ) { }
struct
{
char * string;
int length;
HB_SIZE length;
HB_BOOL dealloc;
} valChar;
struct
{
char * string;
int length;
HB_SIZE length;
int flags; /* Flag for early {|| &macro} (1) or late {|| &(macro)} (2) binding */
} asCodeblock;
PHB_VARTYPE asVarType;

View File

@@ -365,13 +365,13 @@ typedef union YYSTYPE
struct
{
char * string;
int length;
HB_SIZE length;
HB_BOOL dealloc;
} valChar;
struct
{
char * string;
int length;
HB_SIZE length;
int flags; /* Flag for early {|| &macro} (1) or late {|| &(macro)} (2) binding */
} asCodeblock;
PHB_VARTYPE asVarType;

View File

@@ -184,13 +184,13 @@ typedef union YYSTYPE
struct
{
char * string;
int length;
HB_SIZE length;
HB_BOOL dealloc;
} valChar;
struct
{
char * string;
int length;
HB_SIZE length;
int flags; /* Flag for early {|| &macro} (1) or late {|| &(macro)} (2) binding */
} asCodeblock;
PHB_VARTYPE asVarType;

View File

@@ -6315,7 +6315,7 @@ void hb_pp_tokenToString( PHB_PP_STATE pState, PHB_PP_TOKEN pToken )
}
char * hb_pp_tokenBlockString( PHB_PP_STATE pState, PHB_PP_TOKEN pToken,
int * piType, int * piLen )
int * piType, HB_SIZE * pnLen )
{
*piType = 0;
hb_membufFlush( pState->pBuffer );
@@ -6345,7 +6345,7 @@ char * hb_pp_tokenBlockString( PHB_PP_STATE pState, PHB_PP_TOKEN pToken,
}
while( iBraces && ! HB_PP_TOKEN_ISEOC( pToken ) );
}
*piLen = ( int ) hb_membufLen( pState->pBuffer );
*pnLen = hb_membufLen( pState->pBuffer );
hb_membufAddCh( pState->pBuffer, '\0' );
return hb_membufPtr( pState->pBuffer );
}

View File

@@ -2524,7 +2524,7 @@ static HB_BOOL hb_gt_wvt_KeyEvent( PHB_GTWVT pWVT, UINT message, WPARAM wParam,
if( iFlags & HB_KF_CTRL )
{
pWVT->IgnoreWM_SYSCHAR = HB_TRUE;
iKey = wParam - VK_NUMPAD0 + '0';
iKey = ( int ) wParam - VK_NUMPAD0 + '0';
}
else if( iFlags == HB_KF_ALT )
iFlags = 0; /* for ALT + <ASCII_VALUE_FROM_KEYPAD> */