From cc8488348dff7a9df3df6188eb6f97ec5004b283 Mon Sep 17 00:00:00 2001 From: Ron Pinkas Date: Fri, 16 Jun 2000 08:48:09 +0000 Subject: [PATCH] 2000-06-16 01:42 UTC-0800 Ron Pinkas * makefile.bc - Removed redundant -Iinclude from echo into make.tmp (Harbour.exe) * source/compiler/hbgenerr.c - Removed no longer needed int iLine * source/pp/ppcore.c ! Fixed bug PP was not able to parse #command/translate if no space before "=>" like: #translate CRLF=>Chr(13) + Chr(10) --- harbour/ChangeLog | 13 ++++++++++++- harbour/makefile.bc | 5 ++--- harbour/source/compiler/hbgenerr.c | 9 +-------- harbour/source/pp/ppcore.c | 2 +- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index fdadf5b1fc..06e2f7d14c 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,14 @@ +2000-06-16 01:42 UTC-0800 Ron Pinkas + * makefile.bc + - Removed redundant -I from echo into make.tmp (Harbour.exe) + + * source/compiler/hbgenerr.c + - Removed no longer needed int iLine + + * source/pp/ppcore.c + ! Fixed bug PP was not able to parse #command/translate if no space before "=>" like: + #translate CRLF=>Chr(13) + Chr(10) + 2000-06-15 20:56 UTC-0800 Ron Pinkas * source/compiler/harbour.l * source/compiler/harbour.y @@ -8,7 +19,7 @@ * source/compiler/hbgenerr.c * source/pp/ppcomp.c - ! Fixed line numbering. Warnnings and Errors, should now report correct line numbers. + ! Fixed line numbering. Warnings and Errors, should now report correct line numbers. 2000-06-15 15:30 UTC-0400 David G. Holm diff --git a/harbour/makefile.bc b/harbour/makefile.bc index 89d5f523f9..d1390f0273 100644 --- a/harbour/makefile.bc +++ b/harbour/makefile.bc @@ -662,9 +662,8 @@ $(OBJ_DIR)\pptable.obj : $(PP_DIR)\pptable.c # $(HARBOUR_EXE) : $(HARBOUR_EXE_OBJS) - echo. $(CFLAGS) > make.tmp - echo. -e$(HARBOUR_EXE) >> make.tmp - echo. -I$(INCLUDE_DIR) >> make.tmp + echo. -e$(HARBOUR_EXE) > make.tmp + echo. $(CFLAGS) >> make.tmp echo. $(OBJ_DIR)\harbour.obj >> make.tmp echo. $(OBJ_DIR)\harboury.obj >> make.tmp echo. $(OBJ_DIR)\harbourl.obj >> make.tmp diff --git a/harbour/source/compiler/hbgenerr.c b/harbour/source/compiler/hbgenerr.c index 20e382d958..75a4f2e2c0 100644 --- a/harbour/source/compiler/hbgenerr.c +++ b/harbour/source/compiler/hbgenerr.c @@ -122,12 +122,9 @@ char * hb_comp_szWarnings[] = void hb_compGenError( char * szErrors[], char cPrefix, int iError, char * szError1, char * szError2 ) { - int iLine = hb_comp_iLine; - - if( hb_comp_EOL ) - --iLine; if( hb_comp_files.pLast != NULL && hb_comp_files.pLast->szFileName != NULL ) printf( "\r%s(%i) ", hb_comp_files.pLast->szFileName, hb_comp_files.pLast->iLine - 1 ); + printf( "Error %c%04i ", cPrefix, iError ); printf( szErrors[ iError - 1 ], szError1, szError2 ); printf( "\n" ); @@ -142,10 +139,6 @@ void hb_compGenError( char * szErrors[], char cPrefix, int iError, char * szErro void hb_compGenWarning( char * szWarnings[], char cPrefix, int iWarning, char * szWarning1, char * szWarning2) { char * szText = szWarnings[ iWarning - 1 ]; - int iLine = hb_comp_iLine; - - if( hb_comp_EOL ) - --iLine; if( ( szText[ 0 ] - '0' ) <= hb_comp_iWarnings ) { diff --git a/harbour/source/pp/ppcore.c b/harbour/source/pp/ppcore.c index e4b7e6a014..a5bfde9af7 100644 --- a/harbour/source/pp/ppcore.c +++ b/harbour/source/pp/ppcore.c @@ -703,7 +703,7 @@ static void ParseCommand( char * sLine, BOOL com_or_xcom, BOOL com_or_tra ) HB_SKIPTABSPACES( sLine ); ipos = 0; - while( *sLine != '\0' && *sLine != ' ' && *sLine != '\t' && *sLine != '<' && (*sLine !='(' || ipos==0) ) + while( *sLine != '\0' && *sLine != ' ' && *sLine != '\t' && *sLine != '<' && *sLine != '=' && ( *sLine != '(' || ipos == 0 ) ) { *(cmdname+ipos++) = *sLine++; }