* harbour/tests/codebl.prg
* harbour/tests/langmsg.prg
* harbour/utils/hbpptest/pp_test.prg
* harbour/utils/hbpptest/pretest.prg
* harbour/samples/pe/license.txt
* removed carriage return (\r) characters
* harbour/include/hbcomp.h
* harbour/include/hbapi.h
* harbour/include/hbcompdf.h
* harbour/include/hbexprb.c
* harbour/include/hbexprop.h
* harbour/source/vm/macro.c
* harbour/source/compiler/hbcomp.c
* harbour/source/compiler/complex.c
* harbour/source/compiler/harbour.c
* harbour/source/compiler/harbour.l
* harbour/source/compiler/harbour.y
* harbour/source/compiler/genjava.c
* harbour/source/compiler/hbcomp.c
* harbour/source/compiler/hbident.c
* harbour/source/compiler/hbpcode.c
* harbour/source/compiler/ppcomp.c
* separated HB_COMP and HB_MACRO definitions and added HB_COMMON
structure used when HB_COMMON_SUPPORT macro is set
* hide HB_MACRO internal definitions in hbapi.h when HB_MACRO_SUPPORT
is not set
These modifications should help in future compiler and macro compiler
integration into single binary.
+ added clipper compatible error message in unclosed structures
In general we should cleanup rules to make error reporting more
user friendly and Clipper compatible
% eliminated unnecessary allocations
+ added int mode member to common part of HB_COMP and HB_MACRO
structure. It's initialized to HB_MODE_MACRO or HB_MODE_COMPILER
+ add TOFIX note about memory leaks in cParamTypes and pParamClasses
members of COMDECLARED structure. It's a part of unfinished strong
typing code. I do not know what Ryszard plan to do with it so I'm
leaving it as is. The part of strong typing which were operating
on emulated HVM stack has been removed.
* removed static variables from genjava.c. Also gencli.c and genobj32.c
should be fixed but this will not make this code working so I haven't
touched it.
* changed 3-rd parameter of hb_compIdentifierNew() from BOOL to int.
Now it can have the following values: HB_IDENT_STATIC, HB_IDENT_FREE,
HB_IDENT_COPY. This modification will allow in the future using common
for static and dynamic symbol hash table without additional source code
changes. I also plan to use identifier hash table in PP the reduce
number of memory allocations and speed-up preprocessing by using
second level hashing for hash keys.
* harbour/source/common/expropt1.c
* harbour/source/common/expropt2.c
* changed HB_MACRO_SUPPORT to HB_COMMON_SUPPORT to automatically detect
possible conflicts between compiler and macro compiler
! removed first detected conflict which existed for long time
+ added hb_compExprMacroAsAlias() function to convert HB_ET_VARIABLE
expression to HB_ET_ALIAS.
* harbour/source/macro/macro.y
! fixed using prefix¯o-> and ¯o.sufix-> when macro cannot be
substituted by compiler, f.e.:
M->v := NIL
x := "&v.1->fld"
M->v := "v"
M->v1:= "data"
? &x
! fixed memory leak in macro substituted expression compilation
* harbour/source/vm/macro.c
! fixed initialization of some HB_MACRO members
! fixed value returned for type("&V->F") when alias does not exist
- removed not longer used hb_comp_bShortCuts global variable
205 lines
6.0 KiB
C
205 lines
6.0 KiB
C
/*
|
|
* $Id$
|
|
*/
|
|
|
|
/*
|
|
* Harbour Project source code:
|
|
* Compiler C source with real code generation
|
|
*
|
|
* 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 of the License, 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 program; if not, write to the Free Software
|
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA (or visit
|
|
* their web site at http://www.gnu.org/).
|
|
*
|
|
*/
|
|
|
|
|
|
#include "hbcomp.h"
|
|
#include <errno.h>
|
|
|
|
static void hb_pp_ErrorGen( void * cargo,
|
|
char * szMsgTable[], char cPrefix, int iErrorCode,
|
|
const char * szParam1, const char * szParam2 )
|
|
{
|
|
/* I do not know why but compiler expect line number 1 bigger then
|
|
real line number */
|
|
if( cPrefix == 'W' )
|
|
hb_compGenWarning( ( HB_COMP_PTR ) cargo, szMsgTable, cPrefix, iErrorCode, szParam1, szParam2 );
|
|
else
|
|
hb_compGenError( ( HB_COMP_PTR ) cargo, szMsgTable, cPrefix, iErrorCode, szParam1, szParam2 );
|
|
}
|
|
|
|
static void hb_pp_PragmaDump( void * cargo, char * pBuffer, ULONG ulSize,
|
|
int iLine )
|
|
{
|
|
PINLINE pInline;
|
|
|
|
pInline = hb_compInlineAdd( ( HB_COMP_PTR ) cargo, NULL, iLine );
|
|
pInline->pCode = ( BYTE * ) hb_xgrab( ulSize + 1 );
|
|
memcpy( pInline->pCode, pBuffer, ulSize );
|
|
pInline->pCode[ ulSize ] = '\0';
|
|
pInline->lPCodeSize = ulSize;
|
|
}
|
|
|
|
static void hb_pp_hb_inLine( void * cargo, char * szFunc,
|
|
char * pBuffer, ULONG ulSize, int iLine )
|
|
{
|
|
HB_COMP_DECL = ( HB_COMP_PTR ) cargo;
|
|
|
|
if( HB_COMP_PARAM->iLanguage != LANG_C && HB_COMP_PARAM->iLanguage != LANG_OBJ_MODULE )
|
|
{
|
|
hb_compGenError( ( HB_COMP_PTR ) cargo, hb_comp_szErrors, 'F', HB_COMP_ERR_REQUIRES_C, NULL, NULL );
|
|
}
|
|
else
|
|
{
|
|
PINLINE pInline = hb_compInlineAdd( ( HB_COMP_PTR ) cargo,
|
|
hb_compIdentifierNew( HB_COMP_PARAM, szFunc, HB_IDENT_COPY ), iLine );
|
|
pInline->pCode = ( BYTE * ) hb_xgrab( ulSize + 1 );
|
|
memcpy( pInline->pCode, pBuffer, ulSize );
|
|
pInline->pCode[ ulSize ] = '\0';
|
|
pInline->lPCodeSize = ulSize;
|
|
}
|
|
}
|
|
|
|
static BOOL hb_pp_CompilerSwitch( void * cargo, const char * szSwitch,
|
|
int iValue )
|
|
{
|
|
HB_COMP_DECL = ( HB_COMP_PTR ) cargo;
|
|
BOOL fError = FALSE;
|
|
int i = strlen( szSwitch );
|
|
|
|
if( i > 1 && szSwitch[ i - 1 ] - '0' == iValue )
|
|
--i;
|
|
|
|
if( i == 1 )
|
|
{
|
|
switch( szSwitch[ 0 ] )
|
|
{
|
|
case 'a':
|
|
case 'A':
|
|
HB_COMP_PARAM->fAutoMemvarAssume = iValue != 0;
|
|
break;
|
|
|
|
case 'b':
|
|
case 'B':
|
|
HB_COMP_PARAM->fDebugInfo = iValue != 0;
|
|
break;
|
|
|
|
case 'l':
|
|
case 'L':
|
|
HB_COMP_PARAM->fLineNumbers = iValue != 0;
|
|
break;
|
|
|
|
case 'n':
|
|
case 'N':
|
|
HB_COMP_PARAM->fStartProc = iValue != 0;
|
|
break;
|
|
|
|
case 'p':
|
|
case 'P':
|
|
HB_COMP_PARAM->fPPO = iValue != 0;
|
|
break;
|
|
|
|
case 'q':
|
|
case 'Q':
|
|
HB_COMP_PARAM->fQuiet = iValue != 0;
|
|
break;
|
|
|
|
case 'v':
|
|
case 'V':
|
|
HB_COMP_PARAM->fForceMemvars = iValue != 0;
|
|
break;
|
|
|
|
case 'w':
|
|
case 'W':
|
|
if( iValue >= 0 && iValue <= 3 )
|
|
HB_COMP_PARAM->iWarnings = iValue;
|
|
else
|
|
fError = TRUE;
|
|
break;
|
|
|
|
case 'z':
|
|
case 'Z':
|
|
if( iValue )
|
|
HB_COMP_PARAM->supported &= ~HB_COMPFLAG_SHORTCUTS;
|
|
else
|
|
HB_COMP_PARAM->supported |= HB_COMPFLAG_SHORTCUTS;
|
|
break;
|
|
|
|
default:
|
|
fError = TRUE;
|
|
}
|
|
}
|
|
else if( i == 2 )
|
|
{
|
|
if( hb_strnicmp( szSwitch, "es", 2 ) == 0 &&
|
|
( iValue == HB_EXITLEVEL_DEFAULT ||
|
|
iValue == HB_EXITLEVEL_SETEXIT ||
|
|
iValue == HB_EXITLEVEL_DELTARGET ) )
|
|
HB_COMP_PARAM->iExitLevel = iValue;
|
|
else
|
|
fError = TRUE;
|
|
}
|
|
/* xHarbour extension */
|
|
else if( i >= 4 && hb_strnicmp( szSwitch, "TEXTHIDDEN", i ) == 0 &&
|
|
iValue >= 0 && iValue <= 1 )
|
|
HB_COMP_PARAM->iHidden = iValue;
|
|
else
|
|
fError = TRUE;
|
|
|
|
return fError;
|
|
}
|
|
|
|
|
|
void hb_compInitPP( HB_COMP_DECL, int argc, char * argv[] )
|
|
{
|
|
HB_TRACE( HB_TR_DEBUG, ( "hb_compInitPP()" ) );
|
|
|
|
if( HB_COMP_PARAM->pLex->pPP )
|
|
{
|
|
hb_pp_init( HB_COMP_PARAM->pLex->pPP, HB_COMP_PARAM->fQuiet,
|
|
HB_COMP_PARAM->iMaxTransCycles,
|
|
HB_COMP_PARAM, NULL, NULL,
|
|
hb_pp_ErrorGen, NULL, hb_pp_PragmaDump,
|
|
HB_COMP_ISSUPPORTED( HB_COMPFLAG_HB_INLINE_PP ) ?
|
|
hb_pp_hb_inLine : NULL, hb_pp_CompilerSwitch );
|
|
|
|
if( ! HB_COMP_PARAM->szStdCh )
|
|
hb_pp_setStdRules( HB_COMP_PARAM->pLex->pPP );
|
|
else if( HB_COMP_PARAM->szStdCh[ 0 ] > ' ' )
|
|
hb_pp_readRules( HB_COMP_PARAM->pLex->pPP, HB_COMP_PARAM->szStdCh );
|
|
else if( ! HB_COMP_PARAM->fQuiet )
|
|
{
|
|
printf( "Standard command definitions excluded.\n" );
|
|
fflush( stdout );
|
|
}
|
|
|
|
hb_pp_initDynDefines( HB_COMP_PARAM->pLex->pPP );
|
|
|
|
/* Add /D and /undef: command line or envvar defines */
|
|
hb_compChkDefines( HB_COMP_PARAM, argc, argv );
|
|
|
|
/* mark current rules as standard ones */
|
|
hb_pp_setStdBase( HB_COMP_PARAM->pLex->pPP );
|
|
}
|
|
|
|
if( HB_COMP_PARAM->pFileName )
|
|
{
|
|
hb_xfree( ( void * ) HB_COMP_PARAM->pFileName );
|
|
HB_COMP_PARAM->pFileName = NULL;
|
|
}
|
|
}
|