From: Akim Demaille <demaille@gostai.com>
Date: Thu, 7 Aug 2008 18:53:08 +0000 (+0200)
Subject: fix eof condition
X-Git-Tag: v2.7.90~1112
X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/db65ca1f12743e848a666209a744d514c6bf7315?ds=sidebyside

fix eof condition
---

diff --git a/ChangeLog b/ChangeLog
index 8c4b8c9e..663efd39 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-11-09  Akim Demaille  <demaille@gostai.com>
+
+	fix eof condition
+
 2008-11-09  Akim Demaille  <demaille@gostai.com>
 
 	Fix --help.
diff --git a/etc/bench.pl.in b/etc/bench.pl.in
index 40023d3f..1497a695 100755
--- a/etc/bench.pl.in
+++ b/etc/bench.pl.in
@@ -575,8 +575,7 @@ sub generate_grammar_list ($$@)
 {
   my ($base, $max, @directive) = @_;
   my $directives = directives ($base, @directive);
-  my $variant = grep { $_ eq '%define variant' } @directive;
-
+  my $variant = grep { /%define variant/ } @directive;
   my $out = new IO::File ">$base.y"
     or die;
   print $out <<EOF;
@@ -917,7 +916,10 @@ sub parse (@)
 {
   @token = @_;
   verbose 2, "Parsing: @token\n";
-  return parse_expr ();
+  my @res = parse_expr ();
+  die "expected end of directives, unexpected: @token"
+    if defined $token[0];
+  return @res;
 }
 
 sub parse_expr ()