2012-11-16 14:53 UTC+0100 Viktor Szakats (harbour syenar.net)

+ contrib/xhb/xhbctbit.c
  * contrib/xhb/xhb.hbp
  * contrib/xhb/xhb.hbx
    + implemented NUM*X() function from xhb, which
      are there present in CT lib as extensions. In
      Harbour they are in xhb lib.
      Adapted types, missing functions, some cleanups 
      and uncrustify.
This commit is contained in:
Viktor Szakats
2012-11-16 13:54:48 +00:00
parent ff386300ed
commit 7cafb2d6ff
4 changed files with 362 additions and 0 deletions

View File

@@ -16,6 +16,16 @@
The license applies to all entries newer than 2009-04-28.
*/
2012-11-16 14:53 UTC+0100 Viktor Szakats (harbour syenar.net)
+ contrib/xhb/xhbctbit.c
* contrib/xhb/xhb.hbp
* contrib/xhb/xhb.hbx
+ implemented NUM*X() function from xhb, which
are there present in CT lib as extensions. In
Harbour they are in xhb lib.
Adapted types, missing functions, some cleanups
and uncrustify.
2012-11-16 14:12 UTC+0100 Viktor Szakats (harbour syenar.net)
* extras/hbvpdf/hbvpdf.hbx
+ camelcased

View File

@@ -44,6 +44,7 @@ xhbarr.c
xhbarrex.c
xhbat.c
xhbcopyf.c
xhbctbit.c
xhbdate.c
xhbenum.c
xhberrc.c

View File

@@ -323,7 +323,13 @@ DYNAMIC NetRecall
DYNAMIC NetRecLock
DYNAMIC Notify
DYNAMIC NotifyAll
DYNAMIC NumAndX
DYNAMIC NumMirrX
DYNAMIC NumNotX
DYNAMIC NumOrX
DYNAMIC NumRolX
DYNAMIC NumToHex
DYNAMIC NumXorX
DYNAMIC Ole2txtError
DYNAMIC OleError
DYNAMIC os_IsWin2000

View File

