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

quote consistently and make tests pass with new quoting from gnulib

Browse Source 
Updating to gnulib pulled in new quote and quotarg modules,
by which quoting is now done like 'this' rather than `this'.
That change induces many "make check" test failures.  This change
adapts code and tests so that "make check" passes once again.
* src/scan-code.l: Quote like 'this', not like `this'.
* src/scan-gram.l: Likewise.
* src/symtab.c: Likewise.
* tests/actions.at: Adjust tests to match.
* tests/input.at: Likewise.
* tests/named-refs.at: Likewise.
* tests/output.at: Likewise.
* tests/regression.at: Likewise.
* lib/.gitignore: Regenerate.
* m4/.gitignore: Likewise.
(cherry picked from commit ae93e4e4b8)

Conflicts:

	src/scan-code.l
	src/scan-gram.l
	src/symtab.c
	tests/output.at
This commit is contained in:
Jim Meyering
2012-01-16 19:20:50 +01:00
committed by Akim Demaille
parent 14594e38ad
commit 9874f80b2e
10 changed files with 207 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/scan-gram.l
View File

@@ -88,11 +88,11 @@ static void unexpected_newline (boundary, char const *);
/* Strings and characters in directives/rules. */
%x SC_ESCAPED_STRING SC_ESCAPED_CHARACTER
/* A identifier was just read in directives/rules. Special state
to capture the sequence `identifier :'. */
to capture the sequence 'identifier :'. */
%x SC_AFTER_IDENTIFIER
/* Three types of user code:
- prologue (code between `%{' `%}' in the first section, before %%);
- prologue (code between '%{' '%}' in the first section, before %%);
- actions, printers, union, etc, (between braced in the middle section);
- epilogue (everything after the second %%). */
%x SC_PROLOGUE SC_BRACED_CODE SC_EPILOGUE
@@ -146,7 +146,7 @@ splice (\\[ \f\t\v]*\n)*
<INITIAL,SC_AFTER_IDENTIFIER,SC_BRACKETED_ID,SC_RETURN_BRACKETED_ID>
{
/* Comments and white space. */
"," warn_at (*loc, _("stray `,' treated as white space"));
"," warn_at (*loc, _("stray ',' treated as white space"));
[ \f\n\t\v] |
"//".* ;
"/*" {
@@ -397,7 +397,7 @@ splice (\\[ \f\t\v]*\n)*
/*---------------------------------------------------------------.
| Scanning a Yacc comment. The initial `/ *' is already eaten. |
| Scanning a Yacc comment. The initial '/ *' is already eaten. |
`---------------------------------------------------------------*/
<SC_YACC_COMMENT>
@@ -409,7 +409,7 @@ splice (\\[ \f\t\v]*\n)*
/*------------------------------------------------------------.
| Scanning a C comment. The initial `/ *' is already eaten. |
| Scanning a C comment. The initial '/ *' is already eaten. |
`------------------------------------------------------------*/
<SC_COMMENT>
@@ -420,7 +420,7 @@ splice (\\[ \f\t\v]*\n)*
/*--------------------------------------------------------------.
| Scanning a line comment. The initial `//' is already eaten. |
| Scanning a line comment. The initial '//' is already eaten. |
`--------------------------------------------------------------*/
<SC_LINE_COMMENT>
@@ -648,8 +648,8 @@ splice (\\[ \f\t\v]*\n)*
}
}
/* Tokenize `<<%' correctly (as `<<' `%') rather than incorrrectly
(as `<' `<%'). */
/* Tokenize '<<%' correctly (as '<<' '%') rather than incorrrectly
(as '<' '<%'). */
"<"{splice}"<" STRING_GROW;
<<EOF>> {
@@ -840,7 +840,7 @@ convert_ucn_to_byte (char const *ucn)
/*----------------------------------------------------------------.
| Handle `#line INT "FILE"'. ARGS has already skipped `#line '. |
| Handle '#line INT "FILE"'. ARGS has already skipped '#line '. |
`----------------------------------------------------------------*/
static void
@@ -884,7 +884,7 @@ unexpected_end (boundary start, char const *msgid, char const *token_end)
static void
unexpected_eof (boundary start, char const *token_end)
{
unexpected_end (start, N_("missing `%s' at end of file"), token_end);
unexpected_end (start, N_("missing '%s' at end of file"), token_end);
}
@@ -895,7 +895,7 @@ unexpected_eof (boundary start, char const *token_end)
static void
unexpected_newline (boundary start, char const *token_end)
{
unexpected_end (start, N_("missing `%s' at end of line"), token_end);
unexpected_end (start, N_("missing '%s' at end of line"), token_end);
}