parser 2.4.0.2 → 2.5.0.0

data/lib/parser/macruby.y

@@ -274,12 +274,14 @@ rule
  cmd_brace_block: tLBRACE_ARG
                     {
                       @static_env.extend_dynamic
+                      @context.push(:block)
                     }
                     opt_block_param compstmt tRCURLY
                     {
                       result = [ val[0], val[2], val[3], val[4] ]
 
                       @static_env.unextend
+                      @context.pop
                     }
 
          command: operation command_args =tLOWEST
@@ -1122,10 +1124,11 @@ rule
                     {
                       @static_env.extend_static
                       @lexer.push_cmdarg
+                      @context.push(:class)
                     }
                     bodystmt kEND
                     {
-                      if in_def?
+                      if @context.indirectly_in_def?
                         diagnostic :error, :class_in_def, nil, val[0]
                       end
 
@@ -1136,14 +1139,13 @@ rule
 
                       @lexer.pop_cmdarg
                       @static_env.unextend
+                      @context.pop
                     }
                 | kCLASS tLSHFT expr term
                     {
-                      result = @def_level
-                      @def_level = 0
-
                       @static_env.extend_static
                       @lexer.push_cmdarg
+                      @context.push(:sclass)
                     }
                     bodystmt kEND
                     {
@@ -1152,8 +1154,7 @@ rule
 
                       @lexer.pop_cmdarg
                       @static_env.unextend
-
-                      @def_level = val[4]
+                      @context.pop
                     }
                 | kMODULE cpath
                     {
@@ -1162,7 +1163,7 @@ rule
                     }
                     bodystmt kEND
                     {
-                      if in_def?
+                      if @context.indirectly_in_def?
                         diagnostic :error, :module_in_def, nil, val[0]
                       end
 
@@ -1174,9 +1175,9 @@ rule
                     }
                 | kDEF fname
                     {
-                      @def_level += 1
                       @static_env.extend_static
                       @lexer.push_cmdarg
+                      @context.push(:def)
                     }
                     f_arglist bodystmt kEND
                     {
@@ -1185,7 +1186,7 @@ rule
 
                       @lexer.pop_cmdarg
                       @static_env.unextend
-                      @def_level -= 1
+                      @context.pop
                     }
                 | kDEF singleton dot_or_colon
                     {
@@ -1193,9 +1194,9 @@ rule
                     }
                     fname
                     {
-                      @def_level += 1
                       @static_env.extend_static
                       @lexer.push_cmdarg
+                      @context.push(:defs)
                     }
                     f_arglist bodystmt kEND
                     {
@@ -1204,7 +1205,7 @@ rule
 
                       @lexer.pop_cmdarg
                       @static_env.unextend
-                      @def_level -= 1
+                      @context.pop
                     }
                 | kBREAK
                     {
@@ -1468,24 +1469,36 @@ rule
                       result = @builder.args(nil, val[0], nil)
                     }
 
-     lambda_body: tLAMBEG compstmt tRCURLY
+     lambda_body: tLAMBEG
+                    {
+                      @context.push(:lambda)
+                    }
+                  compstmt tRCURLY
                     {
-                      result = [ val[0], val[1], val[2] ]
+                      result = [ val[0], val[2], val[3] ]
+                      @context.pop
                     }
-                | kDO_LAMBDA compstmt kEND
+                | kDO_LAMBDA
                     {
-                      result = [ val[0], val[1], val[2] ]
+                      @context.push(:lambda)
+                    }
+                  compstmt kEND
+                    {
+                      result = [ val[0], val[2], val[3] ]
+                      @context.pop
                     }
 
         do_block: kDO_BLOCK
                     {
                       @static_env.extend_dynamic
+                      @context.push(:block)
                     }
                     opt_block_param compstmt kEND
                     {
                       result = [ val[0], val[2], val[3], val[4] ]
 
                       @static_env.unextend
+                      @context.pop
                     }
 
       block_call: command do_block
@@ -1559,22 +1572,26 @@ rule
      brace_block: tLCURLY
                     {
                       @static_env.extend_dynamic
+                      @context.push(:block)
                     }
                     opt_block_param compstmt tRCURLY
                     {
                       result = [ val[0], val[2], val[3], val[4] ]
 
                       @static_env.unextend
+                      @context.pop
                     }
                 | kDO
                     {
                       @static_env.extend_dynamic
+                      @context.push(:block)
                     }
                     opt_block_param compstmt kEND
                     {
                       result = [ val[0], val[2], val[3], val[4] ]
 
                       @static_env.unextend
+                      @context.pop
                     }
 
        case_body: kWHEN args then compstmt cases
@@ -2170,8 +2187,6 @@ end
 
 require 'parser'
 
-Parser.check_for_encoding_support
-
 ---- inner
 
   def version

data/lib/parser/messages.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Parser
   ##
   # Diagnostic messages (errors, warnings and notices) that can be generated.
@@ -26,6 +28,8 @@ module Parser
     :bare_backslash          => 'bare backslash only allowed before newline',
     :unexpected              => "unexpected `%{character}'",
     :embedded_document       => 'embedded document meets end of file (and they embark on a romantic journey)',
+    :heredoc_id_has_newline  => 'here document identifier across newlines, never match',
+    :heredoc_id_ends_with_nl => 'here document identifier ends with a newline',
 
     # Lexer warnings
     :invalid_escape_use      => 'invalid character syntax; use ?%{escape}',
@@ -56,6 +60,7 @@ module Parser
     :masgn_as_condition      => 'multiple assignment in conditional context',
     :block_given_to_yield    => 'block given to yield',
     :invalid_regexp          => '%{message}',
+    :invalid_return          => 'Invalid return in class/module body',
 
     # Parser warnings
     :useless_else            => 'else without rescue is useless',
@@ -66,5 +71,14 @@ module Parser
     # Rewriter diagnostics
     :invalid_action          => 'cannot %{action}',
     :clobbered               => 'clobbered by: %{action}',
+
+    # Rewriter diagnostics
+    :different_replacements        => 'different replacements: %{replacement} vs %{other_replacement}',
+    :swallowed_insertions          => 'this replacement:',
+    :swallowed_insertions_conflict => 'swallows some inner rewriting actions:',
+    :crossing_deletions            => 'the deletion of:',
+    :crossing_deletions_conflict   => 'is crossing:',
+    :crossing_insertions           => 'the rewriting action on:',
+    :crossing_insertions_conflict  => 'is crossing that on:',
   }.freeze
 end

data/lib/parser/meta.rb

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

data/lib/parser/rewriter.rb

@@ -1,52 +1,15 @@
+# frozen_string_literal: true
+
 module Parser
 
   ##
-  # {Parser::Rewriter} offers a basic API that makes it easy to rewrite
-  # existing ASTs. It's built on top of {Parser::AST::Processor} and
-  # {Parser::Source::Rewriter}.
-  #
-  # For example, assume you want to remove `do` tokens from a while statement.
-  # You can do this as following:
-  #
-  #     require 'parser/current'
-  #
-  #     class RemoveDo < Parser::Rewriter
-  #       def on_while(node)
-  #         # Check if the statement starts with "do"
-  #         if node.location.begin.is?('do')
-  #           remove(node.location.begin)
-  #         end
-  #       end
-  #     end
-  #
-  #     code = <<-EOF
-  #     while true do
-  #       puts 'hello'
-  #     end
-  #     EOF
-  #
-  #     buffer        = Parser::Source::Buffer.new('(example)')
-  #     buffer.source = code
-  #     parser        = Parser::CurrentRuby.new
-  #     ast           = parser.parse(buffer)
-  #     rewriter      = RemoveDo.new
-  #
-  #     # Rewrite the AST, returns a String with the new form.
-  #     puts rewriter.rewrite(buffer, ast)
-  #
-  # This would result in the following Ruby code:
-  #
-  #     while true
-  #       puts 'hello'
-  #     end
-  #
-  # Keep in mind that {Parser::Rewriter} does not take care of indentation when
-  # inserting/replacing code so you'll have to do this yourself.
-  #
-  # See also [a blog entry](http://whitequark.org/blog/2013/04/26/lets-play-with-ruby-code/)
-  # describing rewriters in greater detail.
+  # {Parser::Rewriter} is deprecated. Use {Parser::TreeRewriter} instead.
+  # It has a backwards compatible API and uses {Parser::Source::TreeRewriter}
+  # instead of {Parser::Source::Rewriter}.
+  # Please check the documentation for {Parser::Source::Rewriter} for details.
   #
   # @api public
+  # @deprecated Use {Parser::TreeRewriter}
   #
   class Rewriter < Parser::AST::Processor
     ##
@@ -85,6 +48,16 @@ module Parser
       @source_rewriter.remove(range)
     end
 
+    ##
+    # Wraps the given source range with the given values.
+    #
+    # @param [Parser::Source::Range] range
+    # @param [String] content
+    #
+    def wrap(range, before, after)
+      @source_rewriter.wrap(range, before, after)
+    end
+
     ##
     # Inserts new code before the given source range.
     #
@@ -114,6 +87,19 @@ module Parser
     def replace(range, content)
       @source_rewriter.replace(range, content)
     end
+
+    DEPRECATION_WARNING = [
+      'Parser::Rewriter is deprecated.',
+      'Please update your code to use Parser::TreeRewriter instead'
+    ].join("\n").freeze
+
+    extend Deprecation
+
+    def initialize(*)
+      self.class.warn_of_deprecation
+      Source::Rewriter.warned_of_deprecation = true
+      super
+    end
   end
 
 end

data/lib/parser/ruby18.y

@@ -142,7 +142,7 @@ rule
                     }
                 | klBEGIN tLCURLY compstmt tRCURLY
                     {
-                      if in_def?
+                      if @context.indirectly_in_def?
                         diagnostic :error, :begin_in_method, nil, val[0]
                       end
 
@@ -268,12 +268,14 @@ rule
  cmd_brace_block: tLBRACE_ARG
                     {
                       @static_env.extend_dynamic
+                      @context.push(:block)
                     }
                     opt_block_var compstmt tRCURLY
                     {
                       result = [ val[0], val[2], val[3], val[4] ]
 
                       @static_env.unextend
+                      @context.pop
                     }
 
          command: operation command_args =tLOWEST
@@ -1122,10 +1124,11 @@ rule
                 | kCLASS cpath superclass
                     {
                       @static_env.extend_static
+                      @context.push(:class)
                     }
                     bodystmt kEND
                     {
-                      if in_def?
+                      if @context.indirectly_in_def?
                         diagnostic :error, :class_in_def, nil, val[0]
                       end
 
@@ -1135,13 +1138,12 @@ rule
                                                   val[4], val[5])
 
                       @static_env.unextend
+                      @context.pop
                     }
                 | kCLASS tLSHFT expr term
                     {
-                      result = @def_level
-                      @def_level = 0
-
                       @static_env.extend_static
+                      @context.push(:sclass)
                     }
                     bodystmt kEND
                     {
@@ -1149,8 +1151,7 @@ rule
                                                    val[5], val[6])
 
                       @static_env.unextend
-
-                      @def_level = val[4]
+                      @context.pop
                     }
                 | kMODULE cpath
                     {
@@ -1158,7 +1159,7 @@ rule
                     }
                     bodystmt kEND
                     {
-                      if in_def?
+                      if @context.indirectly_in_def?
                         diagnostic :error, :module_in_def, nil, val[0]
                       end
 
@@ -1169,8 +1170,8 @@ rule
                     }
                 | kDEF fname
                     {
-                      @def_level += 1
                       @static_env.extend_static
+                      @context.push(:def)
                     }
                     f_arglist bodystmt kEND
                     {
@@ -1178,7 +1179,7 @@ rule
                                   val[3], val[4], val[5])
 
                       @static_env.unextend
-                      @def_level -= 1
+                      @context.pop
                     }
                 | kDEF singleton dot_or_colon
                     {
@@ -1186,8 +1187,8 @@ rule
                     }
                     fname
                     {
-                      @def_level += 1
                       @static_env.extend_static
+                      @context.push(:defs)
                     }
                     f_arglist bodystmt kEND
                     {
@@ -1195,7 +1196,7 @@ rule
                                   val[4], val[6], val[7], val[8])
 
                       @static_env.unextend
-                      @def_level -= 1
+                      @context.pop
                     }
                 | kBREAK
                     {
@@ -1330,12 +1331,14 @@ rule
         do_block: kDO_BLOCK
                     {
                       @static_env.extend_dynamic
+                      @context.push(:block)
                     }
                     opt_block_var compstmt kEND
                     {
                       result = [ val[0], val[2], val[3], val[4] ]
 
                       @static_env.unextend
+                      @context.pop
                     }
 
       block_call: command do_block
@@ -1393,22 +1396,26 @@ rule
      brace_block: tLCURLY
                     {
                       @static_env.extend_dynamic
+                      @context.push(:block)
                     }
                     opt_block_var compstmt tRCURLY
                     {
                       result = [ val[0], val[2], val[3], val[4] ]
 
                       @static_env.unextend
+                      @context.pop
                     }
                 | kDO
                     {
                       @static_env.extend_dynamic
+                      @context.push(:block)
                     }
                     opt_block_var compstmt kEND
                     {
                       result = [ val[0], val[2], val[3], val[4] ]
 
                       @static_env.unextend
+                      @context.pop
                     }
 
        case_body: kWHEN when_args then compstmt cases
@@ -1923,5 +1930,5 @@ require 'parser'
   end
 
   def default_encoding
-    Encoding::BINARY if defined? Encoding
+    Encoding::BINARY
   end