2008-09-29 13:11 UTC-0300 Antonio Carlos Pantaglione <toninho@fwi.com.br>
* contrib/xhb/common.mak
* contrib/xhb/makefile
+ contrib/xhb/hbstruct.ch
+ contrib/xhb/hbstruct.prg
+ STRUCTURE / MEMBER / ENDSTRUCTURE support
This commit is contained in:
@@ -8,6 +8,13 @@
|
||||
2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
|
||||
*/
|
||||
|
||||
2008-09-29 13:11 UTC-0300 Antonio Carlos Pantaglione <toninho@fwi.com.br>
|
||||
* contrib/xhb/common.mak
|
||||
* contrib/xhb/makefile
|
||||
+ contrib/xhb/hbstruct.ch
|
||||
+ contrib/xhb/hbstruct.prg
|
||||
+ STRUCTURE / MEMBER / ENDSTRUCTURE support
|
||||
|
||||
2008-09-29 17:41 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
|
||||
* harbour/include/hbset.h
|
||||
* harbour/source/vm/set.c
|
||||
|
||||
@@ -29,6 +29,7 @@ PRG_SOURCES=\
|
||||
hblog.prg \
|
||||
hblognet.prg \
|
||||
cstruct.prg \
|
||||
hbstruct.prg \
|
||||
dirrec.prg \
|
||||
xhbcomp.prg \
|
||||
|
||||
|
||||
@@ -34,6 +34,7 @@ LIB_OBJS = \
|
||||
$(OBJ_DIR)hblog$(OBJEXT) \
|
||||
$(OBJ_DIR)hblognet$(OBJEXT) \
|
||||
$(OBJ_DIR)cstruct$(OBJEXT) \
|
||||
$(OBJ_DIR)hbstruct$(OBJEXT) \
|
||||
$(OBJ_DIR)dirrec$(OBJEXT) \
|
||||
$(OBJ_DIR)xhbcomp$(OBJEXT) \
|
||||
|
||||
|
||||
82
harbour/contrib/xhb/hbstruct.ch
Normal file
82
harbour/contrib/xhb/hbstruct.ch
Normal file
@@ -0,0 +1,82 @@
|
||||
/*
|
||||
* $Id: hbstruct.ch 9505 2008-09-25 11:16:49Z toninhofwi $
|
||||
*/
|
||||
|
||||
/*
|
||||
* Harbour Project source code:
|
||||
* Header file for cross-compatibility between different Harbour flavours
|
||||
*
|
||||
* Copyright 1999-2007 {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.
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef _H_STRUCTURE
|
||||
#define _H_STRUCTURE
|
||||
|
||||
#xcommand STRUCTURE <hStruct> ;
|
||||
=> ;
|
||||
#ifdef _TSTRUCT_ ;;
|
||||
#undef _TSTRUCT_ ;;
|
||||
#endif ;;
|
||||
#define _TSTRUCT_ <hStruct> ;;
|
||||
<hStruct> := HB_Hash() ;;
|
||||
HB_HCaseMatch( <hStruct>, .f. )
|
||||
|
||||
#xcommand MEMBER <cName, ...> ;
|
||||
[ AS <type:STRING,NUMERIC,LOGICAL,DATE,CODEBLOCK,OBJECT> ] ;
|
||||
[ INIT <uValue> ] ;
|
||||
=> ;
|
||||
HB_HashAddMember( {<(cName)>}, <(type)>, <uValue>, _TSTRUCT_ )
|
||||
|
||||
#xcommand MEMBER <cName> ;
|
||||
[ AS <type:ARRAY> ] ;
|
||||
[ INIT <uValue> ] ;
|
||||
=> ;
|
||||
HB_HashAddMember( {<(cName)>}, <(type)>, <uValue>, _TSTRUCT_ )
|
||||
|
||||
#xcommand ENDSTRUCTURE => HB_HAutoAdd( _TSTRUCT_, .f. )
|
||||
|
||||
|
||||
#translate DESTROY STRUCTURE <hStruct> => <hStruct> := nil
|
||||
|
||||
#endif
|
||||
120
harbour/contrib/xhb/hbstruct.prg
Normal file
120
harbour/contrib/xhb/hbstruct.prg
Normal file
@@ -0,0 +1,120 @@
|
||||
/*
|
||||
* $Id: hbstruct.ch 9505 2008-09-25 11:16:49Z toninhofwi $
|
||||
*/
|
||||
|
||||
/*
|
||||
* Harbour Project source code:
|
||||
* Header file for cross-compatibility between different Harbour flavours
|
||||
*
|
||||
* Copyright 1999-2007 {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.
|
||||
*
|
||||
*/
|
||||
|
||||
procedure HB_HashAddMember( aName, cType, uInit, oObj )
|
||||
|
||||
local cName
|
||||
|
||||
if !( cType == nil )
|
||||
|
||||
switch Upper( Left( cType, 1 ) )
|
||||
|
||||
case "S" // STRING
|
||||
|
||||
if uInit == nil
|
||||
uInit = ""
|
||||
endif
|
||||
|
||||
exit
|
||||
|
||||
case "N" // NUMERIC
|
||||
|
||||
if uInit == nil
|
||||
uInit = 0
|
||||
endif
|
||||
|
||||
exit
|
||||
|
||||
case "L" // LOGICAL
|
||||
|
||||
if uInit == nil
|
||||
uInit = .f.
|
||||
endif
|
||||
|
||||
exit
|
||||
|
||||
case "D" // DATE
|
||||
|
||||
if uInit == nil
|
||||
uInit = CtoD( "" )
|
||||
endif
|
||||
|
||||
exit
|
||||
|
||||
case "C" // CODEBLOCK
|
||||
|
||||
if uInit == nil
|
||||
uInit = { || nil }
|
||||
endif
|
||||
|
||||
exit
|
||||
|
||||
case "A" // ARRAY
|
||||
|
||||
if uInit == nil
|
||||
uInit = {}
|
||||
endif
|
||||
|
||||
exit
|
||||
|
||||
case "O" // OBJECT
|
||||
exit
|
||||
|
||||
end switch
|
||||
|
||||
endif
|
||||
|
||||
for each cName in aName
|
||||
oObj[ cName ] = uInit
|
||||
next
|
||||
|
||||
return
|
||||
Reference in New Issue
Block a user