* harbour/common.mak
* harbour/source/compiler/Makefile
* harbour/include/hbcomp.h
* harbour/include/hbexprb.c
* harbour/include/hbexprc.c
* harbour/source/compiler/cmdcheck.c
* harbour/source/compiler/genc.c
* harbour/source/compiler/harbour.c
* harbour/source/compiler/harbour.l
* harbour/source/compiler/harbour.slx
* harbour/source/compiler/harbour.y
* harbour/source/compiler/hbgenerr.c
* harbour/source/compiler/hbident.c
* harbour/source/compiler/ppcomp.c
+ harbour/source/compiler/complex.c
+ added new PP based compiler lexer - it's smaller, MT safe and a
little bit faster then then the FLEX version.
+ added HB_COMP structure to hold compiler data in future MT version
+ added global variable HB_COMP_PTR hb_comp_data to make conversion
to MT easier - now it holds only PP and lexer data.
* update PP related code in compiler to be MT safe
+ added %pure-parser, %parse-param and %lex-param for bison to generate
MT safe grammar parser.
* updated FLEX to work with recent compiler modifications and pure-parser
bison API
* harbour/makefile.bc
* harbour/makefile.vc
* harbour/source/macro/Makefile
* harbour/source/macro/macro.l
* harbour/source/macro/macro.y
* harbour/source/macro/macrolex.c
* use hb_macro prefix instead of hb_comp in bison/flex parser/lexer
used in macro compiler to avoid possible conflicts in the future
* separated lexer data
* harbour/include/hbapi.h
* harbour/include/hbpp.h
* harbour/source/pp/ppcore.c
* harbour/source/pp/ppgen.c
* harbour/source/pp/pplib.c
* harbour/source/vm/macro.c
* removed not used members from HB_MACRO structure to make it
cleaner before creating common to compiler and macro compiler
structure
+ added new token HB_PP_TOKEN_EPSILON
+ added void * cargo parameters passed to executed user functions
+ hb_pp_tokenGet(), hb_pp_tokenToString(), hb_pp_tokenBlockString()
functions for new PP based compiler lexer
* harbour/utils/hbpp/hbpp.c
* harbour/utils/hbpp/hbpp.h
* harbour/utils/hbpp/hbppcomp.c
* harbour/utils/hbpp/hbppcore.c
* harbour/utils/hbpp/hbpplib.c
* harbour/utils/hbpp/pragma.c
* updated to compile with recent compiler header file modifications
PP, new lexer and most of grammar parser should be MT safe. Now we should
update all compiler functions to pass pointer to HB_COMP data structure
where we should all current global variables. This structure as first
member should have HB_CMPCOMMON structure which will hold common to
compiler and macro compiler data. Ryszard I think you are the best person
to define this structure.
We have new lexer which is MT safe but please note that it has to be
extensively tested so I would like to ask everybody to compile as much
as possible different code and check if the final programs work as
expected. Working on new code I removed some limitations existing in
FLEX though not all. At the beginning I tried to replicate the exact
FLEX behavior but I've found that in few places it does not work as
it should so I begin to encode rules in a way which remove some
limitations. In fact now it's much easier to control some things.
I kept the FLEX code working and made all necessary modifications
so it still can be used but keeping FLEX working cost us IMHO too
much. It's not possible to introduce some improvements to grammar
parser. All identifiers, keyword and macros returned by new lexer
are converted to upper letters, do not have to be freed by hb_xfree()
and is guarantied that will be always accessible. So from grammar file
we can remove all hb_compIdentifierNew( hb_strupr($1), TRUE ) what
should give noticeable speed improvement but will break the FLEX code.
Ryszard and other you will have to decide if we will support FLEX in
the future. We can also clean the code and remove most of other
redundant hb_strupr() and hb_strdup() used in many places. BTW only
one terminal symbol can be returned with lower letters: DOIDENT
and I make it intentionally so it's possible to use:
DO prog1 WITH "sth"
on case sensitive file systems so this symbol should be cloned in
upper cases as function symbol but used without modification as
file name. It's current behavior but I'm not sure you will want
to keep it. Maybe compiler switch to always convert file names
created from
DO <id> [WITH <params,...>]
to lower cases will be better. Please think about it.
256 lines
6.8 KiB
C
256 lines
6.8 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 warning messages */
|
|
if( cPrefix != 'W' )
|
|
{
|
|
char szMsgBuf[ 1024 ];
|
|
PHB_ITEM pError;
|
|
sprintf( 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, 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 );
|
|
}
|