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

see changelog

Browse Source
This commit is contained in:
Eddie Runia
1999-07-21 07:44:08 +00:00
parent 7b2ce3a143
commit 3a3c805a68
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
harbour/ChangeLog
View File

@@ -1,3 +1,7 @@
19990721-09:30 CET Eddie Runia <eddie@runia>
* source/vm/hvm.c
Copy & Paste error
19990721-09:00 CET Jose Lalin
* source/vm/hvm.c
+ added support for concatenation operator "-"

8
harbour/source/vm/hvm.c
View File

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