options: no longer document warnings when diagnosing an invalid -W

[bison.git] / src / getargs.c

diff --git a/src/getargs.c b/src/getargs.c
index 0d43186f23c2713573e79368b12044216df0b117..fe6c1d4270bf605017cd42cf61af0bfb9630dd9d 100644 (file)
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -1,6 +1,6 @@
 /* Parse command line arguments for Bison.
 
-   Copyright (C) 1984, 1986, 1989, 1992, 2000-2012 Free Software
+   Copyright (C) 1984, 1986, 1989, 1992, 2000-2013 Free Software
    Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
@@ -46,7 +46,7 @@ bool yacc_flag; /* for -y */
 bool nondeterministic_parser = false;
 bool glr_parser = false;
 
-int feature_flag = feature_none;
+int feature_flag = feature_caret;
 int report_flag = report_none;
 int trace_flag = trace_none;
 
@@ -196,8 +196,6 @@ ARGMATCH_VERIFY (report_args, report_types);
 
 static const char * const trace_args[] =
 {
-  /* In a series of synonyms, present the most meaningful first, so
-     that argmatch_valid be more readable.  */
   "none       - no traces",
   "scan       - grammar scanner traces",
   "parse      - grammar parser traces",
@@ -244,17 +242,16 @@ ARGMATCH_VERIFY (trace_args, trace_types);
 
 static const char * const warnings_args[] =
 {
-  /* In a series of synonyms, present the most meaningful first, so
-     that argmatch_valid be more readable.  */
-  "none            - no warnings",
-  "midrule-values  - unset or unused midrule values",
-  "yacc            - incompatibilities with POSIX Yacc",
-  "conflicts-sr    - S/R conflicts",
-  "conflicts-rr    - R/R conflicts",
-  "deprecated      - obsolete constructs",
-  "other           - all other warnings",
-  "all             - all of the above",
-  "error           - warnings are errors",
+  "none",
+  "midrule-values",
+  "yacc",
+  "conflicts-sr",
+  "conflicts-rr",
+  "deprecated",
+  "precedence",
+  "other",
+  "all",
+  "error",
   0
 };
 
@@ -266,6 +263,7 @@ static const int warnings_types[] =
   Wconflicts_sr,
   Wconflicts_rr,
   Wdeprecated,
+  Wprecedence,
   Wother,
   Wall,
   Werror
@@ -381,6 +379,7 @@ Warning categories include:\n\
   `conflicts-sr'      S/R conflicts (enabled by default)\n\
   `conflicts-rr'      R/R conflicts (enabled by default)\n\
   `deprecated'        obsolete constructs\n\
+  `precedence'        useless precedence and associativity\n\
   `other'             all other warnings (enabled by default)\n\
   `all'               all the warnings\n\
   `no-CATEGORY'       turn off warnings in CATEGORY\n\