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

Merge remote-tracking branch 'origin/maint'

Browse Source 
* origin/maint:
  gnulib: update
  errors: indent "user token number redeclaration" context

Conflicts:
	src/symtab.c
This commit is contained in:
Akim Demaille
2012-09-28 15:28:46 +02:00
parent 46bdb8ec59 93d133c932
commit 595284e9d0
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gnulib

Submodule gnulib updated: cb38ce7db8...dcf27bef48

1
src/symtab.c
View File

@@ -569,6 +569,7 @@ user_token_number_redeclaration (int num, symbol *first, symbol *second)
complain_at_indent (second->location, complaint, &i,
_("user token number %d redeclaration for %s"),
num, second->tag);
i += SUB_INDENT;
complain_at_indent (first->location, complaint, &i,
_("previous declaration for %s"),
first->tag);

4
tests/input.at
View File

@@ -805,9 +805,9 @@ start: DECIMAL_1 HEXADECIMAL_2;
AT_BISON_CHECK([redecl.y], [1], [],
[[redecl.y:10.10-22: error: user token number 11259375 redeclaration for HEXADECIMAL_1
redecl.y:9.8-16: previous declaration for DECIMAL_1
redecl.y:9.8-16: previous declaration for DECIMAL_1
redecl.y:12.10-18: error: user token number 16702650 redeclaration for DECIMAL_2
redecl.y:11.10-22: previous declaration for HEXADECIMAL_2
redecl.y:11.10-22: previous declaration for HEXADECIMAL_2
]])
AT_DATA_GRAMMAR([too-large.y],