From 057aabe72325b5989b05a4a543ad44a0164c94db Mon Sep 17 00:00:00 2001 From: Ron Pinkas Date: Sun, 25 Jun 2000 10:38:11 +0000 Subject: [PATCH] 2000-06-25 03:35 UTC-0800 Ron Pinkas * source/compiler/hbgenerr.c ! Fixed line number when in was 1 too short. * make_b32.bat ! Removed -i (ignore erros). --- harbour/ChangeLog | 12 +++++++++--- harbour/make_b32.bat | 2 +- harbour/source/compiler/hbgenerr.c | 7 +++++-- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 2164e3b50d..e5ea831ebd 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,5 +1,11 @@ -2000-06-25 10:40 UTC+0100 Ryszard Glab +2000-06-25 03:35 UTC-0800 Ron Pinkas + * source/compiler/hbgenerr.c + ! Fixed line number when in was 1 too short. + * make_b32.bat + ! Removed -i (ignore erros). + +2000-06-25 10:40 UTC+0100 Ryszard Glab *tests/onidle.prg *added missing demo file of idle states tasks @@ -8,7 +14,7 @@ *Small change to hb___CompressMultipleFile() 2000-06-24 22:10 GMT -3 Luiz Rafael Culik -+contrib/samples/makefile.bc ++contrib/samples/makefile.bc *Makefile for samples.lib for borland compilers *contrib/hbzlib/makefile.bc @@ -17,7 +23,7 @@ *contrib/hbzlib/zlibapi.c %some enhacements to hb___CompressMultipleFile() -*contrib/hbzlib/test.prg +*contrib/hbzlib/test.prg *added test to demostrate the changes *contrib/hbzlib/doc/zip.txt diff --git a/harbour/make_b32.bat b/harbour/make_b32.bat index 76488fddd9..5f4e392bda 100644 --- a/harbour/make_b32.bat +++ b/harbour/make_b32.bat @@ -8,7 +8,7 @@ if "%1" == "CLEAN" goto CLEAN :BUILD - make -i -fmakefile.bc %1 %2 %3 > make_b32.log + make -fmakefile.bc %1 %2 %3 > make_b32.log if errorlevel 1 goto BUILD_ERR :BUILD_OK diff --git a/harbour/source/compiler/hbgenerr.c b/harbour/source/compiler/hbgenerr.c index 6fefa751ba..bd0d13e12a 100644 --- a/harbour/source/compiler/hbgenerr.c +++ b/harbour/source/compiler/hbgenerr.c @@ -127,8 +127,11 @@ void hb_compGenError( char * szErrors[], char cPrefix, int iError, char * szErro if( cPrefix != 'F' && hb_comp_bError ) return; - if( hb_comp_files.pLast && hb_comp_files.pLast->szFileName ) - printf( "\r%s(%i) ", hb_comp_files.pLast->szFileName, hb_comp_files.pLast->iLine - 1 ); + /* + printf( "Eol: %i >%s<\n", hb_comp_EOL, yytext ); + */ + + printf( "\r%s(%i) ", hb_comp_szFile, hb_comp_iCompiled + ( yytext[0] == '\n' ? 1: 0 ) ); printf( "Error %c%04i ", cPrefix, iError ); printf( szErrors[ iError - 1 ], szError1, szError2 );