diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 95f56a3c60..3c14f4801d 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,16 @@ +20000210-23:53 GMT+1 Victor Szakats + * include/hboo.ch + source/rtl/classes.c + source/rtl/tclass.prg + ! HB_OO_ONERROR renamed to HB_OO_MSG_ONERROR + * source/rtl/tgetlist.prg + + Added READVAR() support for the GETs. + * include/* + source/rtl/readvar.prg + * My name changed to the real one. + * source/rtl/filesys.c + ! Minor formatting fix. + 20000210-14:45 EST Paul Tucker * makefile.vc * temporarily - not defining _Windows for tone.c and oemansi.c diff --git a/harbour/include/clipdefs.h b/harbour/include/clipdefs.h index 67a2c307b6..4de7999e64 100644 --- a/harbour/include/clipdefs.h +++ b/harbour/include/clipdefs.h @@ -6,7 +6,7 @@ * Harbour Project source code: * Compatibility header file for CA-Clipper base definitions * - * Copyright 1999 Victor Szel + * Copyright 1999 Victor Szakats * www - http://www.harbour-project.org * * This program is free software; you can redistribute it and/or modify diff --git a/harbour/include/error.api b/harbour/include/error.api index 427e006778..7c498f38e4 100644 --- a/harbour/include/error.api +++ b/harbour/include/error.api @@ -6,7 +6,7 @@ * Harbour Project source code: * Compatibility header file for CA-Clipper Error API * - * Copyright 1999 Victor Szel + * Copyright 1999 Victor Szakats * www - http://www.harbour-project.org * * This program is free software; you can redistribute it and/or modify diff --git a/harbour/include/extend.api b/harbour/include/extend.api index e6025ecedf..c2cb70c7b7 100644 --- a/harbour/include/extend.api +++ b/harbour/include/extend.api @@ -6,7 +6,7 @@ * Harbour Project source code: * Compatibility header file for CA-Clipper Extend API * - * Copyright 1999 Victor Szel + * Copyright 1999 Victor Szakats * www - http://www.harbour-project.org * * This program is free software; you can redistribute it and/or modify diff --git a/harbour/include/fileio.ch b/harbour/include/fileio.ch index 8067b5a2be..944c8b2a05 100644 --- a/harbour/include/fileio.ch +++ b/harbour/include/fileio.ch @@ -39,7 +39,7 @@ * V 1.5 David G. Holm Added my email address. * V 1.4 David G. Holm Added copyright and license header, * along with a complete version history. - * V 1.3 Victor Szel Undocumented change. + * V 1.3 Victor Szakats Undocumented change. * V 1.2 David G. Holm Corrected RCS Id keyword. * V 1.1 David G. Holm Committed to CVS. * V 1.0 David G. Holm Initial version. diff --git a/harbour/include/filesys.api b/harbour/include/filesys.api index 0781a0168e..cbd8269a52 100644 --- a/harbour/include/filesys.api +++ b/harbour/include/filesys.api @@ -36,11 +36,11 @@ /* * ChangeLog: * - * V 1.6 Victor Szel #include changed to #include "x". + * V 1.6 Victor Szakats #include changed to #include "x". * V 1.5 David G. Holm Added my email address. * V 1.4 David G. Holm Added copyright and license header, * along with a complete version history. - * V 1.3 Victor Szel Undocumented change. + * V 1.3 Victor Szakats Undocumented change. * V 1.2 David G. Holm Corrected RCS Id keyword. * V 1.1 David G. Holm Committed to CVS. * V 1.0 David G. Holm Initial version. diff --git a/harbour/include/filesys.h b/harbour/include/filesys.h index c409d17228..ba504d0540 100644 --- a/harbour/include/filesys.h +++ b/harbour/include/filesys.h @@ -38,11 +38,11 @@ * * V 1.22 David G. Holm Added FS_ERROR. * V 1.21 David G. Holm Added hb_fsFile(). - * V 1.7 Victor Szel #include changed to #include "x". + * V 1.7 Victor Szakats #include changed to #include "x". * V 1.6 David G. Holm Added my email address. * V 1.5 David G. Holm Added copyright and license header, * along with a complete version history. - * V 1.4 Victor Szel Undocumented change. + * V 1.4 Victor Szakats Undocumented change. * V 1.3 Gonzalo A. Diethelm Ensured that all Harbour functions * are declared as HB_FUNCTION( void ); * V 1.2 David G. Holm Corrected RCS Id keyword. diff --git a/harbour/include/fm.api b/harbour/include/fm.api index 75fd5ee018..45f9c90e2b 100644 --- a/harbour/include/fm.api +++ b/harbour/include/fm.api @@ -6,7 +6,7 @@ * Harbour Project source code: * Compatibility header file for CA-Clipper Fixed Memory API * - * Copyright 1999 Victor Szel + * Copyright 1999 Victor Szakats * www - http://www.harbour-project.org * * This program is free software; you can redistribute it and/or modify diff --git a/harbour/include/gt.api b/harbour/include/gt.api index ef503f9c4f..1429f04ebc 100644 --- a/harbour/include/gt.api +++ b/harbour/include/gt.api @@ -6,7 +6,7 @@ * Harbour Project source code: * Compatibility header file for CA-Clipper Terminal API * - * Copyright 1999 Victor Szel + * Copyright 1999 Victor Szakats * www - http://www.harbour-project.org * * This program is free software; you can redistribute it and/or modify diff --git a/harbour/include/hb_vmpub.h b/harbour/include/hb_vmpub.h index 09b91360bc..78f58f8069 100644 --- a/harbour/include/hb_vmpub.h +++ b/harbour/include/hb_vmpub.h @@ -6,7 +6,7 @@ * Harbour Project source code: * Header file for the generated C language source code * - * Copyright 1999 Victor Szel + * Copyright 1999 Victor Szakats * www - http://www.harbour-project.org * * This program is free software; you can redistribute it and/or modify diff --git a/harbour/include/hbexpr.c b/harbour/include/hbexpr.c index 03a7ebcc2c..f627249a5d 100644 --- a/harbour/include/hbexpr.c +++ b/harbour/include/hbexpr.c @@ -768,7 +768,7 @@ HB_EXPR_PTR hb_compExprNewFunCall( HB_EXPR_PTR pName, HB_EXPR_PTR pParms ) /* NOTE: CA-Cl*pper's compiler optimizer will be wrong for those CHR() cases where the passed parameter is a constant which can be divided by 256 but it's not zero, in this case it - will return an empty string instead of a Chr(0). [vszel] */ + will return an empty string instead of a Chr(0). [vszakats] */ pExpr = hb_compExprNew( HB_ET_STRING ); pExpr->ValType = HB_EV_STRING; @@ -4554,7 +4554,7 @@ static HB_EXPR_FUNC( hb_compExprUseIN ) BOOL bResult; /* NOTE: CA-Cl*pper has a bug where the $ operator returns .T. - when an empty string is searched [vszel] */ + when an empty string is searched [vszakats] */ if( pSelf->value.asOperator.pLeft->ulLength == 0 ) bResult = TRUE; diff --git a/harbour/include/hbfsapi.h b/harbour/include/hbfsapi.h index 30296dd844..c46b3298a4 100644 --- a/harbour/include/hbfsapi.h +++ b/harbour/include/hbfsapi.h @@ -6,7 +6,7 @@ * Harbour Project source code: * Header file for the common Filesys API * - * Copyright 1999 Victor Szel + * Copyright 1999 Victor Szakats * www - http://www.harbour-project.org * * This program is free software; you can redistribute it and/or modify diff --git a/harbour/include/hbmemory.ch b/harbour/include/hbmemory.ch index a653085e5f..d28f6d1466 100644 --- a/harbour/include/hbmemory.ch +++ b/harbour/include/hbmemory.ch @@ -6,7 +6,7 @@ * Harbour Project source code: * Header file for MEMORY() function * - * Copyright 1999 Victor Szel + * Copyright 1999 Victor Szakats * www - http://www.harbour-project.org * * This program is free software; you can redistribute it and/or modify @@ -41,23 +41,24 @@ /* Parameters for Memory() function */ /* Standard */ -#define HB_MEM_CHAR 0 /* Free Variable Space (KB) */ -#define HB_MEM_BLOCK 1 /* Largest String (KB) */ -#define HB_MEM_RUN 2 /* RUN Memory (KB) */ +#define HB_MEM_CHAR 0 /* Free Variable Space (KB) */ +#define HB_MEM_BLOCK 1 /* Largest String (KB) */ +#define HB_MEM_RUN 2 /* RUN Memory (KB) */ /* CA-Cl*pper undocumented */ -#define HB_MEM_VM 3 /* Virtual Memory (KB) */ -#define HB_MEM_EMS 4 /* Free Expanded Memory (KB) (?) */ -#define HB_MEM_FM 101 /* Fixed Memory/Heap (KB) (?) */ -#define HB_MEM_FMSEGS 102 /* Segments in Fixed Memory/Heap (?) */ -#define HB_MEM_SWAP 103 /* Free Swap Memory (KB) */ -#define HB_MEM_CONV 104 /* Free Conventional (KB) */ -#define HB_MEM_EMSUSED 105 /* Used Expanded Memory (KB) (?) */ +#define HB_MEM_VM 3 /* Virtual Memory (KB) */ +#define HB_MEM_EMS 4 /* Free Expanded Memory (KB) (?) */ +#define HB_MEM_FM 101 /* Fixed Memory/Heap (KB) (?) */ +#define HB_MEM_FMSEGS 102 /* Segments in Fixed Memory/Heap (?) */ +#define HB_MEM_SWAP 103 /* Free Swap Memory (KB) */ +#define HB_MEM_CONV 104 /* Free Conventional (KB) */ +#define HB_MEM_EMSUSED 105 /* Used Expanded Memory (KB) (?) */ /* Harbour extensions */ -#define HB_MEM_USED 1001 /* Memory used (bytes) */ -#define HB_MEM_USEDMAX 1002 /* Maximum memory used (bytes) */ -#define HB_MEM_STACKITEMS 1003 /* Total items on the stack */ +#define HB_MEM_USED 1001 /* Memory used (bytes) */ +#define HB_MEM_USEDMAX 1002 /* Maximum memory used (bytes) */ +#define HB_MEM_STACKITEMS 1003 /* Total items on the stack */ #define HB_MEM_STACK 1004 /* Total memory size used by the stack (bytes) */ #endif /* HB_MEMORY_CH_ */ + diff --git a/harbour/include/hboo.ch b/harbour/include/hboo.ch index 56ffa76125..3b032b9b26 100644 --- a/harbour/include/hboo.ch +++ b/harbour/include/hboo.ch @@ -6,7 +6,7 @@ * Harbour Project source code: * Header file for low-level object engine * - * Copyright 1999 Victor Szel + * Copyright 1999 Victor Szakats * www - http://www.harbour-project.org * * This program is free software; you can redistribute it and/or modify @@ -45,7 +45,7 @@ #define HB_OO_MSG_INLINE 3 #define HB_OO_MSG_VIRTUAL 4 #define HB_OO_MSG_SUPER 5 -#define HB_OO_ONERROR 6 +#define HB_OO_MSG_ONERROR 6 /* Data */ #define HB_OO_DATA_SYMBOL 1 @@ -55,4 +55,5 @@ #define HB_OO_CLSD_SYMBOL 1 #define HB_OO_CLSD_VALUE 2 -#endif /* HB_OO_CH_ */ \ No newline at end of file +#endif /* HB_OO_CH_ */ + diff --git a/harbour/include/hbsetup.ch b/harbour/include/hbsetup.ch index d8bc85416c..8e3ed910ce 100644 --- a/harbour/include/hbsetup.ch +++ b/harbour/include/hbsetup.ch @@ -6,7 +6,7 @@ * Harbour Project source code: * Header file for runtime configuration, common for Harbour and C level. * - * Copyright 1999 Victor Szel + * Copyright 1999 Victor Szakats * www - http://www.harbour-project.org * * This program is free software; you can redistribute it and/or modify diff --git a/harbour/include/hbundoc.api b/harbour/include/hbundoc.api index 59c44b7c40..0a09d3057d 100644 --- a/harbour/include/hbundoc.api +++ b/harbour/include/hbundoc.api @@ -6,7 +6,7 @@ * Harbour Project source code: * Compatibility header file for undocumented C API functions * - * Copyright 1999 Victor Szel + * Copyright 1999 Victor Szakats * www - http://www.harbour-project.org * * This program is free software; you can redistribute it and/or modify diff --git a/harbour/include/hbver.h b/harbour/include/hbver.h index ded980f6cb..8d26730fdd 100644 --- a/harbour/include/hbver.h +++ b/harbour/include/hbver.h @@ -58,7 +58,7 @@ * Added version history. * Bumped revision code to "d" and * updated date. - * V 1.8 Victor Szel Change not documented. + * V 1.8 Victor Szakats Change not documented. * V 1.7 David G. Holm Bumped revision code to "c". * V 1.6 Patrick Mast Bumped build to 27 and updated date * for new public release. diff --git a/harbour/include/item.api b/harbour/include/item.api index 14869a13aa..f6d387ccf6 100644 --- a/harbour/include/item.api +++ b/harbour/include/item.api @@ -6,7 +6,7 @@ * Harbour Project source code: * Compatibility header file for CA-Clipper Item API * - * Copyright 1999 Victor Szel + * Copyright 1999 Victor Szakats * www - http://www.harbour-project.org * * This program is free software; you can redistribute it and/or modify diff --git a/harbour/include/langapi.h b/harbour/include/langapi.h index 3a6dc9d0ec..60612ba2f7 100644 --- a/harbour/include/langapi.h +++ b/harbour/include/langapi.h @@ -6,7 +6,7 @@ * Harbour Project source code: * Header file for the Language API * - * Copyright 1999 Victor Szel + * Copyright 1999 Victor Szakats * www - http://www.harbour-project.org * * This program is free software; you can redistribute it and/or modify diff --git a/harbour/include/mouseapi.h b/harbour/include/mouseapi.h index 6f0960ef18..c391c74a06 100644 --- a/harbour/include/mouseapi.h +++ b/harbour/include/mouseapi.h @@ -6,7 +6,7 @@ * Harbour Project source code: * Header file for the Mouse API * - * Copyright 1999 Victor Szel + * Copyright 1999 Victor Szakats * www - http://www.harbour-project.org * * This program is free software; you can redistribute it and/or modify diff --git a/harbour/include/rdd.api b/harbour/include/rdd.api index d1c38208bf..da394b733e 100644 --- a/harbour/include/rdd.api +++ b/harbour/include/rdd.api @@ -6,7 +6,7 @@ * Harbour Project source code: * Compatibility header file for CA-Clipper RDD API * - * Copyright 1999 Victor Szel + * Copyright 1999 Victor Szakats * www - http://www.harbour-project.org * * This program is free software; you can redistribute it and/or modify diff --git a/harbour/include/set.ch b/harbour/include/set.ch index ec038f616d..5033819175 100644 --- a/harbour/include/set.ch +++ b/harbour/include/set.ch @@ -40,7 +40,7 @@ * V 1.4 David G. Holm Added my email address. * V 1.3 David G. Holm Added copyright and license header, * along with a complete version history. - * V 1.2 Victor Szel Change not documented. + * V 1.2 Victor Szakats Change not documented. * V 1.1 Manuel Ruiz Committed to CVS. * V 1.0 David G. Holm Initial version. * diff --git a/harbour/include/set.h b/harbour/include/set.h index 120796280f..a86eb4c729 100644 --- a/harbour/include/set.h +++ b/harbour/include/set.h @@ -39,7 +39,7 @@ * V 1.31 David G. Holm Added missing Clipper 5.3 SETs. * V 1.25 Paul Tucker Converted HB_SET_DEBUG back to Logical. * Clipper 5.3 docs are incorrect on this. - * V 1.19 Victor Szel #include changed to #include "x". + * V 1.19 Victor Szakats #include changed to #include "x". * V 1.18 David G. Holm Added INKEY_EXTENDED to allow some * platforms to select between normal * and extended key codes. @@ -60,9 +60,9 @@ * V 1.12 David G. Holm Added copyright and license header, * along with a complete version history. * V 1.11 David G. Holm Added hb_set_extrahan. - * V 1.10 Victor Szel Renamed InitializeSets() to + * V 1.10 Victor Szakats Renamed InitializeSets() to * hb_setInitialize() and renamed - * V 1.9 Victor Szel ReleaseSets() to hb_setRelease(). + * V 1.9 Victor Szakats ReleaseSets() to hb_setRelease(). * V 1.8 David G. Holm Changed HB_SET_DEBUG to numeric. * V 1.7 Gonzalo A. Diethelm Made the #include guard ANSI compliant. * V 1.6 Gonzalo A. Diethelm Ensured that all Harbour functions diff --git a/harbour/include/vm.api b/harbour/include/vm.api index a6e5cf2c92..b7ce915661 100644 --- a/harbour/include/vm.api +++ b/harbour/include/vm.api @@ -6,7 +6,7 @@ * Harbour Project source code: * Compatibility header file for CA-Clipper Virtual Memory API * - * Copyright 1999 Victor Szel + * Copyright 1999 Victor Szakats * www - http://www.harbour-project.org * * This program is free software; you can redistribute it and/or modify diff --git a/harbour/source/rtl/classes.c b/harbour/source/rtl/classes.c index 65b62b4994..4624d8128b 100644 --- a/harbour/source/rtl/classes.c +++ b/harbour/source/rtl/classes.c @@ -50,7 +50,7 @@ * __objHasMsg() * __objSendMsg() * - * Copyright 1999 Victor Szel + * Copyright 1999 Victor Szakats * hb___msgEval() * HB___CLASSNEW() * HB___CLASSINSTANCE() @@ -100,7 +100,7 @@ typedef struct static PCLASS s_pClasses = NULL; static USHORT s_uiClasses = 0; -static PMETHOD s_pMethod = NULL; /* TOFIX: The object engine is not thread safe because of this. */ +static PMETHOD s_pMethod = NULL; /* TOFIX: The object engine is not thread safe because of this. [vszakats] */ static PHB_DYNS s_msgClassName = NULL; static PHB_DYNS s_msgClassH = NULL; static PHB_DYNS s_msgEval = NULL; @@ -498,7 +498,7 @@ HARBOUR HB___CLSADDMSG( void ) pNewMeth->pFunction = hb___msgSuper; break; - case HB_OO_ONERROR: + case HB_OO_MSG_ONERROR: pClass->pFunError = ( PHB_FUNC ) hb_parnl( 2 ); break; diff --git a/harbour/source/rtl/filesys.c b/harbour/source/rtl/filesys.c index 59e6d50ca0..c3281c7824 100644 --- a/harbour/source/rtl/filesys.c +++ b/harbour/source/rtl/filesys.c @@ -61,19 +61,19 @@ * hb_fsIsDevice() * HB_FSETDEVMOD() * - * * Copyright 2000 Luiz Rafael Culik - * FOPEN() DOCUMENTATION - * FCLOSE() DOCUMENTATION - * FWRITE() DOCUMENTATION - * FSEEK() DOCUMENTATION - * FREAD() DOCUMENTATION - * FILE() DOCUMENTATION - * FREADSTR() DOCUMENTATION - * FRENAME() DOCUMENTATION - * FERROR() DOCUMENTATION - * RENAME DOCUMENTATION - * ERASE DOCUMENTATION + * FOPEN() Documentation + * FCLOSE() Documentation + * FWRITE() Documentation + * FSEEK() Documentation + * FREAD() Documentation + * FILE() Documentation + * FREADSTR() Documentation + * FRENAME() Documentation + * FERROR() Documentation + * RENAME Documentation + * ERASE Documentation + * * See doc/license.txt for licensing terms. * */ @@ -1355,7 +1355,7 @@ FHANDLE hb_fsExtOpen( BYTE * pFilename, BYTE * pDefExt, * * The Sharing Modes determine how other processes may access the file. * - * FOPEN() Sharing Modes + * FOPEN() Sharing Modes * 컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴 * Mode Fileio.ch Operation * 컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴 @@ -1370,10 +1370,10 @@ FHANDLE hb_fsExtOpen( BYTE * pFilename, BYTE * pDefExt, * The Access Modes in combination (+) with the Sharing modes determine the * accessibility of the file in a network environment. * - * $RETURNS$ + * $RETURNS$ * FOPEN() returns the file handle of the opened file in the range of zero * to 65,535. If an error occurs, FOPEN() returns -1. - * $DESCRIPTION$ + * $DESCRIPTION$ * FOPEN() is a low-level file function that opens an existing binary file * for reading and writing, depending on the argument. Whenever * there is an open error, use FERROR() to return the DOS error number. @@ -1439,10 +1439,10 @@ HARBOUR HB_FOPEN( void ) * $SYNTAX$ * FCREATE(, []) --> nHandle * $ARGUMENTS$ - * is the name of the file to create. + * is the name of the file to create. * * Numeric code for the DOS file attribute - * + * * $RETURNS$ * Numeric expression * $DESCRIPTION$ @@ -1460,7 +1460,7 @@ HARBOUR HB_FOPEN( void ) * this Function. * * ^bValue of File Attribute - * 0 Normal/Default,Read/Write + * 0 Normal/Default,Read/Write * 1 Read-only,Attemptinf to open for * output returns an error * 2 Hidden,Excluded from normal DIR @@ -1490,7 +1490,7 @@ HARBOUR HB_FOPEN( void ) * $SEEALSO$ * FCLOSE(),FOPEN(),FWRITE(),FREAD(),FERROR() * $INCLUDE$ - * + * * $END$ */ @@ -1512,10 +1512,10 @@ HARBOUR HB_FCREATE( void ) * Read characters from a binary file into a buffer variable * $SYNTAX$ * FREAD(, @, ) --> nBytes - * $ARGUMENTS$ + * $ARGUMENTS$ * is the file handle obtained from FOPEN(), FCREATE(), or * predefined by DOS. - * + * * is the name of an existing and initialized character * variable used to store data read from the specified file. The length of * this variable must be greater than or equal to . @@ -1523,11 +1523,11 @@ HARBOUR HB_FCREATE( void ) * pass-by-reference operator (@). * * is the number of bytes to read into the buffer. - * $RETURNS$ + * $RETURNS$ * FREAD() returns the number of bytes successfully read as an integer * numeric value. A return value less than or zero indicates end * of file or some other read error. - * $DESCRIPTION$ + * $DESCRIPTION$ * FREAD() is a low-level file function that reads characters from a binary * file into an existing character variable. It reads from the file * starting at the current DOS file pointer position, advancing the file @@ -1572,7 +1572,7 @@ HARBOUR HB_FCREATE( void ) * $SEEALSO$ * BIN2I(),BIN2L(),BIN2W(),FERROR(),FWRITE() * $INCLUDE$ - * + * * $END$ */ @@ -1611,10 +1611,10 @@ HARBOUR HB_FREAD( void ) * Low Level * $ONELINER$ * Write to an open binary file - * $SYNTAX$ + * $SYNTAX$ * FWRITE(, , []) * --> nBytesWritten - * $ARGUMENTS$ + * $ARGUMENTS$ * is the file handle obtained from FOPEN(), FCREATE(), or * predefined by DOS. * @@ -1623,12 +1623,12 @@ HARBOUR HB_FREAD( void ) * indicates the number of bytes to write beginning at the * current file pointer position. If omitted, the entire content of * is written. - * $RETURNS$ + * $RETURNS$ * FWRITE() returns the number of bytes written as an integer numeric * value. If the value returned is equal to , the operation was * successful. If the return value is less than or zero, either * the disk is full or another error has occurred. - * $DESCRIPTION$ + * $DESCRIPTION$ * FWRITE() is a low-level file function that writes data to an open binary * file from a character string buffer. You can either write all or a * portion of the buffer contents. Writing begins at the current file @@ -1642,7 +1642,7 @@ HARBOUR HB_FREAD( void ) * knowledge of the operating system * $EXAMPLES$ * ^CFE This example copies the contents of one file to another: - * + * * #include "Fileio.ch" * #define F_BLOCK 512 * // @@ -1674,7 +1674,7 @@ HARBOUR HB_FREAD( void ) * $SEEALSO$ * FCLOSE(),FCREATE(),FERROR(),FOPEN(),I2BIN(),L2BIN() * $INCLUDE$ - * + * * $END$ */ @@ -1698,7 +1698,7 @@ HARBOUR HB_FWRITE( void ) * $SYNTAX$ * FERROR() --> * $ARGUMENTS$ - * + * * $RETURNS$ * Value of the DOS error last encountered by a * low-level file function. @@ -1733,7 +1733,7 @@ HARBOUR HB_FWRITE( void ) * of possibles values returned by the FERROR() function. * * FERROR() Return Values - * Value Reason + * Value Reason * 컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴 * 0 Successful * 2 File not found @@ -1770,7 +1770,7 @@ HARBOUR HB_FWRITE( void ) * $SEEALSO$ * FCLOSE(),FERASE(),FOPEN(),FWRITE() * $INCLUDE$ - * + * * $END$ */ @@ -1808,7 +1808,7 @@ HARBOUR HB_FERROR( void ) * $SEEALSO$ * FOPEN(),FCREATE(),FREAD(),FWRITE(),FERROR() * $INCLUDE$ - * + * * $END$ */ @@ -1836,7 +1836,7 @@ HARBOUR HB_FCLOSE( void ) * FERASE() --> nSuccess * $ARGUMENTS$ * Name of file to erase. - * $RETURNS$ + * $RETURNS$ * 0 if successful, -1 if not * $DESCRIPTION$ * This function deletes the file specified in from the disk. @@ -1859,7 +1859,7 @@ HARBOUR HB_FCLOSE( void ) * #include "Directry.ch" * AEVAL(DIRECTORY("*.BAK"), { |aFile| ; * FERASE(aFile[F_NAME]) }) - * + * * ^CFE This example erases a file and displays a message if the * operation fails: * @@ -1876,7 +1876,7 @@ HARBOUR HB_FCLOSE( void ) * $SEEALSO$ * FERROR(),FRENAME() * $INCLUDE$ - * + * * $END$ */ @@ -1899,7 +1899,7 @@ HARBOUR HB_FERASE( void ) * Change the name of a file * $SYNTAX$ * FRENAME(, ) --> nSuccess - * $ARGUMENTS$ + * $ARGUMENTS$ * is the name of the file to rename, including the file * extension. A drive letter and/or path name may also be included as part * of the filename. @@ -1907,11 +1907,11 @@ HARBOUR HB_FERASE( void ) * is the new name of the file, including the file * extension. A drive letter and/or path name may also be included as part * of the name. - * $RETURNS$ + * $RETURNS$ * FRENAME() returns -1 if the operation fails and zero if it succeeds. In * the case of a failure, FERROR() can be used to determine the nature of * the error. - * $DESCRIPTION$ + * $DESCRIPTION$ * FRENAME() is a file function that changes the name of a specified file * to a new name and is identical to the RENAME command. * @@ -1944,7 +1944,7 @@ HARBOUR HB_FERASE( void ) * $SEEALSO$ * ERASE,FERASE(),FERROR(),FILE(),RENAME * $INCLUDE$ - * + * * $END$ */ @@ -1967,7 +1967,7 @@ HARBOUR HB_FRENAME( void ) * Set a binary file pointer to a new position * $SYNTAX$ * FSEEK(, , []) --> nPosition - * $ARGUMENTS$ + * $ARGUMENTS$ * is the file handle obtained from FOPEN(), FCREATE(), or * predefined by DOS. * @@ -1989,11 +1989,11 @@ HARBOUR HB_FRENAME( void ) * 1 FS_RELATIVE Seek from the current pointer position * 2 FS_END Seek from end of file * 컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴컴 - * $RETURNS$ + * $RETURNS$ * FSEEK() returns the new position of the file pointer relative to the * beginning of file (position 0) as an integer numeric value. This value * is without regard to the original position of the file pointer. - * $DESCRIPTION$ + * $DESCRIPTION$ * FSEEK() is a low-level file function that moves the file pointer forward * or backward in an open binary file without actually reading the contents * of the specified file. The beginning position and offset are specified @@ -2105,15 +2105,15 @@ BOOL hb_fsFile( BYTE * pFilename ) * Tests for the existence of file(s) * $SYNTAX$ * FILE() --> lExists - * $ARGUMENTS$ + * $ARGUMENTS$ * is in the current Harbour default directory and path. * It is a standard file specification that can include the wildcard * characters * and ? as well as a drive and path reference. Explicit * references to a file must also include an extension. - * $RETURNS$ + * $RETURNS$ * FILE() returns true (.T.) if there is a match for any file matching the * pattern; otherwise, it returns false (.F.). - * $DESCRIPTION$ + * $DESCRIPTION$ * FILE() is an environment function that determines whether any file * matching a file specification pattern is found. FILE() searches the * specified directory if a path is explicitly specified. @@ -2143,9 +2143,9 @@ BOOL hb_fsFile( BYTE * pFilename ) * $COMPLIANCE$ * This function is CA-Clipper compatible * $SEEALSO$ - * + * * $INCLUDE$ - * + * * $END$ */ @@ -2163,17 +2163,17 @@ HARBOUR HB_FILE( void ) * Read characters from a binary file * $SYNTAX$ * FREADSTR(, ) --> cString - * $ARGUMENTS$ + * $ARGUMENTS$ * is the file handle obtained from FOPEN(), FCREATE(), or * predefined by DOS. * * is the number of bytes to read, beginning at the current * DOS file pointer position. - * $RETURNS$ + * $RETURNS$ * FREADSTR() returns a character string with any size including * strings greather then 64K. A return value ("") indicates an * error or end of file. - * $DESCRIPTION$ + * $DESCRIPTION$ * FREADSTR() is a low-level file function that reads characters from an * open binary file beginning with the current DOS file pointer position. * Characters are read up to or until a null character (CHR(0)) is @@ -2210,7 +2210,7 @@ HARBOUR HB_FILE( void ) * $SEEALSO$ * BIN2I(),BIN2L(),BIN2W(),FERROR(),FREAD(),FSEEK() * $INCLUDE$ - * + * * $END$ */ @@ -2480,7 +2480,7 @@ HARBOUR HB_FSETDEVMOD( void ) /* $DOC$ * $FUNCNAME$ - * RENAME + * RENAME * $CATEGORY$ * Command * $ONELINER$ @@ -2538,7 +2538,7 @@ HARBOUR HB_FSETDEVMOD( void ) * $SEEALSO$ * CURDIR(),ERASE,FILE(),FERASE(),FRENAME() * $INCLUDE$ - * + * * $END$ */ @@ -2571,7 +2571,7 @@ HARBOUR HB_FSETDEVMOD( void ) * * Warning! Files must be CLOSEd before deleting them. * - * $EXAMPLES$ + * $EXAMPLES$ * * ^CFE This example removes a specified file from disk then tests to * see if the file was in fact removed: @@ -2590,7 +2590,7 @@ HARBOUR HB_FSETDEVMOD( void ) * $SEEALSO$ * CURDIR(),FILE() * $INCLUDE$ - * + * * $END$ */ diff --git a/harbour/source/rtl/readvar.prg b/harbour/source/rtl/readvar.prg index b0c6544689..753a6ce9d0 100644 --- a/harbour/source/rtl/readvar.prg +++ b/harbour/source/rtl/readvar.prg @@ -6,7 +6,7 @@ * Harbour Project source code: * READVAR() function * - * Copyright 1999 Victor Szel + * Copyright 1999 Victor Szakats * www - http://www.harbour-project.org * * This program is free software; you can redistribute it and/or modify @@ -32,6 +32,7 @@ * their web site at http://www.gnu.org/). * */ + /* $DOC$ * $FUNCNAME$ * READVAR() diff --git a/harbour/source/rtl/tclass.prg b/harbour/source/rtl/tclass.prg index 39b7fc94eb..c5cdfc81ec 100644 --- a/harbour/source/rtl/tclass.prg +++ b/harbour/source/rtl/tclass.prg @@ -178,7 +178,7 @@ STATIC FUNCTION Create() NEXT if ::nOnError != nil - __clsAddMsg( hClass, ::nOnError,, HB_OO_ONERROR ) + __clsAddMsg( hClass, ::nOnError,, HB_OO_MSG_ONERROR ) endif RETURN NIL diff --git a/harbour/source/rtl/tgetlist.prg b/harbour/source/rtl/tgetlist.prg index 1c8d03dc8e..023c0904a0 100644 --- a/harbour/source/rtl/tgetlist.prg +++ b/harbour/source/rtl/tgetlist.prg @@ -594,6 +594,7 @@ METHOD ReadVar( cNewVarName ) CLASS TGetList if ISCHARACTER( cNewVarName ) ::cVarName := cNewVarName + ReadVar( cNewVarName ) endif return cOldName @@ -631,3 +632,4 @@ function Updated() endif return .f. +