diff --git a/harbour/ChangeLog b/harbour/ChangeLog index fb445438a6..c57dc5f0fb 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,33 @@ 2002-12-01 23:12 UTC+0100 Foo Bar */ +2001-12-15 23:13 UTC+0100 Viktor Szakats + + * source/debug/dbgwa.prg + ! Missing CVS header. + + * TODO + + Added some new items. + + * include/Makefile + * include/hbexprb.c + * include/hbexprc.c + * include/hbmacro.h + + include/hbmacro.ch + - include/hbmsetup.h + * include/set.ch + * source/compiler/genc.c + * source/vm/hvm.c + * hbmsetup.h renamed to hbmacro.ch + ! Fixed the inclusion of .h files from .ch files. + + Added CVS header, copyright header, other stuff. + % Removed some unneeded #includes. + + * include/hbgetcmt.ch + * include/ord.ch + * source/rtl/radiogrp.prg + * Small corrections. + 2001-12-15 23:05 UTC+0100 Viktor Szakats * source/rtl/memvars.c @@ -16,7 +43,7 @@ * __ISMV() renamed to __MVEXIST() + __MVEXIST() added to hbextern.ch -2001-12-16 02:15 GMT+0700 Andi Jahja +2001-12-16 02:15 UTC+0700 Andi Jahja Revision by Ron Pinkas * source/compiler/harbour.sly @@ -24,7 +51,6 @@ ! __ISMV() in memvars was incorrectly returning TRUE for *any* dynamic symbol, instead of only MEMVARs. - 2001-12-15 16:04 UTC+0100 Viktor Szakats * source/common/hbver.c diff --git a/harbour/TODO b/harbour/TODO index afb59874af..09ed8dc3d2 100644 --- a/harbour/TODO +++ b/harbour/TODO @@ -11,6 +11,8 @@ _______________________________________________________________________ Topic Responsible developer(s) =================================== ========================= +TEXT/ENDTEXT support ??? + DBFCDX support Ryszard Glab Fixing internal HVM/RTL handling of string ??? @@ -18,11 +20,22 @@ items (Clipper passes a pointer to the same allocated memory instead of creating string copies) -Removed #pragma pack() tricks ??? +Remove #pragma pack() tricks ??? from rdd .h files. +Rewrite filesys.c to use native platform ??? +specific file I/O with unlimited number +of file handles, while maintaining +compatibility with the CA-Cl*pper legacy +handle numbering system. This either +involves adding a linked list for the +translation table, or we should state that +only handles 0-4 are number compatible. +[Optimization] + Optimize out the need for the PUSHNIL Ryszard Glab opcode before each function call. +[Optimization] OO system Jean-Francois Lefebvre (JFL) Adding Class Method @@ -46,7 +59,8 @@ support complete? Tasks for v.1 release: _______________________________________________________________________ - +Dynamic multi-language compiler/runtime ??? +support diff --git a/harbour/include/Makefile b/harbour/include/Makefile index a690d2c433..fce02d4a4e 100644 --- a/harbour/include/Makefile +++ b/harbour/include/Makefile @@ -25,7 +25,6 @@ C_HEADERS=\ hbinit.h \ hbmacro.h \ hbmath.h \ - hbmsetup.h \ hbpcode.h \ hbpp.h \ hbrddcdx.h \ @@ -61,6 +60,7 @@ PRG_HEADERS=\ hbgetcmt.ch \ hbinkey.ch \ hblang.ch \ + hbmacro.ch \ hbmemory.ch \ hbmemvar.ch \ hboo.ch \ diff --git a/harbour/include/hbexprb.c b/harbour/include/hbexprb.c index 0516ebaa0c..b400d19cf5 100644 --- a/harbour/include/hbexprb.c +++ b/harbour/include/hbexprb.c @@ -62,7 +62,7 @@ #include #include "hbcomp.h" -#include "hbmsetup.h" +#include "hbmacro.ch" /* memory allocation */ diff --git a/harbour/include/hbexprc.c b/harbour/include/hbexprc.c index f6965ef37b..d1c03110b7 100644 --- a/harbour/include/hbexprc.c +++ b/harbour/include/hbexprc.c @@ -62,7 +62,7 @@ #include #include "hbcomp.h" -#include "hbmsetup.h" +#include "hbmacro.ch" /* ************************************************************************* */ diff --git a/harbour/include/hbgetcmt.ch b/harbour/include/hbgetcmt.ch index 16c1b01e24..2791f66a70 100644 --- a/harbour/include/hbgetcmt.ch +++ b/harbour/include/hbgetcmt.ch @@ -1,4 +1,3 @@ - /* * $Id$ */ @@ -51,9 +50,11 @@ * */ +#ifndef HB_GETCMT_CH_ +#define HB_GETCMT_CH_ + #include "hbsetup.ch" -#ifndef _HBGETCMT_CH -#define _HBGETCMT_CH + #ifdef HB_COMPAT_C53 #command @ , GET ; @@ -168,4 +169,5 @@ #endif -#endif + +#endif /* HB_GETCMT_CH_ */ diff --git a/harbour/include/hbmacro.ch b/harbour/include/hbmacro.ch new file mode 100644 index 0000000000..5df32bdc06 --- /dev/null +++ b/harbour/include/hbmacro.ch @@ -0,0 +1,66 @@ +/* + * $Id$ + */ + +/* + * Harbour Project source code: + * Header file for macro related defines + * + * Copyright 2001-2002 {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 + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). + * + * As a special exception, the Harbour Project gives permission for + * additional uses of the text contained in its release of Harbour. + * + * The exception is that, if you link the Harbour libraries with other + * files to produce an executable, this does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * Your use of that executable is in no way restricted on account of + * linking the Harbour library code into it. + * + * This exception does not however invalidate any other reasons why + * the executable file might be covered by the GNU General Public License. + * + * This exception applies only to the code released by the Harbour + * Project under the name Harbour. If you copy code from other + * Harbour Project or Free Software Foundation releases into a copy of + * Harbour, as the General Public License permits, the exception does + * not apply to the code that you add in this way. To avoid misleading + * anyone as to the status of such modified files, you must delete + * this exception notice from them. + * + * If you write modifications of your own for Harbour, it is your choice + * whether to permit this exception to apply to your modifications. + * If you do not wish that, delete this exception notice. + * + */ + +/* NOTE: This file is also used by C code. */ + +#ifndef HB_MACRO_CH_ +#define HB_MACRO_CH_ + +/* runtime settings for macro compiler */ +#define HB_SM_HARBOUR 1 /* extended Harbour features */ +#define HB_SM_XBASE 2 /* extended xbase compatibility */ +#define HB_SM_PREPROC 4 /* enable/disable commands preprocessing */ +#define HB_SM_SHORTCUTS 8 /* enable/disable sortcuts for logical operators */ +#define HB_SM_RT_MACRO 64 /* disable automatic setup of macro flag */ +#define HB_SM_PARSER 128 /* address of macro parser (TODO) */ + +#endif /* HB_MACRO_CH_ */ diff --git a/harbour/include/hbmacro.h b/harbour/include/hbmacro.h index 47f481103e..175f870607 100644 --- a/harbour/include/hbmacro.h +++ b/harbour/include/hbmacro.h @@ -72,7 +72,7 @@ #include "hbvm.h" #include "hbexprop.h" #include "hbpcode.h" -#include "hbmsetup.h" +#include "hbmacro.ch" #if defined(HB_EXTERN_C) extern "C" { diff --git a/harbour/include/hbmsetup.h b/harbour/include/hbmsetup.h deleted file mode 100644 index 4a17002a84..0000000000 --- a/harbour/include/hbmsetup.h +++ /dev/null @@ -1,12 +0,0 @@ -/*-----------------8/9/2001 1:37AM------------------ - * NOTE: This file is also included from set.ch - * use #defines ONLY!!! - * --------------------------------------------------*/ - -/* runtime settings for macro compiler */ -#define HB_SM_HARBOUR 1 /* extended Harbour features */ -#define HB_SM_XBASE 2 /* extended xbase compatibility */ -#define HB_SM_PREPROC 4 /* enable/disable commands preprocessing */ -#define HB_SM_SHORTCUTS 8 /* enable/disable sortcuts for logical operators */ -#define HB_SM_RT_MACRO 64 /* disable automatic setup of macro flag */ -#define HB_SM_PARSER 128 /* address of macro parser (TODO) */ diff --git a/harbour/include/ord.ch b/harbour/include/ord.ch index 93d115c37b..05f646a53e 100644 --- a/harbour/include/ord.ch +++ b/harbour/include/ord.ch @@ -50,14 +50,12 @@ * */ - -#ifndef HB_ORD_H_ -#define HB_ORD_H_ +#ifndef HB_ORD_CH_ +#define HB_ORD_CH_ #define TOPSCOPE 0 #define BOTTOMSCOPE 1 - /* SCOPE commands: */ #command SET SCOPETOP TO => OrdScope( 0, nil ) @@ -127,7 +125,7 @@ #define DBOI_KEYCOUNTRAW 52 /* keycount ignoring any filter */ #define DBOI_OPTLEVEL 53 /* Optimization achieved for last query */ -// Ideally should be an entry point that doesn't require an open table +/* Ideally should be an entry point that doesn't require an open table */ #define DBOI_STRICTREAD 60 /* Get/set read thru RDD when indexing */ #define DBOI_OPTIMIZE 61 /* Get/set use of query optimization */ #define DBOI_AUTOOPEN 62 /* Get/set auto open of production index */ @@ -139,5 +137,4 @@ #define DBOI_OPTIMIZED_PART 1 #define DBOI_OPTIMIZED_FULL 2 -#endif - +#endif /* HB_ORD_CH_ */ diff --git a/harbour/include/set.ch b/harbour/include/set.ch index ddb2c405fd..9eacf3811a 100644 --- a/harbour/include/set.ch +++ b/harbour/include/set.ch @@ -121,7 +121,3 @@ #define HB_SET_COUNT 2 #endif /* _SET_CH */ - -/* runtime settings for macro compiler (HB_SETMACRO() function) -*/ -#include "hbmsetup.h" diff --git a/harbour/source/compiler/genc.c b/harbour/source/compiler/genc.c index 8e226aefc4..99acb6b2b1 100644 --- a/harbour/source/compiler/genc.c +++ b/harbour/source/compiler/genc.c @@ -29,7 +29,6 @@ #include #include "hbcomp.h" -#include "hbmsetup.h" static void hb_compGenCReadable( PFUNCTION pFunc, FILE * yyc ); static void hb_compGenCCompact( PFUNCTION pFunc, FILE * yyc ); diff --git a/harbour/source/debug/dbgwa.prg b/harbour/source/debug/dbgwa.prg index 3846f393e0..a150f7ace0 100644 --- a/harbour/source/debug/dbgwa.prg +++ b/harbour/source/debug/dbgwa.prg @@ -1,8 +1,12 @@ +/* + * $Id$ + */ + /* * Harbour Project source code: * The Debugger Array Inspector * - * Copyright 2001 Ignacio Ortiz de Zuņiga + * Copyright 2001-2002 Ignacio Ortiz de Zuņiga * www - http://www.harbour-project.org * * This program is free software; you can redistribute it and/or modify @@ -58,9 +62,9 @@ function __dbgShowWorkAreas( oDebugger ) aAlias := {} aBrw := Array(3) - n1 := 1 - n2 := 1 - n3 := 1 + n1 := 1 + n2 := 1 + n3 := 1 cColor := iif( __Dbg():lMonoDisplay, "N/W, W/N, W+/W, W+/N",; "N/W, N/BG, R/W, R/BG" ) @@ -364,4 +368,5 @@ static function UpdateInfo( oDlg, cAlias ) SELECT (cOldAlias) -return nil \ No newline at end of file +return nil + diff --git a/harbour/source/rtl/radiogrp.prg b/harbour/source/rtl/radiogrp.prg index 93e8123329..68360c2d53 100644 --- a/harbour/source/rtl/radiogrp.prg +++ b/harbour/source/rtl/radiogrp.prg @@ -1,4 +1,3 @@ - /* * $Id$ */ diff --git a/harbour/source/vm/hvm.c b/harbour/source/vm/hvm.c index 9e308e6f34..b593576269 100644 --- a/harbour/source/vm/hvm.c +++ b/harbour/source/vm/hvm.c @@ -83,10 +83,9 @@ #include "hbvm.h" #include "hbpcode.h" #include "hbset.h" -#include "hbmsetup.h" #ifdef HB_MACRO_STATEMENTS - #include "hbpp.h" + #include "hbpp.h" #endif /* DEBUG only*/