parser 2.4.0.2 → 2.5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21fa6f8258f6f3aa414da7c3d82fe00d6b1313f4
-  data.tar.gz: b88cb2843f00f3ac299b8b48c21d250d067a9c4c
+  metadata.gz: 17012e63bed58664c7f879ca77f492e6d551962a
+  data.tar.gz: 1ba7782eabfc5d33ffbcd5a3f5c7ce1b149e0eb1
 SHA512:
-  metadata.gz: 40b71684cadcb850f3d58c463dcba4f1a3d25d9909cd989862f566a9827cfa79e5a1fb884c0349234dac7be1475f8ff7c5d396e78457591871f7a6535bbacfb6
-  data.tar.gz: e7cee38420cd64baa34150c3075532b125eeb98296ca00bf127dd41fe178502ec79a5423b9e4c462b499499f3f8c7110728b16c5d4b18dce1600b07417865786
+  metadata.gz: 88787ec044608f586f8d1f9f2ced18005d1af68b5ff6f4cfc7633161bb8e6004aac032803da28c2b37255f98023b47c33d322806096239b1166dc117bf6a1459
+  data.tar.gz: 564a7e7e4e75bb412677011482eef36cff953fd023f3b889f0bc922ec0f51e36d6110cd1f01cc18d0d670a286a71aa58b8ad2ef3b268c7582e3afbe4cd45e442

data/.travis.yml

@@ -1,14 +1,13 @@
 dist: trusty
 language: ruby
 rvm:
- - 1.9.2
- - 1.9.3
  - 2.0.0
- - 2.2.5
- - 2.3.1
- - 2.4.0
+ - 2.2.9
+ - 2.3.6
+ - 2.4.3
+ - 2.5.0
  - ruby-head
- - jruby-9.1.14.0
+ - jruby-9.1.15.0
  - rbx-2
 matrix:
  allow_failures:

data/CHANGELOG.md

@@ -1,9 +1,43 @@
 Changelog
 =========
 
-Not released (2017-11-13)
+Not released (2018-02-16)
 -------------------------
 
