identifiers: dashes are letters.

[bison.git] / src / scan-gram.l

diff --git a/src/scan-gram.l b/src/scan-gram.l
index bc7592ec3e996f9143119c3cfad5043ca49cdb1c..5d4b4b306f20746ba1885b6487c3b6ca15b19d12 100644 (file)
--- a/src/scan-gram.l
+++ b/src/scan-gram.l
@@ -98,8 +98,8 @@ static void unexpected_newline (boundary, char const *);
  /* Strings and characters in code. */
 %x SC_STRING SC_CHARACTER
 
-letter   [.abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_]
-id       {letter}({letter}|[0-9]|-)*
+letter   [-.abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_]
+id       {letter}({letter}|[0-9])*
 directive %{id}
 int      [0-9]+
 
@@ -181,7 +181,7 @@ splice       (\\[ \f\t\v]*\n)*
   "%defines"                        return PERCENT_DEFINES;
   "%destructor"                     return PERCENT_DESTRUCTOR;
   "%dprec"                          return PERCENT_DPREC;
-  "%error"[-_]"verbose"             RETURN_PERCENT_FLAG("error_verbose");
+  "%error"[-_]"verbose"             RETURN_PERCENT_FLAG("error-verbose");
   "%expect"                         return PERCENT_EXPECT;
   "%expect"[-_]"rr"                 return PERCENT_EXPECT_RR;
   "%file-prefix"                    return PERCENT_FILE_PREFIX;