o Remove some unnecessary backslashes

o collapse multiple !'s by using !+ and checking if yyleng is even or odd.
  this allows us to simplify ! handling in parse.yacc

diff --git a/parse.lex b/parse.lex
index cede10671339c9406dba21e74f47a00d1ab896a0..221ce413b16726beaa4df1caeeb63afd8d88b627 100644 (file)
--- a/parse.lex
+++ b/parse.lex
@@ -139,13 +139,14 @@ WORD                      [[:alnum:]_-]+
                            sawspace = FALSE;
                          }                     /* a command line arg */
 
-\,                     {
+,                      {
                            LEXTRACE(", ");
                            return(',');
                        }                       /* return ',' */
 
-\!                     {
-                           return('!');                /* return '!' */
+!+                     {
+                           if (yyleng % 2 == 1)
+                               return('!');    /* return '!' */
                        }
 
 =                      {
@@ -244,9 +245,10 @@ PASSWD[[:blank:]]*:        {
                            if (strcmp(yytext, "ALL") == 0) {
                                LEXTRACE("ALL ");
                                return(ALL);
+                           } else {
+                               LEXTRACE("ALIAS ");
+                               return(ALIAS);
                            }
-                           LEXTRACE("ALIAS ");
-                           return(ALIAS);
                        }
 
 [[:alnum:]][[:alnum:]_-]*      {