From 283b555df85e24d04112cb84385636af10671cff Mon Sep 17 00:00:00 2001
From: Ryszard Glab <rglab@imid.med.pl>
Date: Wed, 9 Aug 2000 12:17:01 +0000
Subject: [PATCH] ChangeLog 2000-08-09 14:15 UTC+0100

---
 harbour/ChangeLog                   |  5 +++
 harbour/source/compiler/harbour.slx | 62 ++++++++++++++++++++++++++++-
 2 files changed, 66 insertions(+), 1 deletion(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 661c45f72d..a958d09988 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,8 @@
+2000-08-09 14:15 UTC+0100 Ryszard Glab <rglab@imid.med.pl>
+
+    *source/compiler/harbour.slx
+        * fixed to work with current syntax rules in harbour.y 
+
 2000-08-09 07:10 GMT-3 Luiz Rafael Culik <culik@sl.conex.net>
   *doc/en/sayget.txt
   *doc/en/file.txt
diff --git a/harbour/source/compiler/harbour.slx b/harbour/source/compiler/harbour.slx
index 90094ef0f6..af5d014f34 100644
--- a/harbour/source/compiler/harbour.slx
+++ b/harbour/source/compiler/harbour.slx
@@ -1176,7 +1176,7 @@ int hb_lex_CustomAction( int x, int iWordLen, int aiHold[], int *ptr_iHold, BOOL
          if( hb_comp_wForCounter == 0 && hb_comp_wWhileCounter == 0 )
             hb_compGenError( hb_comp_szErrors, 'E', HB_COMP_ERR_UNMATCHED_EXIT, "EXIT", NULL );
 
-	 x = EXITLOOP;
+	 x = EXIT;
 	 break;
 
       case HB_CHK_LOOP :
@@ -1441,6 +1441,66 @@ int hb_lex_CustomAction( int x, int iWordLen, int aiHold[], int *ptr_iHold, BOOL
 	 sIdentifier[iWordLen] = '\0';
          x = IDENTIFIER;
          break;
+         
+      case OPTIONAL :
+         strncpy( (char*) sIdentifier, "OPTIONAL" , iWordLen );
+	 sIdentifier[iWordLen] = '\0';
+      yylval.string = hb_compIdentifierNew( (char*) sIdentifier, TRUE );
+         break;
+
+      case EXTERN :
+         strncpy( (char*) sIdentifier, "EXTERNAL" , iWordLen );
+	 sIdentifier[iWordLen] = '\0';
+      yylval.string = hb_compIdentifierNew( (char*) sIdentifier, TRUE );
+         break;
+
+      case ANNOUNCE :
+         strncpy( (char*) sIdentifier, "ANNOUNCE" , iWordLen );
+	 sIdentifier[iWordLen] = '\0';
+      yylval.string = hb_compIdentifierNew( (char*) sIdentifier, TRUE );
+         break;
+
+      case LOCAL :
+         strncpy( (char*) sIdentifier, "LOCAL" , iWordLen );
+	 sIdentifier[iWordLen] = '\0';
+      yylval.string = hb_compIdentifierNew( (char*) sIdentifier, TRUE );
+         break;
+
+      case MEMVAR :
+         strncpy( (char*) sIdentifier, "MEMVAR" , iWordLen );
+	 sIdentifier[iWordLen] = '\0';
+      yylval.string = hb_compIdentifierNew( (char*) sIdentifier, TRUE );
+         break;
+
+      case STATIC :
+         strncpy( (char*) sIdentifier, "STATIC" , iWordLen );
+	 sIdentifier[iWordLen] = '\0';
+      yylval.string = hb_compIdentifierNew( (char*) sIdentifier, TRUE );
+         break;
+
+      case PRIVATE :
+         strncpy( (char*) sIdentifier, "PRIVATE" , iWordLen );
+	 sIdentifier[iWordLen] = '\0';
+      yylval.string = hb_compIdentifierNew( (char*) sIdentifier, TRUE );
+         break;
+
+      case PUBLIC :
+         strncpy( (char*) sIdentifier, "PUBLIC" , iWordLen );
+	 sIdentifier[iWordLen] = '\0';
+      yylval.string = hb_compIdentifierNew( (char*) sIdentifier, TRUE );
+         break;
+
+      case PARAMETERS :
+         strncpy( (char*) sIdentifier, "PARAMETERS" , iWordLen );
+	 sIdentifier[iWordLen] = '\0';
+      yylval.string = hb_compIdentifierNew( (char*) sIdentifier, TRUE );
+         break;
+
+      case PROCREQ :
+         strncpy( (char*) sIdentifier, "PROCREQ" , iWordLen );
+	 sIdentifier[iWordLen] = '\0';
+      yylval.string = hb_compIdentifierNew( (char*) sIdentifier, TRUE );
+         break;
 
       case HB_IN_ID :
          strcpy( (char*) sIdentifier, "IN" );