* 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.
290 lines
9.3 KiB
C
290 lines
9.3 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, 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 "hbcomp.h"
|
|
|
|
static void hb_pp_ErrorGen( void * cargo,
|
|
const char * szMsgTable[], char cPrefix, int iErrorCode,
|
|
const char * szParam1, const char * szParam2 )
|
|
{
|
|
HB_COMP_DECL = ( HB_COMP_PTR ) cargo;
|
|
int iCurrLine = HB_COMP_PARAM->currLine;
|
|
const char * currModule = HB_COMP_PARAM->currModule;
|
|
|
|
HB_COMP_PARAM->currLine = hb_pp_line( HB_COMP_PARAM->pLex->pPP );
|
|
HB_COMP_PARAM->currModule = hb_pp_fileName( HB_COMP_PARAM->pLex->pPP );
|
|
if( cPrefix == 'W' )
|
|
hb_compGenWarning( HB_COMP_PARAM, szMsgTable, cPrefix, iErrorCode, szParam1, szParam2 );
|
|
else
|
|
hb_compGenError( HB_COMP_PARAM, szMsgTable, cPrefix, iErrorCode, szParam1, szParam2 );
|
|
HB_COMP_PARAM->fError = FALSE;
|
|
HB_COMP_PARAM->currLine = iCurrLine;
|
|
HB_COMP_PARAM->currModule = currModule;
|
|
}
|
|
|
|
static void hb_pp_Disp( void * cargo, const char * szMessage )
|
|
{
|
|
HB_COMP_DECL = ( HB_COMP_PTR ) cargo;
|
|
|
|
hb_compOutStd( HB_COMP_PARAM, szMessage );
|
|
}
|
|
|
|
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 != HB_LANG_C && HB_COMP_PARAM->iLanguage != HB_LANG_OBJ_MODULE )
|
|
{
|
|
int iCurrLine = HB_COMP_PARAM->currLine;
|
|
HB_COMP_PARAM->currLine = iLine;
|
|
hb_compGenError( HB_COMP_PARAM, hb_comp_szErrors, 'F', HB_COMP_ERR_REQUIRES_C, NULL, NULL );
|
|
HB_COMP_PARAM->fError = FALSE;
|
|
HB_COMP_PARAM->currLine = iCurrLine;
|
|
}
|
|
else
|
|
{
|
|
PINLINE pInline = hb_compInlineAdd( HB_COMP_PARAM,
|
|
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 && ( ( int ) ( 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 'j':
|
|
case 'J':
|
|
HB_COMP_PARAM->fI18n = 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( szSwitch[ 0 ] == 'k' || szSwitch[ 0 ] == 'K' )
|
|
{
|
|
int iFlag = 0;
|
|
/* -k? parameters are case sensitive */
|
|
switch( szSwitch[ 1 ] )
|
|
{
|
|
case 'c':
|
|
/* clear all flags - minimal set of features */
|
|
HB_COMP_PARAM->supported &= HB_COMPFLAG_SHORTCUTS;
|
|
HB_COMP_PARAM->supported |= HB_COMPFLAG_OPTJUMP |
|
|
HB_COMPFLAG_MACROTEXT;
|
|
break;
|
|
case 'h':
|
|
iFlag = HB_COMPFLAG_HARBOUR;
|
|
break;
|
|
case 'i':
|
|
iFlag = HB_COMPFLAG_HB_INLINE;
|
|
break;
|
|
case 'r':
|
|
iFlag = HB_COMPFLAG_RT_MACRO;
|
|
break;
|
|
case 'x':
|
|
iFlag = HB_COMPFLAG_XBASE;
|
|
break;
|
|
case 'J':
|
|
iFlag = HB_COMPFLAG_OPTJUMP;
|
|
iValue = !iValue;
|
|
break;
|
|
case 'M':
|
|
iFlag = HB_COMPFLAG_MACROTEXT;
|
|
iValue = !iValue;
|
|
break;
|
|
case 's':
|
|
iFlag = HB_COMPFLAG_ARRSTR;
|
|
break;
|
|
default:
|
|
fError = TRUE;
|
|
}
|
|
if( !fError && iFlag )
|
|
{
|
|
if( iValue )
|
|
HB_COMP_PARAM->supported |= iFlag;
|
|
else
|
|
HB_COMP_PARAM->supported &= ~iFlag;
|
|
}
|
|
}
|
|
else 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 if( hb_stricmp( szSwitch, "p+" ) == 0 )
|
|
HB_COMP_PARAM->fPPT = iValue != 0;
|
|
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 * const 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, hb_pp_Disp, hb_pp_PragmaDump,
|
|
HB_COMP_ISSUPPORTED( HB_COMPFLAG_HB_INLINE ) ?
|
|
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 )
|
|
hb_compOutStd( HB_COMP_PARAM, "Standard command definitions excluded.\n" );
|
|
|
|
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 );
|
|
}
|
|
}
|