@@ -0,0 +1,345 @@
/*
* $Id$
*/
/*
* Harbour Project source code:
* CT3 Number and bit manipulation functions: - NUMANDX()
* - NUMORX()
* - NUMXORX()
* - NUMNOTX()
* - NUMROLX()
* - NUMMIRRX()
*
* Copyright 2001 Walter Negro - FOEESITRA" <waltern@foeesitra.org.ar>
* 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"
static HB_LONG __getparam( int iParam );
static HB_LONG __numand( HB_LONG wNum1, HB_LONG wNum2 );
static HB_LONG __numor( HB_LONG wNum1, HB_LONG wNum2 );
static HB_LONG __numxor( HB_LONG wNum1, HB_LONG wNum2 );
static HB_LONG __numnot( HB_LONG wNum1, HB_LONG wNum2 );
static HB_LONG __numfun( int iPCount, HB_LONG ( * operation )( HB_LONG wNum1, HB_LONG wNum2 ), HB_BOOL * pbOk );
static void sizeofbits( HB_USHORT * pusBytes, HB_LONG * plPattern, HB_LONG * plTestMSB );
HB_ULONG hb_hextonum( const char * cHex )
{
HB_ULONG ulNum = 0;
char c;
int iDigit;
while( *cHex && *cHex == ' ' )
cHex++;
while( *cHex )
{
ulNum <<= 4;
c = *cHex;
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 += iDigit;
cHex++;
}
return ulNum;
}
HB_FUNC( NUMANDX )
{
int iPCount;
HB_LONG lNumOp;
HB_BOOL bOk;
iPCount = hb_pcount();
lNumOp = __numfun( iPCount, ( HB_LONG ( * )( HB_LONG wNum1, HB_LONG wNum2 ) )( __numand ), &bOk );
if( bOk )
hb_retnl( lNumOp );
else
hb_ret();
}
HB_FUNC( NUMORX )
{
int iPCount;
HB_LONG lNumOp;
HB_BOOL bOk;
iPCount = hb_pcount();
lNumOp = __numfun( iPCount, ( HB_LONG ( * )( HB_LONG wNum1, HB_LONG wNum2 ) )( __numor ), &bOk );
if( bOk )
hb_retnl( lNumOp );
else
hb_ret();
}
HB_FUNC( NUMXORX )
{
int iPCount;
HB_LONG lNumOp;
HB_BOOL bOk;
iPCount = 3;
lNumOp = __numfun( iPCount, ( HB_LONG ( * )( HB_LONG wNum1, HB_LONG wNum2 ) )( __numxor ), &bOk );
if( bOk )
hb_retnl( lNumOp );
else
hb_ret();
}
HB_FUNC( NUMNOTX )
{
int iPCount;
HB_LONG lNumOp;
HB_BOOL bOk;
iPCount = 2;
lNumOp = __numfun( iPCount, ( HB_LONG ( * )( HB_LONG wNum1, HB_LONG wNum2 ) )( __numnot ), &bOk );
if( bOk )
hb_retnl( lNumOp );
else
hb_ret();
}
HB_FUNC( NUMROLX )
{
HB_LONG lNum1, lNumBak, lPattern, lTestRol;
HB_USHORT usBytes, usFor, usNum2;
if( HB_ISNUM( 2 ) || HB_ISCHAR( 2 ) )
{
lNum1 = __getparam( 2 ); /* Number to do ROL */
usNum2 = ( HB_USHORT ) __getparam( 3 ); /* Iterations */
sizeofbits( &usBytes, &lPattern, &lTestRol );
usNum2 = usNum2 % usBytes; /* Set usNum2 < usBytes */
lNumBak = lNum1 & lPattern; /* lNumBak contain the section
to doesn't ROL */
for( usFor = 1; usFor <= usNum2; usFor++ )
{
if( lNum1 & lTestRol ) /* Test if MSB is ON */
{
lNum1 = lNum1 << 1;
lNum1 = lNum1 | 1; /* Simulate that the MSB move to LSB */
}
else
lNum1 = lNum1 << 1;
}
/* Set the section not ROLed */
lNum1 = ( lNum1 & ( ~lPattern ) ) | lNumBak;
hb_retnl( lNum1 );
}
else
hb_ret();
}
HB_FUNC( NUMMIRRX )
{
HB_LONG lNum1, lPattern, lTestMSB, lNumBak, lMirror = 0;
HB_USHORT usBytes, usFor;
if( HB_ISNUM( 2 ) || HB_ISCHAR( 2 ) )
{
lNum1 = __getparam( 2 );
sizeofbits( &usBytes, &lPattern, &lTestMSB );
lNumBak = lNum1 & lPattern;
for( usFor = 1; usFor <= usBytes; usFor++ )
{
if( lNum1 & 1 )
{
lMirror = lMirror << 1; /* if the LSB of lNum1 == 1 then */
lMirror = lMirror | 1; /* set the LSB of lMirror = 1 */
}
else
lMirror = lMirror << 1;
lNum1 = lNum1 >> 1;
}
lMirror = ( lMirror & ( ~lPattern ) ) | lNumBak;
hb_retnl( lMirror );
}
else
hb_ret();
}
static HB_LONG __getparam( int iParam )
{
if( HB_ISCHAR( iParam ) )
return ( HB_LONG ) hb_hextonum( hb_parcx( iParam ) );
else
return hb_parnl( iParam );
}
static HB_LONG __numand( HB_LONG lNum1, HB_LONG lNum2 )
{
return lNum1 & lNum2;
}
static HB_LONG __numor( HB_LONG lNum1, HB_LONG lNum2 )
{
return lNum1 | lNum2;
}
static HB_LONG __numxor( HB_LONG lNum1, HB_LONG lNum2 )
{
return lNum1 ^ lNum2;
}
static HB_LONG __numnot( HB_LONG lNum1, HB_LONG lNum2 )
{
HB_SYMBOL_UNUSED( lNum2 );
return ~lNum1;
}
static HB_LONG __numfun( int iPCount, HB_LONG ( * operation )( HB_LONG wNum1, HB_LONG wNum2 ), HB_BOOL * pbOk )
{
HB_LONG lNumOp = 0;
HB_LONG lNum1, lNum2;
HB_LONG lPattern, lTestMSB;
HB_USHORT usBytes;
int iFor;
if( HB_ISNUM( 1 ) || HB_ISNIL( 1 ) )
{
sizeofbits( &usBytes, &lPattern, &lTestMSB );
if( HB_ISNUM( 2 ) || HB_ISCHAR( 2 ) )
{
lNum1 = __getparam( 2 );
if( iPCount == 2 )
/* If unary operation: NOT */
lNumOp = ( *operation )( lNum1, 0 );
else
for( iFor = 3; iFor <= iPCount; iFor++ )
{
if( HB_ISNUM( iFor ) || HB_ISCHAR( iFor ) )
{
lNum2 = __getparam( iFor );
/* Call to operation: AND, OR, XOR */
lNumOp = ( *operation )( lNum1, lNum2 );
}
else
{
/* If error in parameter then return -1 */
*pbOk = HB_FALSE;
return -1;
}
/* Copy result to first parameter if multi operation */
lNum1 = lNumOp;
}
}
else
{
/* If error in parameter then return -1 */
*pbOk = HB_FALSE;
return -1;
}
/* Return result of operation */
lNumOp = ( lNumOp & lTestMSB ) ? lNumOp | lPattern : lNumOp & ( ~lPattern );
*pbOk = HB_TRUE;
return lNumOp;
}
else
{
*pbOk = HB_FALSE;
return -1;
}
}
static void sizeofbits( HB_USHORT * pusBytes, HB_LONG * plPattern, HB_LONG * plTestMSB )
{
*pusBytes = ( ( HB_ISNIL( 1 ) || hb_parni( 1 ) == 0 ) ? sizeof( int ) * 8
: ( HB_USHORT ) hb_parni( 1 ) );
if( *pusBytes > sizeof( HB_LONG ) * 8 )
*pusBytes = *pusBytes % ( sizeof( HB_LONG ) * 8 );
*plPattern = *pusBytes == ( sizeof( HB_LONG ) * 8 ) ? 0 : ( -1 ) << *pusBytes;
*plTestMSB = *pusBytes == 0 ? 0 : 1 << ( *pusBytes - 1 );
}