2017-04-20 09:14 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)

* include/hbcomp.h
  * src/compiler/hbmain.c
    * removed not longer necessary calls to hb_compExprLstDealloc()

  * src/compiler/hbcomp.c
    ! do not generate internal error when nested expression deallocation
      is activated

  * contrib/rddads/ads1.c
    ! fixed bad typo which effectively completely broke
      AdsTestRecLocks( .t. ) mode
This commit is contained in:
Przemysław Czerpak
2017-04-20 09:14:04 +02:00
parent 6a1f383282
commit 66ee94abcc
5 changed files with 19 additions and 13 deletions

View File

@@ -10,6 +10,19 @@
* Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
*/
2017-04-20 09:14 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* include/hbcomp.h
* src/compiler/hbmain.c
* removed not longer necessary calls to hb_compExprLstDealloc()
* src/compiler/hbcomp.c
! do not generate internal error when nested expression deallocation
is activated
* contrib/rddads/ads1.c
! fixed bad typo which effectively completely broke
AdsTestRecLocks( .t. ) mode
2017-04-19 18:20 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* src/common/hbdate.c
! fixed compilation with HB_TR_LEVEL_DEBUG in C mode

View File

@@ -1999,7 +1999,7 @@ static HB_ERRCODE adsDeleteRec( ADSAREAP pArea )
if( hb_ads_bTestRecLocks )
{
if( ! hb_adsCheckLock( pArea ) == HB_SUCCESS )
if( hb_adsCheckLock( pArea ) != HB_SUCCESS )
return HB_FAILURE;
}
@@ -2572,7 +2572,7 @@ static HB_ERRCODE adsPutRec( ADSAREAP pArea, const HB_BYTE * pBuffer )
if( hb_ads_bTestRecLocks )
{
if( ! hb_adsCheckLock( pArea ) == HB_SUCCESS )
if( hb_adsCheckLock( pArea ) != HB_SUCCESS )
return HB_FAILURE;
}
@@ -2622,7 +2622,7 @@ static HB_ERRCODE adsPutValue( ADSAREAP pArea, HB_USHORT uiIndex, PHB_ITEM pItem
if( hb_ads_bTestRecLocks )
{
if( ! hb_adsCheckLock( pArea ) == HB_SUCCESS )
if( hb_adsCheckLock( pArea ) != HB_SUCCESS )
return HB_FAILURE;
}
@@ -2840,7 +2840,7 @@ static HB_ERRCODE adsRecall( ADSAREAP pArea )
if( hb_ads_bTestRecLocks )
{
if( ! hb_adsCheckLock( pArea ) == HB_SUCCESS )
if( hb_adsCheckLock( pArea ) != HB_SUCCESS )
return HB_FAILURE;
}
@@ -5056,7 +5056,7 @@ static HB_ERRCODE adsPutValueFile( ADSAREAP pArea, HB_USHORT uiIndex, const char
if( hb_ads_bTestRecLocks )
{
if( ! hb_adsCheckLock( pArea ) == HB_SUCCESS )
if( hb_adsCheckLock( pArea ) != HB_SUCCESS )
return HB_FAILURE;
}

View File

@@ -251,8 +251,6 @@ extern int hb_compMainExt( int argc, const char * const argv[], HB_BYTE ** pBuf
extern void hb_compOutStd( HB_COMP_DECL, const char * szMessage );
extern void hb_compOutErr( HB_COMP_DECL, const char * szMessage );
extern void hb_compExprLstDealloc( HB_COMP_DECL );
extern PHB_EXPR hb_compExprGenStatement( PHB_EXPR, HB_COMP_DECL );
extern PHB_EXPR hb_compExprGenPush( PHB_EXPR, HB_COMP_DECL );
extern PHB_EXPR hb_compExprGenPop( PHB_EXPR, HB_COMP_DECL );

View File

@@ -82,8 +82,6 @@ static void hb_compExprDealloc( HB_COMP_DECL, PHB_EXPR pExpr )
}
hb_xfree( pExpItm );
}
else
hb_errInternal( HB_EI_ERRUNRECOV, "hb_compExprDealloc() called with an invalid pointer", NULL, NULL );
}
static PHB_EXPR hb_compExprNew( HB_COMP_DECL, HB_EXPRTYPE iType )
@@ -117,7 +115,7 @@ static void hb_compExprFree( HB_COMP_DECL, PHB_EXPR pExpr )
hb_compExprDealloc( HB_COMP_PARAM, pExpr );
}
void hb_compExprLstDealloc( HB_COMP_DECL )
static void hb_compExprLstDealloc( HB_COMP_DECL )
{
if( HB_COMP_PARAM->pExprLst )
{

View File

@@ -3801,9 +3801,6 @@ void hb_compCodeBlockRewind( HB_COMP_DECL )
/* initialize support variables */
static void hb_compInitVars( HB_COMP_DECL )
{
if( HB_COMP_PARAM->iErrorCount != 0 )
hb_compExprLstDealloc( HB_COMP_PARAM );
HB_COMP_PARAM->functions.iCount = 0;
HB_COMP_PARAM->functions.pFirst = NULL;
HB_COMP_PARAM->functions.pLast = NULL;