* harbour/include/hbapi.h
+ added
void * pLex;
member to HB_MACRO structure - it will be necessary for MT safe
macro parser
* harbour/include/set.ch
* harbour/include/hbexprb.c
* harbour/source/macro/macro.l
* harbour/source/macro/macro.y
* indenting, formatting and converting tabs to spaces
* harbour/include/hbpp.h
* harbour/source/compiler/ppcomp.c
* harbour/source/pp/ppcore.c
* harbour/source/pp/ppgen.c
* harbour/source/pp/pplib.c
* make HB_PP_TOKEN structure public for other code and changed
public PP API to not force including static rules by programs
which does not need them.
+ added basic API for using PP as lexer
* divided HB_PP_TOKEN_MACRO to HB_PP_TOKEN_MACROVAR and
HB_PP_TOKEN_MACROTEXT and mark
[<keyword>][&<keyword>[.[<nextidchars>]]]+
as HB_PP_TOKEN_MACROTEXT not pair HB_PP_TOKEN_KEYWORD and
HB_PP_TOKEN_MACRO
It allows easier integration PP as (macro)compiler lexer and
fixes preprocessing [<keyword>][&<keyword>[.[<nextidchars>]]]+
in some patterns.
* harbour/utils/hbtest/Makefile
+ added PP library to linked library list
* harbour/source/macro/macro.y
+ added seaport to use PP as lexer. It's disabled by default and
can be enabled using by defining HB_PP_MACROLEX. It eliminates
using FLEX or SIMPLEX lexer in macro compiler. Now it emulates
the behavior of FLEX lexer because I wanted to minimize the
modification but in fact because parsed token are freed when
macro compiler finish its job then we can resolve RT memory
leaks which apear during parsing wrong expressions. It will be
enough to drop allocating memory for new terminal symbols and
using them as is like in compiler. It will also quite nice
simplify include/hbexpr*.c code and will allow to move some
functions to COMMON library. I want to make also pure compiler
code MT safe so I will have to add passing pointer to a structure
with compiler context just like in macro compiler. It means that
if we define a structure which will be common to compiler and macro
compiler with local (not common) data stored in other structure for
which will will keep only a pointer then we will be able to move most
of include/hbexpr*.c code to common library. But I do not want to
make farther modification without consultation without Ryszard.
Also to make PP default lexer some farther modifications should
be done in core PP code and include/hbexpr*.c files to not reduce
the speed. Now using HB_PP_MACROLEX for sure will have to cause
speed reduction in macro compiler. But if we make necessary
modifications then we should keep at least the same speed or
probably reach noticeable better results.
284 lines
7.0 KiB
C
284 lines
7.0 KiB
C
/*
|
|
* $Id$
|
|
*/
|
|
|
|
/*
|
|
* Harbour Project source code:
|
|
*
|
|
*
|
|
* 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 PHB_PP_STATE s_pp_state = NULL;
|
|
|
|
static void hb_pp_ErrorMessage( char * szMsgTable[], char cPrefix, int iCode,
|
|
const char * szParam1, const char * szParam2 )
|
|
{
|
|
HB_TRACE(HB_TR_DEBUG, ("hb_pp_ErrorGen(%p, %c, %d, %s, %s)", szMsgTable, cPrefix, iCode, szParam1, szParam2));
|
|
|
|
/* 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( const char * szMessage )
|
|
{
|
|
/* ignore stdout messages when PP used as library */
|
|
HB_SYMBOL_UNUSED( szMessage );
|
|
}
|
|
|
|
static PHB_PP_STATE hb_pp_stateNew( BOOL fInit )
|
|
{
|
|
PHB_PP_STATE pState = hb_pp_new();
|
|
|
|
if( pState )
|
|
{
|
|
hb_pp_init( pState, TRUE, NULL, NULL,
|
|
hb_pp_ErrorMessage, hb_pp_Disp, NULL, NULL, NULL );
|
|
|
|
if( fInit )
|
|
{
|
|
hb_pp_setStdRules( pState );
|
|
hb_pp_initDynDefines( pState );
|
|
hb_pp_setStdBase( pState );
|
|
}
|
|
if( ! s_pp_state )
|
|
s_pp_state = pState;
|
|
}
|
|
|
|
return pState;
|
|
}
|
|
|
|
static void hb_pp_stateFree( PHB_PP_STATE pState )
|
|
{
|
|
if( pState )
|
|
{
|
|
if( pState == s_pp_state )
|
|
s_pp_state = NULL;
|
|
hb_pp_free( pState );
|
|
}
|
|
}
|
|
|
|
|
|
static PHB_PP_STATE hb_pp_stateParam( int * piParam )
|
|
{
|
|
PHB_PP_STATE pState = ( PHB_PP_STATE ) hb_parptr( 1 );
|
|
|
|
if( pState )
|
|
{
|
|
* piParam = 2;
|
|
return pState;
|
|
}
|
|
else
|
|
{
|
|
* piParam = 1;
|
|
if( !s_pp_state )
|
|
return hb_pp_stateNew( TRUE );
|
|
else
|
|
return s_pp_state;
|
|
}
|
|
}
|
|
|
|
/*
|
|
* 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 pState;
|
|
|
|
hb_pp_stateFree( s_pp_state );
|
|
pState = hb_pp_stateNew( FALSE );
|
|
if( pState )
|
|
{
|
|
char * szPath = hb_parc( 1 ), * szStdCh = hb_parc( 2 );
|
|
|
|
if( szPath )
|
|
hb_pp_addSearchPath( pState, szPath, TRUE );
|
|
|
|
if( szStdCh )
|
|
hb_pp_readRules( pState, szStdCh );
|
|
else
|
|
hb_pp_setStdRules( pState );
|
|
hb_pp_initDynDefines( pState );
|
|
hb_pp_setStdBase( pState );
|
|
|
|
hb_retptr( pState );
|
|
}
|
|
else
|
|
hb_ret();
|
|
}
|
|
|
|
/*
|
|
* free PP context.
|
|
* __PP_FREE( <pPP> )
|
|
*/
|
|
HB_FUNC( __PP_FREE )
|
|
{
|
|
if( hb_pcount() == 0 )
|
|
hb_pp_stateFree( s_pp_state );
|
|
else
|
|
hb_pp_stateFree( ( PHB_PP_STATE ) hb_parptr( 1 ) );
|
|
}
|
|
|
|
/*
|
|
* add new (or replace previous) include paths.
|
|
* __PP_PATH( <pPP>, <cPath> [, <lClearPrev>] )
|
|
*/
|
|
HB_FUNC( __PP_PATH )
|
|
{
|
|
PHB_PP_STATE pState;
|
|
int iParam;
|
|
|
|
pState = hb_pp_stateParam( &iParam );
|
|
if( pState )
|
|
{
|
|
hb_pp_addSearchPath( pState, hb_parc( iParam ), hb_parl( iParam + 1 ) );
|
|
}
|
|
}
|
|
|
|
/*
|
|
* reset the PP context (remove all rules added by user or preprocessed code)
|
|
* __PP_RESET( <pPP> )
|
|
*/
|
|
HB_FUNC( __PP_RESET )
|
|
{
|
|
PHB_PP_STATE pState;
|
|
int iParam;
|
|
|
|
pState = hb_pp_stateParam( &iParam );
|
|
if( pState )
|
|
{
|
|
hb_pp_reset( pState );
|
|
}
|
|
}
|
|
|
|
/*
|
|
* preprocess and execute new preprocessor directive
|
|
* __PPADDRULE( <pPP>, <cDirective> )
|
|
*/
|
|
HB_FUNC( __PP_ADDRULE )
|
|
{
|
|
PHB_PP_STATE pState;
|
|
int iParam;
|
|
|
|
pState = hb_pp_stateParam( &iParam );
|
|
if( pState )
|
|
{
|
|
char * szText = hb_parc( iParam );
|
|
ULONG ulLen = hb_parclen( iParam );
|
|
|
|
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
|
|
* __PREPROCESS( <pPP>, <cCode> ) -> <cPreprocessedCode>
|
|
*/
|
|
HB_FUNC( __PREPROCESS )
|
|
{
|
|
PHB_PP_STATE pState;
|
|
int iParam;
|
|
|
|
pState = hb_pp_stateParam( &iParam );
|
|
if( pState )
|
|
{
|
|
char * szText = hb_parc( iParam );
|
|
ULONG ulLen = hb_parclen( iParam );
|
|
|
|
if( szText && ulLen )
|
|
{
|
|
szText = hb_pp_parseLine( pState, szText, &ulLen );
|
|
hb_retclen( szText, ulLen );
|
|
return;
|
|
}
|
|
}
|
|
|
|
hb_retc( NULL );
|
|
}
|