Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-18 16:53:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't add a semicolon to actions for %skeleton or %language.

Browse Source 
It breaks Java test cases as reported by Akim Demaille.
* src/scan-code.l: Implement.
This commit is contained in:
Joel E. Denny
2008-11-07 16:48:57 -05:00
parent 4b1ebc495b
commit 7ed73f82ad
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
2008-11-07 Joel E. Denny <jdenny@ces.clemson.edu>
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 <jdenny@ces.clemson.edu> 2008-11-07 Joel E. Denny <jdenny@ces.clemson.edu>
Clean up %skeleton and %language priority implementation. Clean up %skeleton and %language priority implementation.

7
src/scan-code.l
View File

@@ -175,7 +175,9 @@ splice (\\[ \f\t\v]*\n)*
/* As an undocumented Bison extension, append `;' before the last /* As an undocumented Bison extension, append `;' before the last
brace in braced code, so that the user code can omit trailing brace in braced code, so that the user code can omit trailing
`;'. But do not append `;' if emulating Yacc, since Yacc does `;'. 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 FIXME: Bison should warn if a semicolon seems to be necessary
here, and should omit the semicolon if it seems unnecessary 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. should also diagnose other Bison extensions like %yacc.
Perhaps there should also be a GCC-style --pedantic-errors Perhaps there should also be a GCC-style --pedantic-errors
option, so that such warnings are diagnosed as 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, ';'); obstack_1grow (&obstack_for_string, ';');
STRING_GROW; STRING_GROW;