* harbour/contrib/xhb/Makefile
* harbour/contrib/xhb/common.mak
+ harbour/contrib/xhb/xhbarr.c
+ added aSplice(), aRemove() and aMerge() functions - code borrowed
from xHarbour by Ron Pinkas.
! fixed GPF trap in these functions
* harbour/contrib/xhb/xhbfunc.c
+ added CSTR()
* harbour/contrib/xhb/hbcompat.ch
! changed name of xHarbour include files - they where changed few
months ago and now they are the same as in Harbour.
To xHarbour users: please update hbcompat.ch in xHarbour CVS
* harbour/contrib/xhb/filestat.c
! fixed UNICODE compilation
* harbour/contrib/xhb/hblognet.prg
* harbour/contrib/xhb/hblog.prg
* formatting
* harbour/contrib/hbnf/tempfile.prg
! do not use HB_ISBYREF() .prg function - this function does not
exist in Harbour and does not work correctly in xHarbour
* harbour/include/hbapiitm.h
* harbour/source/vm/macro.c
* harbour/source/vm/codebloc.c
* harbour/source/vm/hashes.c
* harbour/source/vm/garbage.c
* harbour/source/vm/itemapi.c
* harbour/source/vm/memvars.c
* cleanup
* harbour/contrib/gtwvg/Makefile
! fixed typo
* harbour/contrib/gtwvg/hbgtwvg.ch
* added new line at the end of file and changed non ANSI C // comments
to /* */ - this file is included by C code too.
* harbour/contrib/gtwvg/wvgwin.c
* harbour/contrib/gtwvg/wincallb.c
* pacified some warnings and fixed possible access to uninitialized data
* harbour/source/compiler/harbour.y
* harbour/source/compiler/harbour.yyc
! fixed possible double freeing of memory blocks in #line directives
TOMERGE[1.0]
* harbour/common.mak
* harbour/source/compiler/hbmain.c
+ harbour/source/compiler/compi18n.c
* moved hb_compI18n*() functions to separate file covered by GPL with
Harbour exception - Thank to Mindaugas
* harbour/include/hbcomp.h
* harbour/include/hbcompdf.h
* harbour/include/hbexpra.c
* harbour/include/hbexprop.h
* harbour/include/hbexprb.c
* harbour/source/common/expropt1.c
* harbour/source/compiler/Makefile
* harbour/source/compiler/ppcomp.c
* added support for plural forms:
hb_i18n_ngettext[_noop|_strict]( <nExp>, <cText> | <acText> ;
[, <cContext> )
<acText> is accepted only as array of literal strings even if
_strict suffix is missing - if it's a problem then we can change it.
hb_i18n_ngettext_noop() is reduced only when it has valid parameters
The default plural index expression used for reduction at compile
time is: iif( <nExp> == 1, 1, 2 )
If second parameter of hb_i18n_ngettext_noop() is <cText> or <acText>
length is 1 then it's reduced to <cText> or acText[1] else if second
parameter is <acText> with more then 1 item then it's reduced to
<acText>[ iif( <nExp> == 1, 1, 2 ) ]
and if <nExp> is literal numeric expression is farther reduced to
given array item. Otherwise is not reduced and warning is generated.
The plural forms in .pot files are generated as:
msgid ""
msgid_plural ""
msgid_plural2 ""
[...]
msgid_pluralN ""
msgstr[0] ""
Then real message ID is only msgid (with context if any) and
msgid_plural* is used only for information. When the same msgid
is used more then once in different hb_i18n_ngettext*() calls then
plural messages are merged.
Please remember that for strict gettext compatibility only two plural
forms are allowed.
* extended i18n warnings for simple types validation, f.e.:
hb_i18n_gettext( .t. )
* do not generate empty .pot file when source code does not contain any
hb_i18n_*() functions
* store in .pot files references to real source file names with paths
respecting #include directives
* use hb_compIdentifierNew() to hash i18n messages at compile time
! fixed possible bad escape encoding of i18n strings
+ added support to control -j[01] flag using #pragma directive
Before I'll begin to work on runtime support please test these
modifications and inform me about problems you can see with the
above version and missing functionality.
309 lines
10 KiB
C
309 lines
10 KiB
C
/*
|
|
* $Id$
|
|
*/
|
|
|
|
/*
|
|
* Harbour Project source code:
|
|
* Codeblock runtime support
|
|
*
|
|
* Copyright 1999 Ryszard Glab <rglab@imid.med.pl>
|
|
* 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 Harbour implementation of codeblocks */
|
|
|
|
#include "hbvmopt.h"
|
|
#include "hbapi.h"
|
|
#include "hbapiitm.h"
|
|
#include "hbvm.h"
|
|
#include "hbstack.h"
|
|
#include "hbpcode.h"
|
|
|
|
/* Dummy returning NIL for buggy code which may store references
|
|
to freed by GC codeblock in .prg destructors and then (after
|
|
catching RT EG_DESTRUCTOR error) try to execute them
|
|
*/
|
|
static const BYTE s_pCode[ 2 ] = { HB_P_PUSHNIL, HB_P_ENDBLOCK };
|
|
|
|
/* Release all allocated memory when called from the garbage collector
|
|
*/
|
|
static HB_GARBAGE_FUNC( hb_codeblockDeleteGarbage )
|
|
{
|
|
HB_CODEBLOCK_PTR pCBlock = ( HB_CODEBLOCK_PTR ) Cargo;
|
|
|
|
HB_TRACE(HB_TR_DEBUG, ("hb_codeblockDeleteGarbage(%p)", Cargo));
|
|
|
|
/* free space allocated for pcodes - if it was a macro-compiled codeblock
|
|
*/
|
|
if( pCBlock->pCode && pCBlock->dynBuffer )
|
|
{
|
|
pCBlock->dynBuffer = FALSE;
|
|
hb_xfree( pCBlock->pCode );
|
|
}
|
|
pCBlock->pCode = ( BYTE * ) s_pCode;
|
|
|
|
/* free space allocated for local variables
|
|
*/
|
|
if( pCBlock->pLocals )
|
|
{
|
|
PHB_ITEM pLocals = pCBlock->pLocals;
|
|
USHORT uiLocals = pCBlock->uiLocals;
|
|
|
|
/* clear pCBlock->pLocals to avoid infinit loop in cross
|
|
* referenced items
|
|
*/
|
|
pCBlock->pLocals = NULL;
|
|
pCBlock->uiLocals = 0;
|
|
|
|
if( hb_xRefDec( pLocals ) )
|
|
{
|
|
while( uiLocals )
|
|
hb_memvarValueDecRef( pLocals[ uiLocals-- ].item.asMemvar.value );
|
|
hb_xfree( pLocals );
|
|
}
|
|
}
|
|
}
|
|
|
|
/* Creates the codeblock structure
|
|
*
|
|
* pBuffer -> the buffer with pcodes (without HB_P_PUSHBLOCK)
|
|
* wLocals -> number of local variables referenced in a codeblock
|
|
* pLocalPosTable -> a table with positions on eval stack for referenced variables
|
|
* pSymbols -> a pointer to the module symbol table
|
|
*
|
|
* Note: pLocalPosTable cannot be used if uiLocals is ZERO
|
|
*
|
|
*/
|
|
HB_CODEBLOCK_PTR hb_codeblockNew( const BYTE * pBuffer,
|
|
USHORT uiLocals,
|
|
const BYTE * pLocalPosTable,
|
|
PHB_SYMB pSymbols,
|
|
ULONG ulLen )
|
|
{
|
|
HB_CODEBLOCK_PTR pCBlock;
|
|
PHB_ITEM pLocals;
|
|
BYTE * pCode;
|
|
|
|
HB_TRACE(HB_TR_DEBUG, ("hb_codeblockNew(%p, %hu, %p, %p, %lu)", pBuffer, uiLocals, pLocalPosTable, pSymbols, ulLen));
|
|
|
|
/*
|
|
* allocate memory for code block body and detach items hb_gcAlloc()
|
|
* to be safe for automatic GC activation in hb_xgrab() without
|
|
* calling hb_gcLock()/hb_gcUnlock(). [druzus]
|
|
*/
|
|
|
|
if( ulLen )
|
|
{
|
|
/*
|
|
* The codeblock pcode is stored in dynamically allocated memory that
|
|
* can be deallocated after creation of a codeblock. We have to duplicate
|
|
* the passed buffer
|
|
*/
|
|
pCode = ( BYTE * ) hb_xgrab( ulLen );
|
|
memcpy( pCode, pBuffer, ulLen );
|
|
}
|
|
else
|
|
{
|
|
/*
|
|
* The codeblock pcode is stored in static segment.
|
|
* The only allowed operation on a codeblock is evaluating it then
|
|
* there is no need to duplicate its pcode - just store the pointer to it
|
|
*/
|
|
pCode = ( BYTE * ) pBuffer;
|
|
}
|
|
|
|
if( uiLocals )
|
|
{
|
|
/* NOTE: if a codeblock will be created by macro compiler then
|
|
* uiLocal have to be ZERO
|
|
* uiLocal will be also ZERO if it is a nested codeblock
|
|
*/
|
|
USHORT ui = 1;
|
|
PHB_ITEM pLocal;
|
|
|
|
/* Create a table that will store the values of local variables
|
|
* accessed in a codeblock
|
|
* The element 0 is unused
|
|
* NOTE: This table can be shared by codeblocks created during
|
|
* evaluation of this codeblock
|
|
*/
|
|
pLocals = ( PHB_ITEM ) hb_xgrab( ( uiLocals + 1 ) * sizeof( HB_ITEM ) );
|
|
pLocals[ 0 ].type = HB_IT_NIL;
|
|
|
|
do
|
|
{
|
|
/* Swap the current value of local variable with the reference to this
|
|
* value.
|
|
* TODO: If Harbour will support threads in the future then we need
|
|
* to implement some kind of semaphores here.
|
|
*/
|
|
int iLocal = HB_PCODE_MKUSHORT( pLocalPosTable );
|
|
pLocal = hb_stackLocalVariable( &iLocal );
|
|
pLocalPosTable += 2;
|
|
|
|
pLocal = hb_memvarDetachLocal( pLocal );
|
|
hb_itemRawCpy( pLocals + ui, pLocal );
|
|
/* Increment the reference counter so this value will not be
|
|
* released if other codeblock will be deleted
|
|
*/
|
|
hb_memvarValueIncRef( pLocal->item.asMemvar.value );
|
|
}
|
|
while( ++ui <= uiLocals );
|
|
}
|
|
else
|
|
{
|
|
/* Check if this codeblock is created during evaluation of another
|
|
* codeblock - all inner codeblocks use the local variables table
|
|
* created during creation of the outermost codeblock
|
|
*/
|
|
PHB_ITEM pLocal;
|
|
|
|
pLocal = hb_stackSelfItem();
|
|
if( HB_IS_BLOCK( pLocal ) )
|
|
{
|
|
HB_CODEBLOCK_PTR pOwner = pLocal->item.asBlock.value;
|
|
|
|
uiLocals = pOwner->uiLocals;
|
|
pLocals = pOwner->pLocals;
|
|
if( pLocals )
|
|
hb_xRefInc( pLocals );
|
|
}
|
|
else
|
|
pLocals = NULL;
|
|
}
|
|
|
|
pCBlock = ( HB_CODEBLOCK_PTR ) hb_gcAlloc( sizeof( HB_CODEBLOCK ), hb_codeblockDeleteGarbage );
|
|
|
|
pCBlock->pCode = pCode;
|
|
pCBlock->dynBuffer = ulLen != 0;
|
|
pCBlock->pDefSymb = hb_stackBaseItem()->item.asSymbol.value;
|
|
pCBlock->pSymbols = pSymbols;
|
|
pCBlock->lStatics = hb_stackGetStaticsBase();
|
|
pCBlock->uiLocals = uiLocals;
|
|
pCBlock->pLocals = pLocals;
|
|
|
|
HB_TRACE(HB_TR_INFO, ("codeblock created %p", pCBlock));
|
|
|
|
return pCBlock;
|
|
}
|
|
|
|
HB_CODEBLOCK_PTR hb_codeblockMacroNew( const BYTE * pBuffer, ULONG ulLen )
|
|
{
|
|
HB_CODEBLOCK_PTR pCBlock;
|
|
BYTE * pCode;
|
|
|
|
HB_TRACE(HB_TR_DEBUG, ("hb_codeblockMacroNew(%p, %lu)", pBuffer, ulLen));
|
|
|
|
/*
|
|
* The codeblock pcode is stored in dynamically allocated memory that
|
|
* can be deallocated after creation of a codeblock. We have to duplicate
|
|
* the passed buffer
|
|
*/
|
|
/*
|
|
* allocate memory for code block body and detach items hb_gcAlloc()
|
|
* to be safe for automatic GC activation in hb_xgrab() without
|
|
* calling hb_gcLock()/hb_gcUnlock(). [druzus]
|
|
*/
|
|
pCode = ( BYTE * ) hb_xgrab( ulLen );
|
|
memcpy( pCode, pBuffer, ulLen );
|
|
|
|
pCBlock = ( HB_CODEBLOCK_PTR ) hb_gcAlloc( sizeof( HB_CODEBLOCK ), hb_codeblockDeleteGarbage );
|
|
/* Store the number of referenced local variables */
|
|
pCBlock->pCode = pCode;
|
|
pCBlock->dynBuffer = TRUE;
|
|
pCBlock->pDefSymb = hb_stackBaseItem()->item.asSymbol.value;
|
|
pCBlock->pSymbols = NULL; /* macro-compiled codeblock cannot acces a local symbol table */
|
|
pCBlock->lStatics = hb_stackGetStaticsBase();
|
|
pCBlock->uiLocals = 0;
|
|
pCBlock->pLocals = NULL;
|
|
|
|
HB_TRACE(HB_TR_INFO, ("codeblock created %p", pCBlock));
|
|
|
|
return pCBlock;
|
|
}
|
|
|
|
/* Evaluate passed codeblock
|
|
* Before evaluation we have to switch to a static variable base that
|
|
* was defined when the codeblock was created.
|
|
* (The codeblock can only see the static variables defined in a module
|
|
* where the codeblock was created)
|
|
*/
|
|
void hb_codeblockEvaluate( HB_ITEM_PTR pItem )
|
|
{
|
|
HB_TRACE(HB_TR_DEBUG, ("hb_codeblockEvaluate(%p)", pItem));
|
|
|
|
hb_stackSetStaticsBase( pItem->item.asBlock.value->lStatics );
|
|
hb_vmExecute( pItem->item.asBlock.value->pCode, pItem->item.asBlock.value->pSymbols );
|
|
}
|
|
|
|
/* Get local variable referenced in a codeblock
|
|
*/
|
|
PHB_ITEM hb_codeblockGetVar( PHB_ITEM pItem, LONG iItemPos )
|
|
{
|
|
HB_CODEBLOCK_PTR pCBlock = pItem->item.asBlock.value;
|
|
|
|
HB_TRACE(HB_TR_DEBUG, ("hb_codeblockGetVar(%p, %ld)", pItem, iItemPos));
|
|
|
|
/* local variables accessed in a codeblock are always stored as reference */
|
|
return hb_itemUnRef( pCBlock->pLocals - iItemPos );
|
|
}
|
|
|
|
/* Get local variable passed by reference
|
|
*/
|
|
PHB_ITEM hb_codeblockGetRef( HB_CODEBLOCK_PTR pCBlock, LONG iItemPos )
|
|
{
|
|
HB_TRACE(HB_TR_DEBUG, ("hb_codeblockGetRef(%p, %ld)", pCBlock, iItemPos));
|
|
|
|
return pCBlock->pLocals - iItemPos;
|
|
}
|
|
|
|
/* retrieves the codeblock unique ID
|
|
*/
|
|
void * hb_codeblockId( PHB_ITEM pItem )
|
|
{
|
|
if( HB_IS_BLOCK( pItem ) )
|
|
return ( void * ) pItem->item.asBlock.value;
|
|
else
|
|
return NULL;
|
|
}
|