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

*** empty log message ***

Browse Source
This commit is contained in:
Viktor Szakats
1999-05-09 17:14:01 +00:00
parent 5f83bce1b9
commit afdccb99c0
7 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
harbour/ChangeLog
View File

@@ -1,3 +1,11 @@
19990509-18:00 CET Victor Szel <info@szelvesz.hu>
* source/rtl/strings.c:
hb_At() -> hb_strAt()
* source/rtl/*.c, source/include/extend.h
hb_julian2greg() -> hb_dateDecode()
hb_greg2julian() -> hb_dateEncode()
19990508-20:57 Eddie Runia
* source/rtl/arrays.c:
Fixed unreleased memory block in aEval.
@@ -76,7 +84,7 @@ Sat May 8 03:02:04 1999 Ryszard Glab <rglab@imid.med.pl>
Thu May 07 17:00:00 1999 Victor Szel <info@szelvesz.hu>
* source/rtl/strings.c:
Adapted changes by "Matthew Hamilton" <MHamilton@bunge.com.au>
Adapted changes by Matthew Hamilton <MHamilton@bunge.com.au>
Some internal functions renamed
long type changed to ULONG.

4
harbour/include/extend.h
View File

@@ -152,8 +152,8 @@ ULONG ArrayGetStringLen( PITEM pArray, ULONG ulIndex ); /* retrieves the string
int hb_itemStrCmp( PITEM pFirst, PITEM pSecond ); /* our string compare */
BOOL hb_strempty( char * szText, ULONG ulLen );
long hb_greg2julian( long lDay, long lMonth, long lYear );
void hb_julian2greg( long julian, long * plDay, long * plMonth, long * plYear );
long hb_dateEncode( long lDay, long lMonth, long lYear );
void hb_dateDecode( long julian, long * plDay, long * plMonth, long * plYear );
HARBOURFUNC GetMethod( PITEM pObject, PSYMBOL pSymMsg ); /* returns the method pointer of a object class */
char * _GetClassName( PITEM pObject ); /* retrieves an object class name */

10
harbour/source/rtl/dates.c
View File

@@ -11,7 +11,7 @@
#define _OPTIMIZE_DTOS
#endif
long hb_greg2julian( long lDay, long lMonth, long lYear )
long hb_dateEncode( long lDay, long lMonth, long lYear )
{
long lFactor = ( lMonth < 3 ) ? -1: 0;
@@ -21,7 +21,7 @@ long hb_greg2julian( long lDay, long lMonth, long lYear )
lDay - 32075;
}
void hb_julian2greg( long julian, long * plDay, long * plMonth, long * plYear )
void hb_dateDecode( long julian, long * plDay, long * plMonth, long * plYear )
{
long U, V, W, X;
@@ -299,7 +299,7 @@ HARBOUR DAY( void )
if( pDate )
{
hb_julian2greg( pDate->value.lDate, &lDay, &lMonth, &lYear );
hb_dateDecode( pDate->value.lDate, &lDay, &lMonth, &lYear );
_retni( lDay );
}
else
@@ -318,7 +318,7 @@ HARBOUR MONTH( void )
if( pDate )
{
hb_julian2greg( pDate->value.lDate, &lDay, &lMonth, &lYear );
hb_dateDecode( pDate->value.lDate, &lDay, &lMonth, &lYear );
_retni( lMonth );
}
else
@@ -337,7 +337,7 @@ HARBOUR YEAR( void )
if( pDate )
{
hb_julian2greg( pDate->value.lDate, &lDay, &lMonth, &lYear );
hb_dateDecode( pDate->value.lDate, &lDay, &lMonth, &lYear );
_retni( lYear );
}
else

6
harbour/source/rtl/extend.c
View File

@@ -110,7 +110,7 @@ char * _pards( WORD wParam, ... )
else if( IS_DATE( pItem ) )
{
hb_julian2greg( pItem->value.lDate, &lDay, &lMonth, &lYear );
hb_dateDecode( pItem->value.lDate, &lDay, &lMonth, &lYear );
stack.szDate[ 0 ] = ( lYear / 1000 ) + '0';
stack.szDate[ 1 ] = ( ( lYear % 1000 ) / 100 ) + '0';
@@ -323,7 +323,7 @@ void _retds( char * szDate ) /* szDate must have yyyymmdd format */
/* QUESTION: Is this ok ? we are going to use a long to store the date */
/* QUESTION: What happens if we use sizeof( LONG ) instead ? */
/* QUESTION: Would it break Clipper language code ? */
stack.Return.value.lDate = hb_greg2julian( lDay, lMonth, lYear );
stack.Return.value.lDate = hb_dateEncode( lDay, lMonth, lYear );
}
void _retnd( double dNumber )
@@ -450,7 +450,7 @@ void _stords( char * szDate, WORD wParam, ... ) /* szDate must have yyyymmdd for
pItemRef = stack.pItems + pItem->value.wItem;
ItemRelease( pItemRef );
pItemRef->wType = IT_DATE;
pItemRef->value.lDate = hb_greg2julian( lDay, lMonth, lYear );
pItemRef->value.lDate = hb_dateEncode( lDay, lMonth, lYear );
}
}
}

4
harbour/source/rtl/itemapi.c
View File

@@ -224,7 +224,7 @@ char *_itemGetDS( PITEM pItem, char *szDate )
if( pItem && IS_DATE(pItem) )
{
long lDay, lMonth, lYear;
hb_julian2greg(pItem->value.lDate, &lDay, &lMonth, &lYear);
hb_dateDecode(pItem->value.lDate, &lDay, &lMonth, &lYear);
szDate[ 0 ] = ( lYear / 1000 ) + '0';
szDate[ 1 ] = ( ( lYear % 1000 ) / 100 ) + '0';
@@ -314,7 +314,7 @@ PITEM _itemPutDS( PITEM pItem, char *szDate )
/* QUESTION: Is this ok ? we are going to use a long to store the date */
/* QUESTION: What happens if we use sizeof( LONG ) instead ? */
/* QUESTION: Would it break Clipper language code ? */
pItem->value.lDate = hb_greg2julian(lDay, lMonth, lYear);
pItem->value.lDate = hb_dateEncode(lDay, lMonth, lYear);
return pItem;
}

4
harbour/source/rtl/strings.c
View File

@@ -271,7 +271,7 @@ HARBOUR PADC( void )
_retc("");
}
ULONG hb_At(char *szSub, long lSubLen, char *szText, long lLen)
ULONG hb_strAt(char *szSub, long lSubLen, char *szText, long lLen)
{
if( lSubLen )
{
@@ -311,7 +311,7 @@ HARBOUR AT( void )
{
if( pText->wType == IT_STRING && pSub->wType == IT_STRING )
{
_retnl( hb_At(pSub->value.szText, pSub->wLength, pText->value.szText, pText->wLength) );
_retnl( hb_strAt(pSub->value.szText, pSub->wLength, pText->value.szText, pText->wLength) );
}
else
{

2
harbour/source/rtl/transfrm.c
View File

@@ -376,7 +376,7 @@ char *DatePicture( long lDate, int iPicFlags, long *lRetSize )
else
{
iPicFlags |= PF_ZERO; /* Pad with zeros */
hb_julian2greg( lDate, &lDay, &lMonth, &lYear );
hb_dateDecode( lDate, &lDay, &lMonth, &lYear );
/* Calculate d/m/y */
}
iLenPic = strlen( szDateFormat );