From 2e3ce4504c3dd9de0fe01c7e9920ebc0063b67de Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 27 Jan 2008 12:32:37 +0000 Subject: [PATCH] 2008-01-27 12:46 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * source/rtl/objfunc.prg ! Fixed ISNUMBER() -> hb_ISPOINTER() for pointers. Thanks to Chen Kedem. * utils/hbtest/rt_stra.prg * utils/hbtest/rt_array.prg ! Fixed expected results to use the recently introduced new error codes. Thanks to Chen Kedem. --- harbour/ChangeLog | 10 ++++++++++ harbour/source/rtl/objfunc.prg | 4 ++-- harbour/utils/hbtest/rt_array.prg | 4 ++-- harbour/utils/hbtest/rt_stra.prg | 10 +++++----- 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index d1d10e66cb..b8d0e659c0 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,16 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2008-01-27 12:46 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * source/rtl/objfunc.prg + ! Fixed ISNUMBER() -> hb_ISPOINTER() for pointers. + Thanks to Chen Kedem. + + * utils/hbtest/rt_stra.prg + * utils/hbtest/rt_array.prg + ! Fixed expected results to use the recently introduced new error codes. + Thanks to Chen Kedem. + 2008-01-26 22:42 UTC+0100 Marek Paliwoda (mpaliwoda at interia pl) * make_gcc.mak + Added an extra compilation phase for building diff --git a/harbour/source/rtl/objfunc.prg b/harbour/source/rtl/objfunc.prg index c52371a187..80d7a2a31b 100644 --- a/harbour/source/rtl/objfunc.prg +++ b/harbour/source/rtl/objfunc.prg @@ -185,7 +185,7 @@ FUNCTION __ObjSetValueList( oObject, aData ) FUNCTION __objAddMethod( oObject, cSymbol, nFuncPtr ) - IF !ISOBJECT( oObject ) .OR. !ISCHARACTER( cSymbol ) .OR. !ISNUMBER( nFuncPtr ) + IF !ISOBJECT( oObject ) .OR. !ISCHARACTER( cSymbol ) .OR. !hb_ISPOINTER( nFuncPtr ) __errRT_BASE( EG_ARG, 3101, NIL, ProcName( 0 ) ) ELSEIF !__objHasMsg( oObject, cSymbol ) __clsAddMsg( oObject:ClassH, cSymbol, nFuncPtr, HB_OO_MSG_METHOD, NIL, 1 ) @@ -219,7 +219,7 @@ FUNCTION __objAddData( oObject, cSymbol ) FUNCTION __objModMethod( oObject, cSymbol, nFuncPtr ) - IF !ISOBJECT( oObject ) .OR. !ISCHARACTER( cSymbol ) .OR. !ISNUMBER( nFuncPtr ) + IF !ISOBJECT( oObject ) .OR. !ISCHARACTER( cSymbol ) .OR. !hb_ISPOINTER( nFuncPtr ) __errRT_BASE( EG_ARG, 3101, NIL, ProcName( 0 ) ) ELSEIF __objHasMethod( oObject, cSymbol ) __clsModMsg( oObject:ClassH, cSymbol, nFuncPtr ) diff --git a/harbour/utils/hbtest/rt_array.prg b/harbour/utils/hbtest/rt_array.prg index be245756d3..a1a313f177 100644 --- a/harbour/utils/hbtest/rt_array.prg +++ b/harbour/utils/hbtest/rt_array.prg @@ -102,9 +102,9 @@ FUNCTION Main_ARRAY() TEST_LINE( AFill( NIL ) , "E BASE 2017 Argument error AEVAL A:4:U:NIL;B:{||...};U:NIL;U:NIL " ) #else #ifndef __XPP__ - TEST_LINE( AFill() , "E BASE 9999 Argument error AFILL " ) + TEST_LINE( AFill() , "E BASE 6004 Argument error AFILL " ) #endif - TEST_LINE( AFill( NIL ) , "E BASE 9999 Argument error AFILL " ) + TEST_LINE( AFill( NIL ) , "E BASE 6004 Argument error AFILL " ) #endif TEST_LINE( AFill( {} ) , "{.[0].}" ) TEST_LINE( AFill( {}, 1 ) , "{.[0].}" ) diff --git a/harbour/utils/hbtest/rt_stra.prg b/harbour/utils/hbtest/rt_stra.prg index 0e3497dab7..e49f3f48f1 100644 --- a/harbour/utils/hbtest/rt_stra.prg +++ b/harbour/utils/hbtest/rt_stra.prg @@ -169,11 +169,11 @@ FUNCTION Main_STRA() TEST_LINE( StrZero(100, 10, NIL) , "E BASE 1099 Argument error STR A:3:N:100;N:10;U:NIL F:S" ) TEST_LINE( StrZero(100, NIL, NIL) , "E BASE 1099 Argument error STR A:3:N:100;U:NIL;U:NIL F:S" ) #else - TEST_LINE( StrZero(NIL) , "E BASE 9999 Argument error STRZERO A:1:U:NIL F:S" ) - TEST_LINE( StrZero("A", 10, 2) , "E BASE 9999 Argument error STRZERO A:3:C:A;N:10;N:2 F:S" ) - TEST_LINE( StrZero(100, 10, "A") , "E BASE 9999 Argument error STRZERO A:3:N:100;N:10;C:A F:S" ) - TEST_LINE( StrZero(100, 10, NIL) , "E BASE 9999 Argument error STRZERO A:3:N:100;N:10;U:NIL F:S" ) - TEST_LINE( StrZero(100, NIL, NIL) , "E BASE 9999 Argument error STRZERO A:3:N:100;U:NIL;U:NIL F:S" ) + TEST_LINE( StrZero(NIL) , "E BASE 6003 Argument error STRZERO A:1:U:NIL F:S" ) + TEST_LINE( StrZero("A", 10, 2) , "E BASE 6003 Argument error STRZERO A:3:C:A;N:10;N:2 F:S" ) + TEST_LINE( StrZero(100, 10, "A") , "E BASE 6003 Argument error STRZERO A:3:N:100;N:10;C:A F:S" ) + TEST_LINE( StrZero(100, 10, NIL) , "E BASE 6003 Argument error STRZERO A:3:N:100;N:10;U:NIL F:S" ) + TEST_LINE( StrZero(100, NIL, NIL) , "E BASE 6003 Argument error STRZERO A:3:N:100;U:NIL;U:NIL F:S" ) #endif TEST_LINE( StrZero(10) , "0000000010" ) TEST_LINE( StrZero(10.0) , "0000000010.0" )