From 5e19a3c8fd6016e4a8cc02218caec7b68a8ea1c7 Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Fri, 17 Nov 2006 22:06:54 +0000 Subject: [PATCH] 2006-11-17 22:55 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/source/pp/ppcore.c ! fixed casting - it resolves problem reported by Alexander with preprocessing chr(255) from static buffer (PP used by .prg code) * harbour/source/macro/macro.y + added some comments * harbour/source/macro/Makefile * commented out compilation of FLEX based lexer for macro compiler and added compilation of new small lexer written in pure .c * harbour/common.mak * replaced macrol.obj by macrolex.obj + harbour/source/macro/macrolex.c + new small lexer written in pure .c. The code is much smaller, MT safe and more friendly for grammar parser. I think it should be also faster but I haven't made any tests yet. When we update grammar parser to not free string representation of terminal symbols then we should expect some farther speed improvement, it will also resolve some set of memory leaks like in: type("user input") and will allow to make some parts of grammar parser common to compiler and macro compiler by removing #if[n]def HB_MACRO_SUPPORT --- harbour/ChangeLog | 26 ++ harbour/common.mak | 2 +- harbour/source/macro/Makefile | 3 +- harbour/source/macro/macro.y | 8 + harbour/source/macro/macrolex.c | 662 ++++++++++++++++++++++++++++++++ harbour/source/pp/ppcore.c | 2 +- 6 files changed, 700 insertions(+), 3 deletions(-) create mode 100644 harbour/source/macro/macrolex.c diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 07a71bd5aa..c27e5fe527 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,32 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ + * harbour/source/common/expropt2.c + % minor modification + + * harbour/source/compiler/harbour.c + ! fixed HB_TRACE message + +2006-11-17 22:55 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/source/pp/ppcore.c + ! fixed casting - it resolves problem reported by Alexander with + preprocessing chr(255) from static buffer (PP used by .prg code) + + * harbour/source/macro/macro.y + + added some comments + + * harbour/source/macro/Makefile + * commented out compilation of FLEX based lexer for macro compiler and + added compilation of new small lexer written in pure .c + + * harbour/common.mak + * replaced macrol.obj by macrolex.obj + + + harbour/source/macro/macrolex.c + + new small lexer written in pure .c. The code is much smaller, + MT safe and more friendly for grammar parser. I think it should + be also faster but I haven't made any tests yet. When we update + grammar parser to not free string representation of terminal symbols then we should expect some farther speed improvement, it will also resolve some set of memory leaks like in: type("user input") diff --git a/harbour/common.mak b/harbour/common.mak index e686176ad1..938900760d 100644 --- a/harbour/common.mak +++ b/harbour/common.mak @@ -489,7 +489,7 @@ MACRO_LIB_OBJS = \ $(OBJ_DIR)\macroa.obj \ $(OBJ_DIR)\macrob.obj \ $(OBJ_DIR)\macroc.obj \ - $(OBJ_DIR)\macrol.obj \ + $(OBJ_DIR)\macrolex.obj \ #********************************************************** diff --git a/harbour/source/macro/Makefile b/harbour/source/macro/Makefile index 5e887f074b..fc5b31d45d 100644 --- a/harbour/source/macro/Makefile +++ b/harbour/source/macro/Makefile @@ -31,7 +31,7 @@ else # see Flex documentation for full set of switches LEX_FLAGS = -Phb_comp -C -LEX_SOURCE=macro.l +#LEX_SOURCE=macro.l LEX_HEADERS=\ hbsetup.h \ @@ -46,6 +46,7 @@ C_SOURCES=\ macroa.c \ macrob.c \ macroc.c \ + macrolex.c \ LIBNAME=macro diff --git a/harbour/source/macro/macro.y b/harbour/source/macro/macro.y index decf679f41..fe62a1fc5b 100644 --- a/harbour/source/macro/macro.y +++ b/harbour/source/macro/macro.y @@ -831,8 +831,13 @@ int hb_macroYYParse( HB_MACRO_PTR pMacro ) if( hb_macroLexNew( pMacro ) ) { pMacro->status = HB_MACRO_CONT; + /* NOTE: bison requires (void *) pointer */ iResult = yyparse( ( void * ) pMacro ); + + /* TODO: we should free HB_EXPR list here when it will be bound + with one of pMacro structure member not with static + variable in vm/macro.c */ hb_macroLexDelete( pMacro ); } else @@ -841,8 +846,11 @@ int hb_macroYYParse( HB_MACRO_PTR pMacro ) return iResult; } + #if defined( HB_MACRO_PPLEX ) +/* it's an example of PP token translator which change tokens generated by + PP into terminal symbols used by our grammar parser generated by Bison */ BOOL hb_macroLexNew( HB_MACRO_PTR pMacro ) { pMacro->pLex = ( void * ) hb_pp_lexNew( pMacro->string, pMacro->length ); diff --git a/harbour/source/macro/macrolex.c b/harbour/source/macro/macrolex.c new file mode 100644 index 0000000000..538872d9db --- /dev/null +++ b/harbour/source/macro/macrolex.c @@ -0,0 +1,662 @@ +/* + * $Id$ + */ + +/* + * Harbour Project source code: + * small and MT safe lexer for macro compiler + * + * Copyright 2006 Przemyslaw Czerpak + * 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. + * + */ + +#define HB_MACRO_SUPPORT + +#include "hbmacro.h" +#include "hbcomp.h" +#include "hbdate.h" +#include "macroy.h" + +#define HB_LEX_ISFIRSTIDCHAR(c) ( ( (c) >= 'A' && (c) <= 'Z' ) || \ + ( (c) >= 'a' && (c) <= 'z' ) || \ + (c) == '_' ) +#define HB_LEX_ISDIGIT(c) ( (c) >= '0' && (c) <= '9' ) +#define HB_LEX_ISHEXDIGIT(c) ( ( (c) >= '0' && (c) <= '9' ) || \ + ( (c) >= 'A' && (c) <= 'F' ) || \ + ( (c) >= 'a' && (c) <= 'f' ) ) +#define HB_LEX_ISNEXTIDCHAR(c) ( HB_LEX_ISFIRSTIDCHAR(c) || \ + HB_LEX_ISDIGIT(c) ) + +typedef struct _HB_MACRO_LEX +{ + char * pString; + char * pDst; + ULONG ulLen; + ULONG ulSrc; + BOOL quote; + char pBuffer[ 2 ]; +} +HB_MACRO_LEX, * PHB_MACRO_LEX; + +BOOL hb_macroLexNew( HB_MACRO_PTR pMacro ) +{ + if( pMacro->length ) + { + /* + * the total maximum size for parsed tokens delimited with ASCII NUL + * cannot be bigger then the size of macro string because only + * identifiers, strings, macrovars and macrotexts have to be returned + * as string and all these tokens have to be separated by some non + * value tokens or strings which will have not used delimiters + */ + pMacro->pLex = hb_xgrab( sizeof( HB_MACRO_LEX ) + pMacro->length ); + ( ( PHB_MACRO_LEX ) pMacro->pLex )->pString = pMacro->string; + ( ( PHB_MACRO_LEX ) pMacro->pLex )->ulLen = pMacro->length; + ( ( PHB_MACRO_LEX ) pMacro->pLex )->ulSrc = 0; + ( ( PHB_MACRO_LEX ) pMacro->pLex )->quote = TRUE; + ( ( PHB_MACRO_LEX ) pMacro->pLex )->pDst = + ( ( PHB_MACRO_LEX ) pMacro->pLex )->pBuffer; + return TRUE; + } + + return FALSE; +} + +void hb_macroLexDelete( HB_MACRO_PTR pMacro ) +{ + if( pMacro->pLex ) + { + hb_xfree( pMacro->pLex ); + pMacro->pLex = NULL; + } +} + +static void hb_lexIdentCopy( PHB_MACRO_LEX pLex ) +{ + while( pLex->ulSrc < pLex->ulLen ) + { + char ch = pLex->pString[ pLex->ulSrc ]; + if( ch >= 'a' && ch <= 'z' ) + *pLex->pDst++ = ch - ( 'a' - 'A' ); + else if( ( ch >= 'A' && ch <= 'Z' ) || + ( ch >= '0' && ch <= '9' ) || ch == '_' ) + *pLex->pDst++ = ch; + else + break; + pLex->ulSrc++; + } +} + +static int hb_lexNumConv( YYSTYPE *yylval_ptr, PHB_MACRO_LEX pLex, ULONG ulLen ) +{ + HB_LONG lNumber; + double dNumber; + int iDec, iWidth; + + if( hb_compStrToNum( pLex->pString + pLex->ulSrc, ulLen, + &lNumber, &dNumber, &iDec, &iWidth ) ) + { + yylval_ptr->valDouble.dNumber = dNumber; + yylval_ptr->valDouble.bDec = iDec; + yylval_ptr->valDouble.bWidth = iWidth; + pLex->ulSrc += ulLen; + return NUM_DOUBLE; + } + else + { + yylval_ptr->valLong.lNumber = lNumber; + yylval_ptr->valLong.bWidth = iWidth; + pLex->ulSrc += ulLen; + return NUM_LONG; + } +} + +static int _hb_complex( YYSTYPE *yylval_ptr, HB_MACRO_PTR pMacro ) +{ + PHB_MACRO_LEX pLex = ( PHB_MACRO_LEX ) pMacro->pLex; + + while( pLex->ulSrc < pLex->ulLen ) + { + char ch = pLex->pString[ pLex->ulSrc++ ]; + switch( ch ) + { + case ' ': + case '\t': + case '\r': + break; + + case '$': + case ',': + case '|': + case '@': + case '(': + case '{': + case ';': + case '\n': + pLex->quote = TRUE; + return ch; + + case ')': + case '}': + case ']': + pLex->quote = FALSE; + return ch; + + case '#': + pLex->quote = TRUE; + return NE1; + + case '!': + pLex->quote = TRUE; + if( pLex->pString[ pLex->ulSrc ] == '=' ) + { + pLex->ulSrc++; + return NE2; + } + return NOT; + + case '<': + pLex->quote = TRUE; + if( pLex->pString[ pLex->ulSrc ] == '>' ) + { + pLex->ulSrc++; + return NE2; + } + else if( pLex->pString[ pLex->ulSrc ] == '=' ) + { + pLex->ulSrc++; + return LE; + } + return '<'; + + case '>': + pLex->quote = TRUE; + if( pLex->pString[ pLex->ulSrc ] == '=' ) + { + pLex->ulSrc++; + return GE; + } + return '>'; + + case '=': + pLex->quote = TRUE; + if( pLex->pString[ pLex->ulSrc ] == '=' ) + { + pLex->ulSrc++; + return EQ; + } + return '='; + + case '+': + pLex->quote = TRUE; + if( pLex->pString[ pLex->ulSrc ] == '+' ) + { + pLex->ulSrc++; + return INC; + } + else if( pLex->pString[ pLex->ulSrc ] == '=' ) + { + pLex->ulSrc++; + return PLUSEQ; + } + return '+'; + + case '-': + pLex->quote = TRUE; + if( pLex->pString[ pLex->ulSrc ] == '-' ) + { + pLex->ulSrc++; + return DEC; + } + else if( pLex->pString[ pLex->ulSrc ] == '=' ) + { + pLex->ulSrc++; + return MINUSEQ; + } + else if( pLex->pString[ pLex->ulSrc ] == '>' ) + { + pLex->ulSrc++; + return ALIASOP; + } + return '-'; + + case '*': + pLex->quote = TRUE; + if( pLex->pString[ pLex->ulSrc ] == '*' ) + { + pLex->ulSrc++; + if( pLex->pString[ pLex->ulSrc ] == '=' ) + { + pLex->ulSrc++; + return EXPEQ; + } + return POWER; + } + else if( pLex->pString[ pLex->ulSrc ] == '=' ) + { + pLex->ulSrc++; + return MULTEQ; + } + return '*'; + + case '/': + pLex->quote = TRUE; + if( pLex->pString[ pLex->ulSrc ] == '=' ) + { + pLex->ulSrc++; + return DIVEQ; + } + return '/'; + + case '%': + pLex->quote = TRUE; + if( pLex->pString[ pLex->ulSrc ] == '=' ) + { + pLex->ulSrc++; + return MODEQ; + } + return '%'; + + case '^': + pLex->quote = TRUE; + if( pLex->pString[ pLex->ulSrc ] == '=' ) + { + pLex->ulSrc++; + return EXPEQ; + } + return POWER; + + case ':': + pLex->quote = TRUE; + if( pLex->pString[ pLex->ulSrc ] == '=' ) + { + pLex->ulSrc++; + return INASSIGN; + } + else if( pLex->pString[ pLex->ulSrc ] == ':' ) + { + yylval_ptr->string = "SELF"; + return IDENTIFIER; + } + return ':'; + + case '.': + pLex->quote = TRUE; + if( pLex->ulSrc < pLex->ulLen && + HB_LEX_ISDIGIT( pLex->pString[ pLex->ulSrc ] ) ) + { + ULONG ul = pLex->ulSrc; + while( ++ul < pLex->ulLen && + HB_LEX_ISDIGIT( pLex->pString[ ul ] ) ); + ul -= --pLex->ulSrc; + return hb_lexNumConv( yylval_ptr, pLex, ul ); + } + if( pLex->ulLen - pLex->ulSrc >= 4 && + pLex->pString[ pLex->ulSrc + 3 ] == '.' ) + { + if( ( pLex->pString[ pLex->ulSrc + 0 ] | ('a' - 'A') ) == 'a' && + ( pLex->pString[ pLex->ulSrc + 1 ] | ('a' - 'A') ) == 'n' && + ( pLex->pString[ pLex->ulSrc + 1 ] | ('a' - 'A') ) == 'd' ) + { + pLex->ulSrc += 4; + return AND; + } + if( ( pLex->pString[ pLex->ulSrc + 0 ] | ('a' - 'A') ) == 'n' && + ( pLex->pString[ pLex->ulSrc + 1 ] | ('a' - 'A') ) == 'o' && + ( pLex->pString[ pLex->ulSrc + 1 ] | ('a' - 'A') ) == 't' ) + { + pLex->ulSrc += 4; + return NOT; + } + } + if( pLex->ulLen - pLex->ulSrc >= 3 && + pLex->pString[ pLex->ulSrc + 2 ] == '.' ) + { + if( ( pLex->pString[ pLex->ulSrc + 0 ] | ('a' - 'A') ) == 'o' && + ( pLex->pString[ pLex->ulSrc + 1 ] | ('a' - 'A') ) == 'r' ) + { + pLex->ulSrc += 3; + return OR; + } + } + if( pLex->ulLen - pLex->ulSrc >= 2 && + pLex->pString[ pLex->ulSrc + 1 ] == '.' ) + { + if( ( pLex->pString[ pLex->ulSrc ] | ('a' - 'A') ) == 't' || + ( pLex->pString[ pLex->ulSrc ] | ('a' - 'A') ) == 'y' ) + { + pLex->quote = FALSE; + pLex->ulSrc += 2; + return TRUEVALUE; + } + if( ( pLex->pString[ pLex->ulSrc ] | ('a' - 'A') ) == 'f' || + ( pLex->pString[ pLex->ulSrc ] | ('a' - 'A') ) == 'n' ) + { + pLex->quote = FALSE; + pLex->ulSrc += 2; + return FALSEVALUE; + } + } + return '.'; + + case '[': + if( pLex->quote ) + { + pLex->quote = FALSE; + yylval_ptr->string = pLex->pDst; + while( pLex->ulSrc < pLex->ulLen ) + { + ch = pLex->pString[ pLex->ulSrc++ ]; + if( ch == ']' ) + { + *pLex->pDst++ = '\0'; + return LITERAL; + } + *pLex->pDst++ = ch; + } + *pLex->pDst++ = '\0'; + hb_macroError( EG_SYNTAX, pMacro ); + return LITERAL; + } + pLex->quote = TRUE; + return '['; + + case '`': + case '\'': + pLex->quote = FALSE; + yylval_ptr->string = pLex->pDst; + while( pLex->ulSrc < pLex->ulLen ) + { + ch = pLex->pString[ pLex->ulSrc++ ]; + if( ch == '\'' ) + { + *pLex->pDst++ = '\0'; + return LITERAL; + } + *pLex->pDst++ = ch; + } + *pLex->pDst++ = '\0'; + hb_macroError( EG_SYNTAX, pMacro ); + return LITERAL; + + case '"': + pLex->quote = FALSE; + yylval_ptr->string = pLex->pDst; + while( pLex->ulSrc < pLex->ulLen ) + { + ch = pLex->pString[ pLex->ulSrc++ ]; + if( ch == '"' ) + { + *pLex->pDst++ = '\0'; + return LITERAL; + } + *pLex->pDst++ = ch; + } + *pLex->pDst++ = '\0'; + hb_macroError( EG_SYNTAX, pMacro ); + return LITERAL; + + case '&': + if( pLex->ulSrc < pLex->ulLen ) + { + if( HB_LEX_ISFIRSTIDCHAR( pLex->pString[ pLex->ulSrc ] ) ) + { + /* [&[.[]]]+ */ + int iParts = 0; + pLex->quote = FALSE; + yylval_ptr->string = pLex->pDst; + pLex->ulSrc--; + do + { + ++iParts; + *pLex->pDst++ = '&'; + pLex->ulSrc++; + hb_lexIdentCopy( pLex ); + if( pLex->pString[ pLex->ulSrc ] == '.' ) + { + ++iParts; + *pLex->pDst++ = '.'; + pLex->ulSrc++; + hb_lexIdentCopy( pLex ); + } + } + while( pLex->ulLen - pLex->ulSrc > 1 && + pLex->pString[ pLex->ulSrc ] == '&' && + HB_LEX_ISFIRSTIDCHAR( pLex->pString[ pLex->ulSrc + 1 ] ) ); + if( iParts == 2 && *( pLex->pDst - 1 ) == '.' ) + { + pLex->pDst--; + iParts = 1; + } + *pLex->pDst++ = '\0'; + if( iParts == 1 ) + { + yylval_ptr->string++; + return MACROVAR; + } + return MACROTEXT; + } + else if( pLex->pString[ pLex->ulSrc ] == '\'' || + pLex->pString[ pLex->ulSrc ] == '"' || + pLex->pString[ pLex->ulSrc ] == '[' ) + hb_macroError( EG_SYNTAX, pMacro ); + } + pLex->quote = TRUE; + return '&'; + + default: + if( HB_LEX_ISDIGIT( ch ) ) + { + ULONG ul = pLex->ulSrc; + + pLex->quote = FALSE; + if( ch == '0' && ul < pLex->ulLen ) + { + if( pLex->pString[ ul ] == 'd' || pLex->pString[ ul ] == 'D' ) + { + while( ++ul < pLex->ulLen && + HB_LEX_ISDIGIT( pLex->pString[ ul ] ) ); + if( ul - pLex->ulSrc == 9 ) + { + int year, month, day; + hb_dateStrGet( pLex->pString + pLex->ulSrc + 1, + &year, &month, &day ); + yylval_ptr->valLong.lNumber = + hb_dateEncode( year, month, day ); + pLex->ulSrc = ul; + return NUM_DATE; + } + ul = pLex->ulSrc; + } + else if( pLex->pString[ ul ] == 'x' || + pLex->pString[ ul ] == 'X' ) + { + while( ++ul < pLex->ulLen && + HB_LEX_ISHEXDIGIT( pLex->pString[ ul ] ) ); + if( ul == pLex->ulSrc + 1 ) + --ul; + } + else + { + while( ul < pLex->ulLen && + HB_LEX_ISDIGIT( pLex->pString[ ul ] ) ) + ++ul; + if( pLex->ulLen - ul > 1 && pLex->pString[ ul ] == '.' && + HB_LEX_ISDIGIT( pLex->pString[ ul + 1 ] ) ) + { + while( ++ul < pLex->ulLen && + HB_LEX_ISDIGIT( pLex->pString[ ul ] ) ); + } + } + } + else + { + while( ul < pLex->ulLen && + HB_LEX_ISDIGIT( pLex->pString[ ul ] ) ) + ++ul; + if( pLex->ulLen - ul > 1 && pLex->pString[ ul ] == '.' && + HB_LEX_ISDIGIT( pLex->pString[ ul + 1 ] ) ) + { + while( ++ul < pLex->ulLen && + HB_LEX_ISDIGIT( pLex->pString[ ul ] ) ); + } + } + ul -= --pLex->ulSrc; + return hb_lexNumConv( yylval_ptr, pLex, ul ); + } + else if( HB_LEX_ISFIRSTIDCHAR( ch ) ) + { + pLex->quote = FALSE; + yylval_ptr->string = pLex->pDst; + *pLex->pDst++ = ch - ( ( ch >= 'a' && ch <= 'z' ) ? 'a' - 'A' : 0 ); + hb_lexIdentCopy( pLex ); + if( pLex->ulLen - pLex->ulSrc > 1 && + pLex->pString[ pLex->ulSrc ] == '&' && + HB_LEX_ISFIRSTIDCHAR( pLex->pString[ pLex->ulSrc + 1 ] ) ) + { + /* [][&[.[]]]+ */ + do + { + *pLex->pDst++ = '&'; + pLex->ulSrc++; + hb_lexIdentCopy( pLex ); + if( pLex->pString[ pLex->ulSrc ] == '.' ) + { + *pLex->pDst++ = '.'; + pLex->ulSrc++; + hb_lexIdentCopy( pLex ); + } + } + while( pLex->ulLen - pLex->ulSrc > 1 && + pLex->pString[ pLex->ulSrc ] == '&' && + HB_LEX_ISFIRSTIDCHAR( pLex->pString[ pLex->ulSrc + 1 ] ) ); + *pLex->pDst++ = '\0'; + return MACROTEXT; + } + *pLex->pDst++ = '\0'; + if( pLex->pDst - yylval_ptr->string == 3 ) + { + if( yylval_ptr->string[ 0 ] == 'I' && + yylval_ptr->string[ 1 ] == 'F' ) + return IF; + } + else if( pLex->pDst - yylval_ptr->string == 4 ) + { + if( yylval_ptr->string[ 0 ] == 'I' && + yylval_ptr->string[ 1 ] == 'I' && + yylval_ptr->string[ 1 ] == 'F' ) + return IIF; + else if( yylval_ptr->string[ 0 ] == 'N' && + yylval_ptr->string[ 1 ] == 'I' && + yylval_ptr->string[ 1 ] == 'L' ) + return NIL; + } + else if( pLex->pDst - yylval_ptr->string > 4 ) + { + if( yylval_ptr->string[ 0 ] == '_' ) + { + if( memcmp( "FIELD", yylval_ptr->string + 1, + pLex->pDst - yylval_ptr->string - 2 ) == 0 ) + return FIELD; + } + else if( yylval_ptr->string[ 0 ] == 'F' ) + { + if( memcmp( "IELD", yylval_ptr->string + 1, + pLex->pDst - yylval_ptr->string - 2 ) == 0 ) + return FIELD; + } + else if( pLex->pDst - yylval_ptr->string == 6 && + yylval_ptr->string[ 0 ] == 'Q' && + memcmp( "SELF", yylval_ptr->string + 1, + pLex->pDst - yylval_ptr->string - 2 ) == 0 ) + { + while( pLex->ulSrc < pLex->ulLen && + ( pLex->pString[ pLex->ulSrc ] == ' ' || + pLex->pString[ pLex->ulSrc ] == '\t' ) ) + pLex->ulSrc++; + if( pLex->ulSrc < pLex->ulLen && + pLex->pString[ pLex->ulSrc ] == '(' ) + { + ULONG ul = pLex->ulSrc; + while( ++ul < pLex->ulLen ) + { + if( pLex->pString[ ul ] == ')' ) + { + pLex->ulSrc = ul + 1; + return SELF; + } + else if( pLex->pString[ ul ] != ' ' && + pLex->pString[ ul ] != '\t' ) + break; + } + } + } + } + return IDENTIFIER; + } + return ch; + } + } + + return 0; +} + +/* + this function is temporary hack which makes this code compatible + with the one generated by FLEX. In fact we do not need to allocate + memory for terminal symbols which need string representation because + memory pointed by yylval_ptr->string is never destroyed until + hb_macroLexDelete() is executed. When we update include/hbexpr*.c + files to not execute hb_xfree() then we can safly remove this function + and change the type and name of function above from: + static _int hb_complex(...) to: int hb_complex(...) + */ +int hb_complex( YYSTYPE *yylval_ptr, HB_MACRO_PTR pMacro ) +{ + int i = _hb_complex( yylval_ptr, pMacro ); + + if( i == IDENTIFIER || i == MACROVAR || i == MACROTEXT || i == LITERAL ) + yylval_ptr->string = hb_strdup( yylval_ptr->string ); + + return i; +} diff --git a/harbour/source/pp/ppcore.c b/harbour/source/pp/ppcore.c index 02bac9b290..a72b1cf6cb 100644 --- a/harbour/source/pp/ppcore.c +++ b/harbour/source/pp/ppcore.c @@ -580,7 +580,7 @@ static void hb_pp_readLine( PHB_PP_STATE pState ) { if( pState->pFile->ulLineBufLen ) { - ch = pState->pFile->pLineBuf[ 0 ]; + ch = ( UCHAR ) pState->pFile->pLineBuf[ 0 ]; pState->pFile->pLineBuf++; pState->pFile->ulLineBufLen--; }