From f85461b1c1bd612c0099b74699a68d50ef8c8d7a Mon Sep 17 00:00:00 2001 From: Ron Pinkas Date: Thu, 22 Mar 2001 21:06:53 +0000 Subject: [PATCH] 2001-03-22 13:00 UTC-0800 Ron Pinkas * contrib/runjava/runjava.c + Added support for Argument Errors * source/rtl/len.c * source/rtl/minmax.c * source/rtl/run.c * source/vm/arrayshb.c * source/vm/memvars.c * Corrected to always use hb_paramError() when calling hb_errRT_BASE*() --- harbour/ChangeLog | 11 +++++++++++ harbour/contrib/runjava/runjava.c | 2 +- harbour/source/rtl/len.c | 2 +- harbour/source/rtl/minmax.c | 4 ++-- harbour/source/rtl/run.c | 2 +- harbour/source/vm/arrayshb.c | 4 ++-- harbour/source/vm/memvars.c | 4 ++-- 7 files changed, 20 insertions(+), 9 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 75743be5f7..dcee0d2a7f 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,14 @@ +2001-03-22 13:00 UTC-0800 Ron Pinkas + * contrib/runjava/runjava.c + + Added support for Argument Errors + + * source/rtl/len.c + * source/rtl/minmax.c + * source/rtl/run.c + * source/vm/arrayshb.c + * source/vm/memvars.c + * Corrected to always use hb_paramError() when calling hb_errRT_BASE*() + 2001-03-22 11:00 UTC-0800 Ron Pinkas * hb_slex.vc diff --git a/harbour/contrib/runjava/runjava.c b/harbour/contrib/runjava/runjava.c index 20301a541f..9288df6460 100644 --- a/harbour/contrib/runjava/runjava.c +++ b/harbour/contrib/runjava/runjava.c @@ -209,7 +209,7 @@ JNIEXPORT jlong JNICALL Java_Harbour_Run( JNIEnv *env, pDynSym = hb_dynsymFind( pSymRead[ ul ].szName ); if( !pDynSym ) { - hb_errRT_BASE( EG_ARG, 9999, "Unknown or unregistered symbol", pSymRead[ ul ].szName ); + hb_errRT_BASE( EG_ARG, 9999, "Unknown or unregistered symbol", pSymRead[ ul ].szName, 0 ); bError = TRUE; break; } diff --git a/harbour/source/rtl/len.c b/harbour/source/rtl/len.c index f04a618187..d9fb23071f 100644 --- a/harbour/source/rtl/len.c +++ b/harbour/source/rtl/len.c @@ -59,5 +59,5 @@ HB_FUNC( LEN ) } } - hb_errRT_BASE_SubstR( EG_ARG, 1111, NULL, "LEN", 1, pItem ); + hb_errRT_BASE_SubstR( EG_ARG, 1111, NULL, "LEN", 1, hb_paramError( 1 ) ); } diff --git a/harbour/source/rtl/minmax.c b/harbour/source/rtl/minmax.c index 7a6033683a..4fd095db58 100644 --- a/harbour/source/rtl/minmax.c +++ b/harbour/source/rtl/minmax.c @@ -86,7 +86,7 @@ HB_FUNC( MAX ) hb_retds( hb_itemGetDL( p1 ) >= hb_itemGetDL( p2 ) ? hb_pardsbuff( szDate, 1 ) : hb_pardsbuff( szDate, 2 ) ); } else - hb_errRT_BASE_SubstR( EG_ARG, 1093, NULL, "MAX", 2, p1, p2 ); + hb_errRT_BASE_SubstR( EG_ARG, 1093, NULL, "MAX", 2, hb_paramError( 1 ), hb_paramError( 2 ) ); } /* returns the minimum of two date or numerics */ @@ -138,6 +138,6 @@ HB_FUNC( MIN ) hb_retds( hb_itemGetDL( p1 ) <= hb_itemGetDL( p2 ) ? hb_pardsbuff( szDate, 1 ) : hb_pardsbuff( szDate, 2 ) ); } else - hb_errRT_BASE_SubstR( EG_ARG, 1092, NULL, "MIN", 2, p1, p2 ); + hb_errRT_BASE_SubstR( EG_ARG, 1092, NULL, "MIN", 2, hb_paramError( 1 ), hb_paramError( 2 ) ); } diff --git a/harbour/source/rtl/run.c b/harbour/source/rtl/run.c index 13a9a9b247..e909509343 100644 --- a/harbour/source/rtl/run.c +++ b/harbour/source/rtl/run.c @@ -54,6 +54,6 @@ HB_FUNC( __RUN ) } } #else - hb_errRT_BASE_Ext1( EG_UNSUPPORTED, 9999, NULL, "__RUN", 0, EF_CANDEFAULT ); + hb_errRT_BASE_Ext1( EG_UNSUPPORTED, 9999, NULL, "__RUN", 0, EF_CANDEFAULT, 0 ); #endif } diff --git a/harbour/source/vm/arrayshb.c b/harbour/source/vm/arrayshb.c index b41848d9ca..bba0447c0b 100644 --- a/harbour/source/vm/arrayshb.c +++ b/harbour/source/vm/arrayshb.c @@ -81,7 +81,7 @@ HB_FUNC( ARRAY ) if( hb_parnl( iParam ) < 0 ) /* || hb_parnl( iParam ) <= 4096 */ { - hb_errRT_BASE( EG_BOUND, 1131, NULL, hb_langDGetErrorDesc( EG_ARRDIMENSION ), 1, hb_param( iParam, HB_IT_ANY ) ); + hb_errRT_BASE( EG_BOUND, 1131, NULL, hb_langDGetErrorDesc( EG_ARRDIMENSION ), 1, hb_paramError( 1 ) ); bError = TRUE; break; } @@ -103,7 +103,7 @@ HB_FUNC( AADD ) if( pValue && hb_arrayAdd( pArray, pValue ) ) hb_itemReturn( pValue ); else - hb_errRT_BASE( EG_BOUND, 1187, NULL, "AADD", 2, pArray, hb_paramError( 2 ) ); + hb_errRT_BASE( EG_BOUND, 1187, NULL, "AADD", 2, hb_paramError( 1 ), hb_paramError( 2 ) ); } else hb_errRT_BASE_SubstR( EG_ARG, 1123, NULL, "AADD", 2, hb_paramError(1), hb_paramError( 2 ) ); diff --git a/harbour/source/vm/memvars.c b/harbour/source/vm/memvars.c index c8bb791601..35a2070b73 100644 --- a/harbour/source/vm/memvars.c +++ b/harbour/source/vm/memvars.c @@ -609,7 +609,7 @@ void hb_memvarCreateFromItem( PHB_ITEM pMemvar, BYTE bScope, PHB_ITEM pValue ) else if( HB_IS_STRING( pMemvar ) ) pDynVar = hb_dynsymGet( pMemvar->item.asString.value ); else - hb_errRT_BASE( EG_ARG, 3008, NULL, "&", 2, pMemvar, pValue ); + hb_errRT_BASE( EG_ARG, 3008, NULL, "&", 2, hb_paramError( 1 ), hb_paramError( 2 ) ); if( pDynVar ) hb_memvarCreateFromDynSymbol( pDynVar, bScope, pValue ); @@ -698,7 +698,7 @@ static void hb_memvarRelease( HB_ITEM_PTR pMemvar ) } } else - hb_errRT_BASE( EG_ARG, 3008, NULL, "RELEASE", 1, pMemvar ); + hb_errRT_BASE( EG_ARG, 3008, NULL, "RELEASE", 1, hb_paramError( 1 ) ); }