From 275ba9f4807639daa165800b7719a1ecd4f07bce Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Thu, 19 May 2011 17:00:41 +0000 Subject: [PATCH] 2011-05-19 18:59 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * src/rtl/valtype.c * contrib/xhb/xhb.hbx * contrib/xhb/xhbfunc.c * HB_ISBYREF() function uncommented and moved from core to xhb lib * contrib/xhb/xhb.hbc + linking hbfship to better emulate xhb environment * contrib/hbfoxpro/misc.prg * formatting --- harbour/ChangeLog | 10 ++++++++++ harbour/contrib/hbfoxpro/misc.prg | 1 - harbour/contrib/xhb/xhb.hbc | 1 + harbour/contrib/xhb/xhb.hbx | 1 + harbour/contrib/xhb/xhbfunc.c | 11 +++++++++++ harbour/src/rtl/valtype.c | 15 --------------- 6 files changed, 23 insertions(+), 16 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index ac3954d9c8..c0bcb58dd5 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,16 @@ The license applies to all entries newer than 2009-04-28. */ +2011-05-19 18:59 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * src/rtl/valtype.c + * contrib/xhb/xhb.hbx + * contrib/xhb/xhbfunc.c + * HB_ISBYREF() function uncommented and moved from core to xhb lib + * contrib/xhb/xhb.hbc + + linking hbfship to better emulate xhb environment + * contrib/hbfoxpro/misc.prg + * formatting + 2011-05-19 17:49 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * src/debug/debugger.prg * src/rtl/valtoexp.prg diff --git a/harbour/contrib/hbfoxpro/misc.prg b/harbour/contrib/hbfoxpro/misc.prg index 9e21929178..9fa3ae4a61 100644 --- a/harbour/contrib/hbfoxpro/misc.prg +++ b/harbour/contrib/hbfoxpro/misc.prg @@ -70,7 +70,6 @@ FUNCTION SYS( nValue, xPar1 ) RETURN NIL - STATIC FUNCTION AFILLNESTED( aValue, xVal ) LOCAL item diff --git a/harbour/contrib/xhb/xhb.hbc b/harbour/contrib/xhb/xhb.hbc index 4ec972b579..16be296f16 100644 --- a/harbour/contrib/xhb/xhb.hbc +++ b/harbour/contrib/xhb/xhb.hbc @@ -11,4 +11,5 @@ libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF} libs=../hbct/hbct.hbc libs=../hbtip/hbtip.hbc libs=../hbwin/hbwin.hbc +libs=../hbfship/hbfship.hbc libs=../hbxpp/hbxpp.hbc diff --git a/harbour/contrib/xhb/xhb.hbx b/harbour/contrib/xhb/xhb.hbx index f85913ae8d..70d2808460 100644 --- a/harbour/contrib/xhb/xhb.hbx +++ b/harbour/contrib/xhb/xhb.hbx @@ -137,6 +137,7 @@ DYNAMIC HB_F_EOF DYNAMIC HB_GETLEN8 DYNAMIC HB_HASHADDMEMBER DYNAMIC HB_INITSTANDARDLOG +DYNAMIC HB_ISBYREF DYNAMIC HB_ISREGEXSTRING DYNAMIC HB_ISSERVICE DYNAMIC HB_IS_CSTRUCTURE diff --git a/harbour/contrib/xhb/xhbfunc.c b/harbour/contrib/xhb/xhbfunc.c index c6c653abc4..d516e3ee20 100644 --- a/harbour/contrib/xhb/xhbfunc.c +++ b/harbour/contrib/xhb/xhbfunc.c @@ -69,6 +69,7 @@ #include "hbapigt.h" #include "hbapicls.h" #include "hbapierr.h" +#include "hbstack.h" #include "hbvm.h" #if 0 @@ -318,6 +319,16 @@ HB_FUNC( XHB_MEMOWRIT ) HB_FUNC_EXEC( MEMOWRIT ) } +HB_FUNC( HB_ISBYREF ) +{ + if( hb_pcount() ) + { + PHB_ITEM pItem = hb_stackItemFromBase( 1 ); + if( HB_IS_BYREF( pItem ) ) + hb_retl( HB_IS_BYREF( hb_itemUnRefOnce( pItem ) ) ); + } +} + HB_FUNC_EXTERN( HB_METHODNAME ) ; HB_FUNC( METHODNAME ) { HB_FUNC_EXEC( HB_METHODNAME ); } HB_FUNC_EXTERN( HB_LIBLOAD ) ; HB_FUNC( LIBLOAD ) { HB_FUNC_EXEC( HB_LIBLOAD ); } HB_FUNC_EXTERN( HB_LIBFREE ) ; HB_FUNC( LIBFREE ) { HB_FUNC_EXEC( HB_LIBFREE ); } diff --git a/harbour/src/rtl/valtype.c b/harbour/src/rtl/valtype.c index 8916b078e6..5c91a1eccb 100644 --- a/harbour/src/rtl/valtype.c +++ b/harbour/src/rtl/valtype.c @@ -65,27 +65,12 @@ #include "hbapi.h" #include "hbapiitm.h" #include "hbapierr.h" -/* #include "hbstack.h" */ HB_FUNC( VALTYPE ) { hb_retc( hb_itemTypeStr( hb_param( 1, HB_IT_ANY ) ) ); } -/* -HB_FUNC( HB_ISBYREF ) -{ - if( hb_pcount() ) - { - PHB_ITEM pItem = hb_stackItemFromBase( 1 ); - if( HB_IS_BYREF( pItem ) ) - { - hb_retl( HB_IS_BYREF( hb_itemUnRefOnce( pItem ) ) ); - } - } -} -*/ - HB_FUNC( HB_ISNIL ) { hb_retl( HB_ISNIL( 1 ) );