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

2006-11-25 20:00 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* harbour/include/hbexprb.c
    ! fixed parenthesis in expression

  * harbour/source/pp/ppcore.c
    ! fixed code block tokens stringify
This commit is contained in:
Przemyslaw Czerpak
2006-11-25 19:01:59 +00:00
parent 74deff4644
commit a9fd83033c
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
harbour/ChangeLog
View File

@@ -8,6 +8,13 @@
2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
2006-11-25 20:00 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/include/hbexprb.c
! fixed parenthesis in expression
* harbour/source/pp/ppcore.c
! fixed code block tokens stringify
2006-11-25 19:30 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/include/hbexpra.c
* harbour/include/hbexprb.c

2
harbour/include/hbexprb.c
View File

@@ -884,7 +884,7 @@ static HB_EXPR_FUNC( hb_compExprUseRef )
{
char *szAlias = pExp->value.asAlias.pAlias->value.asSymbol;
int iLen = strlen( szAlias );
if( ( iLen == 1 ) || ( iLen >= 4 && iLen <= 6 ) &&
if( ( iLen == 1 || ( iLen >= 4 && iLen <= 6 ) ) &&
memcmp( szAlias, "MEMVAR", iLen ) == 0 &&
pExp->value.asAlias.pVar->ExprType == HB_ET_VARIABLE )
{ /* @M-> @MEMVAR-> or @MEMVA-> or @MEMV-> */

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

@@ -5049,10 +5049,10 @@ char * hb_pp_tokenBlockString( PHB_PP_STATE pState, PHB_PP_TOKEN pToken,
hb_membufFlush( pState->pBuffer );
if( HB_PP_TOKEN_TYPE( pToken->type ) == HB_PP_TOKEN_LEFT_CB )
{
int iBraces = 1;
pToken = pToken->pNext;
while( iBraces && !HB_PP_TOKEN_ISEOC( pToken ) )
int iBraces = 0;
do
{
hb_pp_tokenStr( pToken, pState->pBuffer, iBraces != 0, FALSE, 0 );
if( HB_PP_TOKEN_TYPE( pToken->type ) == HB_PP_TOKEN_AMPERSAND )
{
if( pToken->pNext &&
@@ -5066,9 +5066,9 @@ char * hb_pp_tokenBlockString( PHB_PP_STATE pState, PHB_PP_TOKEN pToken,
--iBraces;
else if( HB_PP_TOKEN_TYPE( pToken->type ) == HB_PP_TOKEN_LEFT_CB )
++iBraces;
hb_pp_tokenStr( pToken, pState->pBuffer, TRUE, FALSE, 0 );
pToken = pToken->pNext;
}
while( iBraces && !HB_PP_TOKEN_ISEOC( pToken ) );
}
hb_membufAddCh( pState->pBuffer, '\0' );
return hb_membufPtr( pState->pBuffer );