Instead of using make_symbol<TOK_FOO>, generate make_FOO for each token type.

[bison.git] / src / getargs.h

diff --git a/src/getargs.h b/src/getargs.h
index 8449626b21785795245fbf70ca0c45b99e663b8b..1139067452f7bcdf208997e011266eed151a7ea8 100644 (file)
--- a/src/getargs.h
+++ b/src/getargs.h
@@ -1,7 +1,7 @@
 /* Parse command line arguments for bison.
 
    Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002, 2003, 2004,
 /* Parse command line arguments for bison.
 
    Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002, 2003, 2004,

-   2005, 2006, 2007 Free Software Foundation, Inc.
+   2005, 2006, 2007, 2008 Free Software Foundation, Inc.

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


@@ -24,11 +24,13 @@
 #include "location.h"
 
 extern char *program_name;
 #include "location.h"
 
 extern char *program_name;

+enum { command_line_prio, grammar_prio, default_prio };

 
 /* flags set by % directives */
 
 /* for -S */
 extern char const *skeleton;
 
 /* flags set by % directives */
 
 /* for -S */
 extern char const *skeleton;

+extern int skeleton_prio;

 
 /* for -I */
 extern char const *include;
 
 /* for -I */
 extern char const *include;


@@ -68,6 +70,7 @@ struct bison_language
   bool add_tab;
 };
 
   bool add_tab;
 };
 

+extern int language_prio;

 extern struct bison_language const *language;
 
 /*-----------.
 extern struct bison_language const *language;
 
 /*-----------.


@@ -103,6 +106,7 @@ enum trace
     trace_time      = 1 << 8,  /**< Time consumption. */
     trace_skeleton  = 1 << 9,  /**< Skeleton postprocessing. */
     trace_m4        = 1 << 10, /**< M4 traces. */
     trace_time      = 1 << 8,  /**< Time consumption. */
     trace_skeleton  = 1 << 9,  /**< Skeleton postprocessing. */
     trace_m4        = 1 << 10, /**< M4 traces. */

+    trace_muscles   = 1 << 11, /**< M4 definitions of the muscles. */

     trace_all       = ~0       /**< All of the above.  */
   };
 /** What debug items bison displays during its run.  */
     trace_all       = ~0       /**< All of the above.  */
   };
 /** What debug items bison displays during its run.  */


@@ -132,7 +136,7 @@ extern int warnings_flag;
 void getargs (int argc, char *argv[]);
 
 /* Used by parse-gram.y.  */
 void getargs (int argc, char *argv[]);
 
 /* Used by parse-gram.y.  */

-void language_argmatch (char const *arg, int prio, location const *loc);
-void skeleton_arg (const char *arg, int prio, location const *loc);
+void language_argmatch (char const *arg, int prio, location loc);
+void skeleton_arg (const char *arg, int prio, location loc);

 
 #endif /* !GETARGS_H_ */
 
 #endif /* !GETARGS_H_ */