racc 1.4.13 → 1.4.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63f4e66898f77de945b0df3b04bab131f7c55aed
-  data.tar.gz: 900f1d9ce77c84ea450b5d5f679795c0e0a2cef2
+  metadata.gz: bc823e3d2f74302a78716da88054a9c139fef28c
+  data.tar.gz: 846089f41620044090f7f1f8c0ffc8c8d2b048a4
 SHA512:
-  metadata.gz: 07b41103a1d046166af2d748cacc21a6830d5a70b77a91c9dbf8cbc15469fa83d3367ba6cff6057bb63314cecca05fc18cda889839b5e37416ac29aa8b18131a
-  data.tar.gz: 1edf22c34ccd8cc533a66d513809f07133124dcf0b778f5c0cd8037ec510d4562dd3df4de6c22bc8fd1cd7b8bfccee0f8b7e406dc9e46f3686be5275d334370f
+  metadata.gz: 9c4d722765b8ba6d9dccfb917d611a0f08787a39376ec89711269c578355a1fee56fe7bc94539f679279311be73ac1048f8b8287d15baa224ebb9aa86ef989a5
+  data.tar.gz: e48b9d8d038fe05a2f8073613fc2d674eef9ea2b4ba8060d6a6f5dc059f38cd5260604f42a6505d2aa509822bb1e177c203625b307d58f74725400ecaeca883e

data/Manifest.txt

@@ -61,6 +61,7 @@ test/assets/conf.y
 test/assets/digraph.y
 test/assets/echk.y
 test/assets/err.y
+test/assets/error_recovery.y
 test/assets/expect.y
 test/assets/firstline.y
 test/assets/ichk.y

data/ext/racc/com/headius/racc/Cparse.java

