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

Merge remote-tracking branch 'origin/maint'

Browse Source 
* origin/maint:
  yacc.c: always initialize yylloc
  scanner: issue a single error for groups of invalid characters
  tests: formatting changes
  doc: one of the fixes for an ambiguous grammar was ambiguous too
  doc: fix the dangling else with precedence directives
  doc: prefer "token" to TOKEN
  doc: formatting changes
  scanner: use explicit "ignore" statements

Conflicts:
	src/scan-gram.l
This commit is contained in:
Akim Demaille
2012-11-26 09:14:51 +01:00
parent 06ec0105b1 c6bf97ccb4
commit c6b1772473
8 changed files with 224 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/scan-gram.l
View File

@@ -131,8 +131,8 @@ static void unexpected_newline (boundary, char const *);
%x SC_BRACKETED_ID SC_RETURN_BRACKETED_ID
letter [.abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_]
notletter [^.abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_]{-}[%\{]
id {letter}({letter}|[-0-9])*
directive %{id}
int [0-9]+
/* POSIX says that a tag must be both an id and a C union member, but
@@ -184,7 +184,7 @@ eqopt ([[:space:]]*=)?
complain (loc, Wother, _("stray ',' treated as white space"));
}
[ \f\n\t\v] |
"//".* ;
"//".* continue;
"/*" {
token_start = loc->start;
context_state = YY_START;
@@ -269,7 +269,7 @@ eqopt ([[:space:]]*=)?
"%pure"[-_]"parser" DEPRECATED("%pure-parser");
"%token"[-_]"table" DEPRECATED("%token-table");
{directive} {
"%"{id}|"%"{notletter}([[:graph:]])+ {
complain (loc, complaint, _("invalid directive: %s"), quote (yytext));
}
@@ -353,8 +353,9 @@ eqopt ([[:space:]]*=)?
BEGIN SC_BRACKETED_ID;
}
. {
complain (loc, complaint, _("invalid character: %s"),
[^\[%A-Za-z0-9_<>{}\"\'*;|=/, \f\n\t\v]+|. {
complain (loc, complaint, "%s: %s",
ngettext ("invalid character", "invalid characters", yyleng),
quote_mem (yytext, yyleng));
}
@@ -449,10 +450,14 @@ eqopt ([[:space:]]*=)?
else
complain (loc, complaint, _("an identifier expected"));
}
. {
complain (loc, complaint, _("invalid character in bracketed name: %s"),
[^\].A-Za-z0-9_/ \f\n\t\v]+|. {
complain (loc, complaint, "%s: %s",
ngettext ("invalid character in bracketed name",
"invalid characters in bracketed name", yyleng),
quote_mem (yytext, yyleng));
}
<<EOF>> {
BEGIN bracketed_id_context_state;
unexpected_eof (bracketed_id_start, "]");
@@ -479,7 +484,7 @@ eqopt ([[:space:]]*=)?
<SC_YACC_COMMENT>
{
"*/" BEGIN context_state;
.|\n ;
.|\n continue;
<<EOF>> unexpected_eof (token_start, "*/"); BEGIN context_state;
}