* harbour/include/Makefile
* added missing header files
* harbour/source/compiler/harbour.c
* added support for @filelst[.clp] - partially borrowed from xHarbour
It's not exactly the same as in Clipper because Clipper creates
one final file when [x]Harbour series of files.
To make it like in Clipper we will have to add support from more
then one symbol table in the final file. It will be also useful
for proper implementation of:
DO <file>
Now in [x]Harbour it works like #include <file>.prg when in Clipper
also new symbol table is created for included files. The difference
can be easy sync when current file has static functions with exactly
the same names as the one included by DO - compilation fails.
* add HB_P_ENDBLOCK to PCODE with codeblock body before run any
optimization - it fixes pcode tracing in jump optimization and
also allow to make some validation of generated PCODE
* harbour/source/rdd/dbstrux.prg
* harbour/source/rdd/dbtotal.prg
* removed not longer necessary temporary alias creation. Harbour
support empty aliases ("") like Clipper.
* harbour/source/rdd/dbffpt/dbffpt1.c
* harbour/source/rtl/hbgtcore.c
* casting
* harbour/source/rtl/gtos2/gtos2.c
! fixed hb_gt_os2_GetScreenContents()
185 lines
5.8 KiB
Plaintext
185 lines
5.8 KiB
Plaintext
/*
|
|
* $Id$
|
|
*/
|
|
|
|
/*
|
|
* Harbour Project source code:
|
|
* __DBCOPYSTRUCT(), __DBCOPYXSTRUCT(), __DBCREATE() functions
|
|
*
|
|
* Copyright 1999 {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.
|
|
*
|
|
*/
|
|
|
|
#include "hbsetup.ch"
|
|
|
|
#include "common.ch"
|
|
#include "dbstruct.ch"
|
|
|
|
FUNCTION __dbCopyStruct( cFileName, aFieldList )
|
|
RETURN dbCreate( cFileName, __dbStructFilter( dbStruct(), aFieldList ) )
|
|
|
|
FUNCTION __dbCopyXStruct( cFileName )
|
|
LOCAL nOldArea
|
|
LOCAL oError
|
|
LOCAL aStruct
|
|
|
|
IF Empty( aStruct := dbStruct() )
|
|
RETURN .F.
|
|
ENDIF
|
|
|
|
nOldArea := Select()
|
|
|
|
BEGIN SEQUENCE
|
|
|
|
dbSelectArea( 0 )
|
|
__dbCreate( cFileName, NIL, NIL, .F., "" )
|
|
|
|
AEval( aStruct, {| aField | iif( aField[ DBS_TYPE ] == "C" .AND. aField[ DBS_LEN ] > 255, ;
|
|
( aField[ DBS_DEC ] := Int( aField[ DBS_LEN ] / 256 ), aField[ DBS_LEN ] := aField[ DBS_LEN ] % 256 ), NIL ) } )
|
|
|
|
AEval( aStruct, {| aField | dbAppend(),;
|
|
FIELD->FIELD_NAME := aField[ DBS_NAME ],;
|
|
FIELD->FIELD_TYPE := aField[ DBS_TYPE ],;
|
|
FIELD->FIELD_LEN := aField[ DBS_LEN ], ;
|
|
FIELD->FIELD_DEC := aField[ DBS_DEC ] } )
|
|
|
|
/* NOTE: CA-Cl*pper has a bug, where only a plain RECOVER statement is
|
|
used here (without the USING keyword), so oError will always be
|
|
NIL. */
|
|
RECOVER USING oError
|
|
END SEQUENCE
|
|
|
|
IF Select() != nOldArea
|
|
dbCloseArea()
|
|
dbSelectArea( nOldArea )
|
|
ENDIF
|
|
|
|
IF oError != NIL
|
|
Break( oError )
|
|
ENDIF
|
|
|
|
RETURN .T.
|
|
|
|
FUNCTION __dbCreate( cFileName, cFileFrom, cRDDName, lNew, cAlias, cdpId, nConnection )
|
|
LOCAL nOldArea := Select()
|
|
LOCAL aStruct := {}
|
|
LOCAL oError
|
|
|
|
DEFAULT lNew TO .F.
|
|
|
|
IF Used() .AND. ! lNew
|
|
dbCloseArea()
|
|
ENDIF
|
|
|
|
BEGIN SEQUENCE
|
|
|
|
IF Empty( cFileFrom )
|
|
|
|
dbCreate( cFileName, {;
|
|
{ "FIELD_NAME", "C", 10, 0 },;
|
|
{ "FIELD_TYPE", "C", 1, 0 },;
|
|
{ "FIELD_LEN" , "N", 3, 0 },;
|
|
{ "FIELD_DEC" , "N", 3, 0 } }, cRDDName,,, cdpId, nConnection )
|
|
dbUseArea( .F., cRDDName, cFileName, cAlias,,, cdpId, nConnection )
|
|
|
|
ELSE
|
|
|
|
dbUseArea( lNew,, cFileFrom, "" )
|
|
|
|
dbEval( {|| AAdd( aStruct, { Rtrim(FIELD->FIELD_NAME) ,;
|
|
Rtrim(FIELD->FIELD_TYPE) ,;
|
|
FIELD->FIELD_LEN ,;
|
|
FIELD->FIELD_DEC } ) } )
|
|
dbCloseArea()
|
|
|
|
IF lNew
|
|
dbSelectArea( nOldArea )
|
|
ENDIF
|
|
|
|
AEval( aStruct, {| aField | iif( aField[ DBS_TYPE ] == "C" .AND. aField[ DBS_DEC ] != 0, ;
|
|
( aField[ DBS_LEN ] += aField[ DBS_DEC ] * 256, ;
|
|
aField[ DBS_DEC ] := 0 ), NIL ) } )
|
|
|
|
dbCreate( cFileName, aStruct, cRDDName,,, cdpId, nConnection )
|
|
dbUseArea( lNew, cRDDName, cFileName, cAlias,,, cdpId, nConnection )
|
|
|
|
ENDIF
|
|
|
|
RECOVER USING oError
|
|
dbCloseArea()
|
|
Break( oError )
|
|
END SEQUENCE
|
|
|
|
RETURN Used()
|
|
|
|
/* NOTE: Undocumented, internal Clipper function */
|
|
|
|
#ifdef HB_C52_UNDOC
|
|
|
|
FUNCTION __FLEDIT( aStruct, aFieldList )
|
|
RETURN __dbStructFilter( aStruct, aFieldList )
|
|
|
|
#endif
|
|
|
|
/* NOTE: Internal helper function, CA-Cl*pper name is: __FLEDIT() */
|
|
|
|
FUNCTION __dbStructFilter( aStruct, aFieldList )
|
|
LOCAL aStructFiltered
|
|
LOCAL bFindName
|
|
LOCAL cName
|
|
|
|
IF Empty( aFieldList )
|
|
RETURN aStruct
|
|
ENDIF
|
|
|
|
/* Build a filtered list of the requested fields. */
|
|
|
|
aStructFiltered := {}
|
|
bFindName := {| aField | aField[ DBS_NAME ] == RTrim( Upper(cName ) ) }
|
|
|
|
AEval( aFieldList, {| cFieldName, nIndex | cName := cFieldName, nIndex := aScan( aStruct, bFindName ),;
|
|
iif( nIndex == 0, NIL, AAdd( aStructFiltered, aStruct[ nIndex] ) ) } )
|
|
|
|
RETURN aStructFiltered
|
|
|