From 77b2ea625534e1981c35f5e6f3c732085c758739 Mon Sep 17 00:00:00 2001 From: Ron Pinkas Date: Wed, 16 May 2001 16:06:58 +0000 Subject: [PATCH] 2001-05-16 09:00 UTC-0800 Ron Pinkas * include/hbclass.ch * Refined #error messages for OO compile time inegrity checks, as per input from Antonio and Dave. --- harbour/ChangeLog | 334 +++++++++++++++++++------------------ harbour/include/hbclass.ch | 10 +- 2 files changed, 174 insertions(+), 170 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 7c0be3f80f..0a89e9692e 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,6 +1,10 @@ +2001-05-16 09:00 UTC-0800 Ron Pinkas + * include/hbclass.ch + * Refined #error messages for OO compile time inegrity checks, as per input from Antonio and Dave. + 2001-05-16 08:10 GMT -3 Luiz Rafael Culik *utils/hbmake/checks.prg - updated to the new licence + updated to the new licence 2001-05-16 08:00 GMT -3 Luiz Rafael Culik *make_b32.bat b32_slex.bat @@ -29,183 +33,183 @@ 2001-05-15 15:02 UTC+0100 Viktor Szakats - * contrib/hbclip/hbarg.c - * contrib/hbclip/hbclip.h - * contrib/hbclip/hbclip.prg - * contrib/hbclip/hbcolind.c - * contrib/hbclip/hbkeyput.prg - * contrib/hbclip/hbshadow.prg - * contrib/hbclip/hbstod.c - * contrib/hbclip/hbstodx.c - * contrib/hbclip/hbvaltoc.prg - * contrib/hbclip/readme.txt - * contrib/libct/charevod.c - * contrib/libct/charmix.c - * contrib/libct/ctchksum.c - * contrib/libct/ctcolton.c - * contrib/libct/ctcrypt.c - * contrib/libct/ctmisc.prg - * contrib/libct/ctposupp.c - * contrib/libct/readme.txt - * contrib/libmisc/numtxthu.prg - * contrib/libmisc/strfmt.c - * contrib/libmisc/doc/en/ht_str.txt + * contrib/hbclip/hbarg.c + * contrib/hbclip/hbclip.h + * contrib/hbclip/hbclip.prg + * contrib/hbclip/hbcolind.c + * contrib/hbclip/hbkeyput.prg + * contrib/hbclip/hbshadow.prg + * contrib/hbclip/hbstod.c + * contrib/hbclip/hbstodx.c + * contrib/hbclip/hbvaltoc.prg + * contrib/hbclip/readme.txt + * contrib/libct/charevod.c + * contrib/libct/charmix.c + * contrib/libct/ctchksum.c + * contrib/libct/ctcolton.c + * contrib/libct/ctcrypt.c + * contrib/libct/ctmisc.prg + * contrib/libct/ctposupp.c + * contrib/libct/readme.txt + * contrib/libmisc/numtxthu.prg + * contrib/libmisc/strfmt.c + * contrib/libmisc/doc/en/ht_str.txt * doc/cmdline.txt - * doc/hdr_tpl.txt + * doc/hdr_tpl.txt * doc/howtocvs.txt - * doc/howtomak.txt + * doc/howtomak.txt * doc/en/hb_apiln.txt - * doc/en/hb_compa.txt + * doc/en/hb_compa.txt * doc/en/hb_date.txt - * doc/en/terminal.txt + * doc/en/terminal.txt * doc/es/lang.txt * include/clipdefs.h - * include/error.api + * include/error.api * include/extend.api - * include/extend.h + * include/extend.h * include/fm.api - * include/gt.api + * include/gt.api * include/hbapigt.h - * include/hbapilng.h + * include/hbapilng.h * include/hbdate.h - * include/hbmemory.ch + * include/hbmemory.ch * include/hboo.ch - * include/hbsetup.ch - * include/hbundoc.api - * include/hbvmpub.h - * include/item.api - * include/rdd.api - * include/vm.api - * source/common/hbfsapi.c - * source/common/hbstr.c - * source/common/hbver.c - * source/compiler/cmdcheck.c - * source/compiler/hbusage.c - * source/debug/dbgtmenu.prg - * source/debug/dbgtmitm.prg - * source/debug/dbgtwin.prg - * source/debug/debugger.prg - * source/lang/msgcs852.c - * source/lang/msgcsiso.c - * source/lang/msgcskam.c - * source/lang/msgcswin.c - * source/lang/msgen.c - * source/lang/msgfr.c - * source/lang/msghe862.c - * source/lang/msghewin.c - * source/lang/msghr852.c - * source/lang/msghriso.c - * source/lang/msghu852.c - * source/lang/msghucwi.c - * source/lang/msghuwin.c - * source/lang/msgis850.c - * source/lang/msgro.c - * source/pp/ppcore.c - * source/rdd/dbnubs.c - * source/rdd/dbfntx/dbfntx0.prg - * source/rtl/accept.c - * source/rtl/adir.prg - * source/rtl/alert.prg - * source/rtl/ampm.c - * source/rtl/binnumx.c - * source/rtl/box.c - * source/rtl/colorind.c - * source/rtl/console.c - * source/rtl/dates.c - * source/rtl/dateshb.c - * source/rtl/datesx.c - * source/rtl/dirdrive.c - * source/rtl/diskspac.c - * source/rtl/disksphb.c - * source/rtl/dummy.prg - * source/rtl/errorapi.c - * source/rtl/fieldbl.prg - * source/rtl/filesys.c - * source/rtl/fkmax.c - * source/rtl/fnsplit.c - * source/rtl/fssize.c - * source/rtl/fstemp.c - * source/rtl/gete.c - * source/rtl/getlist.prg - * source/rtl/gt.c - * source/rtl/gtapi.c - * source/rtl/gtapiu.c - * source/rtl/gx.c - * source/rtl/inkey.c - * source/rtl/isprint.c - * source/rtl/langapi.c - * source/rtl/lennum.c - * source/rtl/memofile.c - * source/rtl/mouseapi.c - * source/rtl/mousex.c - * source/rtl/natmsg.c - * source/rtl/net.c - * source/rtl/oemansi.c - * source/rtl/oldclear.c - * source/rtl/pad.c - * source/rtl/philes.c - * source/rtl/philesx.c - * source/rtl/readkey.prg - * source/rtl/readvar.prg - * source/rtl/samples.c - * source/rtl/setposbs.c - * source/rtl/soundex.c - * source/rtl/strings.c - * source/rtl/strmatch.c - * source/rtl/strzero.c - * source/rtl/type.c - * source/rtl/val.c - * source/rtl/version.c - * source/rtl/word.c - * source/rtl/xhelp.c - * source/rtl/xsavescr.c - * source/rtl/gtcgi/gtcgi.c - * source/rtl/gtcgi/mousecgi.c - * source/rtl/gtcrs/mousecrs.c - * source/rtl/gtdos/gtdos.c - * source/rtl/gtpca/mousepca.c - * source/rtl/gtsln/mousesln.c - * source/rtl/gtstd/gtstd.c - * source/rtl/gtstd/mousestd.c - * source/rtl/gtwin/gtwin.c - * source/vm/arrays.c - * source/vm/asort.c - * source/vm/classes.c - * source/vm/cmdarg.c - * source/vm/extend.c - * source/vm/fm.c - * source/vm/harbinit.prg - * source/vm/hvm.c - * source/vm/itemapi.c - * source/vm/main.c - * source/vm/memvars.c - * source/vm/memvclip.c - * source/vm/proc.c - * tests/fortest.prg - * tests/langapi.prg - * tests/lnlenli1.prg - * tests/lnlenli2.prg - * tests/memfile.prg - * tests/memory.prg - * tests/statinit.prg - * tests/vec1.prg - * utils/hbtest/hbtest.prg - * utils/hbtest/rt_array.prg - * utils/hbtest/rt_date.prg - * utils/hbtest/rt_file.prg - * utils/hbtest/rt_hvm.prg - * utils/hbtest/rt_hvma.prg - * utils/hbtest/rt_init.ch - * utils/hbtest/rt_main.ch - * utils/hbtest/rt_math.prg - * utils/hbtest/rt_misc.prg - * utils/hbtest/rt_str.prg - * utils/hbtest/rt_stra.prg - * utils/hbtest/rt_trans.prg - * utils/hbtest/rt_vars.ch + * include/hbsetup.ch + * include/hbundoc.api + * include/hbvmpub.h + * include/item.api + * include/rdd.api + * include/vm.api + * source/common/hbfsapi.c + * source/common/hbstr.c + * source/common/hbver.c + * source/compiler/cmdcheck.c + * source/compiler/hbusage.c + * source/debug/dbgtmenu.prg + * source/debug/dbgtmitm.prg + * source/debug/dbgtwin.prg + * source/debug/debugger.prg + * source/lang/msgcs852.c + * source/lang/msgcsiso.c + * source/lang/msgcskam.c + * source/lang/msgcswin.c + * source/lang/msgen.c + * source/lang/msgfr.c + * source/lang/msghe862.c + * source/lang/msghewin.c + * source/lang/msghr852.c + * source/lang/msghriso.c + * source/lang/msghu852.c + * source/lang/msghucwi.c + * source/lang/msghuwin.c + * source/lang/msgis850.c + * source/lang/msgro.c + * source/pp/ppcore.c + * source/rdd/dbnubs.c + * source/rdd/dbfntx/dbfntx0.prg + * source/rtl/accept.c + * source/rtl/adir.prg + * source/rtl/alert.prg + * source/rtl/ampm.c + * source/rtl/binnumx.c + * source/rtl/box.c + * source/rtl/colorind.c + * source/rtl/console.c + * source/rtl/dates.c + * source/rtl/dateshb.c + * source/rtl/datesx.c + * source/rtl/dirdrive.c + * source/rtl/diskspac.c + * source/rtl/disksphb.c + * source/rtl/dummy.prg + * source/rtl/errorapi.c + * source/rtl/fieldbl.prg + * source/rtl/filesys.c + * source/rtl/fkmax.c + * source/rtl/fnsplit.c + * source/rtl/fssize.c + * source/rtl/fstemp.c + * source/rtl/gete.c + * source/rtl/getlist.prg + * source/rtl/gt.c + * source/rtl/gtapi.c + * source/rtl/gtapiu.c + * source/rtl/gx.c + * source/rtl/inkey.c + * source/rtl/isprint.c + * source/rtl/langapi.c + * source/rtl/lennum.c + * source/rtl/memofile.c + * source/rtl/mouseapi.c + * source/rtl/mousex.c + * source/rtl/natmsg.c + * source/rtl/net.c + * source/rtl/oemansi.c + * source/rtl/oldclear.c + * source/rtl/pad.c + * source/rtl/philes.c + * source/rtl/philesx.c + * source/rtl/readkey.prg + * source/rtl/readvar.prg + * source/rtl/samples.c + * source/rtl/setposbs.c + * source/rtl/soundex.c + * source/rtl/strings.c + * source/rtl/strmatch.c + * source/rtl/strzero.c + * source/rtl/type.c + * source/rtl/val.c + * source/rtl/version.c + * source/rtl/word.c + * source/rtl/xhelp.c + * source/rtl/xsavescr.c + * source/rtl/gtcgi/gtcgi.c + * source/rtl/gtcgi/mousecgi.c + * source/rtl/gtcrs/mousecrs.c + * source/rtl/gtdos/gtdos.c + * source/rtl/gtpca/mousepca.c + * source/rtl/gtsln/mousesln.c + * source/rtl/gtstd/gtstd.c + * source/rtl/gtstd/mousestd.c + * source/rtl/gtwin/gtwin.c + * source/vm/arrays.c + * source/vm/asort.c + * source/vm/classes.c + * source/vm/cmdarg.c + * source/vm/extend.c + * source/vm/fm.c + * source/vm/harbinit.prg + * source/vm/hvm.c + * source/vm/itemapi.c + * source/vm/main.c + * source/vm/memvars.c + * source/vm/memvclip.c + * source/vm/proc.c + * tests/fortest.prg + * tests/langapi.prg + * tests/lnlenli1.prg + * tests/lnlenli2.prg + * tests/memfile.prg + * tests/memory.prg + * tests/statinit.prg + * tests/vec1.prg + * utils/hbtest/hbtest.prg + * utils/hbtest/rt_array.prg + * utils/hbtest/rt_date.prg + * utils/hbtest/rt_file.prg + * utils/hbtest/rt_hvm.prg + * utils/hbtest/rt_hvma.prg + * utils/hbtest/rt_init.ch + * utils/hbtest/rt_main.ch + * utils/hbtest/rt_math.prg + * utils/hbtest/rt_misc.prg + * utils/hbtest/rt_str.prg + * utils/hbtest/rt_stra.prg + * utils/hbtest/rt_trans.prg + * utils/hbtest/rt_vars.ch ! Corrected names, copyrights, dates for Viktor Szakats. - * include/Makefile + * include/Makefile ! Fixed missing hb_io.h 2001-05-15 13:46 UTC+0100 Viktor Szakats diff --git a/harbour/include/hbclass.ch b/harbour/include/hbclass.ch index babf365117..40c4eb1a90 100644 --- a/harbour/include/hbclass.ch +++ b/harbour/include/hbclass.ch @@ -573,15 +573,15 @@ DECLARE TClass ; #else //#define STRICT_OO #ifdef STRICT_OO - #xcommand METHOD _CLASS_IMPLEMENTATION_ => __ERR(Not declared <"MethodName"> or declaration mismatch in class: _CLASS_NAME_) ; function ; local self := QSelf() - #xcommand METHOD CLASS _CLASS_IMPLEMENTATION_ => #error Not declared <"MethodName"> or declaration mismatch in class: ; function ; local self := QSelf() + #xcommand METHOD _CLASS_IMPLEMENTATION_ => __ERR(Method <"MethodName"> not declared or declaration mismatch in class: _CLASS_NAME_) ; function ; local self := QSelf() + #xcommand METHOD CLASS _CLASS_IMPLEMENTATION_ => #error Method <"MethodName"> not declared or declaration mismatch in class: ; function ; local self := QSelf() #else - #xcommand METHOD _CLASS_IMPLEMENTATION_ => __ERR(Not declared <"MethodName"> in class: _CLASS_NAME_) ; function ; local self := QSelf() - #xcommand METHOD CLASS _CLASS_IMPLEMENTATION_ => #error Not declared <"MethodName"> in class: ; function ; local self := QSelf() + #xcommand METHOD _CLASS_IMPLEMENTATION_ => __ERR(Method <"MethodName"> not declared in class: _CLASS_NAME_) ; function ; local self := QSelf() + #xcommand METHOD CLASS _CLASS_IMPLEMENTATION_ => #error Method <"MethodName"> not declared in class: ; function ; local self := QSelf() #endif #endif -#xcommand METHOD DECLCLASS _CLASS_IMPLEMENTATION_ => #error Not declared class <"ClassName"> for method: ; function ; local self := QSelf() +#xcommand METHOD DECLCLASS _CLASS_IMPLEMENTATION_ => #error Class <"ClassName"> not declared for method: ; function ; local self := QSelf() #xcommand DECLARED METHOD => ; static function DECLMETH ;;