whittle 0.0.4 → 0.0.5

data/lib/whittle/rule.rb

@@ -83,6 +83,8 @@ module Whittle
       end || [self, new_offset].hash
 
       if sym.nil?
+        assert_reducable!(state, sym)
+
         state[sym] = {
           :action => :reduce,
           :rule   => self,
@@ -252,5 +254,19 @@ module Whittle
         end
       end
     end
+
+    def assert_reducable!(instructions, sym)
+      if instructions.key?(sym) && !instructions[sym][:rule].equal?(self)
+        message = <<-END.gsub(/(^|$)\s+/m, " ")
+          Unresolvable conflict found between rules
+          `#{name.inspect} := #{components.inspect}`
+          and
+          `#{instructions[sym][:rule].name.inspect} := #{instructions[sym][:rule].components.inspect}`
+          (restructure your grammar to prevent this)
+        END
+
+        raise GrammarError, message
+      end
+    end
   end
 end

data/lib/whittle/version.rb

@@ -3,5 +3,5 @@
 # Copyright (c) Chris Corbyn, 2011
 
 module Whittle
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/unit/parser/reduce_reduce_conflict_spec.rb

@@ -0,0 +1,36 @@
+require "spec_helper"
+
+describe "a parser with a reduce-reduce conflict" do
+  let(:parser) do
+    Class.new(Whittle::Parser) do
+      rule(:wsp => /\s+/).skip!
+
+      rule(:id => /[a-z]+/)
+
+      rule(:list) do |r|
+        r[:list, :id]
+        r[:id]
+      end
+
+      rule(:prog) do |r|
+        r[:list]
+        r[:id]   # <- conflicts with :list := [:id]
+      end
+
+      start(:prog)
+    end
+  end
+
+  it "raises a GrammarError" do
+    expect { parser.new.parse("a b") }.to raise_error(Whittle::GrammarError)
+  end
+
+  it "specifies the rules that conflict" do
+    begin
+      parser.new.parse("a b")
+    rescue Whittle::GrammarError => e
+      e.message.should =~ /:prog := \[:id\]/
+      e.message.should =~ /:list := \[:id\]/
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: whittle
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-30 00:00:00.000000000 Z
+date: 2011-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70302063205940 !ruby/object:Gem::Requirement
+  requirement: &70134349797920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70302063205940
+  version_requirements: *70134349797920
 description: ! "Write powerful parsers by defining a series of very simple rules\n
   \                    and operations to perform as those rules are matched.  Whittle\n
   \                    parsers are written in pure ruby and as such are extremely
@@ -60,6 +60,7 @@ files:
 - spec/unit/parser/pass_through_parser_spec.rb
 - spec/unit/parser/precedence_spec.rb
 - spec/unit/parser/premature_eof_spec.rb
+- spec/unit/parser/reduce_reduce_conflict_spec.rb
 - spec/unit/parser/self_referential_expr_spec.rb
 - spec/unit/parser/skipped_tokens_spec.rb
 - spec/unit/parser/sum_parser_spec.rb
@@ -101,6 +102,7 @@ test_files:
 - spec/unit/parser/pass_through_parser_spec.rb
 - spec/unit/parser/precedence_spec.rb
 - spec/unit/parser/premature_eof_spec.rb
+- spec/unit/parser/reduce_reduce_conflict_spec.rb
 - spec/unit/parser/self_referential_expr_spec.rb
 - spec/unit/parser/skipped_tokens_spec.rb
 - spec/unit/parser/sum_parser_spec.rb