[SCM] master: Tidy TAB lexer.

[SCM] master: Tidy TAB lexer.

[cagney]

The branch, master has been updated
       via  59fba07fbfacb30f9ae2323677c5ae20b5a14eaf (commit)
      from  d446c71317b65455e9baf4f4b321680170e6b847 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit 59fba07fbfacb30f9ae2323677c5ae20b5a14eaf
Author: Andrew Cagney <cagney@redhat.com>
Date:   Thu Nov 15 19:12:57 2007 -0500

    Tidy TAB lexer.
    
    frysk-core/frysk/expr/ChangeLog
    2007-11-15  Andrew Cagney  <cagney@redhat.com>
    
    	* CExpr.g (tid_expression): Delete.
    	(TAB_IDENT): Fold into TAB.

-----------------------------------------------------------------------

Summary of changes:
 frysk-core/frysk/expr/CExpr.g   |   27 +++++++++------------------
 frysk-core/frysk/expr/ChangeLog |    3 +++
 2 files changed, 12 insertions(+), 18 deletions(-)

First 500 lines of diff:
diff --git a/frysk-core/frysk/expr/CExpr.g b/frysk-core/frysk/expr/CExpr.g
index 8d7b373..45f0a05 100644
--- a/frysk-core/frysk/expr/CExpr.g
+++ b/frysk-core/frysk/expr/CExpr.g
@@ -425,13 +425,9 @@ constant
     {   astPostExpr = #(#[MEMBER, "Member"], #astPostExpr, #id_expr1); }
 )*/
 
-tid_expression
-    :   TAB_IDENT 
-    ;
-
-/*----------------------------------------------------------------------------
-   * The Lexer
-   *----------------------------------------------------------------------------*/
+/*---------------------------------------------------------------------------
+ * The Lexer
+ *---------------------------------------------------------------------------*/
 
 class CExprLexer extends Lexer;
 
@@ -506,18 +502,13 @@ options {testLiterals = true;}
 ;
 
 /**
-  *  A <TAB> token is returned not only on regular tabs
-  *  but also when a TAB is hit after an incomplete variable
-  */
-protected
-TAB
-    :   (IDENT)?'\t'
-    ;
+ *  A <TAB> token is returned not only on regular tabs
+ *  but also when a TAB is hit after an incomplete identifier.
+ */
 
-TAB_IDENT 
-    :   ((IDENT)'\t')=>TAB {$setType(TAB);}
-    |   ('\t')=>TAB {$setType(TAB);}
-    |   IDENT {$setType(IDENT);}
+TAB 
+    :   '\t'
+    |   IDENT {$setType(IDENT);} ('\t' {$setType(TAB);})? 
     ;
 
 protected
diff --git a/frysk-core/frysk/expr/ChangeLog b/frysk-core/frysk/expr/ChangeLog
index 8dc8423..8ec1bb0 100644
--- a/frysk-core/frysk/expr/ChangeLog
+++ b/frysk-core/frysk/expr/ChangeLog
@@ -4,6 +4,9 @@
 
 2007-11-15  Andrew Cagney  <cagney@redhat.com>
 
+	* CExpr.g (tid_expression): Delete.
+	(TAB_IDENT): Fold into TAB.
+	
 	* CExpr.g (options): Delete ASTLabelType.
 	* CExprEvaluator.g (options): Ditto.
 	* ExprAST.java: Delete.


hooks/post-receive
--
frysk system monitor/debugger