diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 8815dac819..a6777d428a 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,12 @@ +20000411-03:04 GMT+1 Victor Szakats + + * utils/hbtest/* + ! Fixed to work when HB_COMPAT_XPP mode is turned off. + + * include/hbsetup.ch + * source/vm/cmdarg.c + + Added defines for Flagship/FoxPro/dBase extensions. + 20000411-02:32 GMT+1 Victor Szakats * source/common/hbver.h diff --git a/harbour/include/hbsetup.ch b/harbour/include/hbsetup.ch index 3030d5aa65..401dd30bd0 100644 --- a/harbour/include/hbsetup.ch +++ b/harbour/include/hbsetup.ch @@ -49,14 +49,20 @@ * You can select here, whether you want to include feature introduced in * Clipper implementations other than Cl*pper 5.2e. * - * By default these are all turned on + * By default 5.3x and Xbase++ are turned on */ -/* Include new CA-Cl*pper 5.3[a,b] functions */ +/* Include CA-Cl*pper 5.3[a,b] extensions */ #define HB_COMPAT_C53 -/* Include new Alaska Xbase++ functions */ +/* Include Alaska Xbase++ extensions */ #define HB_COMPAT_XPP -/* Include new CA-VO functions */ -#define HB_COMPAT_VO +/* Include CA-VO extensions */ +/* #define HB_COMPAT_VO */ +/* Include Flagship extensions */ +/* #define HB_COMPAT_FLAGSHIP */ +/* Include FoxPro extensions */ +/* #define HB_COMPAT_FOXPRO */ +/* Include dBase extensions */ +/* #define HB_COMPAT_DBASE */ #endif /* HB_SETUP_CH_ */ diff --git a/harbour/source/vm/cmdarg.c b/harbour/source/vm/cmdarg.c index 8617a475b2..934b7bbfbe 100644 --- a/harbour/source/vm/cmdarg.c +++ b/harbour/source/vm/cmdarg.c @@ -347,6 +347,30 @@ void hb_cmdargProcessVM( void ) #endif hb_conOutErr( hb_conNewLine(), 0 ); + hb_conOutErr( "Multisoft Flagship compatible extensions: ", 0 ); +#if defined( HB_FLAGSHIP_VO ) + hb_conOutErr( "Yes", 0 ); +#else + hb_conOutErr( "No", 0 ); +#endif + hb_conOutErr( hb_conNewLine(), 0 ); + + hb_conOutErr( "Microsoft FoxPro compatible extensions: ", 0 ); +#if defined( HB_FOXPRO_VO ) + hb_conOutErr( "Yes", 0 ); +#else + hb_conOutErr( "No", 0 ); +#endif + hb_conOutErr( hb_conNewLine(), 0 ); + + hb_conOutErr( "dBase compatible extensions: ", 0 ); +#if defined( HB_DBASE_VO ) + hb_conOutErr( "Yes", 0 ); +#else + hb_conOutErr( "No", 0 ); +#endif + hb_conOutErr( hb_conNewLine(), 0 ); + hb_conOutErr( "Object file generation support: ", 0 ); #if defined( HARBOUR_OBJ_GENERATION ) hb_conOutErr( "Yes", 0 ); @@ -377,6 +401,9 @@ void hb_cmdargProcessVM( void ) hb_conOutErr( buffer, 0 ); hb_conOutErr( hb_conNewLine(), 0 ); } + + hb_conOutErr( "---------------------------", 0 ); + hb_conOutErr( hb_conNewLine(), 0 ); } } diff --git a/harbour/utils/hbtest/hbtest.prg b/harbour/utils/hbtest/hbtest.prg index 4e6d6fe187..66cecbfe24 100644 --- a/harbour/utils/hbtest/hbtest.prg +++ b/harbour/utils/hbtest/hbtest.prg @@ -417,7 +417,7 @@ FUNCTION XToStr( xValue ) RETURN '"' + xValue + '"' CASE cType == "N" ; RETURN LTrim( Str( xValue ) ) - CASE cType == "D" ; RETURN 'SToD("' + DToS( xValue ) + '")' + CASE cType == "D" ; RETURN 'HB_SToD("' + DToS( xValue ) + '")' CASE cType == "L" ; RETURN iif( xValue, ".T.", ".F." ) CASE cType == "O" ; RETURN xValue:className() + " Object" CASE cType == "U" ; RETURN "NIL" @@ -515,11 +515,15 @@ STATIC FUNCTION CMDLGetValue( cCommandLine, cName, cRetVal ) RETURN cRetVal +#ifdef __XPP__ +FUNCTION HB_SToD( cDate ) + RETURN SToD( cDate ) +#endif + #ifndef HAVE_HBCLIP #ifndef __HARBOUR__ -#ifndef __XPP__ -FUNCTION SToD( cDate ) +FUNCTION HB_SToD( cDate ) LOCAL cOldDateFormat LOCAL dDate @@ -539,7 +543,6 @@ FUNCTION SToD( cDate ) #endif #endif -#endif /* Don't change the position of this #include. */ #include "rt_init.ch" diff --git a/harbour/utils/hbtest/rt_date.prg b/harbour/utils/hbtest/rt_date.prg index 724ef08e95..097fe431f2 100644 --- a/harbour/utils/hbtest/rt_date.prg +++ b/harbour/utils/hbtest/rt_date.prg @@ -50,7 +50,7 @@ FUNCTION Main_DATE() #endif TEST_LINE( Year(sdDate) , 1984 ) TEST_LINE( Year(sdDateE) , 0 ) - TEST_LINE( Str(Year(SToD("19990905"))) , " 1999" ) + TEST_LINE( Str(Year(HB_SToD("19990905"))) , " 1999" ) /* MONTH() */ @@ -61,7 +61,7 @@ FUNCTION Main_DATE() #endif TEST_LINE( Month(sdDate) , 3 ) TEST_LINE( Month(sdDateE) , 0 ) - TEST_LINE( Str(Month(SToD("19990905"))) , " 9" ) + TEST_LINE( Str(Month(HB_SToD("19990905"))) , " 9" ) /* DAY() */ @@ -72,7 +72,7 @@ FUNCTION Main_DATE() #endif TEST_LINE( Day(sdDate) , 25 ) TEST_LINE( Day(sdDateE) , 0 ) - TEST_LINE( Str(Day(SToD("19990905"))) , " 5" ) + TEST_LINE( Str(Day(HB_SToD("19990905"))) , " 5" ) /* TIME() */ @@ -87,17 +87,17 @@ FUNCTION Main_DATE() #endif TEST_LINE( Dow(sdDate) , 1 ) TEST_LINE( Dow(sdDateE) , 0 ) - TEST_LINE( Dow(SToD("20000222")) , 3 ) - TEST_LINE( Dow(SToD("20000223")) , 4 ) - TEST_LINE( Dow(SToD("20000224")) , 5 ) - TEST_LINE( Dow(SToD("20000225")) , 6 ) - TEST_LINE( Dow(SToD("20000226")) , 7 ) - TEST_LINE( Dow(SToD("20000227")) , 1 ) - TEST_LINE( Dow(SToD("20000228")) , 2 ) - TEST_LINE( Dow(SToD("20000229")) , 3 ) - TEST_LINE( Dow(SToD("20000230")) , 0 ) - TEST_LINE( Dow(SToD("20000231")) , 0 ) - TEST_LINE( Dow(SToD("20000301")) , 4 ) + TEST_LINE( Dow(HB_SToD("20000222")) , 3 ) + TEST_LINE( Dow(HB_SToD("20000223")) , 4 ) + TEST_LINE( Dow(HB_SToD("20000224")) , 5 ) + TEST_LINE( Dow(HB_SToD("20000225")) , 6 ) + TEST_LINE( Dow(HB_SToD("20000226")) , 7 ) + TEST_LINE( Dow(HB_SToD("20000227")) , 1 ) + TEST_LINE( Dow(HB_SToD("20000228")) , 2 ) + TEST_LINE( Dow(HB_SToD("20000229")) , 3 ) + TEST_LINE( Dow(HB_SToD("20000230")) , 0 ) + TEST_LINE( Dow(HB_SToD("20000231")) , 0 ) + TEST_LINE( Dow(HB_SToD("20000301")) , 4 ) /* CMONTH() */ @@ -108,18 +108,18 @@ FUNCTION Main_DATE() #endif TEST_LINE( CMonth(sdDate) , "March" ) TEST_LINE( CMonth(sdDateE) , "" ) - TEST_LINE( CMonth(SToD("19990101")) , "January" ) - TEST_LINE( CMonth(SToD("19990201")) , "February" ) - TEST_LINE( CMonth(SToD("19990301")) , "March" ) - TEST_LINE( CMonth(SToD("19990401")) , "April" ) - TEST_LINE( CMonth(SToD("19990501")) , "May" ) - TEST_LINE( CMonth(SToD("19990601")) , "June" ) - TEST_LINE( CMonth(SToD("19990701")) , "July" ) - TEST_LINE( CMonth(SToD("19990801")) , "August" ) - TEST_LINE( CMonth(SToD("19990901")) , "September" ) - TEST_LINE( CMonth(SToD("19991001")) , "October" ) - TEST_LINE( CMonth(SToD("19991101")) , "November" ) - TEST_LINE( CMonth(SToD("19991201")) , "December" ) + TEST_LINE( CMonth(HB_SToD("19990101")) , "January" ) + TEST_LINE( CMonth(HB_SToD("19990201")) , "February" ) + TEST_LINE( CMonth(HB_SToD("19990301")) , "March" ) + TEST_LINE( CMonth(HB_SToD("19990401")) , "April" ) + TEST_LINE( CMonth(HB_SToD("19990501")) , "May" ) + TEST_LINE( CMonth(HB_SToD("19990601")) , "June" ) + TEST_LINE( CMonth(HB_SToD("19990701")) , "July" ) + TEST_LINE( CMonth(HB_SToD("19990801")) , "August" ) + TEST_LINE( CMonth(HB_SToD("19990901")) , "September" ) + TEST_LINE( CMonth(HB_SToD("19991001")) , "October" ) + TEST_LINE( CMonth(HB_SToD("19991101")) , "November" ) + TEST_LINE( CMonth(HB_SToD("19991201")) , "December" ) /* CDOW() */ @@ -130,17 +130,17 @@ FUNCTION Main_DATE() #endif TEST_LINE( CDow(sdDate) , "Sunday" ) TEST_LINE( CDow(sdDateE) , "" ) - TEST_LINE( CDow(SToD("20000222")) , "Tuesday" ) - TEST_LINE( CDow(SToD("20000223")) , "Wednesday" ) - TEST_LINE( CDow(SToD("20000224")) , "Thursday" ) - TEST_LINE( CDow(SToD("20000225")) , "Friday" ) - TEST_LINE( CDow(SToD("20000226")) , "Saturday" ) - TEST_LINE( CDow(SToD("20000227")) , "Sunday" ) - TEST_LINE( CDow(SToD("20000228")) , "Monday" ) - TEST_LINE( CDow(SToD("20000229")) , "Tuesday" ) - TEST_LINE( CDow(SToD("20000230")) , "" ) - TEST_LINE( CDow(SToD("20000231")) , "" ) - TEST_LINE( CDow(SToD("20000301")) , "Wednesday" ) + TEST_LINE( CDow(HB_SToD("20000222")) , "Tuesday" ) + TEST_LINE( CDow(HB_SToD("20000223")) , "Wednesday" ) + TEST_LINE( CDow(HB_SToD("20000224")) , "Thursday" ) + TEST_LINE( CDow(HB_SToD("20000225")) , "Friday" ) + TEST_LINE( CDow(HB_SToD("20000226")) , "Saturday" ) + TEST_LINE( CDow(HB_SToD("20000227")) , "Sunday" ) + TEST_LINE( CDow(HB_SToD("20000228")) , "Monday" ) + TEST_LINE( CDow(HB_SToD("20000229")) , "Tuesday" ) + TEST_LINE( CDow(HB_SToD("20000230")) , "" ) + TEST_LINE( CDow(HB_SToD("20000231")) , "" ) + TEST_LINE( CDow(HB_SToD("20000301")) , "Wednesday" ) /* DTOC() */ @@ -157,12 +157,12 @@ FUNCTION Main_DATE() TEST_LINE( CToD(NIL) , "E BASE 1119 Argument error CTOD F:S" ) TEST_LINE( CToD(100) , "E BASE 1119 Argument error CTOD F:S" ) - TEST_LINE( CToD("") , SToD(" ") ) + TEST_LINE( CToD("") , HB_SToD(" ") ) #ifdef __HARBOUR__ - TEST_LINE( CToD(@cDate) , SToD("19991125") ) /* Bug in CA-Cl*pper, it returns: "E BASE 1119 Argument error CTOD F:S" */ + TEST_LINE( CToD(@cDate) , HB_SToD("19991125") ) /* Bug in CA-Cl*pper, it returns: "E BASE 1119 Argument error CTOD F:S" */ #endif - TEST_LINE( CToD(cDate) , SToD("19991125") ) - TEST_LINE( CToD("1999/11/25/10") , SToD("19991125") ) + TEST_LINE( CToD(cDate) , HB_SToD("19991125") ) + TEST_LINE( CToD("1999/11/25/10") , HB_SToD("19991125") ) /* DTOS() */ diff --git a/harbour/utils/hbtest/rt_hvm.prg b/harbour/utils/hbtest/rt_hvm.prg index b602667caa..d439bb6933 100644 --- a/harbour/utils/hbtest/rt_hvm.prg +++ b/harbour/utils/hbtest/rt_hvm.prg @@ -182,7 +182,7 @@ FUNCTION Main_HVM() #ifndef __XPP__ TEST_LINE( "":className() , "CHARACTER" ) TEST_LINE( 0:className() , "NUMERIC" ) - TEST_LINE( SToD( "" ):className() , "DATE" ) + TEST_LINE( HB_SToD( "" ):className() , "DATE" ) TEST_LINE( .F.:className() , "LOGICAL" ) TEST_LINE( {|| NIL }:className() , "BLOCK" ) TEST_LINE( {}:className() , "ARRAY" ) @@ -198,7 +198,7 @@ FUNCTION Main_HVM() #ifndef __XPP__ TEST_LINE( "":classH() , 0 ) TEST_LINE( 0:classH() , 0 ) - TEST_LINE( SToD( "" ):classH() , 0 ) + TEST_LINE( HB_SToD( "" ):classH() , 0 ) TEST_LINE( .F.:classH() , 0 ) TEST_LINE( {|| NIL }:classH() , 0 ) TEST_LINE( {}:classH() , 0 ) @@ -243,134 +243,134 @@ FUNCTION Main_HVM() /* <= */ - TEST_LINE( 2 <= 1 , .F. ) - TEST_LINE( 1 <= 2 , .T. ) - TEST_LINE( 2.0 <= 2 , .T. ) - TEST_LINE( 2 <= 2.0 , .T. ) - TEST_LINE( 2.5 <= 3.7 , .T. ) - TEST_LINE( 3.7 <= 2.5 , .F. ) - TEST_LINE( .F. <= .F. , .T. ) - TEST_LINE( .T. <= .F. , .F. ) - TEST_LINE( .F. <= .T. , .T. ) - TEST_LINE( SToD("") <= SToD("") , .T. ) - TEST_LINE( SToD("") <= SToD("19800101") , .T. ) - TEST_LINE( SToD("19800101") <= SToD("") , .F. ) - TEST_LINE( "" <= "AAA" , .T. ) - TEST_LINE( "AAA" <= "" , .T. ) - TEST_LINE( "AAA" <= "AA" , .T. ) - TEST_LINE( "AAA" <= Chr(255) , .T. ) - TEST_LINE( Chr(150) <= Chr(255) , .T. ) - TEST_LINE( "A" <= "a" , .T. ) - TEST_LINE( "A" <= "Z" , .T. ) - TEST_LINE( "Z" <= " " , .F. ) - TEST_LINE( Chr(0) <= " " , .T. ) - TEST_LINE( "Hallo" <= "Hello" , .T. ) - TEST_LINE( "Hello" <= "Hello" , .T. ) - TEST_LINE( "Hell" <= "Hello" , .T. ) - TEST_LINE( "Hellow" <= "Hello" , .T. ) - TEST_LINE( "J" <= "Hello" , .F. ) - TEST_LINE( "" <= "Hello" , .T. ) - TEST_LINE( "J" <= "" , .T. ) - TEST_LINE( "" <= "" , .T. ) - - /* < */ - - TEST_LINE( 2 < 1 , .F. ) - TEST_LINE( 1 < 2 , .T. ) - TEST_LINE( 2.0 < 2 , .F. ) - TEST_LINE( 2 < 2.0 , .F. ) - TEST_LINE( 2.5 < 3.7 , .T. ) - TEST_LINE( 3.7 < 2.5 , .F. ) - TEST_LINE( .F. < .F. , .F. ) - TEST_LINE( .T. < .F. , .F. ) - TEST_LINE( .F. < .T. , .T. ) - TEST_LINE( SToD("") < SToD("") , .F. ) - TEST_LINE( SToD("") < SToD("19800101") , .T. ) - TEST_LINE( SToD("19800101") < SToD("") , .F. ) - TEST_LINE( "" < "AAA" , .T. ) - TEST_LINE( "AAA" < "" , .F. ) - TEST_LINE( "AAA" < "AA" , .F. ) - TEST_LINE( "AAA" < Chr(255) , .T. ) - TEST_LINE( Chr(150) < Chr(255) , .T. ) - TEST_LINE( "A" < "a" , .T. ) - TEST_LINE( "A" < "Z" , .T. ) - TEST_LINE( "Z" < "A" , .F. ) - TEST_LINE( Chr(0) < " " , .T. ) - TEST_LINE( "Hallo" < "Hello" , .T. ) - TEST_LINE( "Hello" < "Hello" , .F. ) - TEST_LINE( "Hell" < "Hello" , .T. ) - TEST_LINE( "Hellow" < "Hello" , .F. ) - TEST_LINE( "J" < "Hello" , .F. ) - TEST_LINE( "" < "Hello" , .T. ) - TEST_LINE( "J" < "" , .F. ) - TEST_LINE( "" < "" , .F. ) - - /* >= */ - - TEST_LINE( 2 >= 1 , .T. ) - TEST_LINE( 1 >= 2 , .F. ) - TEST_LINE( 2.0 >= 2 , .T. ) - TEST_LINE( 2 >= 2.0 , .T. ) - TEST_LINE( 2.5 >= 3.7 , .F. ) - TEST_LINE( 3.7 >= 2.5 , .T. ) - TEST_LINE( .F. >= .F. , .T. ) - TEST_LINE( .T. >= .F. , .T. ) - TEST_LINE( .F. >= .T. , .F. ) - TEST_LINE( SToD("") >= SToD("") , .T. ) - TEST_LINE( SToD("") >= SToD("19800101") , .F. ) - TEST_LINE( SToD("19800101") >= SToD("") , .T. ) - TEST_LINE( "" >= "AAA" , .F. ) - TEST_LINE( "AAA" >= "" , .T. ) - TEST_LINE( "AAA" >= "AA" , .T. ) - TEST_LINE( "AAA" >= Chr(255) , .F. ) - TEST_LINE( Chr(150) >= Chr(255) , .F. ) - TEST_LINE( "A" >= "a" , .F. ) - TEST_LINE( "A" >= "Z" , .F. ) - TEST_LINE( "Z" >= "A" , .T. ) - TEST_LINE( Chr(0) >= " " , .F. ) - TEST_LINE( "Hallo" >= "Hello" , .F. ) - TEST_LINE( "Hello" >= "Hello" , .T. ) - TEST_LINE( "Hell" >= "Hello" , .F. ) - TEST_LINE( "Hellow" >= "Hello" , .T. ) - TEST_LINE( "J" >= "Hello" , .T. ) - TEST_LINE( "" >= "Hello" , .F. ) - TEST_LINE( "J" >= "" , .T. ) - TEST_LINE( "" >= "" , .T. ) - - /* > */ - - TEST_LINE( 2 > 1 , .T. ) - TEST_LINE( 1 > 2 , .F. ) - TEST_LINE( 2.0 > 2 , .F. ) - TEST_LINE( 2 > 2.0 , .F. ) - TEST_LINE( 2.5 > 3.7 , .F. ) - TEST_LINE( 3.7 > 2.5 , .T. ) - TEST_LINE( .F. > .F. , .F. ) - TEST_LINE( .T. > .F. , .T. ) - TEST_LINE( .F. > .T. , .F. ) - TEST_LINE( SToD("") > SToD("") , .F. ) - TEST_LINE( SToD("") > SToD("19800101") , .F. ) - TEST_LINE( SToD("19800101") > SToD("") , .T. ) - TEST_LINE( "" > "AAA" , .F. ) - TEST_LINE( "AAA" > "" , .F. ) - TEST_LINE( "AAA" > "AA" , .F. ) - TEST_LINE( "AAA" > Chr(255) , .F. ) - TEST_LINE( Chr(150) > Chr(255) , .F. ) - TEST_LINE( "A" > "a" , .F. ) - TEST_LINE( "A" > "Z" , .F. ) - TEST_LINE( "Z" > "A" , .T. ) - TEST_LINE( Chr(0) > " " , .F. ) - TEST_LINE( "Hallo" > "Hello" , .F. ) - TEST_LINE( "Hello" > "Hello" , .F. ) - TEST_LINE( "Hell" > "Hello" , .F. ) - TEST_LINE( "Hellow" > "Hello" , .F. ) - TEST_LINE( "J" > "Hello" , .T. ) - TEST_LINE( "" > "Hello" , .F. ) - TEST_LINE( "J" > "" , .F. ) - TEST_LINE( "" > "" , .F. ) - + TEST_LINE( 2 <= 1 , .F. ) + TEST_LINE( 1 <= 2 , .T. ) + TEST_LINE( 2.0 <= 2 , .T. ) + TEST_LINE( 2 <= 2.0 , .T. ) + TEST_LINE( 2.5 <= 3.7 , .T. ) + TEST_LINE( 3.7 <= 2.5 , .F. ) + TEST_LINE( .F. <= .F. , .T. ) + TEST_LINE( .T. <= .F. , .F. ) + TEST_LINE( .F. <= .T. , .T. ) + TEST_LINE( HB_SToD("") <= HB_SToD("") , .T. ) + TEST_LINE( HB_SToD("") <= HB_SToD("19800101") , .T. ) + TEST_LINE( HB_SToD("19800101") <= HB_SToD("") , .F. ) + TEST_LINE( "" <= "AAA" , .T. ) + TEST_LINE( "AAA" <= "" , .T. ) + TEST_LINE( "AAA" <= "AA" , .T. ) + TEST_LINE( "AAA" <= Chr(255) , .T. ) + TEST_LINE( Chr(150) <= Chr(255) , .T. ) + TEST_LINE( "A" <= "a" , .T. ) + TEST_LINE( "A" <= "Z" , .T. ) + TEST_LINE( "Z" <= " " , .F. ) + TEST_LINE( Chr(0) <= " " , .T. ) + TEST_LINE( "Hallo" <= "Hello" , .T. ) + TEST_LINE( "Hello" <= "Hello" , .T. ) + TEST_LINE( "Hell" <= "Hello" , .T. ) + TEST_LINE( "Hellow" <= "Hello" , .T. ) + TEST_LINE( "J" <= "Hello" , .F. ) + TEST_LINE( "" <= "Hello" , .T. ) + TEST_LINE( "J" <= "" , .T. ) + TEST_LINE( "" <= "" , .T. ) + + /* < */ + + TEST_LINE( 2 < 1 , .F. ) + TEST_LINE( 1 < 2 , .T. ) + TEST_LINE( 2.0 < 2 , .F. ) + TEST_LINE( 2 < 2.0 , .F. ) + TEST_LINE( 2.5 < 3.7 , .T. ) + TEST_LINE( 3.7 < 2.5 , .F. ) + TEST_LINE( .F. < .F. , .F. ) + TEST_LINE( .T. < .F. , .F. ) + TEST_LINE( .F. < .T. , .T. ) + TEST_LINE( HB_SToD("") < HB_SToD("") , .F. ) + TEST_LINE( HB_SToD("") < HB_SToD("19800101") , .T. ) + TEST_LINE( HB_SToD("19800101") < HB_SToD("") , .F. ) + TEST_LINE( "" < "AAA" , .T. ) + TEST_LINE( "AAA" < "" , .F. ) + TEST_LINE( "AAA" < "AA" , .F. ) + TEST_LINE( "AAA" < Chr(255) , .T. ) + TEST_LINE( Chr(150) < Chr(255) , .T. ) + TEST_LINE( "A" < "a" , .T. ) + TEST_LINE( "A" < "Z" , .T. ) + TEST_LINE( "Z" < "A" , .F. ) + TEST_LINE( Chr(0) < " " , .T. ) + TEST_LINE( "Hallo" < "Hello" , .T. ) + TEST_LINE( "Hello" < "Hello" , .F. ) + TEST_LINE( "Hell" < "Hello" , .T. ) + TEST_LINE( "Hellow" < "Hello" , .F. ) + TEST_LINE( "J" < "Hello" , .F. ) + TEST_LINE( "" < "Hello" , .T. ) + TEST_LINE( "J" < "" , .F. ) + TEST_LINE( "" < "" , .F. ) + + /* >= */ + + TEST_LINE( 2 >= 1 , .T. ) + TEST_LINE( 1 >= 2 , .F. ) + TEST_LINE( 2.0 >= 2 , .T. ) + TEST_LINE( 2 >= 2.0 , .T. ) + TEST_LINE( 2.5 >= 3.7 , .F. ) + TEST_LINE( 3.7 >= 2.5 , .T. ) + TEST_LINE( .F. >= .F. , .T. ) + TEST_LINE( .T. >= .F. , .T. ) + TEST_LINE( .F. >= .T. , .F. ) + TEST_LINE( HB_SToD("") >= HB_SToD("") , .T. ) + TEST_LINE( HB_SToD("") >= HB_SToD("19800101") , .F. ) + TEST_LINE( HB_SToD("19800101") >= HB_SToD("") , .T. ) + TEST_LINE( "" >= "AAA" , .F. ) + TEST_LINE( "AAA" >= "" , .T. ) + TEST_LINE( "AAA" >= "AA" , .T. ) + TEST_LINE( "AAA" >= Chr(255) , .F. ) + TEST_LINE( Chr(150) >= Chr(255) , .F. ) + TEST_LINE( "A" >= "a" , .F. ) + TEST_LINE( "A" >= "Z" , .F. ) + TEST_LINE( "Z" >= "A" , .T. ) + TEST_LINE( Chr(0) >= " " , .F. ) + TEST_LINE( "Hallo" >= "Hello" , .F. ) + TEST_LINE( "Hello" >= "Hello" , .T. ) + TEST_LINE( "Hell" >= "Hello" , .F. ) + TEST_LINE( "Hellow" >= "Hello" , .T. ) + TEST_LINE( "J" >= "Hello" , .T. ) + TEST_LINE( "" >= "Hello" , .F. ) + TEST_LINE( "J" >= "" , .T. ) + TEST_LINE( "" >= "" , .T. ) + + /* > */ + + TEST_LINE( 2 > 1 , .T. ) + TEST_LINE( 1 > 2 , .F. ) + TEST_LINE( 2.0 > 2 , .F. ) + TEST_LINE( 2 > 2.0 , .F. ) + TEST_LINE( 2.5 > 3.7 , .F. ) + TEST_LINE( 3.7 > 2.5 , .T. ) + TEST_LINE( .F. > .F. , .F. ) + TEST_LINE( .T. > .F. , .T. ) + TEST_LINE( .F. > .T. , .F. ) + TEST_LINE( HB_SToD("") > HB_SToD("") , .F. ) + TEST_LINE( HB_SToD("") > HB_SToD("19800101") , .F. ) + TEST_LINE( HB_SToD("19800101") > HB_SToD("") , .T. ) + TEST_LINE( "" > "AAA" , .F. ) + TEST_LINE( "AAA" > "" , .F. ) + TEST_LINE( "AAA" > "AA" , .F. ) + TEST_LINE( "AAA" > Chr(255) , .F. ) + TEST_LINE( Chr(150) > Chr(255) , .F. ) + TEST_LINE( "A" > "a" , .F. ) + TEST_LINE( "A" > "Z" , .F. ) + TEST_LINE( "Z" > "A" , .T. ) + TEST_LINE( Chr(0) > " " , .F. ) + TEST_LINE( "Hallo" > "Hello" , .F. ) + TEST_LINE( "Hello" > "Hello" , .F. ) + TEST_LINE( "Hell" > "Hello" , .F. ) + TEST_LINE( "Hellow" > "Hello" , .F. ) + TEST_LINE( "J" > "Hello" , .T. ) + TEST_LINE( "" > "Hello" , .F. ) + TEST_LINE( "J" > "" , .F. ) + TEST_LINE( "" > "" , .F. ) + /* =, == */ - + SET EXACT ON TEST_LINE( "123" = "123 " , .T. ) TEST_LINE( " 123" = "123" , .F. ) diff --git a/harbour/utils/hbtest/rt_hvma.prg b/harbour/utils/hbtest/rt_hvma.prg index ca8cf4f18e..e36f4d30c1 100644 --- a/harbour/utils/hbtest/rt_hvma.prg +++ b/harbour/utils/hbtest/rt_hvma.prg @@ -225,14 +225,14 @@ FUNCTION Main_HVMA() TEST_LINE( .T. .AND. 1 , 1 ) TEST_LINE( .T. .AND. 1.567 , 1.567 ) TEST_LINE( .T. .AND. scString , "HELLO" ) - TEST_LINE( .T. .AND. SToD("") , SToD(" ") ) + TEST_LINE( .T. .AND. HB_SToD("") , HB_SToD(" ") ) TEST_LINE( .T. .AND. NIL , NIL ) TEST_LINE( .T. .AND. {} , "{.[0].}" ) TEST_LINE( .T. .AND. {|| NIL } , "{||...}" ) TEST_LINE( .F. .AND. 1 , .F. ) TEST_LINE( .F. .AND. 1.567 , .F. ) TEST_LINE( .F. .AND. scString , .F. ) - TEST_LINE( .F. .AND. SToD("") , .F. ) + TEST_LINE( .F. .AND. HB_SToD("") , .F. ) TEST_LINE( .F. .AND. NIL , .F. ) TEST_LINE( .F. .AND. {} , .F. ) TEST_LINE( .F. .AND. {|| NIL } , .F. ) @@ -261,14 +261,14 @@ FUNCTION Main_HVMA() TEST_LINE( .T. .AND. 1 , "E BASE 1078 Argument error .AND. F:S" ) TEST_LINE( .T. .AND. 1.567 , "E BASE 1078 Argument error .AND. F:S" ) TEST_LINE( .T. .AND. scString , "E BASE 1078 Argument error .AND. F:S" ) - TEST_LINE( .T. .AND. SToD("") , "E BASE 1078 Argument error .AND. F:S" ) + TEST_LINE( .T. .AND. HB_SToD("") , "E BASE 1078 Argument error .AND. F:S" ) TEST_LINE( .T. .AND. NIL , "E BASE 1078 Argument error .AND. F:S" ) TEST_LINE( .T. .AND. {} , "E BASE 1078 Argument error .AND. F:S" ) TEST_LINE( .T. .AND. {|| NIL } , "E BASE 1078 Argument error .AND. F:S" ) TEST_LINE( .F. .AND. 1 , "E BASE 1078 Argument error .AND. F:S" ) TEST_LINE( .F. .AND. 1.567 , "E BASE 1078 Argument error .AND. F:S" ) TEST_LINE( .F. .AND. scString , "E BASE 1078 Argument error .AND. F:S" ) - TEST_LINE( .F. .AND. SToD("") , "E BASE 1078 Argument error .AND. F:S" ) + TEST_LINE( .F. .AND. HB_SToD("") , "E BASE 1078 Argument error .AND. F:S" ) TEST_LINE( .F. .AND. NIL , "E BASE 1078 Argument error .AND. F:S" ) TEST_LINE( .F. .AND. {} , "E BASE 1078 Argument error .AND. F:S" ) TEST_LINE( .F. .AND. {|| NIL } , "E BASE 1078 Argument error .AND. F:S" ) @@ -340,7 +340,7 @@ FUNCTION Main_HVMA() TEST_LINE( (NIL)->NOFIELD , "E BASE 1065 Argument error & F:S" ) TEST_LINE( (2)->NOFIELD , "E BASE 1003 Variable does not exist NOFIELD F:R" ) TEST_LINE( (2.5)->NOFIELD , "E BASE 1003 Variable does not exist NOFIELD F:R" ) - TEST_LINE( (SToD(""))->NOFIELD , "E BASE 1065 Argument error & F:S" ) + TEST_LINE( (HB_SToD(""))->NOFIELD , "E BASE 1065 Argument error & F:S" ) TEST_LINE( (ErrorNew())->NOFIELD , "E BASE 1065 Argument error & F:S" ) #ifndef __XPP__ @@ -353,7 +353,7 @@ FUNCTION Main_HVMA() TEST_LINE( (NIL)->(Eof()) , .T. ) TEST_LINE( (2)->(Eof()) , .T. ) TEST_LINE( (2.5)->(Eof()) , .T. ) - TEST_LINE( (SToD(""))->(Eof()) , .T. ) + TEST_LINE( (HB_SToD(""))->(Eof()) , .T. ) TEST_LINE( (ErrorNew())->(Eof()) , .T. ) #endif @@ -367,7 +367,7 @@ FUNCTION Main_HVMA() TEST_LINE( NOTHERE->(NIL) , "E BASE 1002 Alias does not exist NOTHERE F:R" ) TEST_LINE( NOTHERE->(1) , "E BASE 1002 Alias does not exist NOTHERE F:R" ) TEST_LINE( NOTHERE->(1.5) , "E BASE 1002 Alias does not exist NOTHERE F:R" ) - TEST_LINE( NOTHERE->(SToD("")) , "E BASE 1002 Alias does not exist NOTHERE F:R" ) + TEST_LINE( NOTHERE->(HB_SToD("")) , "E BASE 1002 Alias does not exist NOTHERE F:R" ) TEST_LINE( NOTHERE->(ErrorNew()) , "E BASE 1002 Alias does not exist NOTHERE F:R" ) TEST_LINE( 200->NOFIELD , "E BASE 1003 Variable does not exist NOFIELD F:R" ) @@ -380,7 +380,7 @@ FUNCTION Main_HVMA() TEST_LINE( 200->(NIL) , NIL ) TEST_LINE( 200->(1) , 1 ) TEST_LINE( 200->(1.5) , 1.5 ) - TEST_LINE( 200->(SToD("")) , SToD(" ") ) + TEST_LINE( 200->(HB_SToD("")) , HB_SToD(" ") ) TEST_LINE( 200->(ErrorNew()) , "ERROR Object" ) TEST_LINE( soObject:hello , "E BASE 1004 No exported method HELLO F:S" ) @@ -444,11 +444,11 @@ FUNCTION Main_HVMA() TEST_LINE( Empty( 10.0 ) , .F. ) TEST_LINE( Empty( 70000+70000 ) , .F. ) TEST_LINE( Empty( 1.5*1.5*2.25 ) , .F. ) - TEST_LINE( Empty( SToD("18241010") ) , .F. ) - TEST_LINE( Empty( SToD("18250231") ) , .T. ) - TEST_LINE( Empty( SToD("99999999") ) , .T. ) - TEST_LINE( Empty( SToD(" ") ) , .T. ) - TEST_LINE( Empty( SToD("") ) , .T. ) + TEST_LINE( Empty( HB_SToD("18241010") ) , .F. ) + TEST_LINE( Empty( HB_SToD("18250231") ) , .T. ) + TEST_LINE( Empty( HB_SToD("99999999") ) , .T. ) + TEST_LINE( Empty( HB_SToD(" ") ) , .T. ) + TEST_LINE( Empty( HB_SToD("") ) , .T. ) TEST_LINE( Empty( .T. ) , .F. ) TEST_LINE( Empty( .F. ) , .T. ) TEST_LINE( Empty( NIL ) , .T. ) diff --git a/harbour/utils/hbtest/rt_init.ch b/harbour/utils/hbtest/rt_init.ch index 53b8a8c0b1..437339ef90 100644 --- a/harbour/utils/hbtest/rt_init.ch +++ b/harbour/utils/hbtest/rt_init.ch @@ -53,8 +53,8 @@ INIT PROCEDURE RT_InitStatics() snLongN := -100000 snDoubleN := -10.567 /* Use different number of decimals than the default */ snDoubleI := 0 // Log( 0 ) - sdDate := SToD( "19840325" ) - sdDateE := SToD( "" ) + sdDate := HB_SToD( "19840325" ) + sdDateE := HB_SToD( "" ) slFalse := .F. slTrue := .T. soObject := ErrorNew() diff --git a/harbour/utils/hbtest/rt_math.prg b/harbour/utils/hbtest/rt_math.prg index 6a8b6f73f2..8ea420504c 100644 --- a/harbour/utils/hbtest/rt_math.prg +++ b/harbour/utils/hbtest/rt_math.prg @@ -249,25 +249,25 @@ FUNCTION Main_MATH() /* MIN()/MAX() */ - TEST_LINE( Max(NIL, NIL) , "E BASE 1093 Argument error MAX F:S" ) - TEST_LINE( Max(10, NIL) , "E BASE 1093 Argument error MAX F:S" ) - TEST_LINE( Max(SToD("19800101"), 10) , "E BASE 1093 Argument error MAX F:S" ) - TEST_LINE( Max(SToD("19800101"), SToD("19800101")) , SToD("19800101") ) - TEST_LINE( Max(SToD("19800102"), SToD("19800101")) , SToD("19800102") ) - TEST_LINE( Max(SToD("19800101"), SToD("19800102")) , SToD("19800102") ) - TEST_LINE( Max(snIntP, snLongP) , 100000 ) -#ifdef __HARBOUR__ - TEST_LINE( Max(@snIntP, @snLongP) , 100000 ) /* Bug in CA-Cl*pper, it will return: "E BASE 1093 Argument error MAX F:S" */ -#endif - TEST_LINE( Min(NIL, NIL) , "E BASE 1092 Argument error MIN F:S" ) - TEST_LINE( Min(10, NIL) , "E BASE 1092 Argument error MIN F:S" ) - TEST_LINE( Min(SToD("19800101"), 10) , "E BASE 1092 Argument error MIN F:S" ) - TEST_LINE( Min(SToD("19800101"), SToD("19800101")) , SToD("19800101") ) - TEST_LINE( Min(SToD("19800102"), SToD("19800101")) , SToD("19800101") ) - TEST_LINE( Min(SToD("19800101"), SToD("19800102")) , SToD("19800101") ) - TEST_LINE( Min(snIntP, snLongP) , 10 ) -#ifdef __HARBOUR__ - TEST_LINE( Min(@snIntP, @snLongP) , 10 ) /* Bug in CA-Cl*pper, it will return: "E BASE 1092 Argument error MIN F:S" */ + TEST_LINE( Max(NIL, NIL) , "E BASE 1093 Argument error MAX F:S" ) + TEST_LINE( Max(10, NIL) , "E BASE 1093 Argument error MAX F:S" ) + TEST_LINE( Max(HB_SToD("19800101"), 10) , "E BASE 1093 Argument error MAX F:S" ) + TEST_LINE( Max(HB_SToD("19800101"), HB_SToD("19800101")) , HB_SToD("19800101") ) + TEST_LINE( Max(HB_SToD("19800102"), HB_SToD("19800101")) , HB_SToD("19800102") ) + TEST_LINE( Max(HB_SToD("19800101"), HB_SToD("19800102")) , HB_SToD("19800102") ) + TEST_LINE( Max(snIntP, snLongP) , 100000 ) +#ifdef __HARBOUR__ + TEST_LINE( Max(@snIntP, @snLongP) , 100000 ) /* Bug in CA-Cl*pper, it will return: "E BASE 1093 Argument error MAX F:S" */ +#endif + TEST_LINE( Min(NIL, NIL) , "E BASE 1092 Argument error MIN F:S" ) + TEST_LINE( Min(10, NIL) , "E BASE 1092 Argument error MIN F:S" ) + TEST_LINE( Min(HB_SToD("19800101"), 10) , "E BASE 1092 Argument error MIN F:S" ) + TEST_LINE( Min(HB_SToD("19800101"), HB_SToD("19800101")) , HB_SToD("19800101") ) + TEST_LINE( Min(HB_SToD("19800102"), HB_SToD("19800101")) , HB_SToD("19800101") ) + TEST_LINE( Min(HB_SToD("19800101"), HB_SToD("19800102")) , HB_SToD("19800101") ) + TEST_LINE( Min(snIntP, snLongP) , 10 ) +#ifdef __HARBOUR__ + TEST_LINE( Min(@snIntP, @snLongP) , 10 ) /* Bug in CA-Cl*pper, it will return: "E BASE 1092 Argument error MIN F:S" */ #endif /* Decimals handling */ diff --git a/harbour/utils/hbtest/rt_misc.prg b/harbour/utils/hbtest/rt_misc.prg index 1a93083b16..6aba0dd340 100644 --- a/harbour/utils/hbtest/rt_misc.prg +++ b/harbour/utils/hbtest/rt_misc.prg @@ -248,12 +248,12 @@ FUNCTION Main_MISC() TEST_LINE( saArray:Eval , "E BASE 1004 No exported method EVAL F:S" ) TEST_LINE( soObject:Eval , "E BASE 1004 No exported method EVAL F:S" ) - /* STOD() */ + /* HB_STOD() */ - /* For these tests in CA-Cl*pper 5.2e the following native STOD() has + /* For these tests in CA-Cl*pper 5.2e the following native HB_STOD() has been used ( not the emulated one written in Clipper ): - CLIPPER STOD( void ) + CLIPPER HB_STOD( void ) { // The length check is a fix to avoid buggy behaviour of _retds() _retds( ( ISCHAR( 1 ) && _parclen( 1 ) == 8 ) ? _parc( 1 ) : " " ); @@ -261,33 +261,33 @@ FUNCTION Main_MISC() */ #ifndef __XPP__ - TEST_LINE( SToD() , SToD(" ") ) + TEST_LINE( HB_SToD() , HB_SToD(" ") ) #endif - TEST_LINE( SToD(1) , SToD(" ") ) - TEST_LINE( SToD(NIL) , SToD(" ") ) - TEST_LINE( SToD("") , SToD(" ") ) - TEST_LINE( SToD(" ") , SToD(" ") ) - TEST_LINE( SToD(" ") , SToD(" ") ) - TEST_LINE( SToD(" ") , SToD(" ") ) - TEST_LINE( SToD(" 1234567") , SToD(" ") ) - TEST_LINE( SToD("1999 ") , SToD(" ") ) - TEST_LINE( SToD("99999999") , SToD(" ") ) - TEST_LINE( SToD("99990101") , SToD(" ") ) - TEST_LINE( SToD("19991301") , SToD(" ") ) - TEST_LINE( SToD("19991241") , SToD(" ") ) - TEST_LINE( SToD("01000101") , SToD("01000101") ) - TEST_LINE( SToD("29991231") , SToD("29991231") ) - TEST_LINE( SToD("19990905") , SToD("19990905") ) - TEST_LINE( SToD(" 9990905") , SToD(" ") ) - TEST_LINE( SToD("1 990905") , SToD(" ") ) - TEST_LINE( SToD("19 90905") , SToD("17490905") ) - TEST_LINE( SToD("199 0905") , SToD("19740905") ) - TEST_LINE( SToD("1999 905") , SToD(" ") ) - TEST_LINE( SToD("19990 05") , SToD(" ") ) - TEST_LINE( SToD("199909 5") , SToD(" ") ) - TEST_LINE( SToD("1999090 ") , SToD(" ") ) - TEST_LINE( SToD("1999 9 5") , SToD(" ") ) - TEST_LINE( SToD("1999090" + Chr(0)) , SToD(" ") ) + TEST_LINE( HB_SToD(1) , HB_SToD(" ") ) + TEST_LINE( HB_SToD(NIL) , HB_SToD(" ") ) + TEST_LINE( HB_SToD("") , HB_SToD(" ") ) + TEST_LINE( HB_SToD(" ") , HB_SToD(" ") ) + TEST_LINE( HB_SToD(" ") , HB_SToD(" ") ) + TEST_LINE( HB_SToD(" ") , HB_SToD(" ") ) + TEST_LINE( HB_SToD(" 1234567") , HB_SToD(" ") ) + TEST_LINE( HB_SToD("1999 ") , HB_SToD(" ") ) + TEST_LINE( HB_SToD("99999999") , HB_SToD(" ") ) + TEST_LINE( HB_SToD("99990101") , HB_SToD(" ") ) + TEST_LINE( HB_SToD("19991301") , HB_SToD(" ") ) + TEST_LINE( HB_SToD("19991241") , HB_SToD(" ") ) + TEST_LINE( HB_SToD("01000101") , HB_SToD("01000101") ) + TEST_LINE( HB_SToD("29991231") , HB_SToD("29991231") ) + TEST_LINE( HB_SToD("19990905") , HB_SToD("19990905") ) + TEST_LINE( HB_SToD(" 9990905") , HB_SToD(" ") ) + TEST_LINE( HB_SToD("1 990905") , HB_SToD(" ") ) + TEST_LINE( HB_SToD("19 90905") , HB_SToD("17490905") ) + TEST_LINE( HB_SToD("199 0905") , HB_SToD("19740905") ) + TEST_LINE( HB_SToD("1999 905") , HB_SToD(" ") ) + TEST_LINE( HB_SToD("19990 05") , HB_SToD(" ") ) + TEST_LINE( HB_SToD("199909 5") , HB_SToD(" ") ) + TEST_LINE( HB_SToD("1999090 ") , HB_SToD(" ") ) + TEST_LINE( HB_SToD("1999 9 5") , HB_SToD(" ") ) + TEST_LINE( HB_SToD("1999090" + Chr(0)) , HB_SToD(" ") ) /* DESCEND() */ @@ -323,9 +323,9 @@ FUNCTION Main_MISC() TEST_LINE( Descend( Chr(0) ) , ""+Chr(0)+"" ) TEST_LINE( Descend( Chr(0) + "Hello" ) , ""+Chr(0)+"¸›””‘" ) TEST_LINE( Descend( "Hello"+Chr(0)+"wo" ) , "¸›””‘"+Chr(0)+"‰‘" ) - TEST_LINE( Descend( SToD( "" ) ) , 5231808 ) - TEST_LINE( Descend( SToD( "01000101" ) ) , 3474223 ) - TEST_LINE( Descend( SToD( "19801220" ) ) , 2787214 ) + TEST_LINE( Descend( HB_SToD( "" ) ) , 5231808 ) + TEST_LINE( Descend( HB_SToD( "01000101" ) ), 3474223 ) + TEST_LINE( Descend( HB_SToD( "19801220" ) ), 2787214 ) #ifdef __HARBOUR__ diff --git a/harbour/utils/hbtest/rt_str.prg b/harbour/utils/hbtest/rt_str.prg index 55b6a933a7..9cd8f8101f 100644 --- a/harbour/utils/hbtest/rt_str.prg +++ b/harbour/utils/hbtest/rt_str.prg @@ -525,135 +525,135 @@ FUNCTION Main_STR() /* LEFT() */ - TEST_LINE( Left(100 , -10) , "E BASE 1124 Argument error LEFT F:S" ) - TEST_LINE( Left("abcdef", "A") , "E BASE 1124 Argument error LEFT F:S" ) - TEST_LINE( Left("abcdef", -10) , "" ) - TEST_LINE( Left("abcdef", -2) , "" ) - TEST_LINE( Left("abcdef", 0) , "" ) - TEST_LINE( Left("abcdef", 2) , "ab" ) - TEST_LINE( Left("abcdef", 10) , "abcdef" ) - TEST_LINE( Left("ab" + Chr(0) + "def", 5) , "ab" + Chr(0) + "de" ) - - /* RIGHT() */ - - TEST_LINE( Right(100 , -10) , "" ) - TEST_LINE( Right("abcdef", "A") , "" ) - TEST_LINE( Right("abcdef", -10) , "" ) - TEST_LINE( Right("abcdef", -2) , "" ) - TEST_LINE( Right("abcdef", 0) , "" ) - TEST_LINE( Right("abcdef", 2) , "ef" ) - TEST_LINE( Right("abcdef", 10) , "abcdef" ) - TEST_LINE( Right("ab" + Chr(0) + "def", 5) , "b" + Chr(0) + "def" ) - - /* PADR() */ - - TEST_LINE( Pad(NIL, 5) , "" ) - TEST_LINE( Pad(.T., 5) , "" ) - TEST_LINE( Pad(10, 5) , "10 " ) - TEST_LINE( Pad(10.2, 5) , "10.2 " ) - TEST_LINE( Pad(100000, 8) , "100000 " ) - TEST_LINE( Pad(100000, 8, "-") , "100000--" ) - TEST_LINE( Pad(-100000, 8, "-") , "-100000-" ) - TEST_LINE( Pad(5000000000, 15) , "5000000000 ") - TEST_LINE( Pad(SToD("19840325"), 12) , "1984.03.25 " ) - TEST_LINE( Pad(Year(SToD("19840325")), 5) , "1984 " ) - TEST_LINE( Pad(Day(SToD("19840325")), 5) , "25 " ) -#ifdef __HARBOUR__ - TEST_LINE( Pad(@scString, 10) , "HELLO " ) /* Bug in CA-Cl*pper, it will return "" */ - TEST_LINE( Pad(scString, @snIntP) , "HELLO " ) /* Bug in CA-Cl*pper, it will return "" */ -#endif -#ifndef __XPP__ - TEST_LINE( Pad("abcdef", "A") , "" ) - TEST_LINE( Pad("abcdef", -5) , "" ) -#endif - TEST_LINE( Pad("abcdef", 0) , "" ) - TEST_LINE( Pad("abcdef", 5) , "abcde" ) - TEST_LINE( Pad("abcdef", 10) , "abcdef " ) - TEST_LINE( Pad("abcdef", 10, "") , "abcdef"+Chr(0)+""+Chr(0)+""+Chr(0)+""+Chr(0)+"" ) - TEST_LINE( Pad("abcdef", 10, "1") , "abcdef1111" ) - TEST_LINE( Pad("abcdef", 10, "12") , "abcdef1111" ) - - /* PADR() */ - - TEST_LINE( PadR(NIL, 5) , "" ) - TEST_LINE( PadR(.T., 5) , "" ) - TEST_LINE( PadR(10, 5) , "10 " ) - TEST_LINE( PadR(10.2, 5) , "10.2 " ) - TEST_LINE( PadR(100000, 8) , "100000 " ) - TEST_LINE( PadR(100000, 8, "-") , "100000--" ) - TEST_LINE( PadR(-100000, 8, "-") , "-100000-" ) - TEST_LINE( PadR(SToD("19840325"), 12) , "1984.03.25 " ) - TEST_LINE( PadR(Year(SToD("19840325")), 5) , "1984 " ) - TEST_LINE( PadR(Day(SToD("19840325")), 5) , "25 " ) -#ifdef __HARBOUR__ - TEST_LINE( PadR(@scString, 10) , "HELLO " ) /* Bug in CA-Cl*pper, it will return "" */ - TEST_LINE( PadR(scString, @snIntP) , "HELLO " ) /* Bug in CA-Cl*pper, it will return "" */ -#endif -#ifndef __XPP__ - TEST_LINE( PadR("abcdef", "A") , "" ) - TEST_LINE( PadR("abcdef", -5) , "" ) -#endif - TEST_LINE( PadR("abcdef", 0) , "" ) - TEST_LINE( PadR("abcdef", 5) , "abcde" ) - TEST_LINE( PadR("abcdef", 10) , "abcdef " ) - TEST_LINE( PadR("abcdef", 10, "") , "abcdef"+Chr(0)+""+Chr(0)+""+Chr(0)+""+Chr(0)+"" ) - TEST_LINE( PadR("abcdef", 10, "1") , "abcdef1111" ) - TEST_LINE( PadR("abcdef", 10, "12") , "abcdef1111" ) - - /* PADL() */ - - TEST_LINE( PadL(NIL, 5) , "" ) - TEST_LINE( PadL(.T., 5) , "" ) - TEST_LINE( PadL(10, 5) , " 10" ) - TEST_LINE( PadL(10.2, 5) , " 10.2" ) - TEST_LINE( PadL(100000, 8) , " 100000" ) - TEST_LINE( PadL(100000, 8, "-") , "--100000" ) - TEST_LINE( PadL(-100000, 8, "-") , "--100000" ) - TEST_LINE( PadL(SToD("19840325"), 12) , " 1984.03.25" ) - TEST_LINE( PadL(Year(SToD("19840325")), 5) , " 1984" ) - TEST_LINE( PadL(Day(SToD("19840325")), 5) , " 25" ) -#ifdef __HARBOUR__ - TEST_LINE( PadL(@scString, 10) , " HELLO" ) /* Bug in CA-Cl*pper, it will return "" */ - TEST_LINE( PadL(scString, @snIntP) , " HELLO" ) /* Bug in CA-Cl*pper, it will return "" */ -#endif -#ifndef __XPP__ - TEST_LINE( PadL("abcdef", "A") , "" ) - TEST_LINE( PadL("abcdef", -5) , "" ) -#endif - TEST_LINE( PadL("abcdef", 0) , "" ) - TEST_LINE( PadL("abcdef", 5) , "abcde" ) /* QUESTION: CA-Cl*pper "bug", should return: "bcdef" ? */ - TEST_LINE( PadL("abcdef", 10) , " abcdef" ) - TEST_LINE( PadL("abcdef", 10, "") , ""+Chr(0)+""+Chr(0)+""+Chr(0)+""+Chr(0)+"abcdef" ) - TEST_LINE( PadL("abcdef", 10, "1") , "1111abcdef" ) - TEST_LINE( PadL("abcdef", 10, "12") , "1111abcdef" ) - - /* PADC() */ - - TEST_LINE( PadC(NIL, 5) , "" ) - TEST_LINE( PadC(.T., 5) , "" ) - TEST_LINE( PadC(10, 5) , " 10 " ) - TEST_LINE( PadC(10.2, 5) , "10.2 " ) - TEST_LINE( PadC(100000, 8) , " 100000 " ) - TEST_LINE( PadC(100000, 8, "-") , "-100000-" ) - TEST_LINE( PadC(-100000, 8, "-") , "-100000-" ) - TEST_LINE( PadC(SToD("19840325"), 12) , " 1984.03.25 " ) - TEST_LINE( PadC(Year(SToD("19840325")), 5) , "1984 " ) - TEST_LINE( PadC(Day(SToD("19840325")), 5) , " 25 " ) -#ifdef __HARBOUR__ - TEST_LINE( PadC(@scString, 10) , " HELLO " ) /* Bug in CA-Cl*pper, it will return "" */ - TEST_LINE( PadC(scString, @snIntP) , " HELLO " ) /* Bug in CA-Cl*pper, it will return "" */ -#endif -#ifndef __XPP__ - TEST_LINE( PadC("abcdef", "A") , "" ) - TEST_LINE( PadC("abcdef", -5) , "" ) -#endif - TEST_LINE( PadC("abcdef", 0) , "" ) - TEST_LINE( PadC("abcdef", 2) , "ab" ) /* QUESTION: CA-Cl*pper "bug", should return: "cd" ? */ - TEST_LINE( PadC("abcdef", 5) , "abcde" ) - TEST_LINE( PadC("abcdef", 10) , " abcdef " ) - TEST_LINE( PadC("abcdef", 10, "") , ""+Chr(0)+""+Chr(0)+"abcdef"+Chr(0)+""+Chr(0)+"" ) - TEST_LINE( PadC("abcdef", 10, "1") , "11abcdef11" ) - TEST_LINE( PadC("abcdef", 10, "12") , "11abcdef11" ) + TEST_LINE( Left(100 , -10) , "E BASE 1124 Argument error LEFT F:S" ) + TEST_LINE( Left("abcdef", "A") , "E BASE 1124 Argument error LEFT F:S" ) + TEST_LINE( Left("abcdef", -10) , "" ) + TEST_LINE( Left("abcdef", -2) , "" ) + TEST_LINE( Left("abcdef", 0) , "" ) + TEST_LINE( Left("abcdef", 2) , "ab" ) + TEST_LINE( Left("abcdef", 10) , "abcdef" ) + TEST_LINE( Left("ab" + Chr(0) + "def", 5) , "ab" + Chr(0) + "de" ) + + /* RIGHT() */ + + TEST_LINE( Right(100 , -10) , "" ) + TEST_LINE( Right("abcdef", "A") , "" ) + TEST_LINE( Right("abcdef", -10) , "" ) + TEST_LINE( Right("abcdef", -2) , "" ) + TEST_LINE( Right("abcdef", 0) , "" ) + TEST_LINE( Right("abcdef", 2) , "ef" ) + TEST_LINE( Right("abcdef", 10) , "abcdef" ) + TEST_LINE( Right("ab" + Chr(0) + "def", 5) , "b" + Chr(0) + "def" ) + + /* PADR() */ + + TEST_LINE( Pad(NIL, 5) , "" ) + TEST_LINE( Pad(.T., 5) , "" ) + TEST_LINE( Pad(10, 5) , "10 " ) + TEST_LINE( Pad(10.2, 5) , "10.2 " ) + TEST_LINE( Pad(100000, 8) , "100000 " ) + TEST_LINE( Pad(100000, 8, "-") , "100000--" ) + TEST_LINE( Pad(-100000, 8, "-") , "-100000-" ) + TEST_LINE( Pad(5000000000, 15) , "5000000000 ") + TEST_LINE( Pad(HB_SToD("19840325"), 12) , "1984.03.25 " ) + TEST_LINE( Pad(Year(HB_SToD("19840325")), 5) , "1984 " ) + TEST_LINE( Pad(Day(HB_SToD("19840325")), 5) , "25 " ) +#ifdef __HARBOUR__ + TEST_LINE( Pad(@scString, 10) , "HELLO " ) /* Bug in CA-Cl*pper, it will return "" */ + TEST_LINE( Pad(scString, @snIntP) , "HELLO " ) /* Bug in CA-Cl*pper, it will return "" */ +#endif +#ifndef __XPP__ + TEST_LINE( Pad("abcdef", "A") , "" ) + TEST_LINE( Pad("abcdef", -5) , "" ) +#endif + TEST_LINE( Pad("abcdef", 0) , "" ) + TEST_LINE( Pad("abcdef", 5) , "abcde" ) + TEST_LINE( Pad("abcdef", 10) , "abcdef " ) + TEST_LINE( Pad("abcdef", 10, "") , "abcdef"+Chr(0)+""+Chr(0)+""+Chr(0)+""+Chr(0)+"" ) + TEST_LINE( Pad("abcdef", 10, "1") , "abcdef1111" ) + TEST_LINE( Pad("abcdef", 10, "12") , "abcdef1111" ) + + /* PADR() */ + + TEST_LINE( PadR(NIL, 5) , "" ) + TEST_LINE( PadR(.T., 5) , "" ) + TEST_LINE( PadR(10, 5) , "10 " ) + TEST_LINE( PadR(10.2, 5) , "10.2 " ) + TEST_LINE( PadR(100000, 8) , "100000 " ) + TEST_LINE( PadR(100000, 8, "-") , "100000--" ) + TEST_LINE( PadR(-100000, 8, "-") , "-100000-" ) + TEST_LINE( PadR(HB_SToD("19840325"), 12) , "1984.03.25 " ) + TEST_LINE( PadR(Year(HB_SToD("19840325")), 5) , "1984 " ) + TEST_LINE( PadR(Day(HB_SToD("19840325")), 5) , "25 " ) +#ifdef __HARBOUR__ + TEST_LINE( PadR(@scString, 10) , "HELLO " ) /* Bug in CA-Cl*pper, it will return "" */ + TEST_LINE( PadR(scString, @snIntP) , "HELLO " ) /* Bug in CA-Cl*pper, it will return "" */ +#endif +#ifndef __XPP__ + TEST_LINE( PadR("abcdef", "A") , "" ) + TEST_LINE( PadR("abcdef", -5) , "" ) +#endif + TEST_LINE( PadR("abcdef", 0) , "" ) + TEST_LINE( PadR("abcdef", 5) , "abcde" ) + TEST_LINE( PadR("abcdef", 10) , "abcdef " ) + TEST_LINE( PadR("abcdef", 10, "") , "abcdef"+Chr(0)+""+Chr(0)+""+Chr(0)+""+Chr(0)+"" ) + TEST_LINE( PadR("abcdef", 10, "1") , "abcdef1111" ) + TEST_LINE( PadR("abcdef", 10, "12") , "abcdef1111" ) + + /* PADL() */ + + TEST_LINE( PadL(NIL, 5) , "" ) + TEST_LINE( PadL(.T., 5) , "" ) + TEST_LINE( PadL(10, 5) , " 10" ) + TEST_LINE( PadL(10.2, 5) , " 10.2" ) + TEST_LINE( PadL(100000, 8) , " 100000" ) + TEST_LINE( PadL(100000, 8, "-") , "--100000" ) + TEST_LINE( PadL(-100000, 8, "-") , "--100000" ) + TEST_LINE( PadL(HB_SToD("19840325"), 12) , " 1984.03.25" ) + TEST_LINE( PadL(Year(HB_SToD("19840325")), 5) , " 1984" ) + TEST_LINE( PadL(Day(HB_SToD("19840325")), 5) , " 25" ) +#ifdef __HARBOUR__ + TEST_LINE( PadL(@scString, 10) , " HELLO" ) /* Bug in CA-Cl*pper, it will return "" */ + TEST_LINE( PadL(scString, @snIntP) , " HELLO" ) /* Bug in CA-Cl*pper, it will return "" */ +#endif +#ifndef __XPP__ + TEST_LINE( PadL("abcdef", "A") , "" ) + TEST_LINE( PadL("abcdef", -5) , "" ) +#endif + TEST_LINE( PadL("abcdef", 0) , "" ) + TEST_LINE( PadL("abcdef", 5) , "abcde" ) /* QUESTION: CA-Cl*pper "bug", should return: "bcdef" ? */ + TEST_LINE( PadL("abcdef", 10) , " abcdef" ) + TEST_LINE( PadL("abcdef", 10, "") , ""+Chr(0)+""+Chr(0)+""+Chr(0)+""+Chr(0)+"abcdef" ) + TEST_LINE( PadL("abcdef", 10, "1") , "1111abcdef" ) + TEST_LINE( PadL("abcdef", 10, "12") , "1111abcdef" ) + + /* PADC() */ + + TEST_LINE( PadC(NIL, 5) , "" ) + TEST_LINE( PadC(.T., 5) , "" ) + TEST_LINE( PadC(10, 5) , " 10 " ) + TEST_LINE( PadC(10.2, 5) , "10.2 " ) + TEST_LINE( PadC(100000, 8) , " 100000 " ) + TEST_LINE( PadC(100000, 8, "-") , "-100000-" ) + TEST_LINE( PadC(-100000, 8, "-") , "-100000-" ) + TEST_LINE( PadC(HB_SToD("19840325"), 12) , " 1984.03.25 " ) + TEST_LINE( PadC(Year(HB_SToD("19840325")), 5) , "1984 " ) + TEST_LINE( PadC(Day(HB_SToD("19840325")), 5) , " 25 " ) +#ifdef __HARBOUR__ + TEST_LINE( PadC(@scString, 10) , " HELLO " ) /* Bug in CA-Cl*pper, it will return "" */ + TEST_LINE( PadC(scString, @snIntP) , " HELLO " ) /* Bug in CA-Cl*pper, it will return "" */ +#endif +#ifndef __XPP__ + TEST_LINE( PadC("abcdef", "A") , "" ) + TEST_LINE( PadC("abcdef", -5) , "" ) +#endif + TEST_LINE( PadC("abcdef", 0) , "" ) + TEST_LINE( PadC("abcdef", 2) , "ab" ) /* QUESTION: CA-Cl*pper "bug", should return: "cd" ? */ + TEST_LINE( PadC("abcdef", 5) , "abcde" ) + TEST_LINE( PadC("abcdef", 10) , " abcdef " ) + TEST_LINE( PadC("abcdef", 10, "") , ""+Chr(0)+""+Chr(0)+"abcdef"+Chr(0)+""+Chr(0)+"" ) + TEST_LINE( PadC("abcdef", 10, "1") , "11abcdef11" ) + TEST_LINE( PadC("abcdef", 10, "12") , "11abcdef11" ) /* STUFF() */ diff --git a/harbour/utils/hbtest/rt_stra.prg b/harbour/utils/hbtest/rt_stra.prg index b5b03971df..caae25e275 100644 --- a/harbour/utils/hbtest/rt_stra.prg +++ b/harbour/utils/hbtest/rt_stra.prg @@ -462,13 +462,13 @@ FUNCTION New_STRINGS() #ifdef __HARBOUR__ - TEST_LINE( HB_ValToStr( 4 ) , " 4" ) - TEST_LINE( HB_ValToStr( 4.0 / 2 ) , " 2.00" ) - TEST_LINE( HB_ValToStr( "String" ) , "String" ) - TEST_LINE( HB_ValToStr( SToD( "20010101" ) ) , "2001.01.01" ) - TEST_LINE( HB_ValToStr( NIL ) , "NIL" ) - TEST_LINE( HB_ValToStr( .F. ) , ".F." ) - TEST_LINE( HB_ValToStr( .T. ) , ".T." ) + TEST_LINE( HB_ValToStr( 4 ) , " 4" ) + TEST_LINE( HB_ValToStr( 4.0 / 2 ) , " 2.00" ) + TEST_LINE( HB_ValToStr( "String" ) , "String" ) + TEST_LINE( HB_ValToStr( HB_SToD( "20010101" ) ) , "2001.01.01" ) + TEST_LINE( HB_ValToStr( NIL ) , "NIL" ) + TEST_LINE( HB_ValToStr( .F. ) , ".F." ) + TEST_LINE( HB_ValToStr( .T. ) , ".T." ) #endif diff --git a/harbour/utils/hbtest/rt_trans.prg b/harbour/utils/hbtest/rt_trans.prg index 4039770a58..0834bd5713 100644 --- a/harbour/utils/hbtest/rt_trans.prg +++ b/harbour/utils/hbtest/rt_trans.prg @@ -167,41 +167,41 @@ FUNCTION Main_TRANS() TEST_LINE( Transform( .F. , "@R Y" ) , "N" ) TEST_LINE( Transform( .T. , "@R X!" ) , "X!T" ) - TEST_LINE( Transform( SToD("20000101") , "@B" ) , "2000.01.01" ) - TEST_LINE( Transform( SToD("19901214") , "99/99/9999" ) , "1990.12.14" ) - TEST_LINE( Transform( SToD("19901202") , "99.99.9999" ) , "1990.12.02" ) - TEST_LINE( Transform( SToD("") , "99/99/9999" ) , " . . " ) - TEST_LINE( Transform( SToD("19901202") , "99/99/99" ) , "1990.12.02" ) - TEST_LINE( Transform( SToD("19901214") , "99-99-99" ) , "1990.12.14" ) - TEST_LINE( Transform( SToD("20040430") , "99.99.99" ) , "2004.04.30" ) - TEST_LINE( Transform( SToD("") , "99/99/99" ) , " . . " ) - TEST_LINE( Transform( SToD("19920101") , "THISWRNG" ) , "1992.01.01" ) - TEST_LINE( Transform( SToD("19350605") , "999/99/9" ) , "1935.06.05" ) - TEST_LINE( Transform( SToD("19101112") , "9#-9#/##" ) , "1910.11.12" ) - TEST_LINE( Transform( SToD("19920101") , "" ) , "1992.01.01" ) - TEST_LINE( Transform( SToD("19920101") , "DO THIS " ) , "1992.01.01" ) - TEST_LINE( Transform( SToD("19920102") , "@E" ) , "02/01/1992" ) /* Bug in CA-Cl*pper, it returns: "2.91901.02" */ - TEST_LINE( Transform( 1234 , "@D 9999" ) , "1234.00.0 " ) - TEST_LINE( Transform( 1234 , "@BD 9999" ) , "1234.00.0 " ) + TEST_LINE( Transform( HB_SToD("20000101") , "@B" ) , "2000.01.01" ) + TEST_LINE( Transform( HB_SToD("19901214") , "99/99/9999" ) , "1990.12.14" ) + TEST_LINE( Transform( HB_SToD("19901202") , "99.99.9999" ) , "1990.12.02" ) + TEST_LINE( Transform( HB_SToD("") , "99/99/9999" ) , " . . " ) + TEST_LINE( Transform( HB_SToD("19901202") , "99/99/99" ) , "1990.12.02" ) + TEST_LINE( Transform( HB_SToD("19901214") , "99-99-99" ) , "1990.12.14" ) + TEST_LINE( Transform( HB_SToD("20040430") , "99.99.99" ) , "2004.04.30" ) + TEST_LINE( Transform( HB_SToD("") , "99/99/99" ) , " . . " ) + TEST_LINE( Transform( HB_SToD("19920101") , "THISWRNG" ) , "1992.01.01" ) + TEST_LINE( Transform( HB_SToD("19350605") , "999/99/9" ) , "1935.06.05" ) + TEST_LINE( Transform( HB_SToD("19101112") , "9#-9#/##" ) , "1910.11.12" ) + TEST_LINE( Transform( HB_SToD("19920101") , "" ) , "1992.01.01" ) + TEST_LINE( Transform( HB_SToD("19920101") , "DO THIS " ) , "1992.01.01" ) + TEST_LINE( Transform( HB_SToD("19920102") , "@E" ) , "02/01/1992" ) /* Bug in CA-Cl*pper, it returns: "2.91901.02" */ + TEST_LINE( Transform( 1234 , "@D 9999" ) , "1234.00.0 " ) + TEST_LINE( Transform( 1234 , "@BD 9999" ) , "1234.00.0 " ) SET CENTURY OFF - TEST_LINE( Transform( SToD("20000101") , "@B" ) , "00.01.01" ) - TEST_LINE( Transform( SToD("19901214") , "99/99/9999" ) , "90.12.14" ) - TEST_LINE( Transform( SToD("19901202") , "99.99.9999" ) , "90.12.02" ) - TEST_LINE( Transform( SToD("") , "99/99/9999" ) , " . . " ) - TEST_LINE( Transform( SToD("19901202") , "99/99/99" ) , "90.12.02" ) - TEST_LINE( Transform( SToD("19901214") , "99-99-99" ) , "90.12.14" ) - TEST_LINE( Transform( SToD("20040430") , "99.99.99" ) , "04.04.30" ) - TEST_LINE( Transform( SToD("") , "99/99/99" ) , " . . " ) - TEST_LINE( Transform( SToD("19920101") , "THISWRNG" ) , "92.01.01" ) - TEST_LINE( Transform( SToD("19350605") , "999/99/9" ) , "35.06.05" ) - TEST_LINE( Transform( SToD("19101112") , "9#-9#/##" ) , "10.11.12" ) - TEST_LINE( Transform( SToD("19920101") , "" ) , "92.01.01" ) - TEST_LINE( Transform( SToD("19920101") , "DO THIS " ) , "92.01.01" ) - TEST_LINE( Transform( SToD("19920102") , "@E" ) , "02/01/92" ) /* Bug in CA-Cl*pper, it returns: "01.92.02" */ - TEST_LINE( Transform( 1234 , "@D 9999" ) , "**.**.* " ) - TEST_LINE( Transform( 1234 , "@BD 9999" ) , "**.**.* " ) + TEST_LINE( Transform( HB_SToD("20000101") , "@B" ) , "00.01.01" ) + TEST_LINE( Transform( HB_SToD("19901214") , "99/99/9999" ) , "90.12.14" ) + TEST_LINE( Transform( HB_SToD("19901202") , "99.99.9999" ) , "90.12.02" ) + TEST_LINE( Transform( HB_SToD("") , "99/99/9999" ) , " . . " ) + TEST_LINE( Transform( HB_SToD("19901202") , "99/99/99" ) , "90.12.02" ) + TEST_LINE( Transform( HB_SToD("19901214") , "99-99-99" ) , "90.12.14" ) + TEST_LINE( Transform( HB_SToD("20040430") , "99.99.99" ) , "04.04.30" ) + TEST_LINE( Transform( HB_SToD("") , "99/99/99" ) , " . . " ) + TEST_LINE( Transform( HB_SToD("19920101") , "THISWRNG" ) , "92.01.01" ) + TEST_LINE( Transform( HB_SToD("19350605") , "999/99/9" ) , "35.06.05" ) + TEST_LINE( Transform( HB_SToD("19101112") , "9#-9#/##" ) , "10.11.12" ) + TEST_LINE( Transform( HB_SToD("19920101") , "" ) , "92.01.01" ) + TEST_LINE( Transform( HB_SToD("19920101") , "DO THIS " ) , "92.01.01" ) + TEST_LINE( Transform( HB_SToD("19920102") , "@E" ) , "02/01/92" ) /* Bug in CA-Cl*pper, it returns: "01.92.02" */ + TEST_LINE( Transform( 1234 , "@D 9999" ) , "**.**.* " ) + TEST_LINE( Transform( 1234 , "@BD 9999" ) , "**.**.* " ) SET CENTURY ON