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

Merge branch 'origin/maint'

Browse Source 
* origin/maint:
  maint: credit Wojciech Polak
  maint: post-release administrivia
  version 2.7
  yacc.c: scope reduction
  tests: C90 compliance
  fix C90 compliance
  glr.c: scope reduction
  gnulib: update

Conflicts:
	NEWS
	gnulib
	src/scan-gram.l
	src/system.h
This commit is contained in:
Akim Demaille
2012-12-14 13:56:11 +01:00
parent e96b1b2c45 2bd435c36c
commit b9278c7d17
13 changed files with 80 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ielr.c
View File

@@ -758,8 +758,8 @@ ielr_compute_state (bitsetv follow_kernel_items, bitsetv always_follows,
if (!bitset_empty_p (lookaheads[i]))
break;
}
// bitset_equal_p uses the size of the first argument, so
// lookaheads[i] must be the second argument.
/* bitset_equal_p uses the size of the first argument,
so lookaheads[i] must be the second argument. */
else if (!bitset_equal_p ((*this_isocorep)->lookaheads[i],
lookaheads[i]))
break;
@@ -1187,8 +1187,8 @@ ielr (void)
free (to_state);
if (lr_type == LR_TYPE__CANONICAL_LR)
{
// Reduction lookaheads are computed in ielr_split_states above but are
// timed as part of phase 4.
/* Reduction lookaheads are computed in ielr_split_states above
but are timed as part of phase 4. */
set_goto_map ();
}
else