[MAIN] fix-options.patch

[marc-alexandre autret]

Hi,

little things to fix options parsing.

Do you agree Pascal?


Index: ChangeLog
===================================================================
RCS file: /cvsroot/bison/bison/ChangeLog,v
retrieving revision 1.215
diff -u -r1.215 ChangeLog
--- ChangeLog   2001/09/20 18:51:48     1.215
+++ ChangeLog   2001/09/21 11:53:44
@@ -1,3 +1,8 @@
+2001-09-21  Marc Autret  <address@hidden>
+
+       * src/options.c (option_table): Adjust.
+       * src/lex.c (parse_percent_token): Fix.
+
 2001-09-20  Pascal Bart  <address@hidden>
 
        * src/options.c (symtab.h): Include it, need by lex.h.
Index: src/lex.c
===================================================================
RCS file: /cvsroot/bison/bison/src/lex.c,v
retrieving revision 1.38
diff -u -r1.38 lex.c
--- src/lex.c   2001/09/20 18:32:20     1.38
+++ src/lex.c   2001/09/21 11:53:45
@@ -569,8 +569,8 @@
   obstack_1grow (&token_obstack, '%');
   while (isalpha (c) || c == '_' || c == '-')
     {
-      if (c == '-')
-       c = '_';
+      if (c == '_')
+       c = '-';
       obstack_1grow (&token_obstack, c);
       c = getc (finput);
     }
Index: src/options.c
===================================================================
RCS file: /cvsroot/bison/bison/src/options.c,v
retrieving revision 1.2
diff -u -r1.2 options.c
--- src/options.c       2001/09/20 18:51:48     1.2
+++ src/options.c       2001/09/21 11:53:45
@@ -86,11 +86,11 @@
   {opt_both, "file-prefix", 
required_argument,&spec_file_prefix,tok_setopt,'b'},
   {opt_both, "name-prefix", 
required_argument,&spec_name_prefix,tok_setopt,'p'},
 #endif
-  {opt_percent, "header_extension",    0,              NULL, tok_hdrext,    0},
-  {opt_percent, "source_extension",    0,              NULL, tok_srcext,    0},
+  {opt_percent, "header-extension",    0,              NULL, tok_hdrext,    0},
+  {opt_percent, "source-extension",    0,              NULL, tok_srcext,    0},
   {opt_percent, "define",              0,              NULL, tok_define,    0},
-  {opt_percent, "semantic_parser",     0,  &semantic_parser, tok_noop,      0},
-  {opt_percent, "pure_parser",         0,      &pure_parser, tok_noop,      0},
+  {opt_percent, "semantic-parser",     0,  &semantic_parser, tok_noop,      0},
+  {opt_percent, "pure-parser",         0,      &pure_parser, tok_noop,      0},
 
   /*
    * Percent and command line declarations.


-- 
Autret Marc (address@hidden)
Eleve Ingenieur en Informatique.