From: Marc Autret <autret_m@epita.fr>
Date: Fri, 21 Sep 2001 15:42:26 +0000 (+0000)
Subject: * src/options.c (option_table): Adjust.
X-Git-Tag: pre-merge-of-1-29-branch~9
X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/6bc35ae56a34c075b00fdc0c14c0cd8c14bf80ca

* src/options.c (option_table): Adjust.
* src/lex.c (parse_percent_token): Fix.
---

diff --git a/ChangeLog b/ChangeLog
index e39fda65..207d233e 100644
--- 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.
diff --git a/src/lex.c b/src/lex.c
index 61f1c262..c18042d4 100644
--- 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 == '-')
     {
-      if (c == '-')
-	c = '_';
+      if (c == '_')
+	c = '-';
       obstack_1grow (&token_obstack, c);
       c = getc (finput);
     }
diff --git a/src/options.c b/src/options.c
index 9732bd3a..5d626247 100644
--- 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_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.