parser 2.4.0.0 → 2.4.0.1

data/test/test_parse_helper.rb

@@ -65,13 +65,13 @@ class TestParseHelper < Minitest::Test
     assert_equal ast, traverse_ast(ast, %w())
 
     assert_equal s(:int, 1), traverse_ast(ast, %w(int))
-    assert_equal nil, traverse_ast(ast, %w(str))
-
     assert_equal s(:str, 'foo'), traverse_ast(ast, %w(dstr str))
     assert_equal s(:int, 2), traverse_ast(ast, %w(dstr int))
     assert_equal s(:int, 2), traverse_ast(ast, %w(dstr int/1))
     assert_equal s(:int, 3), traverse_ast(ast, %w(dstr int/2))
-    assert_equal nil, traverse_ast(ast, %w(dstr int/3))
+
+    assert_nil traverse_ast(ast, %w(str))
+    assert_nil traverse_ast(ast, %w(dstr int/3))
   end
 
   def test_assert_parses

data/test/test_parser.rb

@@ -25,6 +25,7 @@ class TestParser < Minitest::Test
   SINCE_2_2 = SINCE_2_1 - %w(2.1)
   SINCE_2_3 = SINCE_2_2 - %w(2.2)
   SINCE_2_4 = SINCE_2_3 - %w(2.3)
+  SINCE_2_5 = SINCE_2_4 - %w(2.4)
 
   # Guidelines for test naming:
   #  * Test structure follows structure of AST_FORMAT.md.
@@ -98,6 +99,12 @@ class TestParser < Minitest::Test
       %q{42},
       %q{~~ expression})
 
+    assert_parses(
+      s(:int, 42),
+      %q{+42},
+      %q{^ operator
+        |~~~ expression})
+
     assert_parses(
       s(:int, -42),
       %q{-42},
@@ -2868,7 +2875,7 @@ class TestParser < Minitest::Test
       %q{fun(1, bar: 2, 3, nil)},
       %q{            ~~~~~~~~~ expression (hash.pair.objc_varargs)},
       %w(mac))
-    end
+  end
 
   # To receiver
 
@@ -3251,13 +3258,35 @@ class TestParser < Minitest::Test
       SINCE_1_9)
   end
 
-  def test_pow_precedence
+  def test_unary_num_pow_precedence
     assert_parses(
-      s(:send, s(:send, s(:int, 2), :**, s(:int, 10)), :-@),
+      s(:send,
+        s(:send,
+          s(:int, 2), :**, s(:int, 10)),
+        :+@),
+      %q{+2 ** 10},
+      %{},
+      %w{2.1})
+
+    assert_parses(
+      s(:send,
+        s(:send,
+          s(:float, 2.0), :**, s(:int, 10)),
+        :+@),
+      %q{+2.0 ** 10})
+
+    assert_parses(
+      s(:send,
+        s(:send,
+          s(:int, 2), :**, s(:int, 10)),
+        :-@),
       %q{-2 ** 10})
 
     assert_parses(
-      s(:send, s(:send, s(:float, 2.0), :**, s(:int, 10)), :-@),
+      s(:send,
+        s(:send,
+          s(:float, 2.0), :**, s(:int, 10)),
+        :-@),
       %q{-2.0 ** 10})
   end
 
@@ -4255,7 +4284,12 @@ class TestParser < Minitest::Test
   def test_if_masgn__24
     assert_parses(
       s(:if,
-        s(:begin, nil), nil, nil),
+        s(:begin,
+          s(:masgn,
+            s(:mlhs,
+              s(:lvasgn, :a),
+              s(:lvasgn, :b)),
+          s(:lvar, :foo))), nil, nil),
       %q{if (a, b = foo); end},
       %q{},
       SINCE_2_4)
@@ -4277,6 +4311,28 @@ class TestParser < Minitest::Test
       %w(1.8 1.9 2.0 2.1 2.2 2.3 ios mac))
   end
 
+  def test_not_masgn
+    assert_diagnoses(
+      [:error, :masgn_as_condition],
+      %q{!(a, b = foo)},
+      %q{  ~~~~~~~~~~  location},
+      %w(1.8 1.9 2.0 2.1 2.2 2.3 ios mac))
+  end
+
+  def test_not_masgn__24
+    assert_parses(
+      s(:send,
+        s(:begin,
+          s(:masgn,
+            s(:mlhs,
+              s(:lvasgn, :a),
+              s(:lvasgn, :b)),
+          s(:lvar, :foo))), :'!'),
+      %q{!(a, b = foo)},
+      %q{},
+      SINCE_2_4)
+  end
+
   def test_cond_begin
     assert_parses(
       s(:if,
@@ -4333,6 +4389,20 @@ class TestParser < Minitest::Test
       %q{if foo..bar; end},
       %q{   ~~~~~~~~ expression (iflipflop)
         |      ~~ operator (iflipflop)})
+
+    assert_parses(
+      s(:not, s(:begin, s(:iflipflop, s(:lvar, :foo), s(:lvar, :bar)))),
+      %q{!(foo..bar)},
+      %q{  ~~~~~~~~ expression (begin.iflipflop)
+        |     ~~ operator (begin.iflipflop)},
+      %w(1.8))
+
+    assert_parses(
+      s(:send, s(:begin, s(:iflipflop, s(:lvar, :foo), s(:lvar, :bar))), :'!'),
+      %q{!(foo..bar)},
+      %q{  ~~~~~~~~ expression (begin.iflipflop)
+        |     ~~ operator (begin.iflipflop)},
+      SINCE_1_9)
   end
 
   def test_cond_eflipflop
@@ -4342,6 +4412,20 @@ class TestParser < Minitest::Test
       %q{if foo...bar; end},
       %q{   ~~~~~~~~~ expression (eflipflop)
         |      ~~~ operator (eflipflop)})
+
+    assert_parses(
+      s(:not, s(:begin, s(:eflipflop, s(:lvar, :foo), s(:lvar, :bar)))),
+      %q{!(foo...bar)},
+      %q{  ~~~~~~~~~ expression (begin.eflipflop)
+        |     ~~~ operator (begin.eflipflop)},
+      %w(1.8))
+
+    assert_parses(
+      s(:send, s(:begin, s(:eflipflop, s(:lvar, :foo), s(:lvar, :bar))), :'!'),
+      %q{!(foo...bar)},
+      %q{  ~~~~~~~~~ expression (begin.eflipflop)
+        |     ~~~ operator (begin.eflipflop)},
+      SINCE_1_9)
   end
 
   def test_cond_match_current_line
@@ -4354,6 +4438,27 @@ class TestParser < Minitest::Test
         nil, nil),
       %q{if /wat/; end},
       %q{   ~~~~~ expression (match_current_line)})
+
+    assert_parses(
+      s(:not,
+        s(:match_current_line,
+          s(:regexp,
+            s(:str, 'wat'),
+            s(:regopt)))),
+      %q{!/wat/},
+      %q{ ~~~~~ expression (match_current_line)},
+      %w(1.8))
+
+    assert_parses(
+      s(:send,
+        s(:match_current_line,
+          s(:regexp,
+            s(:str, 'wat'),
+            s(:regopt))),
+        :'!'),
+      %q{!/wat/},
+      %q{ ~~~~~ expression (match_current_line)},
+      SINCE_1_9)
   end
 
   # Case matching
@@ -4887,6 +4992,23 @@ class TestParser < Minitest::Test
       SINCE_1_9)
   end
 
+  def test_rescue_without_begin_end
+    assert_parses(
+      s(:block,
+        s(:send, nil, :meth),
+        s(:args),
+        s(:rescue,
+          s(:lvar, :foo),
+          s(:resbody, nil, nil,
+            s(:lvar, :bar)),
+          nil)),
+      %q{meth do; foo; rescue; bar; end},
+      %q{              ~~~~~~ keyword (rescue.resbody)
+        |              ~~~~~~~~~~~ expression (rescue.resbody)
+        |         ~~~~~~~~~~~~~~~~ expression (rescue)},
+      SINCE_2_5)
+  end
+
   def test_resbody_list
     assert_parses(
       s(:kwbegin,
@@ -5229,7 +5351,7 @@ class TestParser < Minitest::Test
 
       ast, comments, tokens = parser.tokenize(source_file, true)
 
-      assert_equal nil, ast
+      assert_nil ast
 
       assert_equal [
                      Parser::Source::Comment.new(range.call(4, 9))
@@ -5320,6 +5442,14 @@ class TestParser < Minitest::Test
         |       ~~~~~~~~~~~~~~~~~~~~~~ expression (rescue)})
   end
 
+  def test_bug_def_empty_else
+    assert_parses(
+      s(:def, :foo, s(:args),
+        s(:begin,
+          s(:begin, nil))),
+      %q{def foo; else; end})
+  end
+
   def test_bug_heredoc_do
     assert_parses(
       s(:block,

data/test/test_source_comment_associator.rb

@@ -213,6 +213,96 @@ end
     assert_equal 0, associations.size
   end
 
+  def test_associate_frozen_string_literal
+    ast, associations = associate(<<-END)
+# frozen_string_literal: true
+class Foo
+end
+    END
+
+    assert_equal 0, associations.size
+  end
+
+  def test_associate_frozen_string_literal_dash_star_dash
+    ast, associations = associate(<<-END)
+# -*- frozen_string_literal: true -*-
+class Foo
+end
+    END
+
+    assert_equal 0, associations.size
+  end
+
+  def test_associate_frozen_string_literal_no_space_after_colon
+    ast, associations = associate(<<-END)
+# frozen_string_literal:true
+class Foo
+end
+    END
+
+    assert_equal 0, associations.size
+  end
+
+  def test_associate_warn_indent
+    ast, associations = associate(<<-END)
+# warn_indent: true
+class Foo
+end
+    END
+
+    assert_equal 0, associations.size
+  end
+
+  def test_associate_warn_indent_dash_star_dash
+    ast, associations = associate(<<-END)
+# -*- warn_indent: true -*-
+class Foo
+end
+    END
+
+    assert_equal 0, associations.size
+  end
+
+  def test_associate_warn_past_scope
+    ast, associations = associate(<<-END)
+# warn_past_scope: true
+class Foo
+end
+    END
+
+    assert_equal 0, associations.size
+  end
+
+  def test_associate_warn_past_scope_dash_star_dash
+    ast, associations = associate(<<-END)
+# -*- warn_past_scope: true -*-
+class Foo
+end
+    END
+
+    assert_equal 0, associations.size
+  end
+
+  def test_associate_multiple
+    ast, associations = associate(<<-END)
+# frozen_string_literal: true; warn_indent: true
+class Foo
+end
+    END
+
+    assert_equal 0, associations.size
+  end
+
+  def test_associate_multiple_dash_star_dash
+    ast, associations = associate(<<-END)
+# -*- frozen_string_literal: true; warn_indent: true -*-
+class Foo
+end
+    END
+
+    assert_equal 0, associations.size
+  end
+
   def test_associate_no_comments
     ast, associations = associate(<<-END)
 class Foo

data/test/test_source_map.rb

@@ -1,7 +1,7 @@
 require 'helper'
 require 'parse_helper'
 
-class TestSourceComment < Minitest::Test
+class TestSourceMap < Minitest::Test
   include ParseHelper
 
   def test_to_hash

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parser
 version: !ruby/object:Gem::Version
-  version: 2.4.0.0
+  version: 2.4.0.1
 platform: ruby
 authors:
 - whitequark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-07 00:00:00.000000000 Z
+date: 2017-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -114,28 +114,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.10'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.15.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.15.1
 - !ruby/object:Gem::Dependency
   name: gauntlet
   requirement: !ruby/object:Gem::Requirement
@@ -213,6 +213,8 @@ files:
 - lib/parser/ruby23.y
 - lib/parser/ruby24.rb
 - lib/parser/ruby24.y
+- lib/parser/ruby25.rb
+- lib/parser/ruby25.y
 - lib/parser/rubymotion.rb
 - lib/parser/rubymotion.y
 - lib/parser/runner.rb
@@ -286,7 +288,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: A Ruby parser written in pure Ruby.