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

2007-02-25 19:25 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* harbour/source/common/expropt2.c
    % strip nested parenthesis in expressions like: (((<exp>)))
This commit is contained in:
Przemyslaw Czerpak
2007-02-25 18:26:12 +00:00
parent fb4d3ca4b8
commit 54a9d778a0
2 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
harbour/ChangeLog
View File

@@ -8,6 +8,10 @@
2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
2007-02-25 19:25 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/source/common/expropt2.c
% strip nested parenthesis in expressions like: (((<exp>)))
2007-02-25 17:10 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/include/hbstdgen.ch
* added #undef HB_COMPAT_XHB

35
harbour/source/common/expropt2.c
View File

@@ -1176,7 +1176,16 @@ HB_EXPR_PTR hb_compExprReduceIIF( HB_EXPR_PTR pSelf, HB_COMP_DECL )
{
HB_EXPR_PTR pExpr;
pExpr = pSelf->value.asList.pExprList; /* get conditional expression */
/* get conditional expression */
pExpr = pSelf->value.asList.pExprList;
if( pExpr->ExprType == HB_ET_LIST )
{
HB_EXPR_PTR pNext = pExpr->pNext;
pExpr = hb_compExprListStrip( pExpr, HB_COMP_PARAM );
pExpr->pNext = pNext;
pSelf->value.asList.pExprList = pExpr;
}
if( pExpr->ExprType == HB_ET_LOGICAL )
{
/* the condition was reduced to a logical value: .T. or .F.
@@ -1255,22 +1264,20 @@ HB_EXPR_PTR hb_compExprReduceIIF( HB_EXPR_PTR pSelf, HB_COMP_DECL )
*/
HB_EXPR_PTR hb_compExprListStrip( HB_EXPR_PTR pSelf, HB_COMP_DECL )
{
if( pSelf->ExprType == HB_ET_LIST )
while( pSelf->ExprType == HB_ET_LIST &&
pSelf->value.asList.pExprList->ExprType <= HB_ET_VARIABLE &&
hb_compExprListLen( pSelf ) == 1 )
{
ULONG ulCount = hb_compExprListLen( pSelf );
/* replace the list with a simple expression
* ( EXPR ) -> EXPR
*/
HB_EXPR_PTR pExpr = pSelf;
if( ulCount == 1 && pSelf->value.asList.pExprList->ExprType <= HB_ET_VARIABLE )
{
/* replace the list with a simple expression
* ( EXPR ) -> EXPR
*/
HB_EXPR_PTR pExpr = pSelf;
pSelf = pSelf->value.asList.pExprList;
pExpr->value.asList.pExprList = NULL;
hb_compExprFree( pExpr, HB_COMP_PARAM );
}
pSelf = pSelf->value.asList.pExprList;
pExpr->value.asList.pExprList = NULL;
hb_compExprFree( pExpr, HB_COMP_PARAM );
}
return pSelf;
}