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

2012-03-20 19:26 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)

Browse Source 
* harbour/include/hbcdpreg.h
    + added few macros for extended CP definition

  * harbour/src/codepage/cp_big5.c
  * harbour/src/codepage/cp_utf8.c
  * harbour/src/codepage/cp_u16le.c
    * updated macros for CP definition

  * harbour/tests/big5_gen.prg
    % added small improvement in code hashing character
      translation tables so they are a little bit smaller

  * harbour/src/codepage/big5.c
    * regenerated
This commit is contained in:
Przemyslaw Czerpak
2012-03-20 18:26:41 +00:00
parent 72070c09a0
commit bfe075abbc
7 changed files with 2799 additions and 2770 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
harbour/ChangeLog
View File

@@ -16,6 +16,22 @@
The license applies to all entries newer than 2009-04-28.
*/
2012-03-20 19:26 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* harbour/include/hbcdpreg.h
+ added few macros for extended CP definition
* harbour/src/codepage/cp_big5.c
* harbour/src/codepage/cp_utf8.c
* harbour/src/codepage/cp_u16le.c
* updated macros for CP definition
* harbour/tests/big5_gen.prg
% added small improvement in code hashing character
translation tables so they are a little bit smaller
* harbour/src/codepage/big5.c
* regenerated
2012-03-20 19:14 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* harbour/src/codepage/cp_utf8.c
! added if() statement missing in previous commit

20
harbour/include/hbcdpreg.h
View File

@@ -65,12 +65,22 @@ HB_CALL_ON_STARTUP_BEGIN( HB_MACRONAME_JOIN( _hb_codepage_Init_, HB_CP_ID ) )
#if defined( HB_CP_GET_FUNC ) && \
defined( HB_CP_PUT_FUNC ) && \
defined( HB_CP_LEN_FUNC )
#define HB_CP_CUSTOM HB_TRUE
#define HB_CP_CUSTOM HB_TRUE
#else
#define HB_CP_CUSTOM HB_FALSE
#define HB_CP_GET_FUNC NULL
#define HB_CP_PUT_FUNC NULL
#define HB_CP_LEN_FUNC NULL
#define HB_CP_CUSTOM HB_FALSE
#define HB_CP_GET_FUNC NULL
#define HB_CP_PUT_FUNC NULL
#define HB_CP_LEN_FUNC NULL
#endif
#if !defined( HB_CP_UPPER_FUNC ) && \
!defined( HB_CP_LOWER_FUNC ) && \
!defined( HB_CP_FLAG_FUNC )
#define HB_CP_UPPER_FUNC NULL
#define HB_CP_LOWER_FUNC NULL
#define HB_CP_FLAGS_FUNC NULL
#endif
#ifndef HB_CP_CMP_FUNC
#define HB_CP_CMP_FUNC NULL
#endif
#endif
static HB_CODEPAGE s_codePage =

5472
harbour/src/codepage/big5.c
View File

File diff suppressed because it is too large Load Diff

5
harbour/src/codepage/cp_big5.c
View File

@@ -172,11 +172,12 @@ static void hb_cp_init( PHB_CODEPAGE cdp )
#define HB_CP_PUT_FUNC BIG5_put
#define HB_CP_LEN_FUNC BIG5_len
#define HB_CP_CMP_FUNC NULL
#define HB_CP_FLAG_FUNC NULL
#define HB_CP_FLAGS_FUNC NULL
#define HB_CP_UPPER_FUNC NULL
#define HB_CP_LOWER_FUNC NULL
#define HB_CP_CMP_FUNC NULL
#define s_flags NULL
#define s_upper NULL
#define s_lower NULL

5
harbour/src/codepage/cp_u16le.c
View File

@@ -125,11 +125,12 @@ static void hb_cp_init( PHB_CODEPAGE cdp )
#define HB_CP_PUT_FUNC UTF16LE_put
#define HB_CP_LEN_FUNC UTF16LE_len
#define HB_CP_CMP_FUNC NULL
#define HB_CP_FLAG_FUNC NULL
#define HB_CP_FLAGS_FUNC NULL
#define HB_CP_UPPER_FUNC NULL
#define HB_CP_LOWER_FUNC NULL
#define HB_CP_CMP_FUNC NULL
#define s_flags NULL
#define s_upper NULL
#define s_lower NULL

5
harbour/src/codepage/cp_utf8.c
View File

@@ -137,11 +137,12 @@ static void hb_cp_init( PHB_CODEPAGE cdp )
#define HB_CP_PUT_FUNC UTF8_put
#define HB_CP_LEN_FUNC UTF8_len
#define HB_CP_CMP_FUNC NULL
#define HB_CP_FLAG_FUNC NULL
#define HB_CP_FLAGS_FUNC NULL
#define HB_CP_UPPER_FUNC NULL
#define HB_CP_LOWER_FUNC NULL
#define HB_CP_CMP_FUNC NULL
#define s_flags NULL
#define s_upper NULL
#define s_lower NULL