+API modifications:
+ * Parser::Current: bump to 2.2.9 and 2.3.6. (Stan Hu)
+ * Deprecate Parser::Rewriter (Marc-Andre Lafortune)
+ * Deprecate Parser::Source::Rewriter (Marc-Andre Lafortune)
+ * Change relative order of insert_after_multi and insert_before_multi for non-empty ranges (#399). (Marc-Andre Lafortune)
+
+Features implemented:
+ * parse.y: Reject brace after literal arg. This commit tracks upstream commits ruby/ruby@9987109 and ruby/ruby@7d6965f. (Ilya Bylich)
+ * ruby-parse: add an option for emitting AST as JSON. (Alex Rattray)
+ * Add Parser::TreeRewriter (Marc-Andre Lafortune)
+ * Add Parser::Rewriter#wrap to ease compatibility (Marc-Andre Lafortune)
+ * Add Parser::Source::TreeRewriter (Marc-Andre Lafortune)
+ * Add Range#\<=> and include Comparable (Marc-Andre Lafortune)
+ * parse.y: disable tLPAREN_ARG state after local variable. (Ilya Bylich)
+ * SourceBuffer#source_range (Marc-Andre Lafortune)
+ * Range#adjust (Marc-Andre Lafortune)
+ * Range#contains?, contained?, crossing? (Marc-Andre Lafortune)
+ * Add Range#with. (Marc-André Lafortune)
+ * lexer.rl: Relax restriction spaces inside "\u{...}". This commit tracks upstream commit ruby/ruby@7e8b910. (Ilya Bylich)
+ * lexer.rl: Allow newlines in heredoc identifiers. This commit tracks upstream commit ruby/ruby@d25faa4. (Ilya Bylich)
+ * lexer.rl: allow do after cmdarg in paren. This commit tracks upstream commit ruby/ruby@046c943. (Ilya Bylich)
+
+Bugs fixed:
+ * Fixed magic encoding comment parsing when encoding comment is on the first line but not in the beginning. (Ilya Bylich)
+ * lexer.rl: Parse '1if' as '1 if', '1rescue' as '1 rescue'. (Ilya Bylich)
+ * lexer.rl: Save state before entering a block comment to enter it after =end. (Ilya Bylich)
+ * parse.y: Prohibit return in class/module body except for singleton class. Replaced @def_level/in_def? in favor of context.indirectly_in_def?. This commit tracks upstream commit ruby/ruby@8c15f40ac. (Ilya Bylich)
+ * lexer.rl: Emit :&& as tSYMBEG + tANDOP, :|| as tSYMBEG + tOROP. (Ilya Bylich)
+ * ruby{24,25}.y: preserve cmdarg stack around do/end block [Bug #13073]. (Mateusz Lenik)
+ * Parser::Lexer::State: Fixed #lexpop to match MRI behavior. (Ilya Bylich)
+
+v2.4.0.2 (2017-11-13)
+---------------------
+
 API modifications:
  * parser/current: update for 2.3.5 release. (whitequark)
 

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in parser.gemspec

data/README.md

@@ -110,8 +110,7 @@ with Parser:
 * [Rewriting][rewriting] support.
 * Parsing error recovery.
 * Improved [clang-like][] diagnostic messages with location information.
-* Written in pure Ruby, runs on MRI 1.8.7 or >=1.9.2, JRuby and Rubinius in 1.8
-  and 1.9 mode.
+* Written in pure Ruby, runs on MRI >=2.0.0, JRuby and Rubinius (and historically, all versions of Ruby since 1.8)
 * Only one runtime dependency: the [ast][] gem.
 * [Insane][insane-lexer] Ruby lexer rewritten from scratch in Ragel.
 * 100% test coverage for Bison grammars (except error recovery).

data/Rakefile

@@ -1,4 +1,5 @@
-# encoding:utf-8
+# encoding: utf-8
+# frozen_string_literal: true
 
 require 'bundler/gem_tasks'
 require 'rake/testtask'

data/bin/ruby-parse

@@ -1,4 +1,5 @@
-#!/usr/bin/env ruby
+#! /usr/bin/env ruby
+# frozen_string_literal: true
 
 $LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
 require 'parser/runner/ruby_parse'

data/bin/ruby-rewrite

@@ -1,4 +1,5 @@
-#!/usr/bin/env ruby
+#! /usr/bin/env ruby
+# frozen_string_literal: true
 
 $LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
 require 'parser/runner/ruby_rewrite'

data/lib/gauntlet_parser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'gauntlet'
 require 'parser/all'
 require 'shellwords'

data/lib/parser.rb

@@ -1,22 +1,25 @@
+# frozen_string_literal: true
+
+if RUBY_VERSION =~ /^1\.[89]\./
+  require 'parser/version'
+  raise LoadError, <<-UNSUPPORTED_VERSION_MSG
+parser v#{Parser::VERSION} cannot run on Ruby #{RUBY_VERSION}.
+Please upgrade to Ruby 2.0.0 or higher, or use an older version of the parser gem.
+  UNSUPPORTED_VERSION_MSG
+end
+
 require 'set'
 require 'racc/parser'
 
 require 'ast'
 
-if RUBY_VERSION < '1.9'
-  require 'parser/compatibility/ruby1_8'
-end
-
-if RUBY_VERSION < '2.0'
-  require 'parser/compatibility/ruby1_9'
-end
-
 ##
 # @api public
 #
 module Parser
   require 'parser/version'
   require 'parser/messages'
+  require 'parser/deprecation'
 
   module AST
     require 'parser/ast/node'
@@ -33,6 +36,8 @@ module Parser
 
     require 'parser/source/rewriter'
     require 'parser/source/rewriter/action'
+    require 'parser/source/tree_rewriter'
+    require 'parser/source/tree_rewriter/action'
 
     require 'parser/source/map'
     require 'parser/source/map/operator'
@@ -66,16 +71,10 @@ module Parser
     require 'parser/builders/default'
   end
 
+  require 'parser/context'
+
   require 'parser/base'
 
   require 'parser/rewriter'
-
-  ##
-  # Verify that the current Ruby implementation supports Encoding.
-  # @raise [RuntimeError]
-  def self.check_for_encoding_support
-    unless defined?(Encoding)
-      raise RuntimeError, 'Parsing 1.9 and later versions of Ruby is not supported on 1.8 due to the lack of Encoding support'
-    end
-  end
+  require 'parser/tree_rewriter'
 end

data/lib/parser/all.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'parser/ruby18'
 require 'parser/ruby19'
 require 'parser/ruby20'

data/lib/parser/ast/node.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Parser
   module AST
 

data/lib/parser/ast/processor.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Parser
   module AST
 

data/lib/parser/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Parser
 
   ##
@@ -93,9 +95,7 @@ module Parser
     end
 
     def self.setup_source_buffer(file, line, string, encoding)
-      if string.respond_to? :force_encoding
-        string = string.dup.force_encoding(encoding)
-      end
+      string = string.dup.force_encoding(encoding)
 
       source_buffer = Source::Buffer.new(file, line)
 
@@ -113,6 +113,7 @@ module Parser
     attr_reader :builder
     attr_reader :static_env
     attr_reader :source_buffer
+    attr_reader :context
 
     ##
     # @param [Parser::Builders::Default] builder The AST builder to use.
@@ -128,6 +129,7 @@ module Parser
 
       @builder = builder
       @builder.parser = self
+      @context = Context.new
 
       if self.class::Racc_debug_parser && ENV['RACC_DEBUG']
         @yydebug = true
@@ -141,10 +143,10 @@ module Parser
     #
     def reset
       @source_buffer = nil
-      @def_level     = 0 # count of nested def's.
 
       @lexer.reset
       @static_env.reset
+      @context.reset
 
       self
     end
@@ -217,14 +219,6 @@ module Parser
       @lexer.comments = nil
     end
 
-    ##
-    # @api private
-    # @return [Boolean]
-    #
-    def in_def?
-      @def_level > 0
-    end
-
     private
 
     def next_token

data/lib/parser/builders/default.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Parser
 
   ##
@@ -479,7 +481,7 @@ module Parser
         node.updated(:gvasgn)
 
       when :const
-        if @parser.in_def?
+        if @parser.context.indirectly_in_def?
           diagnostic :error, :dynamic_const, nil, node.loc.expression
         end
 
@@ -1207,13 +1209,9 @@ module Parser
     def delimited_string_map(string_t)
       str_range = loc(string_t)
 
-      begin_l = Source::Range.new(str_range.source_buffer,
-                                  str_range.begin_pos,
-                                  str_range.begin_pos + 1)
+      begin_l = str_range.with(end_pos: str_range.begin_pos + 1)
 
-      end_l   = Source::Range.new(str_range.source_buffer,
-                                  str_range.end_pos - 1,
-                                  str_range.end_pos)
+      end_l   = str_range.with(begin_pos: str_range.end_pos - 1)
 
       Source::Map::Collection.new(begin_l, end_l,
                                   loc(string_t))
@@ -1222,9 +1220,7 @@ module Parser
     def prefix_string_map(symbol)
       str_range = loc(symbol)
 
-      begin_l = Source::Range.new(str_range.source_buffer,
-                                  str_range.begin_pos,
-                                  str_range.begin_pos + 1)
+      begin_l = str_range.with(end_pos: str_range.begin_pos + 1)
 
       Source::Map::Collection.new(begin_l, nil,
                                   loc(symbol))
@@ -1238,13 +1234,9 @@ module Parser
     def pair_keyword_map(key_t, value_e)
       key_range = loc(key_t)
 
-      key_l   = Source::Range.new(key_range.source_buffer,
-                                  key_range.begin_pos,
-                                  key_range.end_pos - 1)
+      key_l   = key_range.adjust(end_pos: -1)
 
-      colon_l = Source::Range.new(key_range.source_buffer,
-                                  key_range.end_pos - 1,
-                                  key_range.end_pos)
+      colon_l = key_range.with(begin_pos: key_range.end_pos - 1)
 
       [ # key map
         Source::Map::Collection.new(nil, nil,
@@ -1257,13 +1249,10 @@ module Parser
     def pair_quoted_map(begin_t, end_t, value_e)
       end_l = loc(end_t)
 
-      quote_l = Source::Range.new(end_l.source_buffer,
-                                  end_l.end_pos - 2,
-                                  end_l.end_pos - 1)
+      quote_l = end_l.with(begin_pos: end_l.end_pos - 2,
+                           end_pos: end_l.end_pos - 1)
 
-      colon_l = Source::Range.new(end_l.source_buffer,
-                                  end_l.end_pos - 1,
-                                  end_l.end_pos)
+      colon_l = end_l.with(begin_pos: end_l.end_pos - 1)
 
       [ # modified end token
         [ value(end_t), quote_l ],
@@ -1351,9 +1340,7 @@ module Parser
 
     def kwarg_map(name_t, value_e=nil)
       label_range = loc(name_t)
-      name_range  = Source::Range.new(label_range.source_buffer,
-                                      label_range.begin_pos,
-                                      label_range.end_pos - 1)
+      name_range  = label_range.adjust(end_pos: -1)
 
       if value_e
         expr_l = loc(name_t).join(value_e.loc.expression)
@@ -1557,19 +1544,17 @@ module Parser
       source = static_string(parts)
       return nil if source.nil?
 
-      if defined?(Encoding)
-        source = case
-        when options.children.include?(:u)
-          source.encode(Encoding::UTF_8)
-        when options.children.include?(:e)
-          source.encode(Encoding::EUC_JP)
-        when options.children.include?(:s)
-          source.encode(Encoding::WINDOWS_31J)
-        when options.children.include?(:n)
-          source.encode(Encoding::BINARY)
-        else
-          source
-        end
+      source = case
+      when options.children.include?(:u)
+        source.encode(Encoding::UTF_8)
+      when options.children.include?(:e)
+        source.encode(Encoding::EUC_JP)
+      when options.children.include?(:s)
+        source.encode(Encoding::WINDOWS_31J)
+      when options.children.include?(:n)
+        source.encode(Encoding::BINARY)
+      else
+        source
       end
 
       Regexp.new(source, (Regexp::EXTENDED if options.children.include?(:x)))
@@ -1591,16 +1576,12 @@ module Parser
       token[0]
     end
 
-    if defined?(Encoding)
-      def string_value(token)
-        unless token[0].valid_encoding?
-          diagnostic(:error, :invalid_encoding, nil, token[1])
-        end
-
-        token[0]
+    def string_value(token)
+      unless token[0].valid_encoding?
+        diagnostic(:error, :invalid_encoding, nil, token[1])
       end
-    else
-      alias string_value value
+
+      token[0]
     end
 
     def loc(token)

data/lib/parser/clobbering_error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Parser
   ##
   # {Parser::ClobberingError} is raised when {Parser::Source::Rewriter}

data/lib/parser/context.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Parser
+  # Context of parsing that is represented by a stack of scopes.
+  #
+  # Supported states:
+  # + :class - in the class body (class A; end)
+  # + :sclass - in the singleton class body (class << obj; end)
+  # + :def - in the method body (def m; end)
+  # + :defs - in the singleton method body (def self.m; end)
+  # + :block - in the block body (tap {})
+  # + :lambda - in the lambda body (-> {})
+  #
+  class Context
+    attr_reader :stack
+
+    def initialize
+      @stack = []
+      freeze
+    end
+
+    def push(state)
+      @stack << state
+    end
+
+    def pop
+      @stack.pop
+    end
+
+    def reset
+      @stack.clear
+    end
+
+    def in_class?
+      @stack.last == :class
+    end
+
+    def indirectly_in_def?
+      @stack.include?(:def) || @stack.include?(:defs)
+    end
+  end
+end