From f9ef0a8ec6321eff8b8a70f00072cfc356783754 Mon Sep 17 00:00:00 2001 From: Ryszard Glab Date: Tue, 15 Jun 1999 07:36:15 +0000 Subject: [PATCH] See ChangeLog 19990615-08:30 --- harbour/ChangeLog | 8 ++++++++ harbour/source/compiler/harbour.l | 2 -- harbour/source/compiler/harbour.y | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 67b49d983f..59ed4bf479 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,11 @@ +19990615-08:30 Ryszard Glab + +* source/compiler/harbour.y + * added missing error message + +* source/compiler/harbour.l + * removed printf introducced for debugging purpose + 19990615-07:00 Ryszard Glab * source/compiler/harbour.y diff --git a/harbour/source/compiler/harbour.l b/harbour/source/compiler/harbour.l index 9bec81d495..02209125d9 100644 --- a/harbour/source/compiler/harbour.l +++ b/harbour/source/compiler/harbour.l @@ -264,7 +264,6 @@ Separator {SpaceTab}|{Comment} yy_lex_count_lf(); if( i_INDEX_STATE ) BEGIN INDEX; else BEGIN 0; if( ! _iQuiet ) printf( "\rline: %i", iLine ); -printf( "\nlineCont"); _iState=LINECONT_; } {Separator}*("("|")") { @@ -273,7 +272,6 @@ printf( "\nlineCont"); {Separator}*. { yy_lex_count_lf(); if( i_INDEX_STATE ) BEGIN INDEX; else BEGIN 0; -printf( "\nLineCont"); unput( yytext[ yyleng-1 ] ); if( _iOpenBracket == 0 && (_iState==SEPARATOR || _iState==IDENTIFIER) && i_INDEX_STATE==0 ) { diff --git a/harbour/source/compiler/harbour.y b/harbour/source/compiler/harbour.y index 0a69996eab..58b0ed4ea6 100644 --- a/harbour/source/compiler/harbour.y +++ b/harbour/source/compiler/harbour.y @@ -262,7 +262,8 @@ char * _szErrors[] = { "Statement not allowed outside of procedure or function", "Syntax error: \'%s\'", "Unclosed control structures at line: %i", "%s statement with no loop in sight", - "Syntax error: \'%s\' in: \'%s\'" + "Syntax error: \'%s\' in: \'%s\'", + "Incomplete statement: %s" }; /* Table with parse warnings */ @@ -3507,6 +3508,7 @@ void CodeBlockEnd() GenPCode1( LOBYTE(wPos) ); GenPCode1( HIBYTE(wPos) ); pFree =pVar; + pFree->szName = NULL; pVar =pVar->pNext; OurFree( pFree ); } @@ -3521,6 +3523,7 @@ void CodeBlockEnd() { /* free used variables */ pFree =pVar; + pFree->szName = NULL; pVar =pVar->pNext; OurFree( pFree ); }