From b66f833ecd3de3b21d39116416ebfe63da840b1f Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 4 Feb 2000 23:32:50 +0000 Subject: [PATCH] 20000205-00:32 GMT+1 Victor Szakats --- harbour/ChangeLog | 21 ++++++++--- harbour/doc/hdr_tpl.txt | 25 ++++++------- harbour/source/pp/hbpp.c | 66 +++++++++++++++++------------------ harbour/source/rdd/dbcmd.c | 21 ++++++----- harbour/source/rtl/arrays.c | 30 ++++++++++------ harbour/source/rtl/inkey.c | 30 ++++++++-------- harbour/source/tools/Makefile | 53 +++++++++++++++------------- 7 files changed, 139 insertions(+), 107 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index f1b6d07caf..4c0a38c74f 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,9 +1,21 @@ +20000205-00:32 GMT+1 Victor Szakats + * source/tools/Makefile + + dbftools.c added. + + html.prg, ng.prg, os2.prg, troff.prg, etc. added. + * doc/hdr_tpl.txt + * Year changed to 2000 + * source/rdd/dbcmd.c + source/rtl/inkey.c + source/rtl/array.c + source/pp/hbpp.c + * Minor formatting fixes. + 20000204-23:10 GMT+1 Antonio Linares * source/rtl/inkey.c * static int s_iMouseCol = 0, s_iMouseRow = 0; (changed SHORT into int accordingly to Dave proposal). -20000204-19:25 GMT-3 Luiz Rafael Culik +20000204-19:25 GMT-3 Luiz Rafael Culik *Source/rdd/dbcmd.c * Change some functions docs *ngdoc/harbwww.rps @@ -53,7 +65,7 @@ * bin/bld_tpl.cmd + Added ..\lib\main.obj to command line for os2/icc builds -20000203-17:05 GMT-3 Luiz Rafael Culik +20000203-17:05 GMT-3 Luiz Rafael Culik *Source/rdd/dbcmd.c * Change some functions docs *Source/tools/html.prg @@ -69,7 +81,6 @@ *makewww.bat +batch make file to ft_helpc generate html output - 20000202-22:00 GMT+1 Antonio Linares * source/rtl/inkey.c + Added MCol() and MRow() mouse support functions @@ -148,7 +159,9 @@ - Removed debug information from OS/2 builds of Harbour * doc/whatsnew.txt - % Synchronized with updates that were made to the build31 branch * source/pp/pragma.c + % Synchronized with updates that were made to the build31 branch + + * source/pp/pragma.c * contrib/dot/pp_harb.ch * tests/inline_c.prg * STOPDUMP renamed as ENDDUMP (with Ron permission) diff --git a/harbour/doc/hdr_tpl.txt b/harbour/doc/hdr_tpl.txt index bb735b40ca..865aeb85cb 100644 --- a/harbour/doc/hdr_tpl.txt +++ b/harbour/doc/hdr_tpl.txt @@ -13,7 +13,7 @@ FILE HEADER TEMPLATE * Harbour Project source code: * {one-liner description about the purpose of this source file} * - * Copyright 1999 {list of individual authors and e-mail addresses} + * Copyright 2000 {list of individual authors and e-mail addresses} * www - http://www.harbour-project.org * * This program is free software; you can redistribute it and/or modify @@ -47,7 +47,7 @@ FILE HEADER TEMPLATE (OPTIONAL ADDITION FOR PARTIAL COPYRIGHTS) * The following parts are Copyright of the individual authors. * www - http://www.harbour-project.org * - * Copyright 1999 {name} <{e-mail address}> + * Copyright 2000 {name} <{e-mail address}> * {function or subsystem name} * * See doc/license.txt for licensing terms. @@ -144,31 +144,32 @@ FUNCTION HEADER EXAMPLE /* * ChangeLog: * - * V 1.11 Victor Szel $FILES$ added. - * V 1.10 Victor Szel $PLATFORMS$ added. - * V 1.9 Victor Szel Small format changes. - * V 1.8 Victor Szel licence -> license - * V 1.7 Victor Szel History separated from the file header + * V 1.12 Victor Szakats Year changed to 2000 from 1999. + * V 1.11 Victor Szakats $FILES$ added. + * V 1.10 Victor Szakats $PLATFORMS$ added. + * V 1.9 Victor Szakats Small format changes. + * V 1.8 Victor Szakats licence -> license + * V 1.7 Victor Szakats History separated from the file header * template. Slight changes in the format * of the header. Removed "(proposal)" * from the top of the file. Added partial * copyright header template. - * V 1.6 Victor Szel RCS Id section separated from + * V 1.6 Victor Szakats RCS Id section separated from * Licenc text. - * V 1.5 Victor Szel Small name correction. + * V 1.5 Victor Szakats Small name correction. * V 1.4 David G. Holm Removed "(C)" from Copyright notice * Put author's name rather than date * next to each version number, because * the RCS tracks dates, but only tracks * CVS user names, not author names. - * V 1.3 Victor Szel Description line changed to be a + * V 1.3 Victor Szakats Description line changed to be a * template, too. * V 1.2 David G. Holm Added HRL/HVM license exception for * executables. Added GNU web site. * Replaced "?" in copyright statement * with "(list of individual authors)". - * V 1.1 Victor Szel Added templates for file and function + * V 1.1 Victor Szakats Added templates for file and function * headers. Committed to CVS. - * V 1.0 Victor Szel Initial version. + * V 1.0 Victor Szakats Initial version. * */ diff --git a/harbour/source/pp/hbpp.c b/harbour/source/pp/hbpp.c index bec1511ea3..c08eccf259 100644 --- a/harbour/source/pp/hbpp.c +++ b/harbour/source/pp/hbpp.c @@ -112,25 +112,25 @@ static void DebugPragma( char *, int, BOOL ); static BOOL s_bTracePragma = FALSE; #define ISNAME( c ) ( isalnum( c ) || ( c ) == '_' || ( c ) > 0x7E ) -#define MAX_NAME 255 -#define MAX_EXP 1024 +#define MAX_NAME 255 +#define MAX_EXP 1024 #define PATTERN_SIZE 2048 -#define STATE_INIT 0 -#define STATE_NORMAL 1 -#define STATE_COMMENT 2 -#define STATE_QUOTE1 3 -#define STATE_QUOTE2 4 -#define STATE_QUOTE3 5 -#define STATE_ID_END 6 -#define STATE_ID 7 -#define STATE_EXPRES 8 +#define STATE_INIT 0 +#define STATE_NORMAL 1 +#define STATE_COMMENT 2 +#define STATE_QUOTE1 3 +#define STATE_QUOTE2 4 +#define STATE_QUOTE3 5 +#define STATE_ID_END 6 +#define STATE_ID 7 +#define STATE_EXPRES 8 #define STATE_EXPRES_ID 9 -#define STATE_BRACKET 10 +#define STATE_BRACKET 10 -#define IT_EXPR 1 -#define IT_ID 2 -#define IT_COMMA 3 +#define IT_EXPR 1 +#define IT_ID 2 +#define IT_COMMA 3 #define IT_ID_OR_EXPR 4 static int s_kolAddDefs = 0; @@ -150,20 +150,20 @@ int hb_pp_nCondCompile = 0; /* Table with parse errors */ char * hb_pp_szErrors[] = { - "Can\'t open #include file: \'%s\'", - "#else does not match #ifdef", - "#endif does not match #ifdef", - "Bad filename in #include", - "#define without parameters", - "Missing => in #translate/#command", - "Error in pattern definition", - "Cycled #define", - "Invalid name follows #: \'%s\'", - "#error: \'%s\'", - "Memory allocation error", - "Memory reallocation error", - "Freeing a NULL memory pointer", - "Value out of range in #pragma directive" + "Can\'t open #include file: \'%s\'", + "#else does not match #ifdef", + "#endif does not match #ifdef", + "Bad filename in #include", + "#define without parameters", + "Missing => in #translate/#command", + "Error in pattern definition", + "Cycled #define", + "Invalid name follows #: \'%s\'", + "#error: \'%s\'", + "Memory allocation error", + "Memory reallocation error", + "Freeing a NULL memory pointer", + "Value out of range in #pragma directive" }; /* Table with parse warnings */ @@ -172,15 +172,15 @@ char * hb_pp_szErrors[] = */ char * hb_pp_szWarnings[] = { - "3Non directive in include file %s(%s)" + "3Non directive in include file %s(%s)" }; int hb_pp_ParseDirective( char * sLine ) { - char sDirective[MAX_NAME]; - char szInclude[_POSIX_PATH_MAX]; + char sDirective[ MAX_NAME ]; + char szInclude[ _POSIX_PATH_MAX ]; int i; - FILE* handl_i; + FILE * handl_i; HB_TRACE(HB_TR_DEBUG, ("hb_pp_ParseDirective(%s)", sLine)); diff --git a/harbour/source/rdd/dbcmd.c b/harbour/source/rdd/dbcmd.c index 1e065b3414..b34df7262e 100644 --- a/harbour/source/rdd/dbcmd.c +++ b/harbour/source/rdd/dbcmd.c @@ -1135,11 +1135,12 @@ ERRCODE hb_rddInherit( PRDDFUNCS pTable, PRDDFUNCS pSubTable, PRDDFUNCS pSuperTa } return SUCCESS; } + /* * Function for getting current workarea pointer */ -void* hb_rddGetCurrentWorkAreaPointer( void ) +void * hb_rddGetCurrentWorkAreaPointer( void ) { HB_TRACE(HB_TR_DEBUG, ("hb_rddGetCurrentWorkAreaPointer()")); @@ -1529,6 +1530,7 @@ HARBOUR HB_AFIELDS( void ) hb_itemRelease( pItem ); hb_retni( uiArrayLen ); } + /* $DOC$ * $FUNCNAME$ * ALIAS() @@ -1711,6 +1713,7 @@ HARBOUR HB_DBEVAL( void ) else hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, "DBEVAL" ); } + /* $DOC$ * $FUNCNAME$ * DBF() @@ -1771,6 +1774,7 @@ HARBOUR HB_DBF( void ) } hb_retc( "" ); } + /* $DOC$ * $FUNCNAME$ * BOF() @@ -2188,7 +2192,7 @@ HARBOUR HB_DBCOMMITALL( void ) * or end of file is encountered. If __DBCONTINUE is successful, the matching * record becomes the current record and FOUND() returns true (.T.); if * unsuccessful, FOUND() returns false (.F.). - + * * Each work area may have an active LOCATE condition. In CA-Clipper, a * LOCATE condition remains pending until a new LOCATE condition is * specified. No other commands release the condition. @@ -2243,7 +2247,6 @@ HARBOUR HB_DBCOMMITALL( void ) * $END$ */ - HARBOUR HB___DBCONTINUE() { BOOL bEof; @@ -3402,7 +3405,7 @@ HARBOUR HB_DBRUNLOCK( void ) * logical true (.T.) value. If is not passed, the function will look * to the internal status of SOFTSEEK before performing the operation. The default * of is a logical false (.F.) - + * * $EXAMPLES$ * FUNCTION Main() * USE Tests New INDEX Tests @@ -7263,11 +7266,6 @@ HARBOUR HB_USED( void ) hb_retl( pCurrArea != NULL ); } -/* NOTE: Same as dbSetDriver() and rddSetDefault(), but doesn't - * throw any error if the driver doesn't exist, this is - * required in the RDDSYS INIT function, since it's not guaranteed - * that the RDD is already registered at that point. */ - /* $DOC$ * $FUNCNAME$ * __RDDSETDEFAULT() @@ -7314,6 +7312,11 @@ HARBOUR HB_USED( void ) * $END$ */ +/* NOTE: Same as dbSetDriver() and rddSetDefault(), but doesn't + throw any error if the driver doesn't exist, this is + required in the RDDSYS INIT function, since it's not guaranteed + that the RDD is already registered at that point. [vszakats] */ + HARBOUR HB___RDDSETDEFAULT( void ) { char * szNewDriver; diff --git a/harbour/source/rtl/arrays.c b/harbour/source/rtl/arrays.c index 8c77686885..6c44497f4e 100644 --- a/harbour/source/rtl/arrays.c +++ b/harbour/source/rtl/arrays.c @@ -37,7 +37,7 @@ * The following parts are Copyright of the individual authors. * www - http://www.harbour-project.org * - * Copyright 1999 Victor Szel + * Copyright 1999 Victor Szakats * hb_arrayIsObject() * hb_arrayError() * hb_arrayCopyC() @@ -297,7 +297,7 @@ char * hb_arrayGetDS( PHB_ITEM pArray, ULONG ulIndex, char * szDate ) hb_itemGetDS( pArray->item.asArray.value->pItems + ulIndex - 1, szDate ); else /* NOTE: Intentionally calling it with a bad parameter in order to get - the default value from hb_itemGetDS(). [vszel] */ + the default value from hb_itemGetDS(). [vszakats] */ hb_itemGetDS( NULL, szDate ); return szDate; @@ -528,7 +528,7 @@ ULONG hb_arrayScan( PHB_ITEM pArray, PHB_ITEM pValue, ULONG * pulStart, ULONG * PHB_ITEM pItem = pBaseArray->pItems + ulStart; /* NOTE: The order of the pItem and pValue parameters passed to - hb_itemStrCmp() is significant, please don't change it. [vszel] */ + hb_itemStrCmp() is significant, please don't change it. [vszakats] */ if( IS_STRING( pItem ) && hb_itemStrCmp( pItem, pValue, FALSE ) == 0 ) return ulStart + 1; } @@ -547,7 +547,7 @@ ULONG hb_arrayScan( PHB_ITEM pArray, PHB_ITEM pValue, ULONG * pulStart, ULONG * } else if( IS_DATE( pValue ) ) { - /* NOTE: This is correct: Get the date as a long value. [vszel] */ + /* NOTE: This is correct: Get the date as a long value. [vszakats] */ LONG lValue = hb_itemGetNL( pValue ); for( ulStart--; ulCount > 0; ulCount--, ulStart++ ) @@ -560,7 +560,7 @@ ULONG hb_arrayScan( PHB_ITEM pArray, PHB_ITEM pValue, ULONG * pulStart, ULONG * } else if( IS_LOGICAL( pValue ) ) { - BOOL bValue = hb_itemGetL( pValue ); /* NOTE: This is correct: Get the date as a long value. [vszel] */ + BOOL bValue = hb_itemGetL( pValue ); /* NOTE: This is correct: Get the date as a long value. [vszakats] */ for( ulStart--; ulCount > 0; ulCount--, ulStart++ ) { @@ -656,7 +656,7 @@ BOOL hb_arrayRelease( PHB_ITEM pArray ) } /* NOTE: CA-Cl*pper 5.3a has a fix for the case when the starting position - is greater than the length of the array. [vszel] */ + is greater than the length of the array. [vszakats] */ BOOL hb_arrayCopy( PHB_ITEM pSrcArray, PHB_ITEM pDstArray, ULONG * pulStart, ULONG * pulCount, ULONG * pulTarget ) @@ -786,6 +786,7 @@ static void hb_arrayNewRagged( PHB_ITEM pArray, int iDimension ) hb_arrayNewRagged( hb_arrayGetItemPtr( pArray, ulElements-- ), iDimension ); } } + /* $DOC$ * $FUNCNAME$ * ARRAY() @@ -857,6 +858,7 @@ HARBOUR HB_ARRAY( void ) hb_arrayNewRagged( &hb_stack.Return, 1 ); } } + /* $DOC$ * $FUNCNAME$ * AADD() @@ -919,8 +921,6 @@ HARBOUR HB_AADD( void ) } } -/* NOTE: CA-Cl*pper 5.3 and older will return NIL on bad parameter, 5.3a,b - will throw a runtime error. [vszel] */ /* $DOC$ * $FUNCNAME$ * ASIZE() @@ -960,6 +960,9 @@ HARBOUR HB_AADD( void ) * $END$ */ +/* NOTE: CA-Cl*pper 5.3 and older will return NIL on bad parameter, 5.3a,b + will throw a runtime error. [vszakats] */ + HARBOUR HB_ASIZE( void ) { PHB_ITEM pArray = hb_param( 1, IT_ARRAY ); @@ -977,6 +980,7 @@ HARBOUR HB_ASIZE( void ) hb_errRT_BASE( EG_ARG, 2023, NULL, "ASIZE" ); #endif } + /* $DOC$ * $FUNCNAME$ * ATAIL() @@ -1015,6 +1019,7 @@ HARBOUR HB_ATAIL( void ) if( pArray ) hb_arrayLast( pArray, &hb_stack.Return ); } + /* $DOC$ * $FUNCNAME$ * AINS() @@ -1065,6 +1070,7 @@ HARBOUR HB_AINS( void ) hb_itemReturn( pArray ); /* AIns() returns the array itself */ } } + /* $DOC$ * $FUNCNAME$ * ADEL() @@ -1116,6 +1122,7 @@ HARBOUR HB_ADEL( void ) hb_itemReturn( pArray ); /* ADel() returns the array itself */ } } + /* $DOC$ * $FUNCNAME$ * AFILL() @@ -1184,6 +1191,7 @@ HARBOUR HB_AFILL( void ) hb_itemReturn( pArray ); /* AFill() returns the array itself */ } } + /* $DOC$ * $FUNCNAME$ * ASCAN() @@ -1257,6 +1265,7 @@ HARBOUR HB_ASCAN( void ) else hb_retnl( 0 ); } + /* $DOC$ * $FUNCNAME$ * AEVAL() @@ -1324,6 +1333,7 @@ HARBOUR HB_AEVAL( void ) else hb_errRT_BASE( EG_ARG, 2017, NULL, "AEVAL" ); } + /* $DOC$ * $FUNCNAME$ * ACOPY() @@ -1408,8 +1418,6 @@ HARBOUR HB_ACOPY( void ) } } -/* NOTE: [vszel] */ - /* $DOC$ * $FUNCNAME$ * ACLONE() @@ -1450,6 +1458,8 @@ HARBOUR HB_ACOPY( void ) * $END$ */ +/* NOTE: Clipper will return NIL if the parameter is not an array. [vszakats] */ + HARBOUR HB_ACLONE( void ) { PHB_ITEM pSrcArray = hb_param( 1, IT_ARRAY ); diff --git a/harbour/source/rtl/inkey.c b/harbour/source/rtl/inkey.c index 2d6562befb..225963740e 100644 --- a/harbour/source/rtl/inkey.c +++ b/harbour/source/rtl/inkey.c @@ -59,8 +59,8 @@ * V 1.21 David G. Holm Added OS/2 DosSleep() * V 1.15 David G. Holm Tested Borland 3.1 hb_releaseCPU() * V 1.5 Paul Tucker ReleaseCPU comments - * V 1.4 Victor Szel - * V 1.3 Victor Szel #include changed to #include "x". + * V 1.4 Victor Szakats + * V 1.3 Victor Szakats #include changed to #include "x". * V 1.2 Gonzalo Diethelm ? * V 1.1 David G. Holm Committed to CVS. * V 1.0 David G. Holm Initial version. @@ -71,7 +71,7 @@ * The following parts are Copyright of the individual authors. * www - http://www.harbour-project.org * - * Copyright 1999 Victor Szel + * Copyright 1999 Victor Szakats * HB___KEYPUT() * * See doc/license.txt for licensing terms. @@ -1157,13 +1157,13 @@ HARBOUR HB___KEYPUT( void ) HARBOUR HB_MCOL( void ) { #if defined(_WINDOWS_) || defined(WINNT) - #if ! defined(HARBOUR_USE_CRS_GTAPI) && ! defined(HARBOUR_USE_SLN_GTAPI) - hb_retnl( s_iMouseCol ); - #else - hb_retnl( 0 ); - #endif + #if ! defined(HARBOUR_USE_CRS_GTAPI) && ! defined(HARBOUR_USE_SLN_GTAPI) + hb_retnl( s_iMouseCol ); + #else + hb_retnl( 0 ); + #endif #else - hb_retnl( 0 ); + hb_retnl( 0 ); #endif } @@ -1201,13 +1201,13 @@ HARBOUR HB_MCOL( void ) HARBOUR HB_MROW( void ) { #if defined(_WINDOWS_) || defined(WINNT) - #if ! defined(HARBOUR_USE_CRS_GTAPI) && ! defined(HARBOUR_USE_SLN_GTAPI) - hb_retnl( s_iMouseRow ); - #else - hb_retnl( 0 ); - #endif + #if ! defined(HARBOUR_USE_CRS_GTAPI) && ! defined(HARBOUR_USE_SLN_GTAPI) + hb_retnl( s_iMouseRow ); + #else + hb_retnl( 0 ); + #endif #else - hb_retnl( 0 ); + hb_retnl( 0 ); #endif } diff --git a/harbour/source/tools/Makefile b/harbour/source/tools/Makefile index 637a308cf7..caa8091963 100644 --- a/harbour/source/tools/Makefile +++ b/harbour/source/tools/Makefile @@ -5,41 +5,46 @@ ROOT = ../../ C_SOURCES=\ - asciisum.c \ - ascpos.c \ - atdiff.c \ - chareven.c \ - charmix.c \ - charodd.c \ - chrcount.c \ - chrfirst.c \ - chrtotal.c \ + asciisum.c \ + ascpos.c \ + atdiff.c \ + chareven.c \ + charmix.c \ + charodd.c \ + chrcount.c \ + chrfirst.c \ + chrtotal.c \ ctchksum.c \ ctchrmix.c \ ctcrypt.c \ dates2.c \ - datesx.c \ - hb_f.c \ - io.c \ - mathx.c \ - strasint.c \ - strcount.c \ - strcspn.c \ - strdiff.c \ - strexpan.c \ + datesx.c \ + dbftools.c \ + hb_f.c \ + io.c \ + mathx.c \ + strasint.c \ + strcount.c \ + strcspn.c \ + strdiff.c \ + strexpan.c \ strfmt.c \ - stringsx.c \ - strleft.c \ - strpbrk.c \ - strright.c \ + stringsx.c \ + strleft.c \ + strpbrk.c \ + strright.c \ PRG_SOURCES=\ - fileread.prg \ + fileread.prg \ + html.prg \ nconvert.prg \ + ng.prg \ numtxthu.prg \ numtxten.prg \ + os2.prg \ rtf.prg \ - stringp.prg \ + stringp.prg \ + troff.prg \ LIBNAME=tools