* contrib/hbxbp/hbxbp.hbc
+ Added gtgui as default GT on win/wce systems.
* include/extend.api
* include/hbsetup.ch
* include/hbapi.h
+ Added new HB_LEGACY_LEVEL3 macro to wrap legacy
constructs to be deprecated in the next major release.
Currently legacy IS*() parameter type checking macros
are marked as such, ones present in CA-Cl*pper retained
in extend.api even when this macro off.
; NOTE: It's recommended for 3rd party developers to
start using new HB_IS*() macros. They work
the same as Clipper compatible IS*() macros,
but got a HB_ prefix: ISNUM( 1 ) -> HB_ISNUM( 1 )
(not to be confused with HB_IS_*() macros which
accept a PHB_ITEM)
Here's a little batch which helps this process:
---
gsar -o -s:x20ISNUM( -r:x20HB_ISNUM( *.c *.cpp
gsar -o -s:x20ISCHAR( -r:x20HB_ISCHAR( *.c *.cpp
gsar -o -s:x20ISLOG( -r:x20HB_ISLOG( *.c *.cpp
gsar -o -s:x20ISARRAY( -r:x20HB_ISARRAY( *.c *.cpp
gsar -o -s:x20ISBYREF( -r:x20HB_ISBYREF( *.c *.cpp
gsar -o -s:x20ISDATE( -r:x20HB_ISDATE( *.c *.cpp
gsar -o -s:x20ISDATETIME( -r:x20HB_ISDATETIME( *.c *.cpp
gsar -o -s:x20ISNIL( -r:x20HB_ISNIL( *.c *.cpp
gsar -o -s:x20ISTIMESTAMP( -r:x20HB_ISTIMESTAMP( *.c *.cpp
gsar -o -s:x20ISBLOCK( -r:x20HB_ISBLOCK( *.c *.cpp
gsar -o -s:x20ISPOINTER( -r:x20HB_ISPOINTER( *.c *.cpp
gsar -o -s:x20ISSYMBOL( -r:x20HB_ISSYMBOL( *.c *.cpp
gsar -o -s:x20ISOBJECT( -r:x20HB_ISOBJECT( *.c *.cpp
gsar -o -s:x20ISHASH( -r:x20HB_ISHASH( *.c *.cpp
gsar -o -s!ISNUM( -r!HB_ISNUM( *.c *.cpp
gsar -o -s!ISCHAR( -r!HB_ISCHAR( *.c *.cpp
gsar -o -s!ISLOG( -r!HB_ISLOG( *.c *.cpp
gsar -o -s!ISARRAY( -r!HB_ISARRAY( *.c *.cpp
gsar -o -s!ISBYREF( -r!HB_ISBYREF( *.c *.cpp
gsar -o -s!ISDATE( -r!HB_ISDATE( *.c *.cpp
gsar -o -s!ISDATETIME( -r!HB_ISDATETIME( *.c *.cpp
gsar -o -s!ISNIL( -r!HB_ISNIL( *.c *.cpp
gsar -o -s!ISTIMESTAMP( -r!HB_ISTIMESTAMP( *.c *.cpp
gsar -o -s!ISBLOCK( -r!HB_ISBLOCK( *.c *.cpp
gsar -o -s!ISPOINTER( -r!HB_ISPOINTER( *.c *.cpp
gsar -o -s!ISSYMBOL( -r!HB_ISSYMBOL( *.c *.cpp
gsar -o -s!ISOBJECT( -r!HB_ISOBJECT( *.c *.cpp
gsar -o -s!ISHASH( -r!HB_ISHASH( *.c *.cpp
---
* source/rtl/hbinet.c
* Formatting.
% Minor optimizations.
* source/debug/dbgentry.c
* source/rdd/dbcmd.c
* source/rdd/dbcmd53.c
* source/rdd/dbcmdx.c
* source/rdd/dbdetach.c
* source/rdd/dbsql.c
* source/rdd/hbsix/sxfname.c
* source/rdd/hbsix/sxord.c
* source/rdd/hbsix/sxtable.c
* source/rdd/usrrdd/usrrdd.c
* source/rtl/at.c
* source/rtl/box.c
* source/rtl/cdpapi.c
* source/rtl/chrasc.c
* source/rtl/colorind.c
* source/rtl/console.c
* source/rtl/copyfile.c
* source/rtl/dateshb.c
* source/rtl/dirdrive.c
* source/rtl/diskspac.c
* source/rtl/disksphb.c
* source/rtl/errapi.c
* source/rtl/filesys.c
* source/rtl/fscopy.c
* source/rtl/fssize.c
* source/rtl/fstemp.c
* source/rtl/gete.c
* source/rtl/gtfunc.c
* source/rtl/gx.c
* source/rtl/hbbit.c
* source/rtl/hbgtcore.c
* source/rtl/hbhex.c
* source/rtl/hbi18n1.c
* source/rtl/hbinet.c
* source/rtl/hbprocfn.c
* source/rtl/hbrandom.c
* source/rtl/hbregex.c
* source/rtl/hbstrsh.c
* source/rtl/hbtoken.c
* source/rtl/hbzlib.c
* source/rtl/hbzlibgz.c
* source/rtl/inkey.c
* source/rtl/itemseri.c
* source/rtl/left.c
* source/rtl/math.c
* source/rtl/maxrow.c
* source/rtl/mlcfunc.c
* source/rtl/mouse53.c
* source/rtl/mousex.c
* source/rtl/mtran.c
* source/rtl/natmsg.c
* source/rtl/padc.c
* source/rtl/padl.c
* source/rtl/padr.c
* source/rtl/philes.c
* source/rtl/philes53.c
* source/rtl/rat.c
* source/rtl/replic.c
* source/rtl/right.c
* source/rtl/round.c
* source/rtl/run.c
* source/rtl/saverest.c
* source/rtl/scroll.c
* source/rtl/setcolor.c
* source/rtl/setcurs.c
* source/rtl/setpos.c
* source/rtl/shadow.c
* source/rtl/strc.c
* source/rtl/strmatch.c
* source/rtl/strpeek.c
* source/rtl/strtoexp.c
* source/rtl/strtran.c
* source/rtl/stuff.c
* source/rtl/substr.c
* source/rtl/tone.c
* source/rtl/trace.c
* source/rtl/transfrm.c
* source/rtl/valtype.c
* source/rtl/word.c
* source/vm/arrayshb.c
* source/vm/asort.c
* source/vm/classes.c
* source/vm/cmdarg.c
* source/vm/eval.c
* source/vm/hashfunc.c
* source/vm/hvm.c
* source/vm/memvars.c
* source/vm/proc.c
* source/vm/thread.c
* IS*() -> HB_IS*() macro rename.
(pass 1 - sf.net SVN works badly today, so I've split
the commit to raise the chances of a successfully
finished one)
239 lines
6.1 KiB
C
239 lines
6.1 KiB
C
/*
|
|
* $Id$
|
|
*/
|
|
|
|
/*
|
|
* Harbour Project source code:
|
|
* HB_NUMTOHEX()
|
|
* HB_HEXTONUM()
|
|
*
|
|
* Copyright 2007 Przemyslaw Czerpak <druzus / at / priv.onet.pl>
|
|
* www - http://www.harbour-project.org
|
|
*
|
|
* 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 "hbapierr.h"
|
|
|
|
HB_FUNC( HB_HEXTONUM )
|
|
{
|
|
char * szHex = hb_parc( 1 );
|
|
|
|
if( szHex )
|
|
{
|
|
HB_ULONG ulNum = 0;
|
|
|
|
while( *szHex == ' ' ) szHex++;
|
|
while( *szHex )
|
|
{
|
|
int iDigit;
|
|
char c = *szHex++;
|
|
if( c >= '0' && c <= '9' )
|
|
iDigit = c - '0';
|
|
else if( c >= 'A' && c <= 'F' )
|
|
iDigit = c - ( 'A' - 10 );
|
|
else if( c >= 'a' && c <= 'f' )
|
|
iDigit = c - ( 'a' - 10 );
|
|
else
|
|
{
|
|
ulNum = 0;
|
|
break;
|
|
}
|
|
ulNum = ( ulNum << 4 ) + iDigit;
|
|
}
|
|
hb_retnint( ulNum );
|
|
}
|
|
else
|
|
hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
|
}
|
|
|
|
HB_FUNC( HB_NUMTOHEX )
|
|
{
|
|
HB_ULONG ulNum;
|
|
int iLen;
|
|
BOOL fDefaultLen;
|
|
char ret[ 33 ];
|
|
|
|
if( HB_ISNUM( 2 ) )
|
|
{
|
|
iLen = hb_parni( 2 );
|
|
iLen = ( iLen < 1 ) ? 1 : ( ( iLen > 32 ) ? 32 : iLen );
|
|
fDefaultLen = 0;
|
|
}
|
|
else
|
|
{
|
|
iLen = 32;
|
|
fDefaultLen = 1;
|
|
}
|
|
|
|
if( HB_ISNUM( 1 ) )
|
|
ulNum = hb_parnint( 1 );
|
|
else if( HB_ISPOINTER( 1 ) )
|
|
ulNum = ( HB_PTRDIFF ) hb_parptr( 1 );
|
|
else
|
|
{
|
|
hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
|
return;
|
|
}
|
|
|
|
ret[ iLen ] = '\0';
|
|
do
|
|
{
|
|
int iDigit = ( int ) ( ulNum & 0x0F );
|
|
ret[ --iLen ] = ( char ) ( iDigit + ( iDigit < 10 ? '0' : 'A' - 10 ) );
|
|
ulNum >>= 4;
|
|
}
|
|
while( fDefaultLen ? ulNum != 0 : iLen != 0 );
|
|
|
|
hb_retc( &ret[ iLen ] );
|
|
}
|
|
|
|
HB_FUNC( HB_STRTOHEX )
|
|
{
|
|
const char * szStr = hb_parc( 1 ), * szSep = "";
|
|
ULONG ulStr, ulSep = 0;
|
|
|
|
if( hb_pcount() > 1 )
|
|
{
|
|
szSep = hb_parc( 2 );
|
|
ulSep = hb_parclen( 2 );
|
|
}
|
|
|
|
if( !szStr || !szSep )
|
|
{
|
|
hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
|
return;
|
|
}
|
|
|
|
ulStr = hb_parclen( 1 );
|
|
if( ulStr )
|
|
{
|
|
ULONG ulDest = ( ulStr << 1 ) + ( ulStr - 1 ) * ulSep;
|
|
char * szDest, * szPtr;
|
|
|
|
szPtr = szDest = ( char * ) hb_xgrab( ulDest + 1 );
|
|
do
|
|
{
|
|
UCHAR uc = ( UCHAR ) *szStr++, ud;
|
|
ud = uc >> 4;
|
|
*szPtr++ = ud + ( ud < 10 ? '0' : 'A' - 10 );
|
|
ud = uc & 0x0F;
|
|
*szPtr++ = ud + ( ud < 10 ? '0' : 'A' - 10 );
|
|
if( --ulStr && ulSep )
|
|
{
|
|
memcpy( szPtr, szSep, ulSep );
|
|
szPtr += ulSep;
|
|
}
|
|
}
|
|
while( ulStr );
|
|
hb_retclen_buffer( szDest, ulDest );
|
|
}
|
|
else
|
|
hb_retc( NULL );
|
|
}
|
|
|
|
HB_FUNC( HB_HEXTOSTR )
|
|
{
|
|
char * szStr = hb_parc( 1 );
|
|
ULONG ulStr;
|
|
|
|
if( !szStr )
|
|
{
|
|
hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
|
return;
|
|
}
|
|
|
|
ulStr = hb_parclen( 1 );
|
|
if( ulStr > 1 )
|
|
{
|
|
ULONG ulDest, ul;
|
|
char * szDest;
|
|
|
|
szDest = szStr;
|
|
ul = ulStr;
|
|
ulDest = 0;
|
|
do
|
|
{
|
|
char c = *szDest++;
|
|
if( ( c >= '0' && c <= '9' ) ||
|
|
( c >= 'A' && c <= 'F' ) ||
|
|
( c >= 'a' && c <= 'f' ) )
|
|
++ulDest;
|
|
}
|
|
while( --ul );
|
|
|
|
ulDest >>= 1;
|
|
if( ulDest )
|
|
{
|
|
int iVal = 0x10;
|
|
|
|
szDest = ( char * ) hb_xgrab( ulDest + 1 );
|
|
/* ul = 0; see above stop condition */
|
|
do
|
|
{
|
|
char c = *szStr++;
|
|
if( c >= '0' && c <= '9' )
|
|
iVal += c - '0';
|
|
else if( c >= 'A' && c <= 'F' )
|
|
iVal += c - ( 'A' - 10 );
|
|
else if( c >= 'a' && c <= 'f' )
|
|
iVal += c - ( 'a' - 10 );
|
|
else
|
|
continue;
|
|
|
|
if( iVal & 0x100 )
|
|
{
|
|
szDest[ul++] = ( char ) iVal & 0xff;
|
|
iVal = 0x1;
|
|
}
|
|
iVal <<= 4;
|
|
}
|
|
while( --ulStr );
|
|
|
|
hb_retclen_buffer( szDest, ulDest );
|
|
return;
|
|
}
|
|
}
|
|
|
|
hb_retc( NULL );
|
|
}
|