From 7ed73f82ad0d54be945b9d5146e343c8e89bf81f Mon Sep 17 00:00:00 2001 From: "Joel E. Denny" Date: Fri, 7 Nov 2008 16:48:57 -0500 Subject: [PATCH] Don't add a semicolon to actions for %skeleton or %language. It breaks Java test cases as reported by Akim Demaille. * src/scan-code.l: Implement. --- ChangeLog | 6 ++++++ src/scan-code.l | 7 +++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4d3011f1..86aa3e5d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-11-07 Joel E. Denny + + Don't add a semicolon to actions for %skeleton or %language. + It breaks Java test cases as reported by Akim Demaille. + * src/scan-code.l: Implement. + 2008-11-07 Joel E. Denny Clean up %skeleton and %language priority implementation. diff --git a/src/scan-code.l b/src/scan-code.l index 71c90768..13a78c27 100644 --- a/src/scan-code.l +++ b/src/scan-code.l @@ -175,7 +175,9 @@ splice (\\[ \f\t\v]*\n)* /* As an undocumented Bison extension, append `;' before the last brace in braced code, so that the user code can omit trailing `;'. But do not append `;' if emulating Yacc, since Yacc does - not append one. + not append one. Also, some output languages (like Java) do not + accept an extra semicolon, so don't append if the user specified + a skeleton or language. FIXME: Bison should warn if a semicolon seems to be necessary here, and should omit the semicolon if it seems unnecessary @@ -186,7 +188,8 @@ splice (\\[ \f\t\v]*\n)* should also diagnose other Bison extensions like %yacc. Perhaps there should also be a GCC-style --pedantic-errors option, so that such warnings are diagnosed as errors. */ - if (outer_brace && ! yacc_flag) + if (outer_brace && !yacc_flag && language_prio == default_prio + && skeleton_prio == default_prio) obstack_1grow (&obstack_for_string, ';'); STRING_GROW; -- 2.45.2