* src/lex.c (parse_percent_token): Change type of variable `tx', which

[bison.git] / src / lex.c

diff --git a/src/lex.c b/src/lex.c
index 4eefa737abb4e1a9ca24d3104c8de7f72bace11d..61f1c262dddfccb165ea0ef1042606f3cd2659d0 100644 (file)
--- a/src/lex.c
+++ b/src/lex.c
@@ -1,5 +1,5 @@
 /* Token-reader for Bison's input parser,
 /* Token-reader for Bison's input parser,

-   Copyright 1984, 1986, 1989, 1992, 2000 Free Software Foundation, Inc.
+   Copyright 1984, 1986, 1989, 1992, 2000, 2001 Free Software Foundation, Inc.

 
    This file is part of Bison, the GNU Compiler Compiler.
 
 
    This file is part of Bison, the GNU Compiler Compiler.
 


@@ -23,6 +23,7 @@
 #include "files.h"
 #include "getopt.h"            /* for optarg */
 #include "symtab.h"
 #include "files.h"
 #include "getopt.h"            /* for optarg */
 #include "symtab.h"

+#include "options.h"

 #include "lex.h"
 #include "xalloc.h"
 #include "complain.h"
 #include "lex.h"
 #include "xalloc.h"
 #include "complain.h"


@@ -31,7 +32,7 @@
 
 /* Buffer for storing the current token.  */
 struct obstack token_obstack;
 
 /* Buffer for storing the current token.  */
 struct obstack token_obstack;

-char *token_buffer = NULL;
+const char *token_buffer = NULL;

 
 bucket *symval;
 int numval;
 
 bucket *symval;
 int numval;


@@ -234,10 +235,10 @@ literalchar (struct obstack *out, int *pcode, char term)
        }
       else
        {
        }
       else
        {

-         char buf [] = "c";
-         buf[0] = c;
+         char badchar [] = "c";
+         badchar[0] = c;

          complain (_("unknown escape sequence: `\\' followed by `%s'"),
          complain (_("unknown escape sequence: `\\' followed by `%s'"),

-                   quote (buf));
+                   quote (badchar));

          code = '?';
        }
     }                          /* has \ */
          code = '?';
        }
     }                          /* has \ */


@@ -509,56 +510,23 @@ lex (void)
     }
 }
 
     }
 }
 

-/* the following table dictates the action taken for the various %
-   directives.  A set_flag value causes the named flag to be set.  A
-   retval action returns the code.  */
-struct percent_table_struct
-{
-  const char *name;
-  void *set_flag;
-  int retval;
-};
+/* This function is a strcmp, which doesn't differentiate `-' and `_'
+   chars.  */

 
 

-struct percent_table_struct percent_table[] =
+static int
+option_strcmp (const char *left, const char *right)

 {
 {

-  { "token",           NULL,                   tok_token },
-  { "term",            NULL,                   tok_token },
-  { "nterm",           NULL,                   tok_nterm },
-  { "type",            NULL,                   tok_type },
-  { "guard",           NULL,                   tok_guard },
-  { "union",           NULL,                   tok_union },
-  { "expect",          NULL,                   tok_expect },
-  { "thong",           NULL,                   tok_thong },
-  { "start",           NULL,                   tok_start },
-  { "left",            NULL,                   tok_left },
-  { "right",           NULL,                   tok_right },
-  { "nonassoc",                NULL,                   tok_nonassoc },
-  { "binary",          NULL,                   tok_nonassoc },
-  { "prec",            NULL,                   tok_prec },
-  { "locations",       &locations_flag,        tok_noop },     /* -l */
-  { "no_lines",                &no_lines_flag,         tok_noop },     /* -l */
-  { "raw",             &raw_flag,              tok_noop },     /* -r */
-  { "token_table",     &token_table_flag,      tok_noop },     /* -k */
-  { "yacc",            &yacc_flag,             tok_noop },     /* -y */
-  { "fixed_output_files",&yacc_flag,           tok_noop },     /* -y */
-  { "defines",         &defines_flag,          tok_noop },     /* -d */
-  { "no_parser",       &no_parser_flag,        tok_noop },     /* -n */
-#if 0
-  /* For the time being, this is not enabled yet, while it's possible
-     though, since we use obstacks.  The only risk is with semantic
-     parsers which will output an `include' of an output file: be sure
-     that the naem included is indeed the name of the output file.  */
-  { "output_file",     &spec_outfile,          tok_setopt },   /* -o */
-  { "file_prefix",     &spec_file_prefix,      tok_setopt },   /* -b */
-  { "name_prefix",     &spec_name_prefix,      tok_setopt },   /* -p */
-#endif
-  { "verbose",         &verbose_flag,          tok_noop },     /* -v */
-  { "debug",           &debug_flag,            tok_noop },     /* -t */
-  { "semantic_parser", &semantic_parser,       tok_noop },
-  { "pure_parser",     &pure_parser,           tok_noop },
-
-  { NULL, NULL, tok_illegal}
-};
+    const unsigned char *l, *r;
+    int c;
+
+    assert(left != NULL && right != NULL);     
+    l = (const unsigned char *)left;
+    r = (const unsigned char *)right;
+    while (((c = *l - *r++) == 0 && *l != '\0')
+          || ((*l == '-' || *l == '_') && (*r == '_' || *r == '-')))
+        l++;
+    return c;
+}

 
 /* Parse a token which starts with %.
    Assumes the % has already been read and discarded.  */
 
 /* Parse a token which starts with %.
    Assumes the % has already been read and discarded.  */


@@ -567,7 +535,7 @@ int
 parse_percent_token (void)
 {
   int c;
 parse_percent_token (void)
 {
   int c;

-  struct percent_table_struct *tx;
+  const struct option_table_struct *tx;

 
   c = getc (finput);
 
 
   c = getc (finput);
 


@@ -612,19 +580,28 @@ parse_percent_token (void)
   token_buffer = obstack_finish (&token_obstack);
 
   /* table lookup % directive */
   token_buffer = obstack_finish (&token_obstack);
 
   /* table lookup % directive */

-  for (tx = percent_table; tx->name; tx++)
-    if (strcmp (token_buffer + 1, tx->name) == 0)
+  for (tx = option_table; tx->name; tx++)
+    if ((tx->access == opt_percent || tx->access == opt_both)
+       && option_strcmp (token_buffer + 1, tx->name) == 0)

       break;
 
       break;
 

-  if (tx->retval == tok_setopt)
+  if (tx->set_flag)

     {
     {

-      *((char **) (tx->set_flag)) = optarg;
+      *((int *) (tx->set_flag)) = 1;

       return tok_noop;
     }
       return tok_noop;
     }

-  if (tx->set_flag)
+
+  switch (tx->ret_val)

     {
     {

-      *((int *) (tx->set_flag)) = 1;
+    case tok_setopt:
+      *((char **) (tx->set_flag)) = optarg;

       return tok_noop;
       return tok_noop;

+      break;
+
+    case tok_obsolete:
+      fatal (_("`%s' is no longer supported"), token_buffer);
+      break;

     }
     }

-  return tx->retval;
+
+  return tx->ret_val;

 }
 }