mirror of
https://git.savannah.gnu.org/git/bison.git
synced 2026-03-11 21:33:04 +00:00
variables: accept dashes.
* src/scan-gram.l ({id}): Also accept dashes after the initial
letter.
({directive}): Use {id}.
* src/parse-gram.y: Comment and formatting changes.
* doc/bison.texinfo (Symbols): Adjust the lexical definitions of
symbols.
* src/complain.h, src/complain.c (yacc_at): New.
* src/symtab.c (symbol_new): Use yacc_at to report inappropriate
symbol names.
* src/output.c (token_definitions_output): Do not #define token
names with dashes.
(cherry picked from commit 4f646c3794)
Conflicts:
data/bison.m4
src/parse-gram.y
This commit is contained in:
committed by
Joel E. Denny
parent
379261b3fd
commit
663ce7bb3e
@@ -1,6 +1,6 @@
|
||||
/* Declaration for error-reporting function for Bison.
|
||||
|
||||
Copyright (C) 2000, 2001, 2002, 2004, 2005, 2006
|
||||
Copyright (C) 2000, 2001, 2002, 2004, 2005, 2006, 2009
|
||||
Free Software Foundation, Inc.
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
@@ -120,6 +120,27 @@ complain (const char *message, ...)
|
||||
}
|
||||
|
||||
|
||||
/*--------------------------------------------------------------.
|
||||
| An incompatibility with POSIX Yacc: mapped either to warn* or |
|
||||
| complain* depending on yacc_flag. |
|
||||
`--------------------------------------------------------------*/
|
||||
|
||||
void
|
||||
yacc_at (location loc, const char *message, ...)
|
||||
{
|
||||
if (yacc_flag)
|
||||
{
|
||||
ERROR_MESSAGE (&loc, NULL, message);
|
||||
complaint_issued = true;
|
||||
}
|
||||
else if (warnings_flag & warnings_yacc)
|
||||
{
|
||||
set_warning_issued ();
|
||||
ERROR_MESSAGE (&loc, _("warning"), message);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/*-------------------------------------------------.
|
||||
| A severe error has occurred, we cannot proceed. |
|
||||
`-------------------------------------------------*/
|
||||
|
||||
Reference in New Issue
Block a user