projects
/
bison.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
style: move argument handling of -W into the diagnostics module
[bison.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index 093e9cb26674aeb0502b16e892f2c2906ae97e43..aa8c7bfa058793bdf5747761334348fb6fc0a2f5 100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-1,6
+1,6
@@
/* Top level entry point of Bison.
/* Top level entry point of Bison.
- Copyright (C) 1984, 1986, 1989, 1992, 1995, 2000-2002, 2004-201
2
Free
+ Copyright (C) 1984, 1986, 1989, 1992, 1995, 2000-2002, 2004-201
3
Free
Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
@@
-76,6
+76,7
@@
main (int argc, char *argv[])
uniqstrs_new ();
muscle_init ();
uniqstrs_new ();
muscle_init ();
+ complain_init ();
getargs (argc, argv);
getargs (argc, argv);
@@
-94,7
+95,7
@@
main (int argc, char *argv[])
reader ();
timevar_pop (TV_READER);
reader ();
timevar_pop (TV_READER);
- if (complaint_
issued
)
+ if (complaint_
status == status_complaint
)
goto finish;
/* Find useless nonterminals and productions and reduce the grammar. */
goto finish;
/* Find useless nonterminals and productions and reduce the grammar. */
@@
-125,7
+126,7
@@
main (int argc, char *argv[])
declarations. */
timevar_push (TV_CONFLICTS);
conflicts_solve ();
declarations. */
timevar_push (TV_CONFLICTS);
conflicts_solve ();
- if (!muscle_percent_define_flag_if ("lr.keep-unreachable-state
s
"))
+ if (!muscle_percent_define_flag_if ("lr.keep-unreachable-state"))
{
state_number *old_to_new = xnmalloc (nstates, sizeof *old_to_new);
state_number nstates_old = nstates;
{
state_number *old_to_new = xnmalloc (nstates, sizeof *old_to_new);
state_number nstates_old = nstates;
@@
-144,6
+145,8
@@
main (int argc, char *argv[])
grammar_rules_useless_report (_("rule useless in parser due to conflicts"));
grammar_rules_useless_report (_("rule useless in parser due to conflicts"));
+ print_precedence_warnings ();
+
/* Output file names. */
compute_output_file_names ();
/* Output file names. */
compute_output_file_names ();
@@
-173,7
+176,7
@@
main (int argc, char *argv[])
/* Stop if there were errors, to avoid trashing previous output
files. */
/* Stop if there were errors, to avoid trashing previous output
files. */
- if (complaint_
issued
)
+ if (complaint_
status == status_complaint
)
goto finish;
/* Lookahead tokens are no longer needed. */
goto finish;
/* Lookahead tokens are no longer needed. */
@@
-215,5
+218,7
@@
main (int argc, char *argv[])
timevar_stop (TV_TOTAL);
timevar_print (stderr);
timevar_stop (TV_TOTAL);
timevar_print (stderr);
- return complaint_issued ? EXIT_FAILURE : EXIT_SUCCESS;
+ cleanup_caret ();
+
+ return complaint_status ? EXIT_FAILURE : EXIT_SUCCESS;
}
}