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

2008-06-07 13:26 UTC+0100 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* contrib/hbmisc/common.mak
   * contrib/hbmisc/Makefile
   - contrib/hbmisc/mathx.c
   + contrib/hbmisc/spd.c
     - Removed math functions equivalent with CT3 ones.
       INCOMPATIBLE: If your code used CEIL() from hbmisc, please 
                     update it to use CEILING() from hbct. Functionality 
                     is the same.
     + Added _SPD() function.
       Contributed by Javier (jarabal at gmail.com)
This commit is contained in:
Viktor Szakats
2008-06-07 11:29:25 +00:00
parent 8fc9dd1a4c
commit ef452ea932
5 changed files with 360 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
harbour/ChangeLog
View File

@@ -8,6 +8,18 @@
2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
2008-06-07 13:26 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* contrib/hbmisc/common.mak
* contrib/hbmisc/Makefile
- contrib/hbmisc/mathx.c
+ contrib/hbmisc/spd.c
- Removed math functions equivalent with CT3 ones.
INCOMPATIBLE: If your code used CEIL() from hbmisc, please
update it to use CEILING() from hbct. Functionality
is the same.
+ Added _SPD() function.
Contributed by Javier (jarabal at gmail.com)
2008-06-07 09:40 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* contrib/hbcurl/hbcurl.c
% Minor opt. [RC1]

2
harbour/contrib/hbmisc/Makefile
View File

@@ -7,7 +7,7 @@ ROOT = ../../
C_SOURCES=\
dates2.c \
hb_f.c \
mathx.c \
spd.c \
strfmt.c \
stringsx.c \

2
harbour/contrib/hbmisc/common.mak
View File

@@ -9,7 +9,7 @@ LIB_PATH = $(LIB_DIR)$(LIBNAME)$(LIBEXT)
LIB_OBJS = \
$(OBJ_DIR)dates2$(OBJEXT) \
$(OBJ_DIR)hb_f$(OBJEXT) \
$(OBJ_DIR)mathx$(OBJEXT) \
$(OBJ_DIR)spd$(OBJEXT) \
$(OBJ_DIR)strfmt$(OBJEXT) \
$(OBJ_DIR)stringsx$(OBJEXT) \
\

172
harbour/contrib/hbmisc/mathx.c
View File

@@ -1,172 +0,0 @@
/*
* $Id$
*/
#include <math.h>
#include "hbapi.h"
#ifndef M_PI_2
#define M_PI_2 1.57079632679489661923
#endif
HB_FUNC( ACOS )
{
if( hb_pcount() > 0 )
{
double dNumber = hb_parnd(1);
if( dNumber >= -1 && dNumber <= 1 )
hb_retnd( acos(dNumber) );
else
/* TODO: Error or return NAN */
hb_retnd(0);
}
else
/* TODO: Error or return NAN */
hb_retnd(0);
}
HB_FUNC( ASIN )
{
if( hb_pcount() > 0 )
{
double dNumber = hb_parnd(1);
if( dNumber >= -1 && dNumber <= 1 )
hb_retnd( asin(dNumber) );
else
/* TODO: Error or return NAN */
hb_retnd(0);
}
else
/* TODO: Error or return NAN */
hb_retnd(0);
}
HB_FUNC( ATAN )
{
if( hb_pcount() > 0 )
{
double dNumber = hb_parnd(1);
if( dNumber >= -M_PI_2 && dNumber <= M_PI_2 )
hb_retnd( atan(dNumber) );
else
/* TODO: Error or return NAN */
hb_retnd(0);
}
else
/* TODO: Error or return NAN */
hb_retnd(0);
}
HB_FUNC( COS )
{
if( hb_pcount() > 0 )
{
hb_retnd( cos( hb_parnd(1) ) );
}
else
/* TODO: Error or return NAN */
hb_retnd(0);
}
HB_FUNC( COSH )
{
if( hb_pcount() > 0 )
{
hb_retnd( cosh( hb_parnd(1) ) );
}
else
/* TODO: Error or return NAN */
hb_retnd(0);
}
HB_FUNC( LOG10 )
{
if( hb_pcount() > 0 )
{
hb_retnd( log10( hb_parnd(1) ) );
}
else
/* TODO: Error or return NAN */
hb_retnd(0);
}
HB_FUNC( SIN )
{
if( hb_pcount() > 0 )
{
hb_retnd( sin( hb_parnd(1) ) );
}
else
/* TODO: Error or return NAN */
hb_retnd(0);
}
HB_FUNC( SINH )
{
if( hb_pcount() > 0 )
{
hb_retnd( sinh( hb_parnd(1) ) );
}
else
/* TODO: Error or return NAN */
hb_retnd(0);
}
HB_FUNC( TAN )
{
if( hb_pcount() > 0 )
{
hb_retnd( tan( hb_parnd(1) ) );
}
else
/* TODO: Error or return NAN */
hb_retnd(0);
}
HB_FUNC( TANH )
{
if( hb_pcount() > 0 )
{
hb_retnd( tanh( hb_parnd(1) ) );
}
else
/* TODO: Error or return NAN */
hb_retnd(0);
}
HB_FUNC( PI )
{
hb_retnd( 3.141592653589793 );
}
HB_FUNC( CEIL )
{
if( ISNUM( 1 ) )
hb_retnd( ceil( hb_parnd( 1 ) ) );
else
/* TODO: Error or return NAN */
hb_retnd( 0 );
}
HB_FUNC( FLOOR )
{
if( ISNUM( 1 ) )
hb_retnd( floor( hb_parnd( 1 ) ) );
else
/* TODO: Error or return NAN */
hb_retnd( 0 );
}
HB_FUNC( FRACTION )
{
if( ISNUM( 1 ) )
hb_retnd( hb_parnd( 1 ) - hb_parnl( 1 ) );
else
/* TODO: Error or return NAN */
hb_retnd( 0 );
}

