ruby_parser 3.2.2 → 3.3.0

data/test/test_ruby_parser.rb

@@ -151,6 +151,19 @@ module TestRubyParserShared
     assert_parse rb, pt
   end
 
+  def test_attrasgn_array_arg
+    rb = "a[[1, 2]] = 3"
+    pt = s(:attrasgn,
+           s(:call, nil, :a),
+           :[]=,
+           s(:array,
+             s(:lit, 1),
+             s(:lit, 2)),
+           s(:lit, 3))
+
+    assert_parse rb, pt
+  end
+
   def test_block_append
     head = s(:args)
     tail = s(:zsuper)
@@ -281,6 +294,13 @@ module TestRubyParserShared
     assert_parse rb, pt
   end
 
+  def test_begin_else_return_value
+    rb = "begin; else 2; end"
+    pt = s(:lit, 2)
+
+    assert_parse rb, pt
+  end
+
   def test_bug_comment_eq_begin
     rb = "\n\n#\n=begin\nblah\n=end\n\n"
     pt = nil
@@ -290,6 +310,13 @@ module TestRubyParserShared
     assert_equal exp, processor.lexer.comments
   end
 
+  def test_eq_begin_why_wont_people_use_their_spacebar?
+    rb = "h[k]=begin\n       42\n     end"
+    pt = s(:attrasgn, s(:call, nil, :h), :[]=, s(:call, nil, :k), s(:lit, 42))
+
+    assert_parse rb, pt
+  end
+
   def test_bug_call_arglist_parens
     rb = 'g ( 1), 2'
     pt = s(:call, nil, :g, s(:lit, 1), s(:lit, 2))
@@ -360,6 +387,14 @@ module TestRubyParserShared
     assert_equal expected_env, processor.env.all
   end
 
+  def test_lasgn_ivar_env
+    rb = '@a = 42'
+    pt = s(:iasgn, :@a, s(:lit, 42))
+
+    assert_parse rb, pt
+    assert_empty processor.env.all
+  end
+
   def test_list_append
     a = s(:lit, 1)
     b = s(:lit, 2)
@@ -539,6 +574,13 @@ module TestRubyParserShared
     assert_parse rb, pt
   end
 
+  def test_str_pct_q
+    rb = "%q{a b c}"
+    pt = s(:str, "a b c")
+
+    assert_parse rb, pt
+  end
+
   # def test_str_pct_nested_nested
   #   rb = "%{ { #\{ \"#\{1}\" } } }"
   #   assert_equal " { 1 } ", eval(rb)
@@ -590,6 +632,41 @@ module TestRubyParserShared
     assert_same result.file, result.call.file
   end
 
+  def test_parse_line_block_inline_comment
+    rb = "a\nb # comment\nc"
+    pt = s(:block,
+           s(:call, nil, :a).line(1),
+           s(:call, nil, :b).line(2),
+           s(:call, nil, :c).line(3))
+
+    # see skipped test: test_parse_line_block_inline_comment2
+    assert_parse rb, pt
+  end
+
+  def test_parse_line_block_inline_comment2
+    skip "I can't fix this yet. Very involved. (process_token to return lineno)"
+
+    rb = "a\nb # comment\n# another comment\nc"
+    pt = s(:block,
+           s(:call, nil, :a).line(1),
+           s(:call, nil, :b).line(2),
+           s(:call, nil, :c).line(4)).line(1)
+
+    assert_parse rb, pt
+  end
+
+  def test_parse_line_block_inline_comment3
+    skip "not yet"
+
+    rb = "\n\n\na\nb # comment\n# another comment\nc"
+    pt = s(:block,
+           s(:call, nil, :a).line(4),
+           s(:call, nil, :b).line(6),
+           s(:call, nil, :c).line(8)).line(1)
+
+    assert_parse rb, pt
+  end
+
   def test_parse_line_call_no_args
     rb = "f do |x, y|\n  x + y\nend"
 
@@ -610,6 +687,8 @@ module TestRubyParserShared
     rb = "def f\nend"
     assert_parse_line rb, pt, 1
 
+    processor.reset
+
     rb = "def f\n\nend"
     assert_parse_line rb, pt, 1
   end
@@ -1413,7 +1492,6 @@ module TestRubyParserShared
   end
 
   def test___ENCODING__
-    # skip "lexer bug" if ruby18
     rb = "__ENCODING__"
     pt = if Ruby18Parser === processor then
            s(:call, nil, :__ENCODING__)
@@ -2794,6 +2872,28 @@ class TestRuby20Parser < RubyParserTestCase
     assert_parse rb, pt
   end
 
+  def test_defn_kwarg_lvar
+    rb = "def fun(kw: :val); kw; end"
+    pt = s(:defn, :fun, s(:args, s(:kwarg, :kw, s(:lit, :val))), s(:lvar, :kw))
+
+    assert_parse rb, pt
+  end
+
+  def test_defn_kwarg_no_parens
+    rb = "def f a: 1\nend"
+    pt = s(:defn, :f, s(:args, s(:kwarg, :a, s(:lit, 1))), s(:nil))
+
+    assert_parse rb, pt
+  end
+
+  def test_block_kwarg_lvar
+    rb = "bl { |kw: :val| kw }"
+    pt = s(:iter, s(:call, nil, :bl), s(:args, s(:kwarg, :kw, s(:lit, :val))),
+           s(:lvar, :kw))
+
+    assert_parse rb, pt
+  end
+
   def test_defn_powarg
     rb = "def f(**opts) end"
     pt = s(:defn, :f, s(:args, :"**opts"), s(:nil))

data/test/test_ruby_parser_extras.rb

@@ -173,36 +173,6 @@ class TestEnvironment < Minitest::Test
     assert_equal 42, @env[:blah]
   end
 
-  def test_use
-    @env.use :blah
-    expected = [{ :blah => true }]
-    assert_equal expected, @env.instance_variable_get(:"@use")
-  end
-
-  def test_use_scoped
-    @env.use :blah
-    @env.extend
-    expected = [{}, { :blah => true }]
-    assert_equal expected, @env.instance_variable_get(:"@use")
-  end
-
-  def test_used_eh
-    @env.extend :dynamic
-    @env[:x] = :dvar
-    @env.use :x
-    assert_equal true, @env.used?(:x)
-  end
-
-  def test_used_eh_none
-    assert_equal nil, @env.used?(:x)
-  end
-
-  def test_used_eh_scoped
-    self.test_used_eh
-    @env.extend :dynamic
-    assert_equal true, @env.used?(:x)
-  end
-
   def test_var_scope_dynamic
     @env.extend :dynamic
     assert_equal 42, @env[:blah]
@@ -217,30 +187,6 @@ class TestEnvironment < Minitest::Test
     assert_equal 42, @env[:blah]
   end
 
-  def test_dynamic
-    expected1 = {}
-    expected2 = { :x => 42 }
-
-    assert_equal expected1, @env.dynamic
-    begin
-      @env.extend :dynamic
-      assert_equal expected1, @env.dynamic
-
-      @env[:x] = 42
-      assert_equal expected2, @env.dynamic
-
-      begin
-        @env.extend :dynamic
-        assert_equal expected2, @env.dynamic
-        @env.unextend
-      end
-
-      assert_equal expected2, @env.dynamic
-      @env.unextend
-    end
-    assert_equal expected1, @env.dynamic
-  end
-
   def test_all_dynamic
     expected = { :blah => 42 }
 
@@ -260,14 +206,6 @@ class TestEnvironment < Minitest::Test
     assert_equal expected, @env.all
   end
 
-  def test_dynamic_eh
-    assert_equal false, @env.dynamic?
-    @env.extend :dynamic
-    assert_equal true, @env.dynamic?
-    @env.extend
-    assert_equal false, @env.dynamic?
-  end
-
   def test_all_static_deeper
     expected0 = { :blah => 42 }
     expected1 = { :blah => 42, :blah2 => 24 }
@@ -277,7 +215,7 @@ class TestEnvironment < Minitest::Test
     @env[:blah2] = 24
     assert_equal expected1, @env.all
 
-    @env.extend 
+    @env.extend
     @env[:blah] = 27
     assert_equal expected2, @env.all
 

metadata

@@ -1,24 +1,18 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ruby_parser
-version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: 
-  segments: 
-  - 3
-  - 2
-  - 2
-  version: 3.2.2
+version: !ruby/object:Gem::Version
+  version: 3.3.0
 platform: ruby
-authors: 
+authors:
 - Ryan Davis
 autorequire: 
 bindir: bin
-cert_chain: 
+cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDPjCCAiagAwIBAgIBADANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
+  MIIDPjCCAiagAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
   ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTA5MDMwNjE4NTMxNVoXDTEwMDMwNjE4NTMxNVowRTETMBEGA1UE
+  GRYDY29tMB4XDTEzMDkxNjIzMDQxMloXDTE0MDkxNjIzMDQxMlowRTETMBEGA1UE
   AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
   JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
   b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
@@ -28,146 +22,139 @@ cert_chain:
   qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
   gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
   HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBBQUAA4IB
-  AQAY59gYvDxqSqgC92nAP9P8dnGgfZgLxP237xS6XxFGJSghdz/nI6pusfCWKM8m
-  vzjjH2wUMSSf3tNudQ3rCGLf2epkcU13/rguI88wO6MrE0wi4ZqLQX+eZQFskJb/
-  w6x9W1ur8eR01s397LSMexySDBrJOh34cm2AlfKr/jokKCTwcM0OvVZnAutaovC0
-  l1SVZ0ecg88bsWHA0Yhh7NFxK1utWoIhtB6AFC/+trM0FQEB/jZkIS8SaNzn96Rl
-  n0sZEf77FLf5peR8TP/PtmIg7Cyqz23sLM4mCOoTGIy5OcZ8TdyiyINUHtb5ej/T
-  FBHgymkyj/AOSqKRIpXPhjC6
+  AQCFZ7JTzoy1gcG4d8A6dmOJy7ygtO5MFpRIz8HuKCF5566nOvpy7aHhDDzFmQuu
+  FX3zDU6ghx5cQIueDhf2SGOncyBmmJRRYawm3wI0o1MeN6LZJ/3cRaOTjSFy6+S6
+  zqDmHBp8fVA2TGJtO0BLNkbGVrBJjh0UPmSoGzWlRhEVnYC33TpDAbNA+u39UrQI
+  ynwhNN7YbnmSR7+JU2cUjBFv2iPBO+TGuWC+9L2zn3NHjuc6tnmSYipA9y8Hv+As
+  Y4evBVezr3SjXz08vPqRO5YRdO3zfeMT8gBjRqZjWJGMZ2lD4XNfrs7eky74CyZw
+  xx3n58i0lQkBE1EpKE0lFu/y
   -----END CERTIFICATE-----
-
-date: 2013-07-12 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-01-15 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: sexp_processor
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 4
-        - 1
-        version: "4.1"
+      - !ruby/object:Gem::Version
+        version: '4.1'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: minitest
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.1'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 5
-        - 0
-        version: "5.0"
+      - !ruby/object:Gem::Version
+        version: '5.2'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '5.2'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 4
-        - 0
-        version: "4.0"
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: racc
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: racc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 4
-        - 6
+      - !ruby/object:Gem::Version
         version: 1.4.6
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.6
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - <
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 10
-        version: "10"
+      - !ruby/object:Gem::Version
+        version: '11'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: '11'
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 3
-        - 6
-        version: "3.6"
+      - !ruby/object:Gem::Version
+        version: '3.7'
   type: :development
-  version_requirements: *id006
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.7'
 description: |-
   ruby_parser (RP) is a ruby parser written in pure ruby (utilizing
   racc--which does by default use a C extension). RP's output is
   the same as ParseTree's output: s-expressions using ruby's arrays and
   base types.
-  
+
   As an example:
-  
+
       def conditional1 arg1
         return 1 if arg1 == 0
         return 0
       end
-  
+
   becomes:
-  
+
       s(:defn, :conditional1, s(:args, :arg1),
         s(:if,
           s(:call, s(:lvar, :arg1), :==, s(:lit, 0)),
           s(:return, s(:lit, 1)),
           nil),
         s(:return, s(:lit, 0)))
-  
+
   Tested against 801,039 files from the latest of all rubygems (as of 2013-05):
-  
+
   * 1.8 parser is at 99.9739% accuracy, 3.651 sigma
   * 1.9 parser is at 99.9940% accuracy, 4.013 sigma
   * 2.0 parser is at 99.9939% accuracy, 4.008 sigma
-email: 
+email:
 - ryand-ruby@zenspider.com
-executables: 
+executables:
 - ruby_parse
 - ruby_parse_extract_error
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - History.txt
 - Manifest.txt
 - README.txt
-files: 
+files:
 - .autotest
+- .gemtest
 - History.txt
 - Manifest.txt
 - README.txt
@@ -187,42 +174,34 @@ files:
 - test/test_ruby_lexer.rb
 - test/test_ruby_parser.rb
 - test/test_ruby_parser_extras.rb
-- .gemtest
 homepage: https://github.com/seattlerb/ruby_parser
-licenses: []
-
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.txt
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: parsetree
-rubygems_version: 1.8.25
+rubyforge_project: ruby_parser
+rubygems_version: 2.2.1
 signing_key: 
-specification_version: 3
-summary: ruby_parser (RP) is a ruby parser written in pure ruby (utilizing racc--which does by default use a C extension)
-test_files: 
+specification_version: 4
+summary: ruby_parser (RP) is a ruby parser written in pure ruby (utilizing racc--which
+  does by default use a C extension)
+test_files:
 - test/test_ruby_lexer.rb
 - test/test_ruby_parser.rb
 - test/test_ruby_parser_extras.rb