From d760c43c3af5b7e47cf716402f1dc73261613c93 Mon Sep 17 00:00:00 2001 From: Ryszard Glab Date: Tue, 18 May 1999 02:08:10 +0000 Subject: [PATCH] See ChangeLog 19990518-03:05 --- harbour/ChangeLog | 9 +++++++++ harbour/include/hberrors.h | 5 ++++- harbour/source/compiler/harbour.l | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 1848c90cd8..60bf374147 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,12 @@ +19990518-03:05 Ryszard Glab + + * source/compiler/harbour.l + -corrected misspelled wCaseCounter + + * include/hberrors.h + -new errors definition added (it should be uploaded in previous + commit -sorry my fault + 19990518-01:45 Ryszard Glab * source/compiler/harbour.l, source/compiler/harbour.y diff --git a/harbour/include/hberrors.h b/harbour/include/hberrors.h index a3c6035bfd..032ed01b55 100644 --- a/harbour/include/hberrors.h +++ b/harbour/include/hberrors.h @@ -17,6 +17,9 @@ #define ERR_ENDDO 12 #define ERR_ENDCASE 13 #define ERR_NEXTFOR 14 -#define ERR_SYNTAX 15 +#define ERR_UNMATCHED_ELSE 15 +#define ERR_UNMATCHED_ELSEIF 16 +#define ERR_SYNTAX 17 +#define ERR_UNCLOSED_STRU 18 void GenError( int, char*, char * ); /* generic parsing error management function */ diff --git a/harbour/source/compiler/harbour.l b/harbour/source/compiler/harbour.l index 50d3058c72..31e7e154cb 100644 --- a/harbour/source/compiler/harbour.l +++ b/harbour/source/compiler/harbour.l @@ -369,7 +369,7 @@ Separator {SpaceTab}|{Comment}|{LineCont} return ENDIF; } "endc"("ase"|"as"|"a")? { /* ENDCASE can be used in one context only */ - if( _wWhileCounter == 0 ) + if( _wCaseCounter == 0 ) GenError( ERR_ENDCASE, NULL, NULL ); return ENDCASE; }