From b509c84428b95130832cbffad30fcec39530d292 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 27 Nov 2012 01:27:47 +0000 Subject: [PATCH] 2012-11-27 02:26 UTC+0100 Viktor Szakats (harbour syenar.net) * contrib/hbct/tests/test.prg * CHR() -> HB_BCHAR() for most usage --- harbour/ChangeLog | 10 ++++++++- harbour/contrib/hbct/tests/test.prg | 34 ++++++++++++++--------------- 2 files changed, 26 insertions(+), 18 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index ffcc17d568..b826a1e8dd 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -10,6 +10,10 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2012-11-27 02:26 UTC+0100 Viktor Szakats (harbour syenar.net) + * contrib/hbct/tests/test.prg + * CHR() -> HB_BCHAR() for most usage + 2012-11-27 02:03 UTC+0100 Viktor Szakats (harbour syenar.net) * doc/en/datetime.txt * doc/en/input.txt @@ -25,10 +29,14 @@ * contrib/hbct/tests/test.prg ! fixed one expected test result ! fixed one wrong test call - ; TOFIX (pbly result of different sting algorithm): + ; TOFIX: + (first pbly result of different sting algorithm) ! MAIN(136) CharSort( "b1a4a3a2a1", 2, 1 ) Result: "a4a3a2a1b1" Expected: "a2a1a3a4b1" + ! MAIN(87) WordOne( "12ABAB12" ) + Result: "12ABAB12" + Expected: "12AB12" * contrib/hbmisc/doc/en/ht_str.txt * contrib/hbmisc/tests/tsstrfmt.prg diff --git a/harbour/contrib/hbct/tests/test.prg b/harbour/contrib/hbct/tests/test.prg index 0a84736048..2256be9c4a 100644 --- a/harbour/contrib/hbct/tests/test.prg +++ b/harbour/contrib/hbct/tests/test.prg @@ -100,30 +100,30 @@ PROCEDURE Main() HBTEST WordRem( "abcd", "0ab1cd" ) IS "0ab1" HBTEST WordRem( "abcd", "ab0cd1" ) IS "0cd1" - HBTEST CharAdd( "012345678", Chr( 1 ) ) IS "123456789" - HBTEST CharAdd( "012345678", Chr( 1 ) + Chr( 2 ) ) IS "133557799" - HBTEST CharAdd( "123456789", Chr( 255 ) ) IS "012345678" - HBTEST CharAdd( "123456789", Chr( 255 ) + Chr( 254 ) ) IS "002244668" - HBTEST CharAnd( "012345678", Chr( 254 ) ) IS "002244668" - HBTEST CharAnd( "012345678", Chr( 254 ) + Chr( 252 ) ) IS "002044648" + HBTEST CharAdd( "012345678", hb_BChar( 1 ) ) IS "123456789" + HBTEST CharAdd( "012345678", hb_BChar( 1 ) + hb_BChar( 2 ) ) IS "133557799" + HBTEST CharAdd( "123456789", hb_BChar( 255 ) ) IS "012345678" + HBTEST CharAdd( "123456789", hb_BChar( 255 ) + hb_BChar( 254 ) ) IS "002244668" + HBTEST CharAnd( "012345678", hb_BChar( 254 ) ) IS "002244668" + HBTEST CharAnd( "012345678", hb_BChar( 254 ) + hb_BChar( 252 ) ) IS "002044648" - HBTEST CharNot( Chr( 85 ) + Chr( 128 ) + Chr( 170 ) + Chr( 1 ) ) IS Chr( 170 ) + Chr( 127 ) + Chr( 85 ) + Chr( 254 ) + HBTEST CharNot( hb_BChar( 85 ) + hb_BChar( 128 ) + hb_BChar( 170 ) + hb_BChar( 1 ) ) IS hb_BChar( 170 ) + hb_BChar( 127 ) + hb_BChar( 85 ) + hb_BChar( 254 ) HBTEST CharNot( CharNot( "This is a test!" ) ) IS "This is a test!" - HBTEST CharOr( "012345678", Chr( 1 ) ) IS "113355779" - HBTEST CharOr( "012345678", Chr( 1 ) + Chr( 3 ) ) IS "133357779" + HBTEST CharOr( "012345678", hb_BChar( 1 ) ) IS "113355779" + HBTEST CharOr( "012345678", hb_BChar( 1 ) + hb_BChar( 3 ) ) IS "133357779" HBTEST CharXor( CharXor( "This is top secret !", "My Password" ), "My Password" ) IS "This is top secret !" - HBTEST CharSub( "123456789", Chr( 1 ) ) IS "012345678" - HBTEST CharSub( "123456789", Chr( 1 ) + Chr( 2 ) ) IS "002244668" - HBTEST CharSub( "012345678", Chr( 255 ) ) IS "123456789" - HBTEST CharSub( "012345678", Chr( 255 ) + Chr( 254 ) ) IS "133557799" + HBTEST CharSub( "123456789", hb_BChar( 1 ) ) IS "012345678" + HBTEST CharSub( "123456789", hb_BChar( 1 ) + hb_BChar( 2 ) ) IS "002244668" + HBTEST CharSub( "012345678", hb_BChar( 255 ) ) IS "123456789" + HBTEST CharSub( "012345678", hb_BChar( 255 ) + hb_BChar( 254 ) ) IS "133557799" - HBTEST CharShl( Chr( 1 ) + Chr( 2 ) + Chr( 4 ) + Chr( 8 ) + Chr( 16 ) + Chr( 32 ) + Chr( 64 ) + Chr( 128 ), 3 ) IS Chr( 8 ) + Chr( 16 ) + Chr( 32 ) + Chr( 64 ) + Chr( 128 ) + Chr( 0 ) + Chr( 0 ) + Chr( 0 ) - HBTEST CharShr( Chr( 1 ) + Chr( 2 ) + Chr( 4 ) + Chr( 8 ) + Chr( 16 ) + Chr( 32 ) + Chr( 64 ) + Chr( 128 ), 3 ) IS Chr( 0 ) + Chr( 0 ) + Chr( 0 ) + Chr( 1 ) + Chr( 2 ) + Chr( 4 ) + Chr( 8 ) + Chr( 16 ) - HBTEST CharRll( Chr( 1 ) + Chr( 2 ) + Chr( 4 ) + Chr( 8 ) + Chr( 16 ) + Chr( 32 ) + Chr( 64 ) + Chr( 128 ), 3 ) IS Chr( 8 ) + Chr( 16 ) + Chr( 32 ) + Chr( 64 ) + Chr( 128 ) + Chr( 1 ) + Chr( 2 ) + Chr( 4 ) - HBTEST CharRlr( Chr( 1 ) + Chr( 2 ) + Chr( 4 ) + Chr( 8 ) + Chr( 16 ) + Chr( 32 ) + Chr( 64 ) + Chr( 128 ), 3 ) IS Chr( 32 ) + Chr( 64 ) + Chr( 128 ) + Chr( 1 ) + Chr( 2 ) + Chr( 4 ) + Chr( 8 ) + Chr( 16 ) + HBTEST CharShl( hb_BChar( 1 ) + hb_BChar( 2 ) + hb_BChar( 4 ) + hb_BChar( 8 ) + hb_BChar( 16 ) + hb_BChar( 32 ) + hb_BChar( 64 ) + hb_BChar( 128 ), 3 ) IS hb_BChar( 8 ) + hb_BChar( 16 ) + hb_BChar( 32 ) + hb_BChar( 64 ) + hb_BChar( 128 ) + hb_BChar( 0 ) + hb_BChar( 0 ) + hb_BChar( 0 ) + HBTEST CharShr( hb_BChar( 1 ) + hb_BChar( 2 ) + hb_BChar( 4 ) + hb_BChar( 8 ) + hb_BChar( 16 ) + hb_BChar( 32 ) + hb_BChar( 64 ) + hb_BChar( 128 ), 3 ) IS hb_BChar( 0 ) + hb_BChar( 0 ) + hb_BChar( 0 ) + hb_BChar( 1 ) + hb_BChar( 2 ) + hb_BChar( 4 ) + hb_BChar( 8 ) + hb_BChar( 16 ) + HBTEST CharRll( hb_BChar( 1 ) + hb_BChar( 2 ) + hb_BChar( 4 ) + hb_BChar( 8 ) + hb_BChar( 16 ) + hb_BChar( 32 ) + hb_BChar( 64 ) + hb_BChar( 128 ), 3 ) IS hb_BChar( 8 ) + hb_BChar( 16 ) + hb_BChar( 32 ) + hb_BChar( 64 ) + hb_BChar( 128 ) + hb_BChar( 1 ) + hb_BChar( 2 ) + hb_BChar( 4 ) + HBTEST CharRlr( hb_BChar( 1 ) + hb_BChar( 2 ) + hb_BChar( 4 ) + hb_BChar( 8 ) + hb_BChar( 16 ) + hb_BChar( 32 ) + hb_BChar( 64 ) + hb_BChar( 128 ), 3 ) IS hb_BChar( 32 ) + hb_BChar( 64 ) + hb_BChar( 128 ) + hb_BChar( 1 ) + hb_BChar( 2 ) + hb_BChar( 4 ) + hb_BChar( 8 ) + hb_BChar( 16 ) HBTEST CharRepl( "1234", "1x2y3z", "abcd" ) IS "axbycz" HBTEST CharRepl( "abcdefghij", "jhfdb", "1234567890" ) IS "08642"