@@ -30,7 +30,7 @@ import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.runtime.load.Library;
 
 public class Cparse implements Library {
-    public static final String RACC_VERSION = "1.4.13"; // TODO: parse from Cparse.c
+    public static final String RACC_VERSION = "1.4.14"; // TODO: parse from Cparse.c
 
     public enum TokenType {
         DEFAULT(-1),

data/ext/racc/cparse.c

@@ -17,7 +17,7 @@
                         Important Constants
 ----------------------------------------------------------------------- */
 
-#define RACC_VERSION "1.4.13"
+#define RACC_VERSION "1.4.14"
 
 #define DEFAULT_TOKEN -1
 #define ERROR_TOKEN    1

data/lib/racc/info.rb

@@ -10,7 +10,7 @@
 #
 
 module Racc
-  VERSION   = '1.4.13'
+  VERSION   = '1.4.14'
   Version = VERSION
   Copyright = 'Copyright (c) 1999-2006 Minero Aoki'
 end

data/lib/racc/parser-text.rb

@@ -1,7 +1,7 @@
 module Racc
   PARSER_TEXT = <<'__end_of_file__'
 #
-# $Id: f015c335c3b92ed58b32b8fb00163be48783f689 $
+# $Id: 2bd697d1146b280d8d3878e21e556ef769484a37 $
 #
 # Copyright (c) 1999-2006 Minero Aoki
 #
@@ -189,10 +189,10 @@ module Racc
   class Parser
 
     Racc_Runtime_Version = ::Racc::VERSION
-    Racc_Runtime_Revision = '$Id: f015c335c3b92ed58b32b8fb00163be48783f689 $'
+    Racc_Runtime_Revision = '$Id: 2bd697d1146b280d8d3878e21e556ef769484a37 $'
 
     Racc_Runtime_Core_Version_R = ::Racc::VERSION
-    Racc_Runtime_Core_Revision_R = '$Id: f015c335c3b92ed58b32b8fb00163be48783f689 $'.split[1]
+    Racc_Runtime_Core_Revision_R = '$Id: 2bd697d1146b280d8d3878e21e556ef769484a37 $'.split[1]
     begin
       if Object.const_defined?(:RUBY_ENGINE) and RUBY_ENGINE == 'jruby'
         require 'racc/cparse-jruby.jar'
@@ -398,7 +398,7 @@ puts $!.backtrace
         # shift
         #
         if @racc_error_status > 0
-          @racc_error_status -= 1 unless @racc_t == 1   # error token
+          @racc_error_status -= 1 unless @racc_t <= 1 # error token or EOF
         end
         @racc_vstack.push @racc_val
         @racc_state.push act
@@ -447,6 +447,8 @@ puts $!.backtrace
           end
         when 3
           if @racc_t == 0   # is $
+            # We're at EOF, and another error occurred immediately after
+            # attempting auto-recovery
             throw :racc_end_parse, nil
           end
           @racc_read_next = true

data/lib/racc/parser.rb

@@ -1,5 +1,5 @@
 #
-# $Id: f015c335c3b92ed58b32b8fb00163be48783f689 $
+# $Id: 2bd697d1146b280d8d3878e21e556ef769484a37 $
 #
 # Copyright (c) 1999-2006 Minero Aoki
 #
@@ -187,10 +187,10 @@ module Racc
   class Parser
 
     Racc_Runtime_Version = ::Racc::VERSION
-    Racc_Runtime_Revision = '$Id: f015c335c3b92ed58b32b8fb00163be48783f689 $'
+    Racc_Runtime_Revision = '$Id: 2bd697d1146b280d8d3878e21e556ef769484a37 $'
 
     Racc_Runtime_Core_Version_R = ::Racc::VERSION
-    Racc_Runtime_Core_Revision_R = '$Id: f015c335c3b92ed58b32b8fb00163be48783f689 $'.split[1]
+    Racc_Runtime_Core_Revision_R = '$Id: 2bd697d1146b280d8d3878e21e556ef769484a37 $'.split[1]
     begin
       if Object.const_defined?(:RUBY_ENGINE) and RUBY_ENGINE == 'jruby'
         require 'racc/cparse-jruby.jar'
@@ -396,7 +396,7 @@ puts $!.backtrace
         # shift
         #
         if @racc_error_status > 0
-          @racc_error_status -= 1 unless @racc_t == 1   # error token
+          @racc_error_status -= 1 unless @racc_t <= 1 # error token or EOF
         end
         @racc_vstack.push @racc_val
         @racc_state.push act
@@ -445,6 +445,8 @@ puts $!.backtrace
           end
         when 3
           if @racc_t == 0   # is $
+            # We're at EOF, and another error occurred immediately after
+            # attempting auto-recovery
             throw :racc_end_parse, nil
           end
           @racc_read_next = true

data/test/assets/error_recovery.y

@@ -0,0 +1,35 @@
+# Regression test case for the bug discussed here:
+# https://github.com/whitequark/parser/issues/93
+# In short, a Racc-generated parser could go into an infinite loop when
+# attempting error recovery at EOF
+
+class InfiniteLoop
+
+rule
+
+  stmts: stmt
+       | error stmt
+
+  stmt: '%' stmt
+
+end
+
+---- inner
+
+  def parse
+    @errors = []
+    do_parse
+  end
+
+  def next_token
+    nil
+  end
+
+  def on_error(error_token, error_value, value_stack)
+    # oh my, an error
+    @errors << [error_token, error_value]
+  end
+
+---- footer
+
+InfiniteLoop.new.parse

data/test/helper.rb

@@ -3,6 +3,7 @@ require 'minitest/autorun'
 require 'racc/static'
 require 'fileutils'
 require 'tempfile'
+require 'timeout'
 
 module Racc
   class TestCase < MiniTest::Unit::TestCase

data/test/test_racc_command.rb

@@ -151,5 +151,14 @@ module Racc
         assert_compile 'unterm.y'
       }
     end
+
+    # Regression test for a problem where error recovery at EOF would cause
+    # a Racc-generated parser to go into an infinite loop (on some grammars)
+    def test_error_recovery_y
+      assert_compile 'error_recovery.y'
+      Timeout.timeout(10) do
+        assert_exec 'error_recovery.y'
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: racc
 version: !ruby/object:Gem::Version
-  version: 1.4.13
+  version: 1.4.14
 platform: ruby
 authors:
 - Aaron Patterson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-16 00:00:00.000000000 Z
+date: 2015-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -155,6 +155,7 @@ files:
 - test/assets/digraph.y
 - test/assets/echk.y
 - test/assets/err.y
+- test/assets/error_recovery.y
 - test/assets/expect.y
 - test/assets/firstline.y
 - test/assets/ichk.y