X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/23d13411c85d3a8705f9507219f61eddea57a218..70b7c357476ed3525ddb5d2739e70690cfebb207:/src/conflicts.c diff --git a/src/conflicts.c b/src/conflicts.c index f8ed1772..885bd78f 100644 --- a/src/conflicts.c +++ b/src/conflicts.c @@ -1,6 +1,6 @@ /* Find and resolve or report lookahead conflicts for bison, - Copyright (C) 1984, 1989, 1992, 2000-2012 Free Software Foundation, + Copyright (C) 1984, 1989, 1992, 2000-2013 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -569,7 +569,7 @@ conflicts_print (void) different strings to translate. */ { int total = count_sr_conflicts (); - // If %expect is not used, but %expect-rr is, then expect 0 sr. + /* If %expect is not used, but %expect-rr is, then expect 0 sr. */ int expected = (expected_sr_conflicts == -1 && expected_rr_conflicts != -1) ? 0 @@ -591,7 +591,7 @@ conflicts_print (void) { int total = count_rr_conflicts (true); - // If %expect-rr is not used, but %expect is, then expect 0 rr. + /* If %expect-rr is not used, but %expect is, then expect 0 rr. */ int expected = (expected_rr_conflicts == -1 && expected_sr_conflicts != -1) ? 0