fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

19991010-02:05 GMT+1

Browse Source
This commit is contained in:
Viktor Szakats
1999-10-10 00:18:35 +00:00
parent e4f42bcace
commit fbf0ac5776
34 changed files with 151 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
harbour/ChangeLog
View File

@@ -1,3 +1,38 @@
19991010-02:05 GMT+1 Victor Szel <info@szelvesz.hu>
* bin/*.bat
! Some minor fix in the help screens
* doc/funclist.txt
+ Changed the format, now the third column (which was not in use) is
meant to store the platform and multithreading support information.
* source/compiler/harbour.y
+ One TODO added.
* include/*.api
include/assert.ch
include/common.ch
include/fileio.ch
include/harbour.ch
include/hbclass.ch
include/hbextern.ch
include/hbmemvar.ch
include/hboo.ch
include/inkey.ch
include/reserved.ch
include/std.ch
include/clipdefs.h
include/filesys.h
source/rtl/filesys.c
source/rtl/console.c
! FM_ #define names replaced with FD_ ones for Clipper compatibility.
! FXO_, FL_ #defines moved to filesys.h from filesys.ch for full compat.
! *.API guard names made compatible.
! Some missing #defines added to .API files (assert.ch, filesys.api)
! Small compatibility enhancement in extend.api (XDOUBLE)
! Guard names adjusted (mostly where filenames have changed).
+ Missing guard added to hbextern.ch
+ Harbour only #defines in compatbility headers prefixed with HB_
* Makefile
+ Added the samples to the make process, but it's commented out.
19991009-22:19 GMT+1 Antonio Linares <alinares@fivetech.com>
* source/compiler/harbour.y
* a[ b ]:c expressions fixed.

1
harbour/Makefile
View File

@@ -9,5 +9,6 @@ DIRS=\
source \
obj \
tests \
# samples \
include $(ROOT)config/dir.cf

2
harbour/bin/buildexe-dos-bcc31.bat
View File

@@ -14,7 +14,7 @@ rem by David G. Holm <dholm@jsd-llc.com>
if not "%1" == "" goto compile
echo.
echo Usage: makeexe.bat name
echo Usage: buildexe.bat name
echo.
echo - 'name' is the .prg filename *without* extension.
echo - Don't forget to make a MAIN function for you application.

2
harbour/bin/buildexe-dos-djgpp.bat
View File

@@ -14,7 +14,7 @@ rem by David G. Holm <dholm@jsd-llc.com>
if not "%1" == "" goto compile
echo.
echo Usage: makeexe.bat name
echo Usage: buildexe.bat name
echo.
echo - 'name' is the .prg filename *without* extension.
echo - Don't forget to make a MAIN function for you application.

2
harbour/bin/buildexe-os2-gcc.cmd
View File

@@ -14,7 +14,7 @@ rem by David G. Holm <dholm@jsd-llc.com>
if not "%1" == "" goto compile
echo.
echo Usage: makeexe.bat name
echo Usage: buildexe.bat name
echo.
echo - 'name' is the .prg filename *without* extension.
echo - Don't forget to make a MAIN function for you application.

2
harbour/bin/buildexe-os2-icc.cmd
View File

@@ -14,7 +14,7 @@ rem by David G. Holm <dholm@jsd-llc.com>
if not "%1" == "" goto compile
echo.
echo Usage: makeexe.bat name
echo Usage: buildexe.bat name
echo.
echo - 'name' is the .prg filename *without* extension.
echo - Don't forget to make a MAIN function for you application.

2
harbour/bin/buildexe-w32-gcc.bat
View File

@@ -14,7 +14,7 @@ rem by David G. Holm <dholm@jsd-llc.com>
if not "%1" == "" goto compile
echo.
echo Usage: makeexe.bat name
echo Usage: buildexe.bat name
echo.
echo - 'name' is the .prg filename *without* extension.
echo - Don't forget to make a MAIN function for you application.

2
harbour/bin/buildexe-w32-mingw32.bat
View File

@@ -13,7 +13,7 @@ rem Maintainer: Victor Szel <info@szelvesz.hu>
if not "%1" == "" goto compile
echo.
echo Usage: makeexe.bat name
echo Usage: buildexe.bat name
echo.
echo - 'name' is the .prg filename *without* extension.
echo - Don't forget to make a MAIN function for you application.

2
harbour/bin/buildexe-w32-msvc.bat
View File

@@ -13,7 +13,7 @@ rem Maintainer: Paul Tucker <ptucker@sympatico.ca>
if not "%1" == "" goto compile
echo.
echo Usage: makeexe.bat name
echo Usage: buildexe.bat name
echo.
echo - 'name' is the .prg filename *without* extension.
echo - Don't forget to make a MAIN function for you application.

18
harbour/doc/funclist.txt
View File

@@ -5,10 +5,24 @@
; funclist.txt - Function Status List
;
; Syntax:
; <function>;<state>;<RTL_file>
; <function/method>;<state>;<platform>
;
; Where:
; <state> - [R]eady, [S]tarted, [N]ot Started
; <state> - R[eady], S[tarted], N[ot Started]
; <platform> - dos[-bcc31][+T]
; dos[-djgpp][+T]
; dos[-watcom][+T]
; w32[-bcc32][+T]
; w32[-gcc][+T]
; w32[-icc][+T]
; w32[-mingw32][+T]
; w32[-msvc][+T]
; os2[-gcc][+T]
; os2[-icc][+T]
; lin[-gcc][+T]
; mac[-mpw][+T]
;
; Examples: w32-gcc+T, w32, w32-icc
;
; Use ';' for comments
;

7
harbour/include/assert.ch
View File

@@ -33,8 +33,9 @@
*
*/
#ifndef _ASSERT_CH
#define _ASSERT_CH
#ifndef HB_ASSERT_CH_
#define HB_ASSERT_CH_
#define _ASSERT_DEFINED // NOTE: For complete CA-Clipper compatibility
#ifdef NDEBUG
@@ -56,4 +57,4 @@
#endif /* NDEBUG */
#endif /* _ASSERT_CH */
#endif /* HB_ASSERT_CH_ */

8
harbour/include/clipdefs.h
View File

@@ -38,9 +38,9 @@
/* This file is provided to support some level of */
/* Harbour compatibility for old Clipper C extension code */
#ifndef HB_CLIPDEFS_H_
#define HB_CLIPDEFS_H_
#ifndef _CLIPDEFS_H
#define _CLIPDEFS_H
#include "extend.h"
/* Old types */
@@ -106,4 +106,4 @@ typedef FUNCP* FUNCPP;
#define NULL 0
#endif
#endif /* HB_CLIPDEFS_H_ */
#endif /* _CLIPDEFS_H */

6
harbour/include/common.ch
View File

@@ -33,8 +33,8 @@
*
*/
#ifndef _COMMON_CH
#define _COMMON_CH
#ifndef HB_COMMON_CH_
#define HB_COMMON_CH_
/* Friendly logical aliases */
#define TRUE .T.
@@ -61,4 +61,4 @@
#command UPDATE <v1> IF <exp> TO <v2> => ;
IF <exp> ; <v1> := <v2> ; END
#endif /* _COMMON_CH */
#endif /* HB_COMMON_CH_ */

6
harbour/include/error.api
View File

@@ -35,8 +35,8 @@
/* DON'T USE THIS FILE FOR NEW HARBOUR C CODE */
#ifndef HB_ERROR_API_
#define HB_ERROR_API_
#ifndef _ERROR_API
#define _ERROR_API
#include "clipdefs.h"
#include "errorapi.h"
@@ -67,4 +67,4 @@ typedef PHB_ITEM ERRORP;
#define _errPutTries hb_errPutTries
#define _errRelease hb_errRelease
#endif /* HB_ERROR_API_ */
#endif /* _ERROR_API */

8
harbour/include/extend.api
View File

@@ -35,14 +35,16 @@
/* DON'T USE THIS FILE FOR NEW HARBOUR C CODE */
#ifndef HB_EXTEND_API_
#define HB_EXTEND_API_
#ifndef _EXTEND_API
#define _EXTEND_API
#include "clipdefs.h"
#include "extend.h"
typedef PHB_ITEM ITEM;
#ifndef CLIPPERDEFS
typedef double XDOUBLE;
#endif
/* Compatible defines */
@@ -89,4 +91,4 @@ typedef double XDOUBLE;
#define _storni hb_storni
#define _stornl hb_stornl
#endif /* HB_EXTEND_API_ */
#endif /* _EXTEND_API */

18
harbour/include/fileio.ch
View File

@@ -57,10 +57,6 @@
#define FC_HIDDEN 0x0002 /* Hidden file attribute is set */
#define FC_SYSTEM 0x0004 /* System file attribute is set */
/* File locking flags */
#define FL_LOCK 0x0000 /* Lock a region */
#define FL_UNLOCK 0x0001 /* Unlock a region */
/* File access flags */
#define FO_READ 0x0000 /* File is opened for reading */
#define FO_WRITE 0x0001 /* File is opened for writing */
@@ -84,17 +80,13 @@
#define FS_END 0x0002 /* Seek from end of file */
/* File mode flags */
#define FM_BINARY 1 /* Binary mode (raw) */
#define FM_TEXT 2 /* Test mode (cooked) */
#define FD_BINARY 1 /* Binary mode (raw) */
#define FD_RAW 1
#define FD_COOKED 2 /* Test mode (cooked) */
#define FD_TEXT 2
#define FD_ASCII 2
/* File system error codes */
#define F_ERROR ( -1 ) /* Unspecified error */
/* Extended file open mode flags */
#define FXO_TRUNCATE 0x0100 /* Create (truncate if exists) */
#define FXO_APPEND 0x0200 /* Create (append if exists) */
#define FXO_FORCEEXT 0x0800 /* Force default extension */
#define FXO_DEFAULTS 0x1000 /* Use SET command defaults */
#define FXO_DEVICERAW 0x2000 /* Open devices in raw mode */
#endif /* _FILEIO_CH */

8
harbour/include/filesys.api
View File

@@ -49,8 +49,8 @@
/* DON'T USE THIS FILE FOR NEW HARBOUR C CODE */
#ifndef HB_FILESYS_API_
#define HB_FILESYS_API_
#ifndef _FILESYS_API
#define _FILESYS_API
#include "clipdefs.h"
#include "filesys.h"
@@ -61,6 +61,8 @@
typedef FHANDLE fhandle;
typedef FHANDLE * FHANDLEP;
#define FHANDLE_DEFINED
/* DOS predefined standard handles */
#define STDIN 0
@@ -91,4 +93,4 @@ typedef FHANDLE * FHANDLEP;
#define _fsSeek hb_fsSeek
#define _fsWrite hb_fsWrite
#endif /* HB_FILESYS_API_ */
#endif /* _FILESYS_API */

11
harbour/include/filesys.h
View File

@@ -61,6 +61,17 @@
typedef int FHANDLE;
/* File locking flags */
#define FL_LOCK 0x0000 /* Lock a region */
#define FL_UNLOCK 0x0001 /* Unlock a region */
/* Extended file open mode flags */
#define FXO_TRUNCATE 0x0100 /* Create (truncate if exists) */
#define FXO_APPEND 0x0200 /* Create (append if exists) */
#define FXO_FORCEEXT 0x0800 /* Force default extension */
#define FXO_DEFAULTS 0x1000 /* Use SET command defaults */
#define FXO_DEVICERAW 0x2000 /* Open devices in raw mode */
/* Filename support */
typedef struct
{

6
harbour/include/fm.api
View File

@@ -35,8 +35,8 @@
/* DON'T USE THIS FILE FOR NEW HARBOUR C CODE */
#ifndef HB_FM_API_
#define HB_FM_API_
#ifndef _FM_API
#define _FM_API
#include "clipdefs.h"
#include "extend.h"
@@ -52,4 +52,4 @@
#define _exmgrab hb_xgrab
#define _exmback( p, s ) hb_xfree( p )
#endif /* HB_FM_API_ */
#endif /* _FM_API */

6
harbour/include/gt.api
View File

@@ -35,8 +35,8 @@
/* DON'T USE THIS FILE FOR NEW HARBOUR C CODE */
#ifndef HB_GT_API_
#define HB_GT_API_
#ifndef _GT_API
#define _GT_API
#include "clipdefs.h"
#include "gtapi.h"
@@ -72,4 +72,4 @@
#define _gtWriteAt hb_gtWriteAt
#define _gtWriteCon hb_gtWriteCon
#endif /* HB_GT_API_ */
#endif /* _GT_API */

6
harbour/include/harbour.ch
View File

@@ -45,11 +45,11 @@
#ifndef __HARBOUR__
#ifndef _HARBOUR_CH
#define _HARBOUR_CH
#ifndef HB_HARBOUR_CH_
#define HB_HARBOUR_CH_
#xtranslate HB_OsNewLine() => Chr( 13 ) + Chr( 10 )
#endif /* _HARBOUR_CH */
#endif /* HB_HARBOUR_CH_ */
#endif

6
harbour/include/hbclass.ch
View File

@@ -33,8 +33,8 @@
*
*/
#ifndef _CLASSES_CH
#define _CLASSES_CH
#ifndef HB_CLASS_CH_
#define HB_CLASS_CH_
#xcommand CLASS <ClassName> [ <frm: FROM, INHERIT> <SuperClass> ] => ;
function <ClassName>() ;;
@@ -97,4 +97,4 @@
static function <ClassName>_<MethodName>( [<params>] ) ;;
local Self := QSelf()
#endif /* _CLASSES_CH */
#endif /* HB_CLASS_CH_ */

5
harbour/include/hbextern.ch
View File

@@ -33,6 +33,9 @@
*
*/
#ifndef HB_EXTERN_CH_
#define HB_EXTERN_CH_
EXTERNAL MEMOLINE
EXTERNAL MLCOUNT
@@ -795,3 +798,5 @@ EXTERNAL READUPDATED
EXTERNAL UPDATED
EXTERNAL __QQPUB
//------------------------------------------------------------
#endif /* HB_EXTERN_CH_ */

6
harbour/include/hbmemvar.ch
View File

@@ -35,8 +35,8 @@
/* NOTE: This file is also used by C code. */
#ifndef _MEMVARS_CH
#define _MEMVARS_CH
#ifndef HB_MEMVAR_CH_
#define HB_MEMVAR_CH_
/* Values returned from __MVSCOPE() function */
#define MV_NOT_FOUND -2 /* not found in the symbols table */
@@ -47,4 +47,4 @@
#define MV_PRIVATE_LOCAL 4 /* PRIVATE created in current function/procedure */
#define MV_PRIVATE 6 /* PRIVATE variable */
#endif /* _MEMVARS_CH */
#endif /* HB_MEMVAR_CH_ */

6
harbour/include/hboo.ch
View File

@@ -35,8 +35,8 @@
/* NOTE: This file is also used by C code. */
#ifndef _HBOO_CH
#define _HBOO_CH
#ifndef HB_OO_CH_
#define HB_OO_CH_
#define MET_METHOD 0
#define MET_DATA 1
@@ -51,4 +51,4 @@
#define CLASSDATA_SYMBOL 1
#define CLASSDATA_VALUE 2
#endif /* _HBOO_CH */
#endif /* HB_OO_CH_ */

6
harbour/include/inkey.ch
View File

@@ -38,8 +38,8 @@
/* NOTE: Keystroke descriptions marked with an asterisk (*) are only */
/* available on enhanced keyboards (those with more than 84 keys) */
#ifndef _INKEY_CH
#define _INKEY_CH
#ifndef HB_INKEY_CH_
#define HB_INKEY_CH_
/* Input event masks */
@@ -272,4 +272,4 @@
#define K_SH_F11 -42 /* * Shift-F11 */
#define K_SH_F12 -43 /* * Shift-F12 */
#endif /* _INKEY_CH */
#endif /* HB_INKEY_CH_ */

6
harbour/include/item.api
View File

@@ -35,8 +35,8 @@
/* DON'T USE THIS FILE FOR NEW HARBOUR C CODE */
#ifndef HB_ITEM_API_
#define HB_ITEM_API_
#ifndef _ITEM_API
#define _ITEM_API
#include "itemapi.h"
@@ -70,4 +70,4 @@ typedef PEVALINFO EVALINFOP;
#define _itemSize hb_itemSize
#define _itemType hb_itemType
#endif /* HB_ITEM_API_ */
#endif /* _ITEM_API */

6
harbour/include/rdd.api
View File

@@ -35,11 +35,11 @@
/* DON'T USE THIS FILE FOR NEW HARBOUR C CODE */
#ifndef HB_RDD_API_
#define HB_RDD_API_
#ifndef _RDD_API
#define _RDD_API
#include "clipdefs.h"
#include "rddapi.h"
#include "item.api"
#endif /* HB_RDD_API_ */
#endif /* _RDD_API */

6
harbour/include/reserved.ch
View File

@@ -33,9 +33,9 @@
*
*/
#ifndef _RESERVED_CH
#define _RESERVED_CH
#ifndef HB_RESERVED_CH_
#define HB_RESERVED_CH_
/* TODO: Fill this file. */
#endif /* _RESERVED_CH */
#endif /* HB_RESERVED_CH_ */

6
harbour/include/std.ch
View File

@@ -33,11 +33,11 @@
*
*/
#ifndef _STD_CH
#define _STD_CH
#ifndef HB_STD_CH_
#define HB_STD_CH_
#include "set.ch"
/* TODO: Fill this file. */
#endif /* _STD_CH */
#endif /* HB_STD_CH_ */

6
harbour/include/vm.api
View File

@@ -35,8 +35,8 @@
/* DON'T USE THIS FILE FOR NEW HARBOUR C CODE */
#ifndef HB_VM_API_
#define HB_VM_API_
#ifndef _VM_API
#define _VM_API
#include "clipdefs.h"
#include "extend.h"
@@ -70,4 +70,4 @@
#define _xvheaplock( h, offset ) ( 0 )
#define _xvheapunlock( h, offset ) /* dummy */
#endif /* HB_VM_API_ */
#endif /* _VM_API */

1
harbour/source/compiler/harbour.y
View File

@@ -49,6 +49,7 @@
* 8) Support this syntax: _FIELD->c->mmezo := mt
* 9) Support this syntax: nPtr := @Hello()
*10) Support for syntax: FOR [ array | object | alias_expr | other ] := value
*11) Support this syntax: {1,2}[2]
*/
/* Compile using: bison -d -v harbour.y */

8
harbour/source/rtl/console.c
View File

@@ -128,7 +128,7 @@ void hb_consoleInitialize( void )
Harbour needs them to be open in binary mode. */
s_iFilenoStdout = fileno( stdout );
hb_fsSetDevMode( s_iFilenoStdout, FM_BINARY );
hb_fsSetDevMode( s_iFilenoStdout, FD_BINARY );
iStderr = hb_cmdargNum( "STDERR" ); /* Undocumented CA-Clipper switch //STDERR:x */
@@ -139,7 +139,7 @@ void hb_consoleInitialize( void )
else /* //STDERR:x */
s_iFilenoStderr = iStderr;
hb_fsSetDevMode( s_iFilenoStderr, FM_BINARY );
hb_fsSetDevMode( s_iFilenoStderr, FD_BINARY );
#ifdef HARBOUR_USE_GTAPI
hb_gtInit();
@@ -155,8 +155,8 @@ void hb_consoleInitialize( void )
void hb_consoleRelease( void )
{
hb_fsSetDevMode( s_iFilenoStdout, FM_TEXT );
hb_fsSetDevMode( s_iFilenoStderr, FM_TEXT );
hb_fsSetDevMode( s_iFilenoStdout, FD_TEXT );
hb_fsSetDevMode( s_iFilenoStderr, FD_TEXT );
/* The is done by the OS from now on */
s_szCrLf[ 0 ] = HB_CHAR_LF;

12
harbour/source/rtl/filesys.c
View File

@@ -440,11 +440,11 @@ void hb_fsSetDevMode( FHANDLE hFileHandle, USHORT uiDevMode )
errno = 0;
switch( uiDevMode )
{
case FM_BINARY:
case FD_BINARY:
setmode( hFileHandle, O_BINARY );
break;
case FM_TEXT:
case FD_TEXT:
setmode( hFileHandle, O_TEXT );
break;
}
@@ -455,11 +455,11 @@ void hb_fsSetDevMode( FHANDLE hFileHandle, USHORT uiDevMode )
errno = 0;
switch( uiDevMode )
{
case FM_BINARY:
case FD_BINARY:
_setmode( hFileHandle, _O_BINARY );
break;
case FM_TEXT:
case FD_TEXT:
_setmode( hFileHandle, _O_TEXT );
break;
}
@@ -1661,12 +1661,12 @@ HARBOUR HB_HB_FNAMEMERGE( void )
void hb_fsSetDevRaw( FHANDLE hFileHandle )
{
hb_fsSetDevMode( hFileHandle, FM_BINARY );
hb_fsSetDevMode( hFileHandle, FD_BINARY );
}
void hb_fsSetDevText( FHANDLE hFileHandle )
{
hb_fsSetDevMode( hFileHandle, FM_TEXT );
hb_fsSetDevMode( hFileHandle, FD_TEXT );
}
/* NOTE: Clipper 5.3 undocumented */