* harbour/include/hbgtinfo.ch
* harbour/contrib/libct/ctwin.c
* harbour/source/rtl/gtalleg/gtalleg.c
* harbour/source/rtl/gtcrs/gtcrs.c
* harbour/source/rtl/gtdos/gtdos.c
* harbour/source/rtl/gtos2/gtos2.c
* harbour/source/rtl/gtpca/gtpca.c
* harbour/source/rtl/gtsln/gtsln.c
* harbour/source/rtl/gtstd/gtstd.c
* harbour/source/rtl/gtwin/gtwin.c
* harbour/source/rtl/gtwvt/gtwvt.c
* harbour/source/rtl/gtxwc/gtxwc.c
+ added support for GTI_FULLSCREEN, GTI_KBDSUPPORT, GTI_ISCTWIN
* harbour/source/rtl/hbgtcore.c
! fixed line and box drawing when the coordinates are out of screen size
* harbour/include/hbapi.h
* harbour/include/hbcomp.h
* harbour/include/hbpcode.h
* harbour/include/hbstack.h
* harbour/include/hbvm.h
* harbour/include/hbxvm.h
* harbour/source/compiler/complex.c
* harbour/source/compiler/genc.c
* harbour/source/compiler/gencc.c
* harbour/source/compiler/harbour.c
* harbour/source/compiler/harbour.y
* harbour/source/compiler/harbour.yyc
* harbour/source/compiler/harbour.yyh
* harbour/source/compiler/hbdead.c
* harbour/source/compiler/hbfix.c
* harbour/source/compiler/hblbl.c
* harbour/source/compiler/hbpcode.c
* harbour/source/compiler/hbstripl.c
* harbour/source/vm/classes.c
* harbour/source/vm/estack.c
* harbour/source/vm/hvm.c
* harbour/source/vm/itemapi.c
! added protection against cyclic references in arrays
* eliminated action parameter from hb_vmRequestReenter() /
hb_vmRequestRestore()
* moved s_lRecoverBase and s_uiActionRequest to HB_STACK structure
for future MT HVM version
+ added internal item structure hb_struRecover - it's not real item
but this structure is used to keep information about BEGIN SEQUENCE
data - it reduce HB_STACK usage
+ added support for ALWAYS clause in BEGIN SEQUENCE
The syntax is:
BEGIN SEQUENCE
<code>
[ RECOVER [ USING oErr ] ]
<recoverCode>
[ ALWAYS ]
<alwaysCode>
END [ SEQUENCE ]
It's guaranteed that <alwaysCode> is _ALWAYS_ executed even if
inside <code> or <recoverCode> some new exceptions like RETURN,
BREAK or QUIT will appear.
Please note that when the following code is executed:
BEGIN SEQUENCE
<code>
ALWAYS
<alwaysCode>
END
(without RECOVER clause) then BREAK exception inside <code> is not
recovered, <alwaysCode> is executed and then BREAK exception is
passed to outer BEGIN SEQUENCE. This is the same semantic as
used in TRY / [ CATCH ] / FINALLY / END
Those of you who prefer to use TRY / CATCH / FINALLY / END instead
of BEGIN SEQUENCE / RECOVER / ALWAYS / END can simply add to your
source code:
#command TRY => BEGIN SEQUENCE
#command CATCH [ oErr ] => RECOVER [ USING <oErr> ]
and:
errorBlock( {|oErr| break( oErr ) } )
Though instead of 'break( oErr )' I suggest to use some small function
which will support some basic recovery/substitute operations like in
default errorsys() and LockErrHandler() to not break existing code
which may depends on the default behavior.
If you want I can add direct support for TRY / CATCH / FINALLY / END
but I'm not sure it's really necessary.
Please note also that in Harbour ALWAYS code is execute even for QUIT
excpetion.
When <alwaysCode> is executed current exception is stored and restored
when is finished. If new exception appears inside <alwaysCode> then
restored exception depends on the priority in the following order:
QUIT // highest priority
BREAK
RETURN
If both exceptions have the same priority and contain additional value
(error object in BREAK or return value in RETURN) then the recently set
one is restored. It's similar behavior to destructor code.
* harbour/source/common/hbstr.c
* moved one character length string table (hb_szAscii) from hvm.c
to use it also in compiler and preprocessor
* harbour/source/compiler/ppcomp.c
* harbour/source/pp/ppcore.c
* harbour/source/pp/pplib.c
* tuned error messages to be more Clipper compatible
% use static strings from hb_szAscii
* harbour/source/rtl/alert.prg
* use hb_gtInfo( GTI_FULLSCREEN ) to detect type of GT driver
! some minor fixes
TOFIX: we have to also use GTI_ISCTWIN or add window allocation
to standard GT drivers to be Clipper compatible when CTWIN
is used - In Clipper Tools ALERT() works in differ way then
the standard one. It creates separate window box to display
data, supports SETKEY(), etc. I'll think about adding some
extended support for ALERT() and similar operations (f.e.
separate debugger windows) to GT API so it will be also
possible to overload standard alert() command by GUI message
box in GTGUI and similar GT drivers.
* harbour/source/rtl/binnumx.c
! fixed U2BIN() - wrong casting
257 lines
6.9 KiB
C
257 lines
6.9 KiB
C
/*
|
|
* $Id$
|
|
*/
|
|
|
|
/*
|
|
* Harbour Project source code:
|
|
* .prg interface to preprocessor
|
|
*
|
|
* Copyright 2006 Przemyslaw Czerpak <druzus / at / priv.onet.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.
|
|
*
|
|
*/
|
|
|
|
|
|
#include "hbpp.h"
|
|
#include "hbapi.h"
|
|
#include "hbapiitm.h"
|
|
#include "hbapifs.h"
|
|
#include "hbapierr.h"
|
|
#include "hbvm.h"
|
|
|
|
static void hb_pp_ErrorMessage( void * cargo, char * szMsgTable[],
|
|
char cPrefix, int iCode,
|
|
const char * szParam1, const char * szParam2 )
|
|
{
|
|
HB_TRACE(HB_TR_DEBUG, ("hb_pp_ErrorGen(%p, %p, %c, %d, %s, %s)", cargo, szMsgTable, cPrefix, iCode, szParam1, szParam2));
|
|
|
|
HB_SYMBOL_UNUSED( cargo );
|
|
|
|
/* ignore all warning messages and errors when break or quit request */
|
|
if( cPrefix != 'W' && hb_vmRequestQuery() == 0 )
|
|
{
|
|
char szMsgBuf[ 1024 ];
|
|
PHB_ITEM pError;
|
|
snprintf( szMsgBuf, sizeof( szMsgBuf ), szMsgTable[ iCode - 1 ],
|
|
szParam1, szParam2 );
|
|
pError = hb_errRT_New( ES_ERROR, "PP", 9999, ( ULONG ) iCode, szMsgBuf,
|
|
NULL, 0, EF_NONE | EF_CANDEFAULT );
|
|
hb_errLaunch( pError );
|
|
hb_errRelease( pError );
|
|
}
|
|
}
|
|
|
|
static void hb_pp_Disp( void * cargo, const char * szMessage )
|
|
{
|
|
/* ignore stdout messages when PP used as library */
|
|
HB_SYMBOL_UNUSED( cargo );
|
|
HB_SYMBOL_UNUSED( szMessage );
|
|
}
|
|
|
|
/* PP destructor */
|
|
static HB_GARBAGE_FUNC( hb_pp_Destructor )
|
|
{
|
|
PHB_PP_STATE * pStatePtr = ( PHB_PP_STATE * ) Cargo;
|
|
|
|
if( * pStatePtr )
|
|
{
|
|
hb_pp_free( * pStatePtr );
|
|
* pStatePtr = NULL;
|
|
}
|
|
}
|
|
|
|
static void hb_pp_StdRules( PHB_PP_STATE pState )
|
|
{
|
|
static BOOL s_fInit = TRUE;
|
|
static PHB_DYNS s_pDynSym;
|
|
|
|
if( s_fInit )
|
|
{
|
|
s_pDynSym = hb_dynsymFind( "__PP_STDRULES" );
|
|
s_fInit = FALSE;
|
|
}
|
|
|
|
if( s_pDynSym )
|
|
{
|
|
hb_vmPushDynSym( s_pDynSym );
|
|
hb_vmPushNil();
|
|
hb_vmPushPointer( ( void * ) &pState );
|
|
hb_vmDo( 1 );
|
|
}
|
|
}
|
|
|
|
static PHB_PP_STATE hb_pp_Param( int iParam )
|
|
{
|
|
PHB_PP_STATE * pStatePtr = ( PHB_PP_STATE * ) hb_parptr( iParam );
|
|
|
|
if( pStatePtr )
|
|
return * pStatePtr;
|
|
else
|
|
return NULL;
|
|
}
|
|
|
|
/*
|
|
* initialize new PP context and return pointer to it.
|
|
* __PP_INIT( [<cIncludePath>] [, <cStdChFile> ] )
|
|
* when <cStdChFile> is empty string ("") then no default rules are used
|
|
* only the dynamically created #defines like __HARBOUR__, __DATE__, __TIME__
|
|
*/
|
|
HB_FUNC( __PP_INIT )
|
|
{
|
|
PHB_PP_STATE * pStatePtr, pState = hb_pp_new();
|
|
|
|
if( pState )
|
|
{
|
|
char * szPath = hb_parc( 1 ), * szStdCh = hb_parc( 2 );
|
|
|
|
hb_pp_init( pState, TRUE, 0, NULL, NULL, NULL,
|
|
hb_pp_ErrorMessage, hb_pp_Disp, NULL, NULL, NULL );
|
|
|
|
if( szPath )
|
|
hb_pp_addSearchPath( pState, szPath, TRUE );
|
|
|
|
if( szStdCh )
|
|
hb_pp_readRules( pState, szStdCh );
|
|
else
|
|
hb_pp_StdRules( pState );
|
|
|
|
hb_pp_initDynDefines( pState );
|
|
hb_pp_setStdBase( pState );
|
|
|
|
pStatePtr = ( PHB_PP_STATE * ) hb_gcAlloc( sizeof( PHB_PP_STATE ),
|
|
hb_pp_Destructor );
|
|
* pStatePtr = pState;
|
|
hb_retptrGC( pStatePtr );
|
|
}
|
|
else
|
|
hb_ret();
|
|
}
|
|
|
|
/*
|
|
* add new (or replace previous) include paths.
|
|
* __PP_PATH( <pPP>, <cPath> [, <lClearPrev>] )
|
|
*/
|
|
HB_FUNC( __PP_PATH )
|
|
{
|
|
PHB_PP_STATE pState = hb_pp_Param( 1 );
|
|
|
|
if( pState )
|
|
hb_pp_addSearchPath( pState, hb_parc( 2 ), hb_parl( 3 ) );
|
|
}
|
|
|
|
/*
|
|
* reset the PP context (remove all rules added by user or preprocessed code)
|
|
* __PP_RESET( <pPP> )
|
|
*/
|
|
HB_FUNC( __PP_RESET )
|
|
{
|
|
PHB_PP_STATE pState = hb_pp_Param( 1 );
|
|
|
|
if( pState )
|
|
hb_pp_reset( pState );
|
|
}
|
|
|
|
/*
|
|
* preprocess and execute new preprocessor directive
|
|
* __PPADDRULE( <pPP>, <cDirective> )
|
|
*/
|
|
HB_FUNC( __PP_ADDRULE )
|
|
{
|
|
PHB_PP_STATE pState = hb_pp_Param( 1 );
|
|
|
|
if( pState )
|
|
{
|
|
char * szText = hb_parc( 2 );
|
|
ULONG ulLen = hb_parclen( 2 );
|
|
|
|
if( szText )
|
|
{
|
|
while( ulLen && ( szText[ 0 ] == ' ' || szText[ 0 ] == '\t' ) )
|
|
{
|
|
++szText;
|
|
--ulLen;
|
|
}
|
|
}
|
|
|
|
if( szText && ulLen && szText[ 0 ] == '#' )
|
|
{
|
|
hb_pp_parseLine( pState, szText, &ulLen );
|
|
|
|
/* probably for parsing #included files the old code was making
|
|
sth like that */
|
|
do
|
|
{
|
|
if( hb_vmRequestQuery() != 0 )
|
|
return;
|
|
}
|
|
while( hb_pp_nextLine( pState, NULL ) );
|
|
|
|
hb_retl( TRUE );
|
|
return;
|
|
}
|
|
}
|
|
hb_retl( FALSE );
|
|
}
|
|
|
|
/*
|
|
* preprocess given code and return result
|
|
* __PP_PROCESS( <pPP>, <cCode> ) -> <cPreprocessedCode>
|
|
*/
|
|
HB_FUNC( __PP_PROCESS )
|
|
{
|
|
PHB_PP_STATE pState = hb_pp_Param( 1 );
|
|
|
|
if( pState )
|
|
{
|
|
ULONG ulLen = hb_parclen( 2 );
|
|
|
|
if( ulLen )
|
|
{
|
|
char * szText = hb_pp_parseLine( pState, hb_parc( 2 ), &ulLen );
|
|
hb_retclen( szText, ulLen );
|
|
return;
|
|
}
|
|
}
|
|
|
|
hb_retc( NULL );
|
|
}
|