46
harbour/tests/big5_gen.prg
View File

@@ -53,6 +53,8 @@ duplicated character has the following mapping in BIG5.TXT:
*************************************************************************** */
//#define DO_START_OPT
proc main()
local cLine, aVal, aVal2, aValU, aValU2, hVal, aInd, ;
n, nn, nBG5, nU16, nMin, nMax, nUMin, nUMax, cResult, nBit
@@ -118,10 +120,13 @@ proc main()
#endif
? "BIG5->UCS16 tables."
n := min_size( aVal, nMin, nMax, @nBit )
? "raw size:", hb_ntos( ( nMax - nMin + 1 ) * 2 )
#ifndef DO_START_OPT
nMin := min( nMin, 41280 ) // optimal
#endif
n := min_size( aVal, @nMin, nMax, @nBit )
? "minimal size:", hb_ntos( n ), ;
"for", hb_ntos( hb_bitshift( 1, nBit ) ), "byte blocks"
"for", hb_ntos( hb_bitshift( 1, nBit ) ), "byte blocks, (from: "+hb_ntos( nMin ) + ")"
calc_size( aVal, nMin, nMax, nBit, @hVal, @aInd, @nn )
aVal2 := hash_to_array( hVal )
@@ -160,10 +165,13 @@ proc main()
?
? "UCS16->BIG5 tables."
n := min_size( aValU, nUMin, nUMax, @nBit )
? "raw size:", hb_ntos( ( nUMax - nUMin + 1 ) * 2 )
#ifndef DO_START_OPT
nUMin := min( nUMin, 160 ) // optimal
#endif
n := min_size( aValU, @nUMin, nUMax, @nBit )
? "minimal size:", hb_ntos( n ), ;
"for", hb_ntos( hb_bitshift( 1, nBit ) ), "byte blocks"
"for", hb_ntos( hb_bitshift( 1, nBit ) ), "byte blocks, (from: "+hb_ntos( nUMin ) + ")"
calc_size( aValU, nUMin, nUMax, nBit, @hVal, @aInd, @nn )
aValU2 := hash_to_array( hVal )
@@ -220,16 +228,24 @@ static function hash_to_array( hVal )
return aVal
function min_size( aVal, nMin, nMax, nBit )
local n, nS, nSize
local n, nM, nS, nSize, nMinX
nSize := 0xFFFFFF
for n := 1 to 16
nS := calc_size( aVal, nMin, nMax, n )
// ? n, nS
if nS < nSize
nSize := nS
nBit := n
endif
nMinX := nMin
#ifdef DO_START_OPT
for nM := hb_bitAnd( nMin, 0xFF00 ) to nMin
#else
for nM := nMin to nMin
#endif
for n := 1 to 16
nS := calc_size( aVal, nM, nMax, n )
if nS < nSize
nSize := nS
nBit := n
nMinX := nM
endif
next
next
nMin := nMinX
return nSize
function calc_size( aVal, nMin, nMax, nBit, hVal, aInd, nn )
@@ -242,7 +258,7 @@ function calc_size( aVal, nMin, nMax, nBit, hVal, aInd, nn )
aInd := {}
hb_hKeepOrder( hVal, .t. )
for n := nMin to nMax
cLine += i2bin( aVal[n] )
cLine += i2bin( iif( n == 0, 0, aVal[ n ] ) )
if len( cLine ) == nLine * 2
hVal[ cLine ] := cLine
aadd( aInd, hb_hpos( hVal, cLine ) - 1 )
@@ -273,11 +289,11 @@ static function index_func( cName, cNameInd, cNameConv, cMin, cMax, cBit )
cResult := "static HB_USHORT " + cName + "( int n )" + hb_eol() + ;
"{" + hb_eol() + ;
" n -= " + cMin + ";" + hb_eol() + ;
" if( n >= 0 && n <= ( " + cMax + " - " + cMin + ") )" + hb_eol() + ;
" if( n >= 0 && n <= ( " + cMax + " - " + cMin + " ) )" + hb_eol() + ;
" {" + hb_eol() + ;
" return " + cNameConv + "[ ( " + cNameInd + ;
"[ n >> " + cBit + " ] << " + cBit + " ) +" + hb_eol() + ;
space( len( cNameInd ) + 16 ) + ;
space( len( cNameConv ) + 15 ) + ;
"( n & ( ( 1 << " + cBit + " ) - 1 ) ) ];" + hb_eol() + ;
" }" + hb_eol() + ;
" return 0;" + hb_eol() + ;