* harbour/common.mak
* updated for new files - please check
* harbour/harbour.spec
* added compiler library
* harbour/bin/pack_src.sh
* harbour/bin/hb-func.sh
* updated for new files and libraries
* harbour/config/w32/mingw32.cf
* harbour/config/w32/watcom.cf
* harbour/config/w32/xcc.cf
* added winsock libraries
* harbour/include/hbapicdp.h
* harbour/source/rtl/cdpapi.c
+ added hb_cdpicmp() - not case sensitive version of hb_cdpcmp()
* harbour/include/hbapiitm.h
* harbour/source/vm/itemapi.c
+ hb_itemStrICmp(), hb_itemCopyFromRef(), hb_itemMoveFromRef()
* harbour/include/hbapi.h
* harbour/include/hbcomp.h
* harbour/include/hbcompdf.h
* harbour/include/hbexpra.c
* harbour/include/hbexprb.c
* harbour/include/hbexprop.h
* harbour/include/hbmacro.h
* harbour/include/hbpcode.h
* harbour/include/hbvmpub.h
* harbour/include/hbxvm.h
* harbour/source/common/expropt1.c
* harbour/source/compiler/complex.c
* harbour/source/compiler/genc.c
* harbour/source/compiler/gencc.c
* harbour/source/compiler/gencli.c
* harbour/source/compiler/genhrb.c
* harbour/source/compiler/genobj32.c
* harbour/source/compiler/harbour.y
* harbour/source/compiler/harbour.yyc
* harbour/source/compiler/harbour.yyh
* harbour/source/compiler/hbdead.c
* harbour/source/compiler/hbfix.c
* harbour/source/compiler/hblbl.c
* harbour/source/compiler/hbmain.c
* harbour/source/compiler/hbopt.c
* harbour/source/compiler/hbpcode.c
* harbour/source/compiler/hbstripl.c
* harbour/source/macro/macro.y
* harbour/source/macro/macro.yyc
* harbour/source/macro/macro.yyh
* harbour/source/macro/macrolex.c
* harbour/source/vm/Makefile
* harbour/source/vm/arrays.c
* harbour/source/vm/asort.c
* harbour/source/vm/classes.c
* harbour/source/vm/eval.c
* harbour/source/vm/garbage.c
* harbour/source/vm/hvm.c
* harbour/source/vm/itemapi.c
* harbour/source/vm/macro.c
+ harbour/source/vm/hashes.c
+ harbour/source/vm/hashfunc.c
+ added hash items, f.e.:
local h1 := {=>}, h2 := { "a"=>1.234, "b"=>2.345 }
? h2[ "a" ], h2[ "b ]
+ added support for DYNAMIC function declaration - it allow to define
functions which are lately bound at runtime, f.e.:
/*** t01.prg ***/
dynamic func1
proc main()
local h:=__hrbload("t02.hrb")
? func1()
return
/*** t02.prg ***/
func func1
return "Hello!!!"
% use new FUNCALL structure to hold EXTERNAL and DYNAMIC functions,
it reduce memory usage, FUNCALL is much smaller then FUNCTION
% use symbol scope bits when possible instead of making some linear scan
+ added new enumarator message: __ENUMKEY - it allow to access
key value when hash item is base enumerator value, f.e.:
proc main()
local v, h:={"a"=>1.000,"b"=>2.000,"c"=>3.000}
heval( h, { |k,v,i| qout( k, v, i ) } ); ?
for each v in h
? v, "=>", v:__enumKey(), v:__enumValue(), v:__enumIndex(), ;
valtype(v:__enumBase())
v += 0.123
next
? ;heval( h, { |k,v,i| qout( k, v, i ) } )
return
+ added C level hb_hash*() functions
+ added support for full HASH item cloning and updated array cloning
to also clone nested hashes - please note that xHarbour does not do
that, in xHarbour ACLONE() clones _ONLY_ nested arrays and HCLONE()
_DOES_NOT_ clone _ANY_ nested items.
* harbour/include/hbextern.ch
+ added hash functions HB_H*()
* changed INET*() functions to HB_INET*()
+ added hash functions H*() and socket functions INET*() when
HB_COMPAT_XHB is set
* harbour/include/hbtypes.h
+ added missing HB_EXTERN_BEGIN / HB_EXTERN_END
* harbour/include/hbpp.h
* harbour/source/pp/ppcore.c
! added protection against automatic word concatenation in some cases
! fixed preprocessing expressions when match marker matches ';' token
* harbour/source/rtl/Makefile
+ harbour/source/rtl/itemseri.c
+ added functions for item serialization: HB_SERIALIZE() and
HB_DESERIALIZE() - these function are not binary compatible
with xHarbour functions with the same names but make very
similar job with the exception to serialization of codeblock
and object variables - Harbour does not allow to serialize
codeblocks and serialize objects as arrays.
In most cases these functions can replace the xHarbour ones
+ added HB_DESERIALBEGIN() and HB_DESERIALIZE() functions covered
by HB_COMPAT_XHB macro - this functions are only for compatibility
with existing xHarbour code, In Harbour HB_DESERIALBEGIN() is
dummy function which returns first parameter and HB_DESERIALNEXT()
is a simple wrapper to HB_DESERIALIZE() so it's not necessary to
use them.
* harbour/source/rtl/hbinet.c
* changed INET*() functions to HB_INET*() and enable them for default
build
+ added INET*() functions wrappers covered by HB_COMPAT_XHB macro
* harbour/source/rtl/hbrandom.c
+ added HB_RANDOMINT() - xHarbour compatible
* harbour/source/rtl/len.c
+ added support for HASHes
* harbour/source/rtl/valtype.c
+ added support for HASHes
+ added set of HB_IS*() functions - they are a little bit faster then
calling VALTYPE( v ) == <cVal>
- removed HB_ISBYREF() - this function cannot longer work, it was using
a Clipper incompatible anomalies in passing variables by reference I
fixed so it has to stop to work. If it will be realy necessary to
implement HB_ISBYREF() function then please inform me - it will have
to be done at compiler level or with some much deeper HVM stack
checking.
* harbour/source/vm/extend.c
! fixed hb_extIsArray() and hb_extIsObject() to work well with
parameters passed by reference.
Please note that now hb_extIsArray() return TRUE only for pure arrays
not object values.
* harbour/contrib/Makefile
+ harbour/contrib/tip/Changelog
+ harbour/contrib/tip/Makefile
+ harbour/contrib/tip/atokens.c
+ harbour/contrib/tip/base64x.c
+ harbour/contrib/tip/cgi.prg
+ harbour/contrib/tip/client.prg
+ harbour/contrib/tip/credent.prg
+ harbour/contrib/tip/cstr.prg
+ harbour/contrib/tip/encb64.prg
+ harbour/contrib/tip/encmthd.c
+ harbour/contrib/tip/encoder.prg
+ harbour/contrib/tip/encqp.prg
+ harbour/contrib/tip/encurl.prg
+ harbour/contrib/tip/ftpcln.prg
+ harbour/contrib/tip/hbhex2n.c
+ harbour/contrib/tip/httpcln.prg
+ harbour/contrib/tip/mail.prg
+ harbour/contrib/tip/popcln.prg
+ harbour/contrib/tip/smtpcln.prg
+ harbour/contrib/tip/tip.ch
+ harbour/contrib/tip/url.prg
+ harbour/contrib/tip/utils.c
+ added TIP library - code borrowed from xHarbour
Please test - a lot of above code is not well tested, also some peaces
were written over year ago for different things (f.e. serialization for
NETRDD) and now I collected them and committed.
The TIP library was not tested at all. It can be compiled but I cannot
say if it works - I hope that people familiar with it can make necessary
test and fixes.
It's also not the final version of low level HASH item code. I'm working
on more efficient structure which uses binary tries but I cannot say when
I'll finish it (maybe in this weekend or maybe in next year) so I committed
working version now even if I'm not happy with overall performance (BTW
not worser then in xHarbour)
205 lines
7.5 KiB
C
205 lines
7.5 KiB
C
/*
|
|
* $Id$
|
|
*/
|
|
|
|
/*
|
|
* Harbour Project source code:
|
|
* Header file for the CodePages API
|
|
*
|
|
* Copyright 2002 Alexander S.Kresin <alex@belacy.belgorod.su>
|
|
* 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.
|
|
*
|
|
*/
|
|
|
|
#ifndef HB_APICDP_H_
|
|
#define HB_APICDP_H_
|
|
|
|
#ifndef HB_CDP_SUPPORT_OFF
|
|
|
|
#include <ctype.h>
|
|
#include "hbapi.h"
|
|
#include "hbinit.h"
|
|
|
|
HB_EXTERN_BEGIN
|
|
|
|
/* This hack is needed to force preprocessing if id is also a macro */
|
|
#define HB_CODEPAGE_REQUEST( id ) HB_CODEPAGE_REQUEST_( id )
|
|
#define HB_CODEPAGE_REQUEST_( id ) HB_FUNC_EXTERN( HB_CODEPAGE_##id ); \
|
|
void hb_codepage_ForceLink_##id( void ) \
|
|
{ \
|
|
HB_FUNCNAME( HB_CODEPAGE_##id )(); \
|
|
}
|
|
#define HB_CODEPAGE_ANNOUNCE( id ) HB_FUNC( HB_CODEPAGE_##id ) {}
|
|
|
|
#define HB_CODEPAGE_INIT( id ) HB_CODEPAGE_ANNOUNCE( id ) \
|
|
HB_CALL_ON_STARTUP_BEGIN( hb_codepage_Init_##id ) \
|
|
hb_cdpRegister( &s_codepage ); \
|
|
HB_CALL_ON_STARTUP_END( hb_codepage_Init_##id )
|
|
|
|
|
|
typedef struct _HB_UNITABLE
|
|
{
|
|
char * uniID;
|
|
int nChars;
|
|
BOOL lMulti;
|
|
USHORT * uniCodes;
|
|
} HB_UNITABLE, * PHB_UNITABLE;
|
|
|
|
typedef struct _HB_MULTICHAR
|
|
{
|
|
char cLast[2];
|
|
char cFirst[2];
|
|
int nCode;
|
|
} HB_MULTICHAR, * PHB_MULTICHAR;
|
|
|
|
typedef struct _HB_CODEPAGE
|
|
{
|
|
char * id;
|
|
char * uniID;
|
|
PHB_UNITABLE uniTable;
|
|
int nChars;
|
|
char * CharsUpper;
|
|
char * CharsLower;
|
|
BOOL lLatin;
|
|
BOOL lAccEqual;
|
|
BOOL lAccInterleave;
|
|
BOOL lSort;
|
|
BOOL lChClone;
|
|
BYTE * s_chars;
|
|
BYTE * s_upper;
|
|
BYTE * s_lower;
|
|
BYTE * s_accent;
|
|
int nMulti;
|
|
PHB_MULTICHAR multi;
|
|
} HB_CODEPAGE, * PHB_CODEPAGE;
|
|
|
|
#define CPID_437 "cp437"
|
|
#define CPID_737 "cp737"
|
|
#define CPID_850 "cp850"
|
|
#define CPID_852 "cp852"
|
|
#define CPID_857 "cp857"
|
|
#define CPID_866 "cp866"
|
|
#define CPID_1250 "cp1250"
|
|
#define CPID_1251 "cp1251"
|
|
#define CPID_1253 "cp1253"
|
|
#define CPID_1254 "cp1254"
|
|
#define CPID_1257 "cp1257"
|
|
#define CPID_8859_1 "iso8859-1"
|
|
#define CPID_8859_1B "iso8859-1b"
|
|
#define CPID_8859_2 "iso8859-2"
|
|
#define CPID_8859_5 "iso8859-5"
|
|
#define CPID_KOI_8 "koi-8"
|
|
#define CPID_KOI_8U "koi-8u"
|
|
#define CPID_MAZ "plmaz"
|
|
#define CPID_KAM "cskam"
|
|
#define UNITB_437 &hb_uniTbl_437
|
|
#define UNITB_737 &hb_uniTbl_737
|
|
#define UNITB_850 &hb_uniTbl_850
|
|
#define UNITB_852 &hb_uniTbl_852
|
|
#define UNITB_857 &hb_uniTbl_857
|
|
#define UNITB_866 &hb_uniTbl_866
|
|
#define UNITB_1250 &hb_uniTbl_1250
|
|
#define UNITB_1251 &hb_uniTbl_1251
|
|
#define UNITB_1253 &hb_uniTbl_1253
|
|
#define UNITB_1254 &hb_uniTbl_1254
|
|
#define UNITB_1257 &hb_uniTbl_1257
|
|
#define UNITB_8859_1 &hb_uniTbl_8859_1
|
|
#define UNITB_8859_1B &hb_uniTbl_8859_1b
|
|
#define UNITB_8859_2 &hb_uniTbl_8859_2
|
|
#define UNITB_8859_5 &hb_uniTbl_8859_5
|
|
#define UNITB_KOI_8 &hb_uniTbl_KOI_8
|
|
#define UNITB_KOI_8U &hb_uniTbl_KOI_8U
|
|
#define UNITB_KAM &hb_uniTbl_kam
|
|
#define UNITB_MAZ &hb_uniTbl_mazovia
|
|
#define UNITB_UNDEF NULL /* ((PHB_UNITABLE) (-1)) */
|
|
|
|
extern HB_UNITABLE hb_uniTbl_437;
|
|
extern HB_UNITABLE hb_uniTbl_737;
|
|
extern HB_UNITABLE hb_uniTbl_850;
|
|
extern HB_UNITABLE hb_uniTbl_852;
|
|
extern HB_UNITABLE hb_uniTbl_857;
|
|
extern HB_UNITABLE hb_uniTbl_866;
|
|
extern HB_UNITABLE hb_uniTbl_1250;
|
|
extern HB_UNITABLE hb_uniTbl_1251;
|
|
extern HB_UNITABLE hb_uniTbl_1253;
|
|
extern HB_UNITABLE hb_uniTbl_1254;
|
|
extern HB_UNITABLE hb_uniTbl_1257;
|
|
extern HB_UNITABLE hb_uniTbl_8859_1;
|
|
extern HB_UNITABLE hb_uniTbl_8859_1b;
|
|
extern HB_UNITABLE hb_uniTbl_8859_2;
|
|
extern HB_UNITABLE hb_uniTbl_8859_5;
|
|
extern HB_UNITABLE hb_uniTbl_KOI_8;
|
|
extern HB_UNITABLE hb_uniTbl_KOI_8U;
|
|
extern HB_UNITABLE hb_uniTbl_mazovia;
|
|
extern HB_UNITABLE hb_uniTbl_kam;
|
|
|
|
extern HB_EXPORT BOOL hb_cdpRegister( PHB_CODEPAGE );
|
|
extern HB_EXPORT char * hb_cdpSelectID( char * );
|
|
extern HB_EXPORT PHB_CODEPAGE hb_cdpSelect( PHB_CODEPAGE );
|
|
extern HB_EXPORT PHB_CODEPAGE hb_cdpFind( char * );
|
|
extern HB_EXPORT void hb_cdpTranslate( char *, PHB_CODEPAGE, PHB_CODEPAGE );
|
|
extern HB_EXPORT void hb_cdpnTranslate( char *, PHB_CODEPAGE, PHB_CODEPAGE, ULONG );
|
|
extern HB_EXPORT int hb_cdpcmp( char *, ULONG, char *, ULONG, PHB_CODEPAGE, BOOL );
|
|
extern HB_EXPORT int hb_cdpicmp( char *, ULONG, char *, ULONG, PHB_CODEPAGE, BOOL );
|
|
extern HB_EXPORT int hb_cdpchrcmp( char, char, PHB_CODEPAGE );
|
|
extern HB_EXPORT void hb_cdpReleaseAll( void );
|
|
|
|
extern HB_EXPORT USHORT hb_cdpGetU16( PHB_CODEPAGE, BOOL, BYTE );
|
|
extern HB_EXPORT BOOL hb_cdpGetFromUTF8( PHB_CODEPAGE, BOOL, BYTE, int *, USHORT * );
|
|
extern HB_EXPORT ULONG hb_cdpStrnToUTF8( PHB_CODEPAGE, BOOL, BYTE *, ULONG, BYTE * );
|
|
extern HB_EXPORT ULONG hb_cdpStrnToU16( PHB_CODEPAGE, BOOL, BYTE *, ULONG, BYTE * );
|
|
extern HB_EXPORT ULONG hb_cdpStringInUTF8Length( PHB_CODEPAGE, BOOL, BYTE *, ULONG );
|
|
extern HB_EXPORT ULONG hb_cdpUTF8ToStrn( PHB_CODEPAGE, BOOL, BYTE *, ULONG, BYTE *, ULONG );
|
|
extern HB_EXPORT ULONG hb_cdpUTF8StringLength( BYTE *, ULONG );
|
|
|
|
extern PHB_CODEPAGE hb_cdp_page;
|
|
|
|
HB_EXTERN_END
|
|
|
|
#else
|
|
|
|
typedef PHB_CODEPAGE void *
|
|
|
|
#endif /* HB_CDP_SUPPORT_OFF */
|
|
|
|
#endif /* HB_APICDP_H_ */
|