* src/options.c (option_table): Adjust.

* src/lex.c (parse_percent_token): Fix.

diff --git a/ChangeLog b/ChangeLog
index e39fda65af84eae8752378a9fc5606228d918032..207d233e720043973c5af13156cda4b92b983d8b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-09-21  Marc Autret  <autret_m@epita.fr>
+
+       * src/options.c (option_table): Adjust.
+       * src/lex.c (parse_percent_token): Fix.
+

 2001-09-20  Pascal Bart  <pascal.bart@epita.fr>
 
        * src/options.c (symtab.h): Include it, need by lex.h.
 2001-09-20  Pascal Bart  <pascal.bart@epita.fr>
 
        * src/options.c (symtab.h): Include it, need by lex.h.

diff --git a/src/lex.c b/src/lex.c
index 61f1c262dddfccb165ea0ef1042606f3cd2659d0..c18042d46fa6c9f0bf610560d5e11fbc9ca776f0 100644 (file)
--- a/src/lex.c
+++ b/src/lex.c
@@ -569,8 +569,8 @@ parse_percent_token (void)
   obstack_1grow (&token_obstack, '%');
   while (isalpha (c) || c == '_' || c == '-')
     {
   obstack_1grow (&token_obstack, '%');
   while (isalpha (c) || c == '_' || c == '-')
     {

-      if (c == '-')
-       c = '_';
+      if (c == '_')
+       c = '-';

       obstack_1grow (&token_obstack, c);
       c = getc (finput);
     }
       obstack_1grow (&token_obstack, c);
       c = getc (finput);
     }

diff --git a/src/options.c b/src/options.c
index 9732bd3aa7c5e1d049784db41e69024e3fc58b2d..5d626247e6cbc231de9ad50b03882d30e8998843 100644 (file)
--- a/src/options.c
+++ b/src/options.c
@@ -86,11 +86,11 @@ const struct option_table_struct option_table[] =
   {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_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, "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.
 
   /*
    * Percent and command line declarations.