parser 2.5.0.2 → 2.5.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1497971563a08dc36f4f331db195ebbe9d157082
-  data.tar.gz: 6af1b9d7f17195f6306c6de045c547ebc4dc77e4
+  metadata.gz: 2b09926b92e95874cfa6295ffa913a0d282c063d
+  data.tar.gz: 10036043ab11e9fd97f36ddf29615f8f25247b78
 SHA512:
-  metadata.gz: 0c87434346083e12a82d091d0e274ff0ef3766aac84704fad1d1b5f734bf1a884187c46570c474136bc04d0fb24122cdfc76eb5d32f0e4c79d1d31f986c8d110
-  data.tar.gz: bae16691e9e99837d7fc31551b31b4f2e98e0729ebf92a401a595b3b942e65de4b6819341e93e89c27cf9fa56951edd02b5201b63b77e9ec023e67e3b1f57768
+  metadata.gz: 78ade228a7b0d40884bd06a6b2241d1282693f15d359bf73e0ae4f56e08b90da90586ecca947666fdf00b5d2a6a9ec7851627cd870a00cab49eafe6368c245fa
+  data.tar.gz: f4109e28f013c637ad30b616115037264756b05eadfde190987564831b1f3ef9071cfafc764b731098639524f28c06d80738437a8c60f4d0062de3cf52daf1ec

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 Changelog
 =========
 
+Not released (2018-03-06)
+-------------------------
+
+Bugs fixed:
+ * Accept `BEGIN` and `END` as correct method name (#463) (Masataka Pocke Kuwabara)
+ * Parser::Source::Buffer: Fixed parsing of encoding comment when the file contains only shebang. (Ilya Bylich)
+
 v2.5.0.2 (2018-02-22)
 ---------------------
 

data/lib/parser/current.rb

@@ -48,7 +48,7 @@ module Parser
     CurrentRuby = Ruby23
 
   when /^2\.4\./
-    current_version = '2.4.0'
+    current_version = '2.4.3'
     if RUBY_VERSION != current_version
       warn_syntax_deviation 'parser/ruby24', current_version
     end

data/lib/parser/lexer.rl

@@ -467,6 +467,7 @@ class Parser::Lexer
     'if'     => :kIF,          'unless'   => :kUNLESS,
     'while'  => :kWHILE,       'until'    => :kUNTIL,
     'rescue' => :kRESCUE,      'defined?' => :kDEFINED,
+    'BEGIN'  => :klBEGIN,      'END'      => :klEND,
   }
 
   %w(class module def undef begin end then elsif else ensure case when
@@ -2219,7 +2220,13 @@ class Parser::Lexer
       e_rbrace | e_rparen | ']'
       => {
         emit_table(PUNCTUATION)
-        @cond.lexpop; @cmdarg.pop
+
+        @cond.lexpop
+        if @version < 24
+          @cmdarg.lexpop
+        else
+          @cmdarg.pop
+        end
 
         if tok == '}'.freeze
           fnext expr_endarg;

data/lib/parser/lexer/literal.rb

@@ -230,7 +230,7 @@ module Parser
     end
 
     def coerce_encoding(string)
-      string.dup.force_encoding(Encoding::BINARY)
+      string.b
     end
 
     def clear_buffer

data/lib/parser/source/buffer.rb

@@ -63,7 +63,7 @@ module Parser
           encoding_line = first_line
         end
 
-        return nil if encoding_line[0] != '#'
+        return nil if encoding_line.nil? || encoding_line[0] != '#'
 
         if (result = ENCODING_RE.match(encoding_line))
           Encoding.find(result[3] || result[4] || result[6])
@@ -103,7 +103,7 @@ module Parser
       end
 
       def initialize(name, first_line = 1)
-        @name        = name
+        @name        = name.to_s
         @source      = nil
         @first_line  = first_line
 

data/lib/parser/source/rewriter.rb

@@ -17,7 +17,7 @@ module Parser
     # - The TreeRewriter policy closest to Rewriter's behavior is:
     #       different_replacements: :raise,
     #       swallowed_insertions: :raise,
-    #       overlapping_deletions: :accept
+    #       crossing_deletions: :accept
     #
     # @!attribute [r] source_buffer
     #  @return [Source::Buffer]

data/lib/parser/source/tree_rewriter.rb

@@ -273,7 +273,7 @@ module Parser
 
       def check_range_validity(range)
         if range.begin_pos < 0 || range.end_pos > @source_buffer.source.size
-          raise IndexError, "The range #{action.range} is outside the bounds of the source"
+          raise IndexError, "The range #{range} is outside the bounds of the source"
         end
         range
       end

data/lib/parser/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Parser
-  VERSION = '2.5.0.2'
+  VERSION = '2.5.0.3'
 end

data/parser.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency             'ast',       '~> 2.4.0'
 
-  spec.add_development_dependency 'bundler',   '~> 1.16'
+  spec.add_development_dependency 'bundler',   '~> 1.15'
   spec.add_development_dependency 'rake',      '~> 10.0'
   spec.add_development_dependency 'racc',      '= 1.4.14'
   spec.add_development_dependency 'cliver',    '~> 0.3.2'

data/test/test_encoding.rb

@@ -27,6 +27,7 @@ class TestEncoding < Minitest::Test
 
   def test_shebang
     assert_equal Encoding::KOI8_R, recognize("#!/bin/foo\n# coding:koi8-r\nfoobar")
+    assert_nil recognize("#!/bin/foo\n")
   end
 
   def test_case

data/test/test_parser.rb

@@ -1804,6 +1804,14 @@ class TestParser < Minitest::Test
     assert_parses(
       s(:def, :until, s(:args), nil),
       %q{def until; end})
+
+    assert_parses(
+      s(:def, :BEGIN, s(:args), nil),
+      %q{def BEGIN; end})
+
+    assert_parses(
+      s(:def, :END, s(:args), nil),
+      %q{def END; end})
   end
 
   def test_defs
@@ -5272,7 +5280,7 @@ class TestParser < Minitest::Test
   def test_bom
     assert_parses(
       s(:int, 1),
-      %Q{\xef\xbb\xbf1}.dup.force_encoding(Encoding::BINARY),
+      %Q{\xef\xbb\xbf1}.b,
       %q{},
       %w(1.9 2.0 2.1))
   end
@@ -5284,8 +5292,7 @@ class TestParser < Minitest::Test
         s(:send, nil, :puts, s(:lvar, :"проверка"))),
       %Q{# coding:koi8-r
          \xd0\xd2\xcf\xd7\xc5\xd2\xcb\xc1 = 42
-         puts \xd0\xd2\xcf\xd7\xc5\xd2\xcb\xc1}.dup.
-        force_encoding(Encoding::BINARY),
+         puts \xd0\xd2\xcf\xd7\xc5\xd2\xcb\xc1}.b,
       %q{},
       %w(1.9 2.0 2.1))
   end
