ruby_parser 3.6.1 → 3.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f2dc966f655d3ceb23a4b37b06c6c9c26c09ab8
-  data.tar.gz: 321f2ab576a8233d784df4723d62f8702f9c6945
+  metadata.gz: 2ac351ad4525bcf28abdb6443e42224edf4421f3
+  data.tar.gz: 8eeb665bfd2c5552211403e22e7ac92fd4d570c6
 SHA512:
-  metadata.gz: cc57151574646570da39acfc3300da57157b6b809fc6fe7bb88fc7d76e83efd2c392b20b16c23655d9655a01069909d1d635e88b4b4587763483e6458e266d17
-  data.tar.gz: 2b1503517bcba3526abc8f233bbe5fef0239b984d511cf6a1e3a3784eae2816e1e8dd3546f8726a83fdd42044fcab71e9779b4179f4d0324828403774f8abc4c
+  metadata.gz: 9be0b8f5ac035254f0653d525c4d7b268aa9357b8514f106c76508a3563fbea078f33647178176a5ab40e92df4b97ea1542594245a08532b9d9c2963b73186b0
+  data.tar.gz: 6646425bfed81e551aad7051d779ea01a750657a2f88677618e248f03036f34945ab1a876182fde2731be2c2fdccb15939a9b807fd44007f3b3d18e6394a4353

data/.autotest

@@ -1,7 +1,7 @@
 # -*- ruby -*-
 
 require 'autotest/restart'
-require 'autotest/isolate'
+# require 'autotest/isolate'
 require 'autotest/rcov' if ENV['RCOV']
 
 Autotest.add_hook :initialize do |at|

data/History.txt

@@ -1,4 +1,10 @@
-=== 3.6.1 / YYYY-MM-DD
+=== 3.6.2 / 2014-07-18
+
+* 1 bug fix:
+
+  * Handle return/next/break/yield w/ block call (WHY).
+
+=== 3.6.1 / 2014-05-12
 
 * 1 bug fix:
 

data/Rakefile

@@ -86,7 +86,7 @@ task :isolate => :phony
 end
 
 task :debug => :isolate do
-  ENV["V"] ||= "20"
+  ENV["V"] ||= "21"
   Rake.application[:parser].invoke # this way we can have DEBUG set
   Rake.application[:lexer].invoke # this way we can have DEBUG set
 

data/lib/ruby19_parser.rb

@@ -5202,6 +5202,8 @@ def _reduce_402(val, _values, result)
                       syntax_error "Both block arg and actual block given." if
                         val[0].block_pass?
 
+                      val = invert_block_call val if inverted? val
+
                       result = val[1]
                       result.insert 1, val[0]
                     

data/lib/ruby19_parser.y

@@ -1432,6 +1432,8 @@ rule
                       syntax_error "Both block arg and actual block given." if
                         val[0].block_pass?
 
+                      val = invert_block_call val if inverted? val
+
                       result = val[1]
                       result.insert 1, val[0]
                     }

data/lib/ruby20_parser.rb

@@ -5503,6 +5503,8 @@ def _reduce_413(val, _values, result)
                       syntax_error "Both block arg and actual block given." if
                         val[0].block_pass?
 
+                      val = invert_block_call val if inverted? val
+
                       result = val[1]
                       result.insert 1, val[0]
                     

data/lib/ruby20_parser.y

@@ -1494,6 +1494,8 @@ opt_block_args_tail: tCOMMA block_args_tail
                       syntax_error "Both block arg and actual block given." if
                         val[0].block_pass?
 
+                      val = invert_block_call val if inverted? val
+
                       result = val[1]
                       result.insert 1, val[0]
                     }

data/lib/ruby21_parser.rb

@@ -5556,6 +5556,8 @@ def _reduce_412(val, _values, result)
                       syntax_error "Both block arg and actual block given." if
                         val[0].block_pass?
 
+                      val = invert_block_call val if inverted? val
+
                       result = val[1]
                       result.insert 1, val[0]
                     

data/lib/ruby21_parser.y

@@ -1495,6 +1495,8 @@ opt_block_args_tail: tCOMMA block_args_tail
                       syntax_error "Both block arg and actual block given." if
                         val[0].block_pass?
 
+                      val = invert_block_call val if inverted? val
+
                       result = val[1]
                       result.insert 1, val[0]
                     }

data/lib/ruby_lexer.rex

@@ -1,7 +1,5 @@
 # encoding: UTF-8
-# TODO: this needs to be put on the first line
 #
-# new_ruby_parser.rex
 # lexical scanner definition for ruby
 
 class RubyLexer

data/lib/ruby_lexer.rex.rb

@@ -1,13 +1,11 @@
+# encoding: UTF-8
 #--
 # This file is automatically generated. Do not modify it.
-# Generated by: oedipus_lex version 2.2.1.
+# Generated by: oedipus_lex version 2.3.1.
 # Source: lib/ruby_lexer.rex
 #++
 
-# encoding: UTF-8
-# TODO: this needs to be put on the first line
 #
-# new_ruby_parser.rex
 # lexical scanner definition for ruby
 
 class RubyLexer

data/lib/ruby_parser_extras.rb

@@ -91,7 +91,7 @@ class RPStringScanner < StringScanner
 end
 
 module RubyParserStuff
-  VERSION = "3.6.1" unless constants.include? "VERSION" # SIGH
+  VERSION = "3.6.2" unless constants.include? "VERSION" # SIGH
 
   attr_accessor :lexer, :in_def, :in_single, :file
   attr_reader :env, :comments
@@ -1061,6 +1061,18 @@ module RubyParserStuff
       block and call_or_args.block_pass?
   end
 
+  def inverted? val
+    [:return, :next, :break, :yield].include? val[0].sexp_type
+  end
+
+  def invert_block_call val
+    (type, call), iter = val
+
+    iter.insert 1, call
+
+    [iter, s(type)]
+  end
+
   def ret_args node
     if node then
       raise "write a test 5" if node[0] == :block_pass

data/test/test_ruby_parser.rb

@@ -1643,6 +1643,46 @@ module TestRubyParserShared19to21
     assert_parse rb, pt
   end
 
+  def test_block_return
+    rb = "return foo arg do |bar| end"
+    pt = s(:return,
+           s(:iter,
+             s(:call, nil, :foo, s(:call, nil, :arg)),
+             s(:args, :bar)))
+
+    assert_parse rb, pt
+  end
+
+  def test_block_next
+    rb = "next foo arg do |bar| end"
+    pt = s(:next,
+           s(:iter,
+             s(:call, nil, :foo, s(:call, nil, :arg)),
+             s(:args, :bar)))
+
+    assert_parse rb, pt
+  end
+
+  def test_block_yield
+    rb = "yield foo arg do |bar| end"
+    pt = s(:yield,
+           s(:iter,
+             s(:call, nil, :foo, s(:call, nil, :arg)),
+             s(:args, :bar)))
+
+    assert_parse rb, pt
+  end
+
+  def test_block_break
+    rb = "break foo arg do |bar| end"
+    pt = s(:break,
+           s(:iter,
+             s(:call, nil, :foo, s(:call, nil, :arg)),
+             s(:args, :bar)))
+
+    assert_parse rb, pt
+  end
+
   def test_block_splat_reg
     rb = "a { |*b, c| }"
     pt = s(:iter, s(:call, nil, :a), s(:args, :"*b", :c))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_parser
 version: !ruby/object:Gem::Version
-  version: 3.6.1
+  version: 3.6.2
 platform: ruby
 authors:
 - Ryan Davis
@@ -29,7 +29,7 @@ cert_chain:
   Y4evBVezr3SjXz08vPqRO5YRdO3zfeMT8gBjRqZjWJGMZ2lD4XNfrs7eky74CyZw
   xx3n58i0lQkBE1EpKE0lFu/y
   -----END CERTIFICATE-----
-date: 2014-05-12 00:00:00.000000000 Z
+date: 2014-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexp_processor
@@ -51,14 +51,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '5.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '5.4'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement