* harbour/include/hbapi.h
* harbour/source/vm/hvm.c
* harbour/source/vm/codebloc.c
* harbour/source/vm/arrays.c
* moved static base offset from hb_struBlock structure
to HB_CODEBLOCK structure
+ added hclass member to hb_struBlock - it will be used in
the future for checking codeblock scope in classy so we will
real scope checking also for messages sent from codeblocks.
- removed supercast and superoffset members from hb_struArray
structure.
* harbour/include/hbclass.ch
* added class(y) like
@:<MessageName>([<MsgParams,...>])
send operator. It's not exactly the same as in class(y) where
this operator is hardcoded to executing function directly,
needs method name instead of message name and is linked statically.
In Harbour this operator uses message name so can be used also for
instance variables and make dynamic casting to the class from which
current method is inherited. In short words sending messages to @:
instead of :: causes that they work like non-virtual messages in
C++ mode.
If you do not use the same method body in different classes
then you can also use explicitly self casting:
::<myclass>:<msgname>[(...)]
and it will be a little bit faster
* harbour/include/hboo.ch
+ added: HB_OO_MSG_ASSIGN, HB_OO_MSG_ACCESS,
HB_OO_MSG_CLSASSIGN, HB_OO_MSG_CLSACCESS
They should be used insted of HB_OO_MSG_DATA and HB_OO_MSG_CLSDATA
This resolves problems with name conflicts when we were detecting
type of message (ACCESS/ASSIGN) by checking the first character
in message name. F.e. now it's possible to create exported instance
variable called __WithObject and it will be used in all WITH OBJECT
statement instead of the base object value. It's simple and effective
WITH OBJECT overloading.
I kept backward compatibility for HB_OO_MSG_DATA and HB_OO_MSG_CLSDATA
but I strongly suggest to update code to use new constants.
+ added HB_OO_MSG_REALCLASS
* harbour/source/rtl/objfunc.prg
* harbour/source/rtl/tobject.prg
* harbour/source/rtl/tclass.prg
* use HB_OO_MSG_[CLS]{ASSIGN,ACCESS} instead of HB_OO_MSG_[CLS]DATA
* harbour/source/rtl/tclass.prg
+ added REALCLASS message to creted classes - it's used for @: operator
* harbour/source/vm/classes.c
* updated for above modifications
* calculate instance area offset in supercasting dynamically - it
will allow to eliminate multiple instance area allocating when
in the inheritance tree the same class exists more then once and
also quite easy add support for non-virtual messages.
! fixed GPF in __CLSINSTSUPER() class function generate HVM exception
% do not inherit unaccessible inline blocks
* some other minor optimization, fixes and code cleanups
* harbour/source/rdd/usrrdd/usrrdd.c
! fixed HB_TRACE message
* harbour/source/rtl/errorapi.c
! generate internal error if ErrorNew() function does not return an object
282 lines
8.3 KiB
Plaintext
282 lines
8.3 KiB
Plaintext
/*
|
|
* $Id$
|
|
*/
|
|
|
|
/*
|
|
* Harbour Project source code:
|
|
* Dynamic Object management and misc. Object related functions
|
|
*
|
|
* Copyright 1999 Eddie Runia <eddie@runia.com>
|
|
* 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.
|
|
*
|
|
*/
|
|
|
|
/*
|
|
* The following parts are Copyright of the individual authors.
|
|
* www - http://www.harbour-project.org
|
|
*
|
|
* Copyright 1999 Antonio Linares <alinares@fivetech.com>
|
|
* __objGetMsgList
|
|
*
|
|
* Copyright 2000 Jf. Lefebvre <jfl@mafact.com> and Ra. Cuylen <rac@mafact.com>
|
|
* __objDerivedFrom
|
|
*
|
|
* New Param for Method :ClassSel() to allow it to return only ClassData array
|
|
*
|
|
* See doc/license.txt for licensing terms.
|
|
*
|
|
*/
|
|
|
|
#include "common.ch"
|
|
#include "error.ch"
|
|
#include "hboo.ch"
|
|
|
|
FUNCTION __objHasData( oObject, cSymbol )
|
|
|
|
IF !ISOBJECT( oObject ) .OR. !ISCHARACTER( cSymbol )
|
|
__errRT_BASE( EG_ARG, 3101, NIL, ProcName( 0 ) )
|
|
ENDIF
|
|
|
|
RETURN __objHasMsg( oObject, cSymbol ) .AND. ;
|
|
__objHasMsg( oObject, "_" + cSymbol )
|
|
|
|
FUNCTION __objHasMethod( oObject, cSymbol )
|
|
|
|
IF !ISOBJECT( oObject ) .OR. !ISCHARACTER( cSymbol )
|
|
__errRT_BASE( EG_ARG, 3101, NIL, ProcName( 0 ) )
|
|
ENDIF
|
|
|
|
RETURN __objHasMsg( oObject, cSymbol ) .AND. ;
|
|
!__objHasMsg( oObject, "_" + cSymbol )
|
|
|
|
|
|
// nCLassType can be 0, 1 or 2 see hbOO.ch
|
|
//#define HB_MSGLISTALL 0
|
|
//#define HB_MSGLISTCLASS 1
|
|
//#define HB_MSGLISTPURE 2
|
|
|
|
FUNCTION __objGetMsgList( oObject, lDataMethod, nClassType )
|
|
LOCAL aInfo
|
|
LOCAL aData
|
|
LOCAL n
|
|
LOCAL nLen
|
|
|
|
IF !ISOBJECT( oObject )
|
|
__errRT_BASE( EG_ARG, 3101, NIL, ProcName( 0 ) )
|
|
ENDIF
|
|
|
|
IF !ISLOGICAL( lDataMethod )
|
|
lDataMethod := .T.
|
|
ENDIF
|
|
|
|
IF !ISNUMBER( nClassType )
|
|
nClasstype := HB_MSGLISTALL
|
|
ENDIF
|
|
|
|
aInfo := ASort( oObject:ClassSel(nClassType) )
|
|
aData := {}
|
|
n := 1
|
|
nLen := Len( aInfo )
|
|
|
|
DO WHILE n <= nLen .AND. !( Substr( aInfo[ n ], 1, 1 ) == "_" )
|
|
|
|
/* If in range and no set function found yet ( set functions */
|
|
/* begin with a leading underscore ). */
|
|
|
|
// If found -> DATA
|
|
// else METHOD
|
|
|
|
/* Find position of matching set function in array with all symbols */
|
|
|
|
IF ( AScan( aInfo, {| tmp | tmp == ( "_" + aInfo[ n ] ) }, n + 1 ) != 0 ) == lDataMethod
|
|
AAdd( aData, aInfo[ n ] )
|
|
ENDIF
|
|
|
|
n++
|
|
|
|
ENDDO
|
|
|
|
RETURN aData
|
|
|
|
FUNCTION __objGetMethodList( oObject )
|
|
|
|
IF !ISOBJECT( oObject )
|
|
__errRT_BASE( EG_ARG, 3101, NIL, ProcName( 0 ) )
|
|
ENDIF
|
|
|
|
RETURN __objGetMsgList( oObject, .F. )
|
|
|
|
FUNCTION __objGetValueList( oObject, aExcept )
|
|
LOCAL aDataSymbol
|
|
LOCAL nLen
|
|
LOCAL aData
|
|
LOCAL cSymbol
|
|
LOCAL n
|
|
|
|
IF !ISOBJECT( oObject )
|
|
__errRT_BASE( EG_ARG, 3101, NIL, ProcName( 0 ) )
|
|
ENDIF
|
|
|
|
IF !ISARRAY( aExcept )
|
|
aExcept := {}
|
|
ENDIF
|
|
|
|
aDataSymbol := __objGetMsgList( oObject )
|
|
nLen := Len( aDataSymbol )
|
|
aData := {}
|
|
|
|
FOR n := 1 to nLen
|
|
cSymbol := aDataSymbol[ n ]
|
|
IF AScan( aExcept, {| tmp | tmp == cSymbol } ) == 0
|
|
AAdd( aData, { cSymbol, __objSendMsg( oObject, cSymbol ) } )
|
|
ENDIF
|
|
NEXT
|
|
|
|
RETURN aData
|
|
|
|
FUNCTION __ObjSetValueList( oObject, aData )
|
|
|
|
IF !ISOBJECT( oObject )
|
|
__errRT_BASE( EG_ARG, 3101, NIL, ProcName( 0 ) )
|
|
ELSE
|
|
AEval( aData, {| aItem | __objSendMsg( oObject, "_" + aItem[ HB_OO_DATA_SYMBOL ], aItem[ HB_OO_DATA_VALUE ] ) } )
|
|
ENDIF
|
|
|
|
RETURN oObject
|
|
|
|
FUNCTION __objAddMethod( oObject, cSymbol, nFuncPtr )
|
|
|
|
IF !ISOBJECT( oObject ) .OR. !ISCHARACTER( cSymbol ) .OR. !ISNUMBER( nFuncPtr )
|
|
__errRT_BASE( EG_ARG, 3101, NIL, ProcName( 0 ) )
|
|
ELSEIF !__objHasMsg( oObject, cSymbol )
|
|
__clsAddMsg( oObject:ClassH, cSymbol, nFuncPtr, HB_OO_MSG_METHOD, NIL, 1 )
|
|
ENDIF
|
|
|
|
RETURN oObject
|
|
|
|
FUNCTION __objAddInline( oObject, cSymbol, bInline )
|
|
|
|
IF !ISOBJECT( oObject ) .OR. !ISCHARACTER( cSymbol )
|
|
__errRT_BASE( EG_ARG, 3101, NIL, ProcName( 0 ) )
|
|
ELSEIF !__objHasMsg( oObject, cSymbol )
|
|
__clsAddMsg( oObject:ClassH, cSymbol, bInline, HB_OO_MSG_INLINE, NIL, 1 )
|
|
ENDIF
|
|
|
|
RETURN oObject
|
|
|
|
FUNCTION __objAddData( oObject, cSymbol )
|
|
LOCAL nSeq, hClass
|
|
|
|
IF !ISOBJECT( oObject ) .OR. !ISCHARACTER( cSymbol )
|
|
__errRT_BASE( EG_ARG, 3101, NIL, ProcName( 0 ) )
|
|
ELSEIF !__objHasMsg( oObject, cSymbol ) .AND. !__objHasMsg( oObject, "_" + cSymbol )
|
|
hClass := oObject:ClassH
|
|
nSeq := __cls_IncData( hClass ) // Allocate new Seq#
|
|
__clsAddMsg( hClass, cSymbol, nSeq, HB_OO_MSG_ACCESS, NIL, 1 )
|
|
__clsAddMsg( hClass, "_" + cSymbol, nSeq, HB_OO_MSG_ASSIGN, NIL, 1 )
|
|
ENDIF
|
|
|
|
RETURN oObject
|
|
|
|
FUNCTION __objModMethod( oObject, cSymbol, nFuncPtr )
|
|
|
|
IF !ISOBJECT( oObject ) .OR. !ISCHARACTER( cSymbol ) .OR. !ISNUMBER( nFuncPtr )
|
|
__errRT_BASE( EG_ARG, 3101, NIL, ProcName( 0 ) )
|
|
ELSEIF __objHasMethod( oObject, cSymbol )
|
|
__clsModMsg( oObject:ClassH, cSymbol, nFuncPtr )
|
|
ENDIF
|
|
|
|
RETURN oObject
|
|
|
|
FUNCTION __objModInline( oObject, cSymbol, bInline )
|
|
|
|
IF !ISOBJECT( oObject ) .OR. !ISCHARACTER( cSymbol ) .OR. !ISBLOCK( bInline )
|
|
__errRT_BASE( EG_ARG, 3101, NIL, ProcName( 0 ) )
|
|
ELSEIF __objHasMethod( oObject, cSymbol )
|
|
__clsModMsg( oObject:ClassH, cSymbol, bInline )
|
|
ENDIF
|
|
|
|
RETURN oObject
|
|
|
|
FUNCTION __objDelMethod( oObject, cSymbol )
|
|
|
|
IF !ISOBJECT( oObject ) .OR. !ISCHARACTER( cSymbol )
|
|
__errRT_BASE( EG_ARG, 3101, NIL, ProcName( 0 ) )
|
|
ELSEIF __objHasMethod( oObject, cSymbol )
|
|
__clsDelMsg( oObject:ClassH, cSymbol )
|
|
ENDIF
|
|
|
|
RETURN oObject
|
|
|
|
FUNCTION __objDelInline( oObject, cSymbol )
|
|
RETURN __objDelMethod( oObject, cSymbol ) // Same story
|
|
|
|
FUNCTION __objDelData( oObject, cSymbol )
|
|
|
|
IF !ISOBJECT( oObject ) .OR. !ISCHARACTER( cSymbol )
|
|
__errRT_BASE( EG_ARG, 3101, NIL, ProcName( 0 ) )
|
|
ELSEIF __objHasData( oObject, cSymbol )
|
|
__clsDelMsg( oObject:ClassH, cSymbol )
|
|
__clsDelMsg( oObject:ClassH, "_" + cSymbol )
|
|
__cls_DecData( oObject:ClassH ) // Decrease wData
|
|
ENDIF
|
|
|
|
RETURN oObject
|
|
|
|
FUNCTION __objDerivedFrom( oObject, xSuper )
|
|
LOCAL cClassName
|
|
|
|
IF !ISOBJECT( oObject )
|
|
__errRT_BASE( EG_ARG, 3101, NIL, ProcName( 0 ) )
|
|
ENDIF
|
|
|
|
IF ISOBJECT( xSuper )
|
|
cClassName := xSuper:ClassName()
|
|
ELSEIF ISCHARACTER( xSuper )
|
|
cClassName := Upper( xSuper )
|
|
ELSE
|
|
__errRT_BASE( EG_ARG, 3101, NIL, ProcName( 0 ) )
|
|
ENDIF
|
|
|
|
RETURN __clsParent( oObject:ClassH, cClassName )
|
|
|