parser 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffeb12159b6b536bbd1d47f0d0fd6c5f00726972
-  data.tar.gz: 9a9af81cd8070c6a7ec4b48aaeb09c2ba68a66f2
+  metadata.gz: d62cbf813cac258da20e47d807e808d4a5d86d98
+  data.tar.gz: e708512bed38b4f38419882d82847f2272c11604
 SHA512:
-  metadata.gz: c6e0265a8b7621a76d4aa1068452f87efb7edc48feb4f744e188c69eb4c19110908b924f7a1ff49a76e569d9f8045e1a5fc27741c4a8facc3862a5cb5f15d224
-  data.tar.gz: 851a3cc71aacef3107b54636092d3579eb65b0c4f9914e24324bf3a9ba21490cff67e8d0a96911dcb99af18f0cdde45313b49ebc260d834007e7fed830d7100b
+  metadata.gz: 250e93427ef7b9907fe8157f1ec494bb8a2e0d589760c137ffb553a81a1056ed079237d3cbe7d9ded2e15ff95a4e27d4bc6e74f19fede3050def8b06b37a9da3
+  data.tar.gz: 05778b96f9bbe5d31ec2e5a071e09b4a9e6336ea06f447b80eb04dd8ed1ae53d45638f0653f3e594abdb35a9bc22d07e68de770e94c0ab190ea5af25022343ef

data/lib/parser/lexer/explanation.rb

@@ -2,10 +2,19 @@ module Parser
 
   module Lexer::Explanation
 
+    def self.included(klass)
+      klass.class_exec do
+        alias_method :state_before_explanation=,  :state=
+        alias_method :advance_before_explanation, :advance
+
+        remove_method :state=, :advance
+      end
+    end
+
     # Like #advance, but also pretty-print the token and its position
     # in the stream to `stdout`.
     def advance
-      type, (val, range) = super
+      type, (val, range) = advance_before_explanation
 
       puts decorate(range,
                     "\e[0;32m#{type} #{val.inspect}\e[0m",
@@ -18,7 +27,7 @@ module Parser
       puts "  \e[1;33m>>> STATE SET <<<\e[0m " +
            "#{new_state.to_s.ljust(12)} #{@cond} #{@cmdarg}".rjust(66)
 
-      super
+      self.state_before_explanation = new_state
     end
 
     private

data/lib/parser/runner/ruby_parse.rb

@@ -107,7 +107,7 @@ module Parser
       @slop.on 'E', 'explain', 'Explain how the source is tokenized' do
         ENV['RACC_DEBUG'] = '1'
 
-        Lexer.send :prepend, Lexer::Explanation
+        Lexer.send :include, Lexer::Explanation
       end
     end
 

data/lib/parser/version.rb

@@ -1,3 +1,3 @@
 module Parser
-  VERSION = '1.4.1'
+  VERSION = '1.4.2'
 end

data/test/test_parser.rb

@@ -4140,7 +4140,7 @@ class TestParser < MiniTest::Unit::TestCase
   #
 
   def test_crlf_line_endings
-    with_versions(ALL_VERSIONS) do |_ver, parser|
+    with_versions(nil, ALL_VERSIONS) do |_ver, parser|
       source_file = Parser::Source::Buffer.new('(comments)')
       source_file.source = "\r\nfoo"
 
@@ -4154,7 +4154,7 @@ class TestParser < MiniTest::Unit::TestCase
                    ast
 
       assert_equal range.call(2, 5),
-                   ast.loc.expression
+                   ast.src.expression
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parser
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Peter Zotov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-29 00:00:00.000000000 Z
+date: 2013-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast