From e6afd45d90d6cd77f061d868e9711e29fc5b7ac5 Mon Sep 17 00:00:00 2001 From: Ron Pinkas Date: Mon, 22 May 2000 17:28:03 +0000 Subject: [PATCH] 20000522-09:40 GMT-8 Ron Pinkas * contrib/hbclip.ch ! Updated to reflect latest sysntax. * tests/testwarn.ch ! Updated translate segment to reflect latest sysntax. --- harbour/ChangeLog | 8 ++++ harbour/contrib/hbclip/hbclip.ch | 75 ++++++++++++++------------------ harbour/tests/testwarn.prg | 40 +++++++++-------- 3 files changed, 62 insertions(+), 61 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 0e425871d7..c60be2ccae 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,11 @@ +20000522-09:40 GMT-8 Ron Pinkas + + * contrib/hbclip.ch + ! Updated to reflect latest sysntax. + + * tests/testwarn.ch + ! Updated translate segment to reflect latest sysntax. + 20000522-09:40 GMT-8 Ron Pinkas * include/hbextern.ch diff --git a/harbour/contrib/hbclip/hbclip.ch b/harbour/contrib/hbclip/hbclip.ch index cbf01fab0f..f684b88173 100644 --- a/harbour/contrib/hbclip/hbclip.ch +++ b/harbour/contrib/hbclip/hbclip.ch @@ -45,60 +45,49 @@ #ifndef __HARBOUR__ -#ifndef HB_CLIP_CH_ -#define HB_CLIP_CH_ + #ifndef HB_CLIP_CH_ + #define HB_CLIP_CH_ -/* TODO: Rewrite as much of these in C or Clipper */ + /* TODO: Rewrite as much of these in C or Clipper */ -#xtranslate HB_ARGCHECK( ) => ( .F. ) -#xtranslate HB_ARGSTRING( ) => "" -#xtranslate HB_FNAMESPLIT( ) => NIL -#xtranslate HB_FNAMEMERGE( [, [, [, ]]] ) => "" -#xtranslate HB_PVALUE( ) => NIL -#xtranslate HB_SETKEYGET( [][, ] ) => NIL -#xtranslate HB_SETKEYSAVE( [] ) => ( {} ) -#xtranslate HB_SETKEYCHECK( [, [, [, ]]] ) => ( .F. ) + #xtranslate HB_ARGCHECK( ) => ( .F. ) + #xtranslate HB_ARGSTRING( ) => "" + #xtranslate HB_FNAMESPLIT( ) => NIL + #xtranslate HB_FNAMEMERGE( [, [, [, ]]] ) => "" + #xtranslate HB_PVALUE( ) => NIL + #xtranslate HB_SETKEYGET( [][, ] ) => NIL + #xtranslate HB_SETKEYSAVE( [] ) => ( {} ) + #xtranslate HB_SETKEYCHECK( [, [, [, ]]] ) => ( .F. ) -#translate AS CHAR ARRAY => -#translate AS CHARACTER ARRAY => -#translate AS STRING ARRAY => + #TRANSLATE AS ARRAY [OF ] => -#translate AS NUM ARRAY => -#translate AS NUMERIC ARRAY => + #TRANSLATE AS CHAR => + #TRANSLATE AS CHARACTER => + #TRANSLATE AS STRING => -#translate AS DATE ARRAY => -#translate AS ARRAY ARRAY => -#translate AS BLOCK ARRAY => -#translate AS OBJECT ARRAY => + #TRANSLATE AS CLASS => + #TRANSLATE AS STRU => + #TRANSLATE AS STRUCTURE => -#translate AS BOOL ARRAY => -#translate AS BOOLEAN ARRAY => -#translate AS LOGICAL ARRAY => + #TRANSLATE AS NUM => + #TRANSLATE AS NUMERIC => -#translate AS VAR ARRAY => -#translate AS VARIANT ARRAY => + #TRANSLATE AS DATE => + #TRANSLATE AS BLOCK => -#translate AS CHAR => -#translate AS CHARACTER => -#translate AS STRING => + #TRANSLATE AS OBJ => + #TRANSLATE AS OBJECT => -#translate AS NUM => -#translate AS NUMERIC => + #TRANSLATE AS BOOL => + #TRANSLATE AS BOOLEAN => + #TRANSLATE AS LOG => + #TRANSLATE AS LOGICAL => -#translate AS DATE => -#translate AS ARRAY => -#translate AS BLOCK => -#translate AS OBJECT => + #TRANSLATE AS VAR => + #TRANSLATE AS VARIANT => -#translate AS BOOL => -#translate AS BOOLEAN => -#translate AS LOGICAL => + #COMMAND DECLARE <*x*> => -#translate AS VAR => -#translate AS VARIANT => - -#command DECLARE FUNCTION <*x*> => - -#endif /* HB_CLIP_CH_ */ + #COMMAND STRUCTURE <*x*> => #endif diff --git a/harbour/tests/testwarn.prg b/harbour/tests/testwarn.prg index f18b846e03..845908a382 100644 --- a/harbour/tests/testwarn.prg +++ b/harbour/tests/testwarn.prg @@ -6,32 +6,36 @@ #ifdef __HARBOUR__ #pragma -es0 #else - #TRANSLATE AS ARRAY [OF ] => + #TRANSLATE AS ARRAY [OF ] => - #TRANSLATE AS CHAR => - #TRANSLATE AS CHARACTER => - #TRANSLATE AS STRING => + #TRANSLATE AS CHAR => + #TRANSLATE AS CHARACTER => + #TRANSLATE AS STRING => - #TRANSLATE AS CLASS => + #TRANSLATE AS CLASS => + #TRANSLATE AS STRU => + #TRANSLATE AS STRUCTURE => - #TRANSLATE AS NUM => - #TRANSLATE AS NUMERIC => + #TRANSLATE AS NUM => + #TRANSLATE AS NUMERIC => - #TRANSLATE AS DATE => - #TRANSLATE AS BLOCK => + #TRANSLATE AS DATE => + #TRANSLATE AS BLOCK => - #TRANSLATE AS OBJ => - #TRANSLATE AS OBJECT => + #TRANSLATE AS OBJ => + #TRANSLATE AS OBJECT => - #TRANSLATE AS BOOL => - #TRANSLATE AS BOOLEAN => - #TRANSLATE AS LOG => - #TRANSLATE AS LOGICAL => + #TRANSLATE AS BOOL => + #TRANSLATE AS BOOLEAN => + #TRANSLATE AS LOG => + #TRANSLATE AS LOGICAL => - #TRANSLATE AS VAR => - #TRANSLATE AS VARIANT => + #TRANSLATE AS VAR => + #TRANSLATE AS VARIANT => - #COMMAND DECLARE <*x*> => + #COMMAND DECLARE <*x*> => + + #COMMAND STRUCTURE <*x*> => #endif DECLARE nMyFunc( cVar AS STRING, @nVar AS NUMERIC ) AS NUMERIC