346
harbour/contrib/hbmisc/spd.c Normal file
View File

@@ -0,0 +1,346 @@
/*
* $Id$
*/
/*
* Harbour Project source code:
* _SPD() function
*
* Copyright 2008 Xavi <jarabal at gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
* Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/).
*
* As a special exception, the Harbour Project gives permission for
* additional uses of the text contained in its release of Harbour.
*
* The exception is that, if you link the Harbour libraries with other
* files to produce an executable, this does not by itself cause the
* resulting executable to be covered by the GNU General Public License.
* Your use of that executable is in no way restricted on account of
* linking the Harbour library code into it.
*
* This exception does not however invalidate any other reasons why
* the executable file might be covered by the GNU General Public License.
*
* This exception applies only to the code released by the Harbour
* Project under the name Harbour. If you copy code from other
* Harbour Project or Free Software Foundation releases into a copy of
* Harbour, as the General Public License permits, the exception does
* not apply to the code that you add in this way. To avoid misleading
* anyone as to the status of such modified files, you must delete
* this exception notice from them.
*
* If you write modifications of your own for Harbour, it is your choice
* whether to permit this exception to apply to your modifications.
* If you do not wish that, delete this exception notice.
*
*/
#include "hbapi.h"
#include "hbapiitm.h"
#include "hbapierr.h"
#include "hbdate.h"
#define DK_INCRES 1024
#define DK_INCBUF 512
#define DK_BLKBUF HB_MAX_DOUBLE_LENGTH /* Expense of DK_INCBUF */
static ULONG SCItm( char *cBuffer, char *cParFrm, int iCOut, int IsIndW, int iIndWidth, int IsIndP, int iIndPrec, PHB_ITEM pItmPar )
{
ULONG s = 0;
if( IsIndW && IsIndP ){
switch( iCOut ){
case 'p':
s = sprintf( cBuffer, cParFrm, iIndWidth, iIndPrec, hb_itemGetPtr( pItmPar ) );
break;
case 's': case 'S':
s = sprintf( cBuffer, cParFrm, iIndWidth, iIndPrec, hb_itemGetCPtr( pItmPar ) );
break;
case 'e': case 'E': case 'f': case 'g': case 'G': case 'a': case 'A':
s = sprintf( cBuffer, cParFrm, iIndWidth, iIndPrec, hb_itemGetND( pItmPar ) );
break;
case 'c': case 'C': case 'd': case 'i': case 'o': case 'u': case 'x': case 'X':
s = sprintf( cBuffer, cParFrm, iIndWidth, iIndPrec, (HB_IS_LONG( pItmPar ) ? hb_itemGetNL( pItmPar ) : hb_itemGetNI( pItmPar )) );
}
}else if( IsIndW || IsIndP ){
int iInd = (IsIndW ? iIndWidth : iIndPrec);
switch( iCOut ){
case 'p':
s = sprintf( cBuffer, cParFrm, iInd, hb_itemGetPtr( pItmPar ) );
break;
case 's': case 'S':
s = sprintf( cBuffer, cParFrm, iInd, hb_itemGetCPtr( pItmPar ) );
break;
case 'e': case 'E': case 'f': case 'g': case 'G': case 'a': case 'A':
s = sprintf( cBuffer, cParFrm, iInd, hb_itemGetND( pItmPar ) );
break;
case 'c': case 'C': case 'd': case 'i': case 'o': case 'u': case 'x': case 'X':
s = sprintf( cBuffer, cParFrm, iInd, (HB_IS_LONG( pItmPar ) ? hb_itemGetNL( pItmPar ) : hb_itemGetNI( pItmPar )) );
}
}else{
switch( iCOut ){
case 'p':
s = sprintf( cBuffer, cParFrm, hb_itemGetPtr( pItmPar ) );
break;
case 's': case 'S':
s = sprintf( cBuffer, cParFrm, hb_itemGetCPtr( pItmPar ) );
break;
case 'e': case 'E': case 'f': case 'g': case 'G': case 'a': case 'A':
s = sprintf( cBuffer, cParFrm, hb_itemGetND( pItmPar ) );
break;
case 'c': case 'C': case 'd': case 'i': case 'o': case 'u': case 'x': case 'X':
s = sprintf( cBuffer, cParFrm, (HB_IS_LONG( pItmPar ) ? hb_itemGetNL( pItmPar ) : hb_itemGetNI( pItmPar )) );
}
}
return s;
}
/*******************************************************************************
* ANSI C sprintf() for ANSI SQL with DATE, DATETIME, LOGICAL, NIL, NUMERIC
* ------------------------------------------------------------------------
* cRes := _SPD( cFrm, ... )
* cFrm : %s for DATE = YYYY-MM-DD, DATETIME = YYYY-MM-DD HH:MM:SS
* %s for LOGICAL = TRUE | FALSE, %d for LOGICAL = 1 | 0
* %s for NIL or HB_IT_NULL = NULL
* %s is also for NUMERIC
* NOTE .-
* Accepts conversion inside if variable is passed by reference.
* Local xDate := Date(); _SPD('%s', @xDate) => xDate == '2008-05-19'
*
* TODO: Support in format % for $.
*
*******************************************************************************/
HB_FUNC( _SPD )
{
char *cItmFrm;
ULONG ulItmFrm;
int argc = hb_pcount() - 1;
PHB_ITEM pItmFrm = hb_param( 1, HB_IT_STRING );
if( !pItmFrm || (cItmFrm = hb_itemGetCPtr( pItmFrm )) == NULL ){
hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, "_SPD", 1, hb_paramError( 1 ) );
}else if( !(ulItmFrm = hb_itemGetCLen( pItmFrm )) ){
hb_retclen( NULL, 0 );
}else if( !argc ){
hb_retclen( cItmFrm, ulItmFrm );
}else{
PHB_ITEM pItmPar;
char *cRes, *cBuffer, *cParFrm, *c;
int p, iCOut, IsIndW, IsIndP, iIndWidth, iIndPrec, iErrorPar = 0;
ULONG s, f, i, ulWidth, ulParPos = 0, ulResPos = 0, ulMaxBuf = DK_INCBUF, ulMaxRes = DK_INCRES;
static char cToken[] = "scdiouxXaAeEfgGpnSC";
cRes = (char *)hb_xgrab( ulMaxRes );
cBuffer = (char *)hb_xgrab( ulMaxBuf );
cParFrm = (char *)hb_xgrab( ulItmFrm + sizeof(char) );
for( p = 0; p < argc; p++ ){
c = cItmFrm + ulParPos;
f = i = ulWidth = iCOut = IsIndW = IsIndP = 0;
do{ /* Get Par Format */
if( f && *c == '%' ){
f = ulWidth = IsIndW = IsIndP = 0;
}else if( f == 1 && !ulWidth && *c >= '0' && *c <= '9' ){
ulWidth = atol( c );
}else if( f && *c == '.' ){
if( f++ == 2 ) iErrorPar = 1;
}else if( f && *c == '*' ){
if( f == 2 ){
if( IsIndP ){
f = 3; iErrorPar = 1;
}else{
IsIndP = 1;
}
}else if( !IsIndW ){
ulWidth = IsIndW = 1;
}else{
f = 3; iErrorPar = 1;
}
}else if( f && *c == '$' ){
f = 3; iErrorPar = 1; /* TO DO */
}else if( f && strchr(cToken, *c) ){
f = 3; iCOut = *c;
}else if( *c == '%' ){
f = 1;
}
cParFrm[i++] = *c++;
}while( f < 3 && *c ); cParFrm[i] = '\0';
if( iErrorPar ) break;
if( IsIndW ){ /* Get Par Indirectly Width Item */
pItmPar = hb_param( p + 2, HB_IT_INTEGER );
if( pItmPar ){
if( (iIndWidth = hb_itemGetNI( pItmPar )) < 0 ){
ulWidth = -iIndWidth;
}else{
ulWidth = iIndWidth;
}
}else{
iErrorPar = 1; break;
}
p++;
}
if( IsIndP ){ /* Get Par Indirectly Precision Item */
pItmPar = hb_param( p + 2, HB_IT_INTEGER );
if( pItmPar ){
iIndPrec = hb_itemGetNI( pItmPar );
}else{
iErrorPar = 1; break;
}
p++;
}
if( *c && p == argc - 1 ){ /* No more Par Items */
do{ cParFrm[i++] = *c; }while( *c++ ); i--;
} /* i == strlen(cParFrm) */
pItmPar = hb_param( p + 2, HB_IT_ANY ); /* Get Par Item */
if( !pItmPar ){
iErrorPar = 1; break;
}
if( !iCOut || iCOut == 'n' ){ /* Par Text Out */
for( f = i, i = 0; i < f; i++ ){ /* Change %% with % */
if( cParFrm[i] == '%' && cParFrm[i + 1] == '%' ){
memcpy( cParFrm + i, cParFrm + i + 1, f - i );
f--;
}
} /* i == strlen(cParFrm) */
if( iCOut ){
for( f = 0; f < i; f++ ){ /* Erase %n */
if( cParFrm[f] == '%' && cParFrm[f + 1] == 'n' ){
memcpy( cParFrm + f, cParFrm + f + 2, i - f - 1 );
break;
}
} /* f == Index % of n */
if( f < i ){
i -= 2; /* i == strlen(cParFrm) */
hb_itemPutNL( pItmPar, ulResPos + f );
}else{
iErrorPar = 1; break;
}
}
if( (f = i + sizeof(char)) > ulMaxBuf ){
ulMaxBuf += f + DK_INCBUF;
cBuffer = (char *)hb_xrealloc( cBuffer, ulMaxBuf );
}
strcpy( cBuffer, cParFrm ); s = i;
}else{ /* Par Item sprintf() Out */
# ifdef HB_IT_NULL
if( (HB_IS_NIL( pItmPar ) || HB_IS_NULL( pItmPar )) && iCOut == 's' ){
# else
if( HB_IS_NIL( pItmPar ) && iCOut == 's' ){
# endif
if( (f = i + HB_MAX(ulWidth, 5)) > ulMaxBuf ){
ulMaxBuf += f + DK_INCBUF; /* size of "NULL" == 5 */
cBuffer = (char *)hb_xrealloc( cBuffer, ulMaxBuf );
}
hb_itemPutCL( pItmPar, "NULL", 4 );
s = SCItm( cBuffer, cParFrm, iCOut, IsIndW, iIndWidth, IsIndP, iIndPrec, pItmPar );
}else if( HB_IS_STRING( pItmPar ) && (iCOut == 's' || iCOut == 'S') ){
f = hb_itemGetCLen( pItmPar );
if( (f = i + HB_MAX(ulWidth, f)) > ulMaxBuf ){
ulMaxBuf += f + DK_INCBUF;
cBuffer = (char *)hb_xrealloc( cBuffer, ulMaxBuf );
}
s = SCItm( cBuffer, cParFrm, iCOut, IsIndW, iIndWidth, IsIndP, iIndPrec, pItmPar );
}else if( HB_IS_DATE( pItmPar ) && iCOut == 's' ){
char cDTBuf[ 19 ], cDTFrm[ 26 ];
# ifdef __XHARBOUR__
if( HB_IS_DATETIME( pItmPar ) ){
hb_datetimeFormat( hb_itemGetDTS( pItmPar, cDTBuf ), cDTFrm, "YYYY-MM-DD", "HH:MM:SS" );
}else
# endif
hb_dateFormat( hb_itemGetDS( pItmPar, cDTBuf ), cDTFrm, "YYYY-MM-DD" );
if( (f = i + HB_MAX(ulWidth, 26)) > ulMaxBuf ){
ulMaxBuf += f + DK_INCBUF;
cBuffer = (char *)hb_xrealloc( cBuffer, ulMaxBuf );
}
hb_itemPutC( pItmPar, cDTFrm );
s = SCItm( cBuffer, cParFrm, iCOut, IsIndW, iIndWidth, IsIndP, iIndPrec, pItmPar );
}else if( HB_IS_LOGICAL( pItmPar ) ){
if( (f = i + (iCOut == 's' ? HB_MAX(ulWidth, 6) : HB_MAX(ulWidth, DK_BLKBUF))) > ulMaxBuf ){
ulMaxBuf += f + DK_INCBUF; /* size of "FALSE" == 6 */
cBuffer = (char *)hb_xrealloc( cBuffer, ulMaxBuf );
}
if( iCOut == 's' ){
hb_itemPutC( pItmPar, (hb_itemGetL( pItmPar ) ? "TRUE" : "FALSE") );
}
s = SCItm( cBuffer, cParFrm, iCOut, IsIndW, iIndWidth, IsIndP, iIndPrec, pItmPar );
}else if( iCOut == 's' ){
char *cTrimStr, *cStr = hb_itemStr( pItmPar, NULL, NULL );
if( cStr ){
f = strlen( cStr ); cTrimStr = hb_strLTrim( cStr, &f );
if( (f = i + HB_MAX(ulWidth, f)) > ulMaxBuf ){
ulMaxBuf += f + DK_INCBUF;
cBuffer = (char *)hb_xrealloc( cBuffer, ulMaxBuf );
}
hb_itemPutCL( pItmPar, cTrimStr, f );
s = SCItm( cBuffer, cParFrm, iCOut, IsIndW, iIndWidth, IsIndP, iIndPrec, pItmPar );
hb_xfree( cStr );
}else{
iErrorPar = p + 2; break;
}
}else if( HB_IS_NUMERIC( pItmPar ) || HB_IS_POINTER( pItmPar ) ){
if( (f = i + HB_MAX(ulWidth, DK_BLKBUF)) > ulMaxBuf ){
ulMaxBuf += f + DK_INCBUF;
cBuffer = (char *)hb_xrealloc( cBuffer, ulMaxBuf );
}
s = SCItm( cBuffer, cParFrm, iCOut, IsIndW, iIndWidth, IsIndP, iIndPrec, pItmPar );
}else{
iErrorPar = p + 2; break;
}
}
if( (f = s + ulResPos + sizeof(char)) > ulMaxRes ){
ulMaxRes += f + DK_INCRES;
cRes = (char *)hb_xrealloc( cRes, ulMaxRes );
}
strcpy( cRes + ulResPos, cBuffer ); ulResPos += s;
if( (ulParPos = c - cItmFrm) >= ulItmFrm ){
break; /* No more Par Format */
}
}
hb_xfree( cParFrm );
hb_xfree( cBuffer );
if( iErrorPar ){
hb_xfree( cRes );
if( iErrorPar > 1 ){
hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, "_SPD", 2, hb_paramError( 1 ), hb_paramError( iErrorPar ) );
}else{
hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, "_SPD", 1, hb_paramError( 1 ) );
}
}else{
hb_retclen_buffer( cRes, ulResPos );
}
}
}