2001-05-10 14:40 UTC-0800 Ron Pinkas <ron@profit-master.com>
This commit is contained in:
Ron Pinkas
@@ -1,14 +1,40 @@
|
||||
2001-05-10 14:40 UTC-0800 Ron Pinkas <ron@profit-master.com>
|
||||
* include/hbclass.ch
|
||||
- Removed 1 #translate that caused conflicts with FWH.
|
||||
+ Refined logic detecting undeclared method and improved messages.
|
||||
+ Added logic for STRICT (#ifdef STRICT_OO) validation (all paramaters must match too)
|
||||
+ Added logic for normal (default) validation (paramaters are ignored).
|
||||
|
||||
* source/compiler/harbour.sly
|
||||
* source/compiler/harbour.y
|
||||
+ Added support for dummy parameters to function pointer ( @SomeFun( DummyParam ) )
|
||||
|
||||
* source/vm/hvm.c
|
||||
* source/compiler/hbpcode.c
|
||||
! Corrected 1 compiler warning.
|
||||
|
||||
* source/pp/ppcore.c
|
||||
+ Added support for #defines in #error messages.
|
||||
|
||||
* source/debug/debugger.prg
|
||||
- Removed orphan method (discovered by new compiler error) CaseSensitive() which is apparantly superceded by ToggleCaseSensitive().
|
||||
* utils/hbdoc/ffile1.prg
|
||||
- Removed orphan method (discovered by new compiler error) GetBuff() which is routed to GetBuffer() in class declaration
|
||||
- Removed orphan method (discovered by new compiler error) fClose() which is not declared and default to Super in class declaration.
|
||||
|
||||
/* These were discovered with the default LOOSE mode. When using /dSTRICT_OO many more inconsistencies are discovered! */
|
||||
|
||||
2001-05-10 14:30 GMT+0200 (MET DST) Martin Vogel <vogel@inttec.de>
|
||||
|
||||
+ contrib/libct/charmirr.c
|
||||
+ CHARMIRR() function
|
||||
|
||||
|
||||
+ contrib/libct/charrepl.c
|
||||
+ CHARREPL() function
|
||||
|
||||
+ contrib/libct/wordrepl.c
|
||||
+ WORDREPL() function
|
||||
|
||||
|
||||
* contrib/libct/Makefile
|
||||
* contrib/libct/makefile.bc
|
||||
* contrib/libct/makefile.vc
|
||||
@@ -17,7 +43,7 @@
|
||||
+ contrib/libct/tests/charmirr.prg
|
||||
+ contrib/libct/tests/charrepl.prg
|
||||
+ contrib/libct/tests/wordrepl.prg
|
||||
! small test programs for new functions
|
||||
! small test programs for new functions
|
||||
|
||||
* contrib/libct/tests/Makefile
|
||||
+ added charmirr.prg, charrepl.prg, wordrepl.prg
|
||||
@@ -34,7 +60,7 @@
|
||||
+ contrib/libct/tests/tokenlow.prg
|
||||
+ contrib/libct/tests/tokenupp.prg
|
||||
+ contrib/libct/tests/tokensep.prg
|
||||
! small test programs for new functions
|
||||
! small test programs for new functions
|
||||
|
||||
2001-05-10 09:46 UTC+0300 Chen Kedem <niki@actcom.co.il>
|
||||
* doc/en/objfunc.txt
|
||||
@@ -55,7 +81,7 @@
|
||||
to the top of the database instead of record number 1.
|
||||
|
||||
2001-05-09 00:02 UTC+1 JFL (mafact) <jfl@mafact.com>
|
||||
* source/vm/classes.c
|
||||
* source/vm/classes.c
|
||||
* modified hb_msgclssel() to accept one logical param
|
||||
so as it return only ClassMsg
|
||||
* source/rtl/objfunc.prg
|
||||
|
||||
@@ -108,7 +108,8 @@ DECLARE TClass ;
|
||||
AddInLine( cName AS String, bBlock AS CodeBlock, nScope AS Numeric ) ;
|
||||
AddVirtual( cName AS String )
|
||||
|
||||
#translate @<MethodName>( <dummy,..> [[,] <more>] ) => @<MethodName>([<-more->])
|
||||
// *** Don't Un-Rem !!!
|
||||
//#translate @<MethodName>( <dummy,..> [[,] <more>] ) => @<MethodName>([<-more->])
|
||||
#xtranslate )() => )
|
||||
|
||||
#ifdef HB_CLS_NOTOBJECT
|
||||
@@ -148,6 +149,8 @@ DECLARE TClass ;
|
||||
|
||||
#ifndef HB_SHORTNAMES
|
||||
|
||||
#xtranslate DECLMETH <ClassName> <MethodName> => <ClassName>_<MethodName> ;;
|
||||
|
||||
#xcommand CLASS <ClassName> [METACLASS <metaClass>] [ <frm: FROM, INHERIT> <SuperClass1> [,<SuperClassN>] ] [<static: STATIC>] => ;
|
||||
_HB_CLASS <ClassName> ;;
|
||||
<static> function <ClassName>() ;;
|
||||
@@ -159,7 +162,8 @@ DECLARE TClass ;
|
||||
#define _CLASS_NAME_ <ClassName> ;;
|
||||
#undef _CLASS_MODE_ ;;
|
||||
#define _CLASS_MODE_ _CLASS_DECLARATION_ ;;
|
||||
#translate CLSMETH <ClassName> <MethodName>() => @<ClassName>_<MethodName>() ;
|
||||
#xtranslate CLSMETH <ClassName> <MethodName> => @<ClassName>_<MethodName> ;;
|
||||
#xtranslate DECLCLASS <ClassName> => ;;
|
||||
[ ; #translate Super( <SuperClassN> ) : => ::<SuperClassN>: ] ;
|
||||
[ ; #translate Super( <SuperClass1> ) : => ::<SuperClass1>: ] ;
|
||||
[ ; #translate Super() : => ::<SuperClass1>: ] ;
|
||||
@@ -179,7 +183,7 @@ DECLARE TClass ;
|
||||
#define _CLASS_NAME_ <ClassName> ;;
|
||||
#undef _CLASS_MODE_ ;;
|
||||
#define _CLASS_MODE_ _CLASS_DECLARATION_ ;;
|
||||
#translate CLSMETH <ClassName> <MethodName>() => @<MethodName>() ;
|
||||
#translate CLSMETH <ClassName> <MethodName>() => @<MethodName> ;
|
||||
[ ; #translate Super( <SuperClassN> ) : => ::<SuperClassN>: ] ;
|
||||
[ ; #translate Super( <SuperClass1> ) : => ::<SuperClass1>: ] ;
|
||||
[ ; #translate Super() : => ::<SuperClass1>: ] ;
|
||||
@@ -306,20 +310,25 @@ DECLARE TClass ;
|
||||
|
||||
#xcommand CONSTRUCTOR <Name> => METHOD <Name> CONSTRUCTOR
|
||||
|
||||
#xcommand METHOD <MethodName> [ <ctor: CONSTRUCTOR> ] [ AS <type> ] [ <export: EXPORTED, VISIBLE>] [<protect: PROTECTED>] [<hidde: HIDDEN>] [_CLASS_DECLARATION_] => ;
|
||||
_HB_MEMBER <MethodName>() [<-ctor-> AS CLASS _CLASS_NAME_] [ AS <type> ];;
|
||||
#xcommand METHOD <MethodName> _CLASS_IMPLEMENTATION_ => METHOD <MethodName> CLASS _CLASS_NAME_;;
|
||||
s_oClass:AddMethod( <(MethodName)>, CLSMETH _CLASS_NAME_ <MethodName>(), HBCLSCHOICE( <.export.>, <.protect.>, <.hidde.> ) + iif( <.ctor.>, HB_OO_CLSTP_CTOR, 0 ) )
|
||||
#ifdef STRICT_OO
|
||||
#xcommand METHOD <MethodName> [ <ctor: CONSTRUCTOR> ] [ AS <type> ] [ <export: EXPORTED, VISIBLE>] [<protect: PROTECTED>] [<hidde: HIDDEN>] [_CLASS_DECLARATION_] => ;
|
||||
_HB_MEMBER <MethodName>() [<-ctor-> AS CLASS _CLASS_NAME_] [ AS <type> ];;
|
||||
#xcommand METHOD <MethodName> [DECLCLASS _CLASS_NAME_] _CLASS_IMPLEMENTATION_ => DECLARED METHOD _CLASS_NAME_ <MethodName>;;
|
||||
s_oClass:AddMethod( <(MethodName)>, CLSMETH _CLASS_NAME_ <MethodName>(), HBCLSCHOICE( <.export.>, <.protect.>, <.hidde.> ) + iif( <.ctor.>, HB_OO_CLSTP_CTOR, 0 ) )
|
||||
#else
|
||||
#xcommand METHOD <MethodName> [ <ctor: CONSTRUCTOR> ] [ AS <type> ] [ <export: EXPORTED, VISIBLE>] [<protect: PROTECTED>] [<hidde: HIDDEN>] [_CLASS_DECLARATION_] => ;
|
||||
_HB_MEMBER <MethodName>() [<-ctor-> AS CLASS _CLASS_NAME_] [ AS <type> ];;
|
||||
#xcommand METHOD <MethodName> [DECLCLASS _CLASS_NAME_] _CLASS_IMPLEMENTATION_ => DECLARED METHOD _CLASS_NAME_ <MethodName>;;
|
||||
#xcommand METHOD <MethodName>([<anyParams,...>]) [DECLCLASS _CLASS_NAME_] _CLASS_IMPLEMENTATION_ => DECLARED METHOD _CLASS_NAME_ <MethodName>([<anyParams>]);;
|
||||
s_oClass:AddMethod( <(MethodName)>, CLSMETH _CLASS_NAME_ <MethodName>(), HBCLSCHOICE( <.export.>, <.protect.>, <.hidde.> ) + iif( <.ctor.>, HB_OO_CLSTP_CTOR, 0 ) )
|
||||
|
||||
#xcommand METHOD <MethodName> [ <ctor: CONSTRUCTOR> ] [ AS <type> ] [ <export: EXPORTED, VISIBLE>] [<protect: PROTECTED>] [<hidde: HIDDEN>] [_CLASS_DECLARATION_] => ;
|
||||
_HB_MEMBER <MethodName>() [<-ctor-> AS CLASS _CLASS_NAME_] [ AS <type> ];;
|
||||
#xcommand METHOD <MethodName> _CLASS_IMPLEMENTATION_ => METHOD <MethodName> CLASS _CLASS_NAME_;;
|
||||
s_oClass:AddMethod( <(MethodName)>, CLSMETH _CLASS_NAME_ <MethodName>(), HBCLSCHOICE( <.export.>, <.protect.>, <.hidde.> ) + iif( <.ctor.>, HB_OO_CLSTP_CTOR, 0 ) )
|
||||
|
||||
#xcommand METHOD <MethodName>( [<params,...>] ) [ <ctor: CONSTRUCTOR> ] [ AS <type> ] [ <export: EXPORTED, VISIBLE>] [<protect: PROTECTED>] [<hidde: HIDDEN>] [_CLASS_DECLARATION_] => ;
|
||||
_HB_MEMBER <MethodName>([<params>]) [<-ctor-> AS CLASS _CLASS_NAME_] [ AS <type> ];;
|
||||
#xcommand METHOD <MethodName> _CLASS_IMPLEMENTATION_ => METHOD <MethodName> CLASS _CLASS_NAME_;;
|
||||
s_oClass:AddMethod( <(MethodName)>, CLSMETH _CLASS_NAME_ <MethodName>(), HBCLSCHOICE( <.export.>, <.protect.>, <.hidde.> ) + iif( <.ctor.>, HB_OO_CLSTP_CTOR, 0 ) )
|
||||
#xcommand METHOD <MethodName>([<params,...>]) [ <ctor: CONSTRUCTOR> ] [ AS <type> ] [ <export: EXPORTED, VISIBLE>] [<protect: PROTECTED>] [<hidde: HIDDEN>] [_CLASS_DECLARATION_] => ;
|
||||
_HB_MEMBER <MethodName>([<params>]) [<-ctor-> AS CLASS _CLASS_NAME_] [ AS <type> ];;
|
||||
#xcommand METHOD <MethodName> [DECLCLASS _CLASS_NAME_] _CLASS_IMPLEMENTATION_ => DECLARED METHOD _CLASS_NAME_ <MethodName>;;
|
||||
#xcommand METHOD <MethodName>() [DECLCLASS _CLASS_NAME_] _CLASS_IMPLEMENTATION_ => DECLARED METHOD _CLASS_NAME_ <MethodName>();;
|
||||
#xcommand METHOD <MethodName>(<anyParams,...>) [DECLCLASS _CLASS_NAME_] _CLASS_IMPLEMENTATION_ => DECLARED METHOD _CLASS_NAME_ <MethodName>([<anyParams>]);;
|
||||
s_oClass:AddMethod( <(MethodName)>, CLSMETH _CLASS_NAME_ <MethodName>(), HBCLSCHOICE( <.export.>, <.protect.>, <.hidde.> ) + iif( <.ctor.>, HB_OO_CLSTP_CTOR, 0 ) )
|
||||
#endif
|
||||
|
||||
#xcommand METHOD <MethodName> [ AS <type> ] BLOCK <CodeBlock> [ <ctor: CONSTRUCTOR> ] [ <export: EXPORTED, VISIBLE>] [<protect: PROTECTED>] [<hidde: HIDDEN>] => ;
|
||||
_HB_MEMBER <MethodName>() [<-ctor-> AS CLASS _CLASS_NAME_] [ AS <type> ];;
|
||||
@@ -355,9 +364,40 @@ DECLARE TClass ;
|
||||
s_oClass:AddMethod( <(MethodName)>, CLSMETH _CLASS_NAME_ <MethodName>(), HBCLSCHOICE( <.export.>, <.protect.>, <.hidde.> ) ) ;;
|
||||
s_oClass:AddInline( <(op)>, {|Self [,<params>] | Self:<MethodName>( [<params>] ) }, HBCLSCHOICE( <.export.>, <.protect.>, <.hidde.> ) )
|
||||
|
||||
#xcommand MESSAGE <MessageName> [ AS <type> ] METHOD <MethodName> [ <ctor: CONSTRUCTOR> ] [ <export: EXPORTED, VISIBLE>] [<protect: PROTECTED>] [<hidde: HIDDEN>] => ;
|
||||
_HB_MEMBER <MessageName>() [<-ctor-> AS CLASS _CLASS_NAME_] [ AS <type> ];;
|
||||
s_oClass:AddMethod( <(MessageName)>, CLSMETH _CLASS_NAME_ <MethodName>(), HBCLSCHOICE( <.export.>, <.protect.>, <.hidde.> ) + iif( <.ctor.>, HB_OO_CLSTP_CTOR, 0 ) )
|
||||
#ifdef STRICT_OO
|
||||
#xcommand MESSAGE <MessageName> [ AS <type> ] METHOD <MethodName> [ <ctor: CONSTRUCTOR> ] [ <export: EXPORTED, VISIBLE>] [<protect: PROTECTED>] [<hidde: HIDDEN>] => ;
|
||||
_HB_MEMBER <MessageName>() [<-ctor-> AS CLASS _CLASS_NAME_] [ AS <type> ];;
|
||||
#xcommand METHOD <MethodName> [DECLCLASS _CLASS_NAME_] _CLASS_IMPLEMENTATION_ => DECLARED METHOD _CLASS_NAME_ <MethodName>;;
|
||||
s_oClass:AddMethod( <(MessageName)>, CLSMETH _CLASS_NAME_ <MethodName>(), HBCLSCHOICE( <.export.>, <.protect.>, <.hidde.> ) + iif( <.ctor.>, HB_OO_CLSTP_CTOR, 0 ) )
|
||||
#else
|
||||
#xcommand MESSAGE <MessageName> [ AS <type> ] METHOD <MethodName> [ <ctor: CONSTRUCTOR> ] [ <export: EXPORTED, VISIBLE>] [<protect: PROTECTED>] [<hidde: HIDDEN>] => ;
|
||||
_HB_MEMBER <MessageName>() [<-ctor-> AS CLASS _CLASS_NAME_] [ AS <type> ];;
|
||||
#xcommand METHOD <MethodName> [DECLCLASS _CLASS_NAME_] _CLASS_IMPLEMENTATION_ => DECLARED METHOD _CLASS_NAME_ <MethodName>;;
|
||||
#xcommand METHOD <MethodName>() [DECLCLASS _CLASS_NAME_] _CLASS_IMPLEMENTATION_ => DECLARED METHOD _CLASS_NAME_ <MethodName>();;
|
||||
#xcommand METHOD <MethodName>([<anyParams,...>]) [DECLCLASS _CLASS_NAME_] _CLASS_IMPLEMENTATION_ => DECLARED METHOD _CLASS_NAME_ <MethodName>([<anyParams>]);;
|
||||
s_oClass:AddMethod( <(MessageName)>, CLSMETH _CLASS_NAME_ <MethodName>(), HBCLSCHOICE( <.export.>, <.protect.>, <.hidde.> ) + iif( <.ctor.>, HB_OO_CLSTP_CTOR, 0 ) )
|
||||
|
||||
#xcommand MESSAGE <MessageName>([MsgParams,...]) [ AS <type> ] METHOD <MethodName> [ <ctor: CONSTRUCTOR> ] [ <export: EXPORTED, VISIBLE>] [<protect: PROTECTED>] [<hidde: HIDDEN>] => ;
|
||||
_HB_MEMBER <MessageName>([<MsgParams>]) [<-ctor-> AS CLASS _CLASS_NAME_] [ AS <type> ];;
|
||||
#xcommand METHOD <MethodName> [DECLCLASS _CLASS_NAME_] _CLASS_IMPLEMENTATION_ => DECLARED METHOD _CLASS_NAME_ <MethodName>;;
|
||||
#xcommand METHOD <MethodName>() [DECLCLASS _CLASS_NAME_] _CLASS_IMPLEMENTATION_ => DECLARED METHOD _CLASS_NAME_ <MethodName>();;
|
||||
#xcommand METHOD <MethodName>([<anyParams,...>]) [DECLCLASS _CLASS_NAME_] _CLASS_IMPLEMENTATION_ => DECLARED METHOD _CLASS_NAME_ <MethodName>([<anyParams>]);;
|
||||
s_oClass:AddMethod( <(MessageName)>, CLSMETH _CLASS_NAME_ <MethodName>(), HBCLSCHOICE( <.export.>, <.protect.>, <.hidde.> ) + iif( <.ctor.>, HB_OO_CLSTP_CTOR, 0 ) )
|
||||
|
||||
#xcommand MESSAGE <MessageName> [ AS <type> ] METHOD <MethodName>([<MtdParams,...>]) [ <ctor: CONSTRUCTOR> ] [ <export: EXPORTED, VISIBLE>] [<protect: PROTECTED>] [<hidde: HIDDEN>] => ;
|
||||
_HB_MEMBER <MessageName>([<MtdParams>]) [<-ctor-> AS CLASS _CLASS_NAME_] [ AS <type> ];;
|
||||
#xcommand METHOD <MethodName> [DECLCLASS _CLASS_NAME_] _CLASS_IMPLEMENTATION_ => DECLARED METHOD _CLASS_NAME_ <MethodName>;;
|
||||
#xcommand METHOD <MethodName>() [DECLCLASS _CLASS_NAME_] _CLASS_IMPLEMENTATION_ => DECLARED METHOD _CLASS_NAME_ <MethodName>();;
|
||||
#xcommand METHOD <MethodName>([<anyParams,...>]) [DECLCLASS _CLASS_NAME_] _CLASS_IMPLEMENTATION_ => DECLARED METHOD _CLASS_NAME_ <MethodName>([<anyParams>]);;
|
||||
s_oClass:AddMethod( <(MessageName)>, CLSMETH _CLASS_NAME_ <MethodName>(), HBCLSCHOICE( <.export.>, <.protect.>, <.hidde.> ) + iif( <.ctor.>, HB_OO_CLSTP_CTOR, 0 ) )
|
||||
|
||||
#xcommand MESSAGE <MessageName>([<MsgParams,...>]) [ AS <type> ] METHOD <MethodName>([<MtdParams,...>]) [ <ctor: CONSTRUCTOR> ] [ <export: EXPORTED, VISIBLE>] [<protect: PROTECTED>] [<hidde: HIDDEN>] => ;
|
||||
_HB_MEMBER <MessageName>([<MtdParams>]) [<-ctor-> AS CLASS _CLASS_NAME_] [ AS <type> ];;
|
||||
#xcommand METHOD <MethodName> [DECLCLASS _CLASS_NAME_] _CLASS_IMPLEMENTATION_ => DECLARED METHOD _CLASS_NAME_ <MethodName>;;
|
||||
#xcommand METHOD <MethodName>() [DECLCLASS _CLASS_NAME_] _CLASS_IMPLEMENTATION_ => DECLARED METHOD _CLASS_NAME_ <MethodName>();;
|
||||
#xcommand METHOD <MethodName>([<anyParams,...>]) [DECLCLASS _CLASS_NAME_] _CLASS_IMPLEMENTATION_ => DECLARED METHOD _CLASS_NAME_ <MethodName>([<anyParams>]);;
|
||||
s_oClass:AddMethod( <(MessageName)>, CLSMETH _CLASS_NAME_ <MethodName>(), HBCLSCHOICE( <.export.>, <.protect.>, <.hidde.> ) + iif( <.ctor.>, HB_OO_CLSTP_CTOR, 0 ) )
|
||||
#endif
|
||||
|
||||
#xcommand MESSAGE <MessageName> [ AS <type> ] IN <SuperClass> => ;
|
||||
_HB_MEMBER <MessageName>() [ AS <type> ];;
|
||||
@@ -387,9 +427,8 @@ DECLARE TClass ;
|
||||
_HB_MEMBER <MessageName>([<params>]) [ AS <type> ];;
|
||||
s_oClass:AddInline( <(MessageName)>, {|Self [,<params>]| Self:<SuperClass>:<SprMethodName>( [<params>] ) } )
|
||||
|
||||
#xcommand MESSAGE <MessageName> [ AS <type> ] IS <MethodName> [ <ctor: CONSTRUCTOR> ] [ <export: EXPORTED, VISIBLE>] [<protect: PROTECTED>] [<hidde: HIDDEN>] => ;
|
||||
_HB_MEMBER <MessageName>() [<-ctor-> AS CLASS _CLASS_NAME_] [ AS <type> ];;
|
||||
s_oClass:AddMethod( <(MessageName)>, CLSMETH _CLASS_NAME_ <MethodName>(), HBCLSCHOICE( <.export.>, <.protect.>, <.hidde.> ) + iif( <.ctor.>, HB_OO_CLSTP_CTOR, 0 ) )
|
||||
#xcommand MESSAGE <MessageName> [ AS <type> ] IS <MethodName> [<more,...>] => MESSAGE <MessageName> [ AS <type> ] METHOD <MethodName> [<more>]
|
||||
|
||||
|
||||
#xcommand MESSAGE <MessageName> [ AS <type> ] TO <oObject> =>;
|
||||
_HB_MEMBER <MessageName>() [ AS <type> ];;
|
||||
@@ -409,15 +448,53 @@ DECLARE TClass ;
|
||||
_HB_MEMBER <MessageName>([<params>]) [ AS <type> ];;
|
||||
s_oClass:AddInline( <(MessageName)>, {|Self [,<params>]| Self:<oObject>:<MessageName>( [<params>] ) } )
|
||||
|
||||
#xcommand METHOD <MethodName> [ AS <type> ] SETGET => ;
|
||||
_HB_MEMBER <MethodName>() [ AS <type> ];;
|
||||
_HB_MEMBER _<MethodName>() [ AS <type> ];;
|
||||
s_oClass:AddMethod( <(MethodName)>, CLSMETH _CLASS_NAME_ <MethodName>(), HB_OO_CLSTP_EXPORTED + HB_OO_CLSTP_READONLY ) ;;
|
||||
s_oClass:AddMethod( "_" + <(MethodName)>, CLSMETH _CLASS_NAME_ <MethodName>() )
|
||||
#ifdef STRICT_OO
|
||||
#xcommand METHOD <MethodName> [ AS <type> ] SETGET => ;
|
||||
_HB_MEMBER <MethodName>() [ AS <type> ];;
|
||||
_HB_MEMBER _<MethodName>() [ AS <type> ];;
|
||||
#xcommand METHOD <MethodName> [DECLCLASS _CLASS_NAME_] _CLASS_IMPLEMENTATION_ => DECLARED METHOD _CLASS_NAME_ <MethodName>;;
|
||||
s_oClass:AddMethod( <(MethodName)>, CLSMETH _CLASS_NAME_ <MethodName>(), HB_OO_CLSTP_EXPORTED + HB_OO_CLSTP_READONLY ) ;;
|
||||
s_oClass:AddMethod( "_" + <(MethodName)>, CLSMETH _CLASS_NAME_ <MethodName>() )
|
||||
#else
|
||||
#xcommand METHOD <MethodName> [ AS <type> ] SETGET => ;
|
||||
_HB_MEMBER <MethodName>() [ AS <type> ];;
|
||||
_HB_MEMBER _<MethodName>() [ AS <type> ];;
|
||||
#xcommand METHOD <MethodName> [DECLCLASS _CLASS_NAME_] _CLASS_IMPLEMENTATION_ => DECLARED METHOD _CLASS_NAME_ <MethodName>;;
|
||||
#xcommand METHOD <MethodName>() [DECLCLASS _CLASS_NAME_] _CLASS_IMPLEMENTATION_ => DECLARED METHOD _CLASS_NAME_ <MethodName>();;
|
||||
#xcommand METHOD <MethodName>([<anyParams,...>]) [DECLCLASS _CLASS_NAME_] _CLASS_IMPLEMENTATION_ => DECLARED METHOD _CLASS_NAME_ <MethodName>([<anyParams>]);;
|
||||
s_oClass:AddMethod( <(MethodName)>, CLSMETH _CLASS_NAME_ <MethodName>(), HB_OO_CLSTP_EXPORTED + HB_OO_CLSTP_READONLY ) ;;
|
||||
s_oClass:AddMethod( "_" + <(MethodName)>, CLSMETH _CLASS_NAME_ <MethodName>() )
|
||||
|
||||
#xcommand ACCESS <AccessName> [ AS <type> ] => ;
|
||||
_HB_MEMBER <AccessName>() [ AS <type> ];;
|
||||
s_oClass:AddMethod( <(AccessName)>, CLSMETH _CLASS_NAME_ <AccessName>(), HB_OO_CLSTP_EXPORTED + HB_OO_CLSTP_READONLY )
|
||||
#xcommand METHOD <MethodName>([<params,...>]) [ AS <type> ] SETGET => ;
|
||||
_HB_MEMBER <MethodName>([<params>]) [ AS <type> ];;
|
||||
_HB_MEMBER _<MethodName>([<params>]) [ AS <type> ];;
|
||||
#xcommand METHOD <MethodName> [DECLCLASS _CLASS_NAME_] _CLASS_IMPLEMENTATION_ => DECLARED METHOD _CLASS_NAME_ <MethodName>;;
|
||||
#xcommand METHOD <MethodName>() [DECLCLASS _CLASS_NAME_] _CLASS_IMPLEMENTATION_ => DECLARED METHOD _CLASS_NAME_ <MethodName>();;
|
||||
#xcommand METHOD <MethodName>([<anyParams,...>]) [DECLCLASS _CLASS_NAME_] _CLASS_IMPLEMENTATION_ => DECLARED METHOD _CLASS_NAME_ <MethodName>([<anyParams>]);;
|
||||
s_oClass:AddMethod( <(MethodName)>, CLSMETH _CLASS_NAME_ <MethodName>(), HB_OO_CLSTP_EXPORTED + HB_OO_CLSTP_READONLY ) ;;
|
||||
s_oClass:AddMethod( "_" + <(MethodName)>, CLSMETH _CLASS_NAME_ <MethodName>() )
|
||||
#endif
|
||||
|
||||
#ifdef STRICT_OO
|
||||
#xcommand ACCESS <AccessName> [ AS <type> ] => ;
|
||||
_HB_MEMBER <AccessName>() [ AS <type> ];;
|
||||
#xcommand METHOD <AccessName> [DECLCLASS _CLASS_NAME_] _CLASS_IMPLEMENTATION_ => DECLARED METHOD _CLASS_NAME_ <AccessName>;;
|
||||
s_oClass:AddMethod( <(AccessName)>, CLSMETH _CLASS_NAME_ <AccessName>(), HB_OO_CLSTP_EXPORTED + HB_OO_CLSTP_READONLY )
|
||||
#else
|
||||
#xcommand ACCESS <AccessName> [ AS <type> ] => ;
|
||||
_HB_MEMBER <AccessName>() [ AS <type> ];;
|
||||
#xcommand METHOD <AccessName> [DECLCLASS _CLASS_NAME_] _CLASS_IMPLEMENTATION_ => DECLARED METHOD _CLASS_NAME_ <AccessName>;;
|
||||
#xcommand METHOD <AccessName>() [DECLCLASS _CLASS_NAME_] _CLASS_IMPLEMENTATION_ => DECLARED METHOD _CLASS_NAME_ <AccessName>();;
|
||||
#xcommand METHOD <AccessName>([<anyParams,...>]) [DECLCLASS _CLASS_NAME_] _CLASS_IMPLEMENTATION_ => DECLARED METHOD _CLASS_NAME_ <AccessName>([<anyParams>]);;
|
||||
s_oClass:AddMethod( <(AccessName)>, CLSMETH _CLASS_NAME_ <AccessName>(), HB_OO_CLSTP_EXPORTED + HB_OO_CLSTP_READONLY )
|
||||
|
||||
#xcommand ACCESS <AccessName>([<params,...>]) [ AS <type> ] => ;
|
||||
_HB_MEMBER <AccessName>([<params>]) [ AS <type> ];;
|
||||
#xcommand METHOD <AccessName> [DECLCLASS _CLASS_NAME_] _CLASS_IMPLEMENTATION_ => DECLARED METHOD _CLASS_NAME_ <AccessName>;;
|
||||
#xcommand METHOD <AccessName>() [DECLCLASS _CLASS_NAME_] _CLASS_IMPLEMENTATION_ => DECLARED METHOD _CLASS_NAME_ <AccessName>();;
|
||||
#xcommand METHOD <AccessName>([<anyParams,...>]) [DECLCLASS _CLASS_NAME_] _CLASS_IMPLEMENTATION_ => DECLARED METHOD _CLASS_NAME_ <AccessName>([<anyParams>]);;
|
||||
s_oClass:AddMethod( <(AccessName)>, CLSMETH _CLASS_NAME_ <AccessName>(), HB_OO_CLSTP_EXPORTED + HB_OO_CLSTP_READONLY )
|
||||
#endif
|
||||
|
||||
#xcommand ACCESS <AccessName> [ AS <type> ] INLINE [Local <v>,] <code,...> => ;
|
||||
_HB_MEMBER <AccessName>() [ AS <type> ];;
|
||||
@@ -427,9 +504,25 @@ DECLARE TClass ;
|
||||
_HB_MEMBER <AccessName>() [ AS <type> ];;
|
||||
s_oClass:AddVirtual( <(AccessName)> )
|
||||
|
||||
#xcommand ASSIGN <AssignName> [ AS <type> ] => ;
|
||||
_HB_MEMBER _<AssignName>() [ AS <type> ];;
|
||||
s_oClass:AddMethod( "_" + <(AssignName)>, CLSMETH _CLASS_NAME_ _<AssignName>(), HB_OO_CLSTP_EXPORTED )
|
||||
#ifdef STRICT_OO
|
||||
#xcommand ASSIGN <AssignName> [ AS <type> ] => ;
|
||||
_HB_MEMBER _<AssignName>() [ AS <type> ];;
|
||||
#xcommand METHOD <AssignName> [DECLCLASS _CLASS_NAME_] _CLASS_IMPLEMENTATION_ => DECLARED METHOD _CLASS_NAME_ <AssignName>);;
|
||||
s_oClass:AddMethod( "_" + <(AssignName)>, CLSMETH _CLASS_NAME_ _<AssignName>(), HB_OO_CLSTP_EXPORTED )
|
||||
#else
|
||||
#xcommand ASSIGN <AssignName> [ AS <type> ] => ;
|
||||
_HB_MEMBER _<AssignName>() [ AS <type> ];;
|
||||
#xcommand METHOD <AssignName> [DECLCLASS _CLASS_NAME_] _CLASS_IMPLEMENTATION_ => DECLARED METHOD _CLASS_NAME_ <AssignName>;;
|
||||
#xcommand METHOD <AssignName>() [DECLCLASS _CLASS_NAME_] _CLASS_IMPLEMENTATION_ => DECLARED METHOD _CLASS_NAME_ <AssignName>();;
|
||||
#xcommand METHOD <AssignName>([<anyParams,...>]) [DECLCLASS _CLASS_NAME_] _CLASS_IMPLEMENTATION_ => DECLARED METHOD _CLASS_NAME_ <AssignName>([<anyParams>]);;
|
||||
s_oClass:AddMethod( "_" + <(AssignName)>, CLSMETH _CLASS_NAME_ _<AssignName>(), HB_OO_CLSTP_EXPORTED )
|
||||
|
||||
#xcommand ASSIGN <AssignName>([<params,...>]) [ AS <type> ] => ;
|
||||
_HB_MEMBER _<AssignName>([<params>]) [ AS <type> ];;
|
||||
#xcommand METHOD <AssignName> [DECLCLASS _CLASS_NAME_] _CLASS_IMPLEMENTATION_ => DECLARED METHOD _CLASS_NAME_ <AssignName>;;
|
||||
#xcommand METHOD <AssignName>([<anyParams,...>]) [DECLCLASS _CLASS_NAME_] _CLASS_IMPLEMENTATION_ => DECLARED METHOD _CLASS_NAME_ <AssignName>([<anyParams>]);;
|
||||
s_oClass:AddMethod( "_" + <(AssignName)>, CLSMETH _CLASS_NAME_ _<AssignName>(), HB_OO_CLSTP_EXPORTED )
|
||||
#endif
|
||||
|
||||
#xcommand ASSIGN <AssignName>( [<params,...>] ) [ AS <type> ] INLINE [Local <v>,] <Code,...> => ;
|
||||
_HB_MEMBER _<AssignName>([<params>]) [ AS <type> ];;
|
||||
@@ -467,12 +560,23 @@ DECLARE TClass ;
|
||||
|
||||
#ifndef HB_SHORTNAMES
|
||||
|
||||
#xcommand METHOD <MethodName> => METHOD <MethodName> _CLASS_MODE_
|
||||
//#xcommand METHOD <MethodName> _CLASS_IMPLEMENTATION_ => METHOD <MethodName> CLASS _CLASS_NAME_
|
||||
#xcommand METHOD <MethodName> _CLASS_IMPLEMENTATION_ => #error NOT DECLARED METHOD <"MethodName">
|
||||
#xcommand METHOD <MethodName> => METHOD <MethodName> _CLASS_MODE_
|
||||
#xcommand METHOD <MethodName> CLASS <ClassName> => METHOD <MethodName> DECLCLASS <ClassName> _CLASS_IMPLEMENTATION_
|
||||
|
||||
#xcommand METHOD <MethodName> CLASS <ClassName> => ;
|
||||
static function <ClassName>_<MethodName> ;;
|
||||
//#xcommand METHOD <MethodName> _CLASS_IMPLEMENTATION_ => METHOD <MethodName> CLASS _CLASS_NAME_
|
||||
//#define STRICT_OO
|
||||
#ifdef STRICT_OO
|
||||
#xcommand METHOD <MethodName> _CLASS_IMPLEMENTATION_ => #error Not declared method or declaration mismatch: _CLASS_NAME_:<MethodName>
|
||||
#xcommand METHOD <MethodName> CLASS <ClassName> _CLASS_IMPLEMENTATION_ => #error Not declared method or declaration mismatch: <ClassName>:<MethodName>
|
||||
#else
|
||||
#xcommand METHOD <MethodName> _CLASS_IMPLEMENTATION_ => #error Not declared method: _CLASS_NAME_:<MethodName>
|
||||
#xcommand METHOD <MethodName> CLASS <ClassName> _CLASS_IMPLEMENTATION_ => #error Not declared method: <ClassName>:<MethodName>
|
||||
#endif
|
||||
|
||||
#xcommand METHOD <MethodName> DECLCLASS <ClassName> _CLASS_IMPLEMENTATION_ => #error Not declared class: <ClassName>:<MethodName>
|
||||
|
||||
#xcommand DECLARED METHOD <ClassName> <MethodName> => ;
|
||||
static function DECLMETH <ClassName> <MethodName> ;;
|
||||
local Self AS CLASS <ClassName> := QSelf() AS CLASS <ClassName>
|
||||
|
||||
#xcommand ACCESS <AccessName> CLASS <ClassName> => ;
|
||||
@@ -484,7 +588,7 @@ DECLARE TClass ;
|
||||
local Self AS CLASS <ClassName> := QSelf() AS CLASS <ClassName>
|
||||
#else
|
||||
|
||||
#xcommand METHOD <MethodName> CLASS <ClassName> => ;
|
||||
#xcommand DECLARED METHOD <ClassName> <MethodName>=> ;
|
||||
static function <MethodName> ;;
|
||||
local Self AS CLASS <ClassName> := QSelf() AS CLASS <ClassName>
|
||||
|
||||
|
||||
@@ -327,7 +327,7 @@ ParamList : IdentName AsType { hb_compVariableAdd( $1, hb_comp_c
|
||||
| ParamList ',' IdentName AsType { hb_compVariableAdd( $3, hb_comp_cVarType ); $$++; }
|
||||
;
|
||||
|
||||
/* NOTE: This alllows the use of Expression as a statement.
|
||||
/* NOTE: This allows the use of Expression as a statement.
|
||||
* The Expression is validated later in reduction phase of
|
||||
* hb_compExprGenStatement(). With this solution we don't have to
|
||||
* stop compilation if invalid syntax will be used.
|
||||
@@ -641,11 +641,20 @@ ArgList : Argument { $$ = hb_compExprNewArgList( $1 ); }
|
||||
| ArgList ',' Argument { $$ = hb_compExprAddListExpr( $1, $3 ); }
|
||||
;
|
||||
|
||||
Argument : EmptyExpression { $$ = $1; }
|
||||
| '@' IdentName { $$ = hb_compExprNewVarRef( $2 ); }
|
||||
| '@' IdentName '(' ')' { $$ = hb_compExprNewFunRef( $2 ); }
|
||||
Argument : EmptyExpression { $$ = $1; }
|
||||
| '@' IdentName { $$ = hb_compExprNewVarRef( $2 ); }
|
||||
| '@' IdentName '(' DummyArgList ')' { $$ = hb_compExprNewFunRef( $2 ); }
|
||||
;
|
||||
|
||||
DummyArgList : DummyArgument {}
|
||||
| DummyArgList ',' DummyArgument {}
|
||||
;
|
||||
|
||||
DummyArgument : EmptyExpression {}
|
||||
| '@' IdentName {}
|
||||
| '@' IdentName '(' DummyArgList ')' {}
|
||||
;
|
||||
|
||||
FunCallAlias : FunCall ALIASOP { $$ = $1; }
|
||||
;
|
||||
|
||||
@@ -1476,20 +1485,20 @@ DecList : /* Nothing */ {}
|
||||
| FormalList ',' OptList
|
||||
;
|
||||
|
||||
FormalList : IdentName AsType { hb_compDeclaredParameterAdd( $1, hb_comp_cVarType ); }
|
||||
| '@' IdentName AsType { hb_compDeclaredParameterAdd( $2, hb_comp_cVarType + VT_OFFSET_BYREF ); }
|
||||
| '@' IdentName '(' ')' { hb_compDeclaredParameterAdd( $2, 'F' ); }
|
||||
| FormalList ',' IdentName AsType { hb_compDeclaredParameterAdd( $3, hb_comp_cVarType ); }
|
||||
| FormalList ',' '@' IdentName AsType { hb_compDeclaredParameterAdd( $4, hb_comp_cVarType + VT_OFFSET_BYREF ); }
|
||||
| FormalList ',' '@' IdentName '(' ')'{ hb_compDeclaredParameterAdd( $4, 'F' ); }
|
||||
FormalList : IdentName AsType { hb_compDeclaredParameterAdd( $1, hb_comp_cVarType ); }
|
||||
| '@' IdentName AsType { hb_compDeclaredParameterAdd( $2, hb_comp_cVarType + VT_OFFSET_BYREF ); }
|
||||
| '@' IdentName '(' DummyArgList ')' { hb_compDeclaredParameterAdd( $2, 'F' ); }
|
||||
| FormalList ',' IdentName AsType { hb_compDeclaredParameterAdd( $3, hb_comp_cVarType ); }
|
||||
| FormalList ',' '@' IdentName AsType { hb_compDeclaredParameterAdd( $4, hb_comp_cVarType + VT_OFFSET_BYREF ); }
|
||||
| FormalList ',' '@' IdentName '(' DummyArgList ')' { hb_compDeclaredParameterAdd( $4, 'F' ); }
|
||||
;
|
||||
|
||||
OptList : OPTIONAL IdentName AsType { hb_compDeclaredParameterAdd( $2, hb_comp_cVarType + VT_OFFSET_OPTIONAL ); }
|
||||
| OPTIONAL '@' IdentName AsType { hb_compDeclaredParameterAdd( $3, hb_comp_cVarType + VT_OFFSET_OPTIONAL + VT_OFFSET_BYREF ); }
|
||||
| OPTIONAL '@' IdentName '(' ')' { hb_compDeclaredParameterAdd( $3, hb_comp_cVarType + VT_OFFSET_OPTIONAL + VT_OFFSET_BYREF ); }
|
||||
| OptList ',' OPTIONAL IdentName AsType { hb_compDeclaredParameterAdd( $4, hb_comp_cVarType + VT_OFFSET_OPTIONAL ); }
|
||||
| OptList ',' OPTIONAL '@' IdentName AsType { hb_compDeclaredParameterAdd( $5, hb_comp_cVarType + VT_OFFSET_OPTIONAL + VT_OFFSET_BYREF ); }
|
||||
| OptList ',' OPTIONAL '@' IdentName '(' ')'{ hb_compDeclaredParameterAdd( $5, hb_comp_cVarType + VT_OFFSET_OPTIONAL + VT_OFFSET_BYREF ); }
|
||||
OptList : OPTIONAL IdentName AsType { hb_compDeclaredParameterAdd( $2, hb_comp_cVarType + VT_OFFSET_OPTIONAL ); }
|
||||
| OPTIONAL '@' IdentName AsType { hb_compDeclaredParameterAdd( $3, hb_comp_cVarType + VT_OFFSET_OPTIONAL + VT_OFFSET_BYREF ); }
|
||||
| OPTIONAL '@' IdentName '(' DummyArgList ')' { hb_compDeclaredParameterAdd( $3, hb_comp_cVarType + VT_OFFSET_OPTIONAL + VT_OFFSET_BYREF ); }
|
||||
| OptList ',' OPTIONAL IdentName AsType { hb_compDeclaredParameterAdd( $4, hb_comp_cVarType + VT_OFFSET_OPTIONAL ); }
|
||||
| OptList ',' OPTIONAL '@' IdentName AsType { hb_compDeclaredParameterAdd( $5, hb_comp_cVarType + VT_OFFSET_OPTIONAL + VT_OFFSET_BYREF ); }
|
||||
| OptList ',' OPTIONAL '@' IdentName '(' DummyArgList ')' { hb_compDeclaredParameterAdd( $5, hb_comp_cVarType + VT_OFFSET_OPTIONAL + VT_OFFSET_BYREF ); }
|
||||
;
|
||||
|
||||
ExecFlow : IfEndif
|
||||
@@ -1797,10 +1806,10 @@ DoArgList : ',' { $$ = hb_compExprAddListExpr( hb_compExp
|
||||
| DoArgList ',' DoArgument { $$ = hb_compExprAddListExpr( $1, $3 ); }
|
||||
;
|
||||
|
||||
DoArgument : IdentName { $$ = hb_compExprNewVarRef( $1 ); }
|
||||
| '@' IdentName '(' ')' { $$ = hb_compExprNewFunRef( $2 ); }
|
||||
| SimpleExpression { $$ = $1; }
|
||||
| PareExpList { $$ = $1; }
|
||||
DoArgument : IdentName { $$ = hb_compExprNewVarRef( $1 ); }
|
||||
| '@' IdentName '(' DummyArgList ')' { $$ = hb_compExprNewFunRef( $2 ); }
|
||||
| SimpleExpression { $$ = $1; }
|
||||
| PareExpList { $$ = $1; }
|
||||
;
|
||||
|
||||
Crlf : '\n' { hb_comp_bError = FALSE; }
|
||||
|
||||
@@ -315,7 +315,7 @@ ParamList : IdentName AsType { hb_compVariableAdd( $1, hb_comp_c
|
||||
| ParamList ',' IdentName AsType { hb_compVariableAdd( $3, hb_comp_cVarType ); $$++; }
|
||||
;
|
||||
|
||||
/* NOTE: This alllows the use of Expression as a statement.
|
||||
/* NOTE: This allows the use of Expression as a statement.
|
||||
* The Expression is validated later in reduction phase of
|
||||
* hb_compExprGenStatement(). With this solution we don't have to
|
||||
* stop compilation if invalid syntax will be used.
|
||||
@@ -621,11 +621,20 @@ ArgList : Argument { $$ = hb_compExprNewArgList( $1 ); }
|
||||
| ArgList ',' Argument { $$ = hb_compExprAddListExpr( $1, $3 ); }
|
||||
;
|
||||
|
||||
Argument : EmptyExpression { $$ = $1; }
|
||||
| '@' IdentName { $$ = hb_compExprNewVarRef( $2 ); }
|
||||
| '@' IdentName '(' ')' { $$ = hb_compExprNewFunRef( $2 ); }
|
||||
Argument : EmptyExpression { $$ = $1; }
|
||||
| '@' IdentName { $$ = hb_compExprNewVarRef( $2 ); }
|
||||
| '@' IdentName '(' DummyArgList ')' { $$ = hb_compExprNewFunRef( $2 ); }
|
||||
;
|
||||
|
||||
DummyArgList : DummyArgument {}
|
||||
| DummyArgList ',' DummyArgument {}
|
||||
;
|
||||
|
||||
DummyArgument : EmptyExpression {}
|
||||
| '@' IdentName {}
|
||||
| '@' IdentName '(' DummyArgList ')' {}
|
||||
;
|
||||
|
||||
FunCallAlias : FunCall ALIASOP { $$ = $1; }
|
||||
;
|
||||
|
||||
@@ -1286,21 +1295,21 @@ DecList : /* Nothing */ {}
|
||||
| FormalList ',' OptList
|
||||
;
|
||||
|
||||
FormalList : IdentName AsType { hb_compDeclaredParameterAdd( $1, hb_comp_cVarType ); }
|
||||
| '@' IdentName AsType { hb_compDeclaredParameterAdd( $2, hb_comp_cVarType + VT_OFFSET_BYREF ); }
|
||||
| '@' IdentName '(' ')' { hb_compDeclaredParameterAdd( $2, 'F' ); }
|
||||
| FormalList ',' IdentName AsType { hb_compDeclaredParameterAdd( $3, hb_comp_cVarType ); }
|
||||
| FormalList ',' '@' IdentName AsType { hb_compDeclaredParameterAdd( $4, hb_comp_cVarType + VT_OFFSET_BYREF ); }
|
||||
| FormalList ',' '@' IdentName '(' ')'{ hb_compDeclaredParameterAdd( $4, 'F' ); }
|
||||
FormalList : IdentName AsType { hb_compDeclaredParameterAdd( $1, hb_comp_cVarType ); }
|
||||
| '@' IdentName AsType { hb_compDeclaredParameterAdd( $2, hb_comp_cVarType + VT_OFFSET_BYREF ); }
|
||||
| '@' IdentName '(' DummyArgList ')' { hb_compDeclaredParameterAdd( $2, 'F' ); }
|
||||
| FormalList ',' IdentName AsType { hb_compDeclaredParameterAdd( $3, hb_comp_cVarType ); }
|
||||
| FormalList ',' '@' IdentName AsType { hb_compDeclaredParameterAdd( $4, hb_comp_cVarType + VT_OFFSET_BYREF ); }
|
||||
| FormalList ',' '@' IdentName '(' DummyArgList ')' { hb_compDeclaredParameterAdd( $4, 'F' ); }
|
||||
;
|
||||
|
||||
OptList : OPTIONAL IdentName AsType { hb_compDeclaredParameterAdd( $2, hb_comp_cVarType + VT_OFFSET_OPTIONAL ); }
|
||||
| OPTIONAL '@' IdentName AsType { hb_compDeclaredParameterAdd( $3, hb_comp_cVarType + VT_OFFSET_OPTIONAL + VT_OFFSET_BYREF ); }
|
||||
| OPTIONAL '@' IdentName '(' ')' { hb_compDeclaredParameterAdd( $3, hb_comp_cVarType + VT_OFFSET_OPTIONAL + VT_OFFSET_BYREF ); }
|
||||
| OptList ',' OPTIONAL IdentName AsType { hb_compDeclaredParameterAdd( $4, hb_comp_cVarType + VT_OFFSET_OPTIONAL ); }
|
||||
| OptList ',' OPTIONAL '@' IdentName AsType { hb_compDeclaredParameterAdd( $5, hb_comp_cVarType + VT_OFFSET_OPTIONAL + VT_OFFSET_BYREF ); }
|
||||
| OptList ',' OPTIONAL '@' IdentName '(' ')'{ hb_compDeclaredParameterAdd( $5, hb_comp_cVarType + VT_OFFSET_OPTIONAL + VT_OFFSET_BYREF ); }
|
||||
;
|
||||
OptList : OPTIONAL IdentName AsType { hb_compDeclaredParameterAdd( $2, hb_comp_cVarType + VT_OFFSET_OPTIONAL ); }
|
||||
| OPTIONAL '@' IdentName AsType { hb_compDeclaredParameterAdd( $3, hb_comp_cVarType + VT_OFFSET_OPTIONAL + VT_OFFSET_BYREF ); }
|
||||
| OPTIONAL '@' IdentName '(' DummyArgList ')' { hb_compDeclaredParameterAdd( $3, hb_comp_cVarType + VT_OFFSET_OPTIONAL + VT_OFFSET_BYREF ); }
|
||||
| OptList ',' OPTIONAL IdentName AsType { hb_compDeclaredParameterAdd( $4, hb_comp_cVarType + VT_OFFSET_OPTIONAL ); }
|
||||
| OptList ',' OPTIONAL '@' IdentName AsType { hb_compDeclaredParameterAdd( $5, hb_comp_cVarType + VT_OFFSET_OPTIONAL + VT_OFFSET_BYREF ); }
|
||||
| OptList ',' OPTIONAL '@' IdentName '(' DummyArgList ')' { hb_compDeclaredParameterAdd( $5, hb_comp_cVarType + VT_OFFSET_OPTIONAL + VT_OFFSET_BYREF ); }
|
||||
;
|
||||
|
||||
ExecFlow : IfEndif
|
||||
| DoCase
|
||||
@@ -1607,10 +1616,10 @@ DoArgList : ',' { $$ = hb_compExprAddListExpr( hb_compExp
|
||||
| DoArgList ',' DoArgument { $$ = hb_compExprAddListExpr( $1, $3 ); }
|
||||
;
|
||||
|
||||
DoArgument : IdentName { $$ = hb_compExprNewVarRef( $1 ); }
|
||||
| '@' IdentName '(' ')' { $$ = hb_compExprNewFunRef( $2 ); }
|
||||
| SimpleExpression { $$ = $1; }
|
||||
| PareExpList { $$ = $1; }
|
||||
DoArgument : IdentName { $$ = hb_compExprNewVarRef( $1 ); }
|
||||
| '@' IdentName '(' DummyArgList ')' { $$ = hb_compExprNewFunRef( $2 ); }
|
||||
| SimpleExpression { $$ = $1; }
|
||||
| PareExpList { $$ = $1; }
|
||||
;
|
||||
|
||||
Crlf : '\n' { hb_comp_bError = FALSE; }
|
||||
|
||||
@@ -512,7 +512,7 @@ void hb_compStrongType( int iSize )
|
||||
{
|
||||
hb_compGenWarning( hb_comp_szWarnings, 'W', HB_COMP_WARN_PARAM_SUSPECT, ( char * ) szType1, ( char * ) szType2 );
|
||||
}
|
||||
else if( bByRef && cParamType == ( ' ' + VT_OFFSET_BYREF ) || cParamType >= ( 'A' + VT_OFFSET_BYREF ) )
|
||||
else if( bByRef && ( cParamType == ( ' ' + VT_OFFSET_BYREF ) || cParamType >= ( 'A' + VT_OFFSET_BYREF ) ) )
|
||||
{
|
||||
hb_compGenWarning( hb_comp_szWarnings, 'W', HB_COMP_WARN_PARAM_SUSPECT, ( char * ) szType1, ( char * ) szType2 );
|
||||
}
|
||||
|
||||
@@ -1701,12 +1701,13 @@ METHOD SearchLine() CLASS TDebugger
|
||||
|
||||
return nil
|
||||
|
||||
/* Not declared - it seems ToggleCaseSensitive() replaced this!!!
|
||||
METHOD CaseSensitive() CLASS TDebugger
|
||||
|
||||
::lCaseSensitive := !::lCaseSensitive
|
||||
|
||||
return nil
|
||||
|
||||
*/
|
||||
|
||||
function __DbgColors()
|
||||
|
||||
@@ -1716,4 +1717,4 @@ return If( ! s_oDebugger:lMonoDisplay, s_oDebugger:aColors,;
|
||||
|
||||
function __Dbg()
|
||||
|
||||
return s_oDebugger
|
||||
return s_oDebugger
|
||||
|
||||
@@ -194,7 +194,7 @@ char * hb_pp_szErrors[] =
|
||||
"Error in pattern definition",
|
||||
"Cycled #define",
|
||||
"Invalid name follows #: \'%s\'",
|
||||
"#error: \'%s\'",
|
||||
"\'%s\'",
|
||||
"Memory allocation error",
|
||||
"Memory reallocation error",
|
||||
"Freeing a NULL memory pointer",
|
||||
@@ -497,8 +497,31 @@ int hb_pp_ParseDirective( char * sLine )
|
||||
|
||||
else if( i >= 4 && i <= 5 && memcmp( sDirective, "ERROR", i ) == 0 )
|
||||
/* --- #error --- */
|
||||
{
|
||||
DEFINES * stdef;
|
||||
int lenToken, i;
|
||||
char *ptri, *sToken, *ptrb, ptro[MAX_NAME];
|
||||
|
||||
ptri = sLine;
|
||||
|
||||
while( ( lenToken = NextName( &ptri, sToken ) ) > 0 )
|
||||
{
|
||||
/* Only simple define here. */
|
||||
if( (stdef = DefSearch(sToken,NULL)) != NULL && stdef->npars < 0 )
|
||||
{
|
||||
ptrb = ptri - lenToken;
|
||||
|
||||
if( ( i = WorkDefine( &ptri, (char*) ptro, stdef ) ) >= 0 )
|
||||
{
|
||||
hb_pp_Stuff( (char*) ptro, ptrb, i - 1, lenToken, strlen( ptrb ) );
|
||||
ptri += i - ( ptri - ptrb );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
hb_compGenError( hb_pp_szErrors, 'E', HB_PP_ERR_EXPLICIT, sLine, NULL );
|
||||
|
||||
}
|
||||
else if( i == 4 && memcmp( sDirective, "LINE", 4 ) == 0 )
|
||||
return -1;
|
||||
|
||||
@@ -1030,6 +1053,8 @@ int hb_pp_ParseExpression( char * sLine, char * sOutLine )
|
||||
|
||||
if( *ptri == '#' )
|
||||
{
|
||||
char *pTmp = sLine;
|
||||
|
||||
hb_pp_ParseDirective( ptri+1 );
|
||||
|
||||
if( ipos > 0 )
|
||||
|
||||
@@ -4311,7 +4311,7 @@ void hb_vmRequestCancel( void )
|
||||
ulLine = 0;
|
||||
|
||||
i2 = strlen( (char *) buffer );
|
||||
sprintf( buffer + i2, " (%i)", ulLine );
|
||||
sprintf( buffer + i2, " (%lu)", ulLine );
|
||||
|
||||
hb_conOutErr( buffer, 0 );
|
||||
hb_conOutErr( hb_conNewLine(), 0 );
|
||||
|
||||
@@ -379,7 +379,10 @@ METHOD goBottom() CLASS FileBase
|
||||
Returns: Self
|
||||
Purpose: To close the file
|
||||
*/
|
||||
METHOD FCLOSE() CLASS FileBase
|
||||
|
||||
/* Not declared in class creation, which means the super version is used. */
|
||||
#ifdef BUG
|
||||
METHOD FCLOSE() CLASS FileBase
|
||||
|
||||
IF Self:noDosError() .AND. Self:nDosHandle > 0
|
||||
FCLOSE( Self:nDosHandle )
|
||||
@@ -390,6 +393,7 @@ METHOD FCLOSE() CLASS FileBase
|
||||
ENDIF
|
||||
|
||||
RETURN ( self )
|
||||
#endif
|
||||
|
||||
/* Method: write(<cChar>)
|
||||
Params: <cChar>
|
||||
@@ -426,7 +430,10 @@ METHOD WRITE( cChar ) CLASS FileBase
|
||||
in a forward direction. The default value is a logical true
|
||||
(.T.) value.
|
||||
*/
|
||||
METHOD Buffget( lForward ) CLASS FileBase
|
||||
|
||||
/* Class declaration send message BuffGet to BufferGet. */
|
||||
#ifdef BUG
|
||||
METHOD Buffget( lForward ) CLASS FileBase
|
||||
|
||||
LOCAL cBuffer // as char
|
||||
LOCAL nLocation // as int
|
||||
@@ -473,6 +480,7 @@ METHOD Buffget( lForward ) CLASS FileBase
|
||||
ENDIF
|
||||
|
||||
RETURN ( nLocation )
|
||||
#endif
|
||||
|
||||
/* Method: appendLine( <cLine )
|
||||
Params: <cLine> Character line to append
|
||||
|
||||
Reference in New Issue
Block a user