@@ -6767,6 +6774,16 @@ class TestParser < Minitest::Test
       %q{m [] do end},
       %q{},
       ALL_VERSIONS)
+
+    assert_parses(
+      s(:block,
+        s(:send, nil, :m,
+          s(:array),
+          s(:int, 1)),
+        s(:args), nil),
+      %q{m [], 1 do end},
+      %q{},
+      ALL_VERSIONS)
   end
 
   def test_bug_435

data/test/test_source_buffer.rb

@@ -8,6 +8,12 @@ class TestSourceBuffer < Minitest::Test
   end
 
   def test_initialize
+    buffer = Parser::Source::Buffer.new(nil)
+    assert_equal '', buffer.name
+
+    buffer = Parser::Source::Buffer.new(Pathname('a/b'))
+    assert_equal 'a/b', buffer.name
+
     buffer = Parser::Source::Buffer.new('(string)')
     assert_equal '(string)', buffer.name
     assert_equal 1, buffer.first_line

data/test/test_source_rewriter.rb

@@ -421,7 +421,7 @@ class TestSourceRewriter < Minitest::Test
   end
 
 
-  def test_overlapping_delete
+  def test_crossing_delete
     assert_equal 'faz',
                  @rewriter.
                    remove(range(1, 4)).

data/test/test_source_tree_rewriter.rb

@@ -126,15 +126,6 @@ DIAGNOSTIC
 DIAGNOSTIC
   end
 
-  def test_multiple_actions
-    assert_actions_result 'puts({:hello => [:everybody]})',
-                          [:replace, @comma_space, ' => '],
-                          [:wrap, @hello.join(@world), '{', '}'],
-                          [:replace, @world, ':everybody'],
-                          [:wrap, @world, '[', ']']
-  end
-
-
   def test_multiple_actions
     assert_actions_result 'puts({:hello => [:everybody]})',
                           [:replace, @comma_space, ' => '],
@@ -174,4 +165,9 @@ DIAGNOSTIC
 (rewriter):1:       ^~~~~  ~~~~
 DIAGNOSTIC
   end
+
+  def test_out_of_range_ranges
+    rewriter = Parser::Source::TreeRewriter.new(@buf)
+    assert_raises(IndexError) { rewriter.insert_before(range(0, 100), 'hola') }
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parser
 version: !ruby/object:Gem::Version
-  version: 2.5.0.2
+  version: 2.5.0.3
 platform: ruby
 authors:
 - whitequark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-22 00:00:00.000000000 Z
+date: 2018-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.15'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement