diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 059dbde3e7..b68918b54d 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,7 @@ +19990721-09:30 CET Eddie Runia + * source/vm/hvm.c + Copy & Paste error + 19990721-09:00 CET Jose Lalin * source/vm/hvm.c + added support for concatenation operator "-" diff --git a/harbour/source/vm/hvm.c b/harbour/source/vm/hvm.c index bcc5c80758..ccbeef4f99 100644 --- a/harbour/source/vm/hvm.c +++ b/harbour/source/vm/hvm.c @@ -1378,21 +1378,23 @@ void Minus( void ) { double dNumber1, dNumber2; long lDate1, lDate2; + PHB_ITEM pItem2 = stack.pPos - 1; + PHB_ITEM pItem1 = stack.pPos - 2; - if( IS_NUMERIC( stack.pPos - 1 ) && IS_NUMERIC( stack.pPos - 2 ) ) + if( IS_NUMERIC( pItem2 ) && IS_NUMERIC( pItem1 ) ) { WORD wDec2, wDec1; dNumber2 = PopDouble( &wDec2 ); dNumber1 = PopDouble( &wDec1 ); PushNumber( dNumber1 - dNumber2, (wDec1 > wDec2) ? wDec1 : wDec2 ); } - else if( IS_DATE( stack.pPos - 1 ) && IS_DATE( stack.pPos - 2 ) ) + else if( IS_DATE( pItem2 ) && IS_DATE( pItem1 ) ) { lDate2 = PopDate(); lDate1 = PopDate(); PushNumber( lDate1 - lDate2, hb_set.HB_SET_DECIMALS ); } - else if( IS_NUMERIC( stack.pPos - 1 ) && IS_DATE( stack.pPos - 2 ) ) + else if( IS_NUMERIC( pItem2 ) && IS_DATE( pItem1 ) ) { dNumber2 = PopNumber(); lDate1 = PopDate();