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

@@ -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;