fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2000-06-16 01:42 UTC-0800 Ron Pinkas <Ron@Profit-Master.com>

Browse Source 
* 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)
This commit is contained in:
Ron Pinkas
2000-06-16 08:48:09 +00:00
parent 99ca708ef6
commit cc8488348d
4 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
harbour/ChangeLog
View File

@@ -1,3 +1,14 @@
2000-06-16 01:42 UTC-0800 Ron Pinkas <Ron@Profit-Master.com>
* 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 <Ron@Profit-Master.com>
* 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 <dholm@jsd-llc.com>

5
harbour/makefile.bc
View File

@@ -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

9
harbour/source/compiler/hbgenerr.c
View File

@@ -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 )
{

2
harbour/source/pp/ppcore.c
View File

@@ -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++;
}