diff --git a/harbour/ChangeLog b/harbour/ChangeLog index fe040a509e..00913d9354 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,8 @@ +19991209-23:04 GMT+1 Antonio Linares + * updated makefile.b32 + * updated hbclass.ch + (first step towards classes missing messages routing method) + 19991209-17:10 GMT+1 Ryszard Glab *config/rules.cf @@ -91,7 +96,7 @@ NOTE: source/macro/macro.c file includes source/compiler/expropt.c *source/compiler/cmdcheck.c * replaced strupr with hb_strupr - + NOTE: All PRG sources HAVE TO be recompiled!!! NOTE: Add macro.lib to all non-GNU make scripts or batch files. @@ -99,7 +104,7 @@ NOTE: Add macro.lib to all non-GNU make scripts or batch files. 19991209-01:05 GMT+1 Victor Szel * source/compiler/* include/compiler.h - + Additional function renaming (prefixing with hb_comp), some functions + + Additional function renaming (prefixing with hb_comp), some functions moved to other files. Declarations fixed, some static vars prefixed with s_. hb_Chk*() -> hb_compChk*() @@ -174,7 +179,7 @@ NOTE: Add macro.lib to all non-GNU make scripts or batch files. + Optimized two functions: % hb_compGenPushLogical() and % hb_compGenPushFunCall (NOTE: Check them, please) - + + source/compiler/hbcmdchk.c + Compiler command line checking + hb_ChkCompilerSwitch() diff --git a/harbour/include/hbclass.ch b/harbour/include/hbclass.ch index 36084c1071..040b07978d 100644 --- a/harbour/include/hbclass.ch +++ b/harbour/include/hbclass.ch @@ -93,6 +93,9 @@ #xcommand MESSAGE () METHOD ( [] ) => ; oClass:AddMethod( <(MessageName)>, CLSMETH _CLASS_NAME_ () ) +#xcommand ERROR HANDLER ( [] ) => ; + oClass:AddMethod( "Error", CLSMETH _CLASS_NAME_ () ) + #xcommand ENDCLASS => oClass:Create() ;; endif ;; return oClass:Instance() @@ -101,4 +104,4 @@ static function _( [] ) ;; local Self := QSelf() -#endif /* HB_CLASS_CH_ */ +#endif /* HB_CLASS_CH_ */ \ No newline at end of file diff --git a/harbour/makefile.b32 b/harbour/makefile.b32 index 0e8f1f8629..8e91bf57ff 100644 --- a/harbour/makefile.b32 +++ b/harbour/makefile.b32 @@ -12,10 +12,10 @@ !endif .path.asm = source\vm -.path.c = source\compiler;source\common;source\vm;source\rtl;source\tools;source\rtl\gt;source\rtl\natmsg;source\pp;source\rdd -.path.h = include -.path.l = source\compiler -.path.y = source\compiler +.path.c = source\compiler;source\common;source\macro;source\vm;source\rtl;source\tools;source\rtl\gt;source\rtl\natmsg;source\pp;source\rdd +.path.h = include;source\macro +.path.l = source\compiler;source\macro +.path.y = source\compiler;source\macro .path.exe = bin .path.lib = lib\b32 .path.obj = obj;source\compiler @@ -35,7 +35,8 @@ harbour.lib : achoice.obj adir.obj alert.obj arrays.obj \ harbinit.obj hardcr.obj hbfsapi.obj hbstr.obj \ hbtrace.obj hb_f.obj hvm.obj initexit.obj \ initsymb.obj inkey.obj input.obj isprint.obj itemapi.obj \ - langapi.obj len.obj mainstd.obj mainwin.obj math.obj \ + langapi.obj len.obj \ + macro.obj macrol.obj macroy.obj mainstd.obj mainwin.obj math.obj \ mathx.obj memofile.obj memoline.obj memvars.obj \ memvarbl.obj menuto.obj mlcount.obj mtran.obj msgen.obj \ natmsg.obj net.obj objfunc.obj oldbox.obj oldclear.obj \ @@ -103,6 +104,9 @@ isprint.obj : isprint.c extend.h hbdefs.h itemapi.obj : itemapi.c extend.h hbdefs.h langapi.obj : langapi.c extend.h hbdefs.h len.obj : len.c extend.h hbdefs.h +macro.obj : macro.c extend.h hbdefs.h +macrol.obj : macrol.c extend.h hbdefs.h +macroy.obj : macroy.c extend.h hbdefs.h mainstd.obj : mainstd.c extend.h hbdefs.h mainwin.obj : mainwin.c extend.h hbdefs.h math.obj : math.c extend.h hbdefs.h @@ -194,15 +198,24 @@ xsavescr.c : xsavescr.prg harbour.exe bin\harbour $< /n /osource\rtl\ /iinclude .c.obj: - bcc32 $(BCC_OPT) -c -Iinclude -o$@ -DHARBOUR_USE_WIN_GTAPI $< + bcc32 $(BCC_OPT) -c -Iinclude;source\macro -o$@ -DHARBOUR_USE_WIN_GTAPI $< tlib lib\b32\harbour.lib -+$@,, -harbour.exe : harboury.c harbourl.c genc.obj genhrb.obj genjava.obj genrc.obj genpas.obj genobj32.obj expropt.obj harbour.obj hbfsapi.obj hbstr.obj compiler.h hbppint.c hbpp.c table.c +harbour.exe : cmdcheck.c harboury.c harbourl.c hbfunchk.c hbgenerr.c hbpcode.c \ + hbusage.c genc.obj genhrb.obj genjava.obj genrc.obj genpas.obj \ + genobj32.obj expropt.obj harbour.obj hbfsapi.obj hbstr.obj compiler.h \ + hbppint.c hbpp.c reserved.c table.c echo $(BCC_OPT) > temp.bld echo -ebin\harbour.exe >> temp.bld echo -Iinclude;source\compiler >> temp.bld + echo source\common\reserved.c >> temp.bld + echo source\compiler\cmdcheck.c >> temp.bld echo source\compiler\harboury.c >> temp.bld echo source\compiler\harbourl.c >> temp.bld + echo source\compiler\hbfunchk.c >> temp.bld + echo source\compiler\hbgenerr.c >> temp.bld + echo source\compiler\hbpcode.c >> temp.bld + echo source\compiler\hbusage.c >> temp.bld echo source\compiler\genobj32.obj >> temp.bld echo source\compiler\genc.obj >> temp.bld echo source\compiler\genhrb.obj >> temp.bld @@ -224,9 +237,15 @@ harbour.exe : harboury.c harbourl.c genc.obj genhrb.obj genjava.obj genrc.obj ge harboury.c : harbour.y bison -d -v -y -osource\compiler\harboury.c source\compiler\harbour.y +macroy.c : macro.y + bison -d -v -y -osource\macro\macroy.c source\macro\macro.y + harbourl.c : harbour.l flex -i -8 -osource\compiler\harbourl.c source\compiler\harbour.l +macrol.c : macro.l + flex -i -8 -osource\macro\macrol.c source\macro\macro.l + genobj32.obj : genobj32.c bcc32 $(BCC_OPT) -c -Iinclude -osource\compiler\genobj32.obj \ source\compiler\genobj32.c @@ -257,4 +276,4 @@ expropt.obj : expropt.c harbour.obj : harbour.c bcc32 $(BCC_OPT) -c -Iinclude;source\compiler -osource\compiler\harbour.obj \ - source\compiler\harbour.c + source\compiler\harbour.c \ No newline at end of file