parser 2.0.0.pre6 → 2.0.0.pre7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57e819d2cd65b374e49ccdc64313da51dab99dec
-  data.tar.gz: 33288353f3f0585227149c307f5ca3d8a7247012
+  metadata.gz: 776614b2c048d80ca7eadd5fd3c3f914c51d88ec
+  data.tar.gz: 01ddc7d4877aa4198de7685707d410febc010c29
 SHA512:
-  metadata.gz: df8f0b48532727b9d74a81f91d0293fc9412942280ab02065d36f8578c4086e496ab7aa05de95b9e894be640135502af0c72e1a9aa85cb782153956e531dfafb
-  data.tar.gz: 16b3d4f6db7babe591faa0ae73bfd78602f681a67f1f19bfe654ab7e711905c41c764431498909035f231f3ad24c70cae121787aead0e318d5fea80592e1f7c4
+  metadata.gz: bab2b3791e25cfe5a13fc6cd844375377c3d678f302b79f3580d10fad2cb6dda60d5d371c8388142899eb803a238c84c9ccc2d2d46d3d2d00f80b53c08df7afc
+  data.tar.gz: be57c964d5423e2b7f53a39db34a7e668f31fe5f9fe032678e1f4d83030f304ba3150f345c6c4b4ccfa64ffde2c652df9adc179febc7d2bfa0a8a2cb3e464eaa

data/CHANGELOG.md

@@ -1,6 +1,16 @@
 Changelog
 =========
 
+v2.0.0.pre7 (2013-09-10)
+------------------------
+
+Features implemented:
+ * Parser::Base: add #parse_with_comments, #parse_file_with_comments. (Trent Ogren)
+
+Bugs fixed:
+ * lexer.rl: "->*{}": tLAMBEG at expr_beg (fixes #103). (Peter Zotov)
+ * Source::Rewriter: apply actions in the insertion order. (Josh Cheek)
+
 v2.0.0.pre5 (2013-07-31)
 ------------------------
 

data/lib/parser/base.rb

@@ -26,6 +26,60 @@ module Parser
     # @return [Parser::AST::Node]
     #
     def self.parse(string, file='(string)', line=1)
+      parser = default_parser
+      source_buffer = setup_source_buffer(file, line, string, parser.default_encoding)
+      parser.parse(source_buffer)
+    end
+
+    ##
+    # Parses a string of Ruby code and returns the AST and comments. If the
+    # source cannot be parsed, {SyntaxError} is raised and a diagnostic is
+    # printed to `stderr`.
+    #
+    # @example
+    #  Parser::Base.parse_with_comments('puts "hello"')
+    #
+    # @param [String] string The block of code to parse.
+    # @param [String] file The name of the file the code originated from.
+    # @param [Numeric] line The initial line number.
+    # @return [Array]
+    #
+    def self.parse_with_comments(string, file='(string)', line=1)
+      parser = default_parser
+      source_buffer = setup_source_buffer(file, line, string, parser.default_encoding)
+      parser.parse_with_comments(source_buffer)
+    end
+
+    ##
+    # Parses Ruby source code by reading it from a file. If the source
+    # cannot be parsed, {SyntaxError} is raised and a diagnostic is
+    # printed to `stderr`.
+    #
+    # @param [String] filename Path to the file to parse.
+    # @return [Parser::AST::Node]
+    # @see #parse
+    #
+    def self.parse_file(filename)
+      parse(File.read(filename), filename)
+    end
+
+    ##
+    # Parses Ruby source code by reading it from a file and returns the AST and
+    # comments. If the source cannot be parsed, {SyntaxError} is raised and a
+    # diagnostic is printed to `stderr`.
+    #
+    # @param [String] filename Path to the file to parse.
+    # @return [Array]
+    # @see #parse
+    #
+    def self.parse_file_with_comments(filename)
+      parse_with_comments(File.read(filename), filename)
+    end
+
+    ##
+    # @return [Parser::Base] parser with the default options set.
+    #
+    def self.default_parser
       parser = new
 
       parser.diagnostics.all_errors_are_fatal = true
@@ -35,7 +89,11 @@ module Parser
         $stderr.puts(diagnostic.render)
       end
 
-      string = string.dup.force_encoding(parser.default_encoding)
+      parser
+    end
+
+    def self.setup_source_buffer(file, line, string, encoding)
+      string = string.dup.force_encoding(encoding)
 
       source_buffer = Source::Buffer.new(file, line)
 
@@ -45,20 +103,9 @@ module Parser
         source_buffer.source     = string
       end
 
-      parser.parse(source_buffer)
-    end
-
-    ##
-    # Parses Ruby source code by reading it from a file. If the source
-    # cannot be parsed, {SyntaxError} is raised and a diagnostic is
-    # printed to `stderr`.
-    #
-    # @param [String] filename Path to the file to parse.
-    # @see #parse
-    #
-    def self.parse_file(filename)
-      parse(File.read(filename), filename)
+      source_buffer
     end
+    private_class_method :setup_source_buffer
 
     attr_reader :diagnostics
     attr_reader :builder

data/lib/parser/diagnostic/engine.rb

@@ -48,11 +48,16 @@ module Parser
     end
 
     ##
-    # Processes a diagnostic and optionally raises {Parser::SyntaxError} when
-    # `all_errors_are_fatal` is set to true.
+    # Processes a `diagnostic`:
+    #   * Passes the diagnostic to the consumer, if it's not a warning when
+    #     `ignore_warnings` is set.
+    #   * After that, raises {Parser::SyntaxError} when `all_errors_are_fatal`
+    #     is set to true.
     #
     # @param [Parser::Diagnostic] diagnostic
     # @return [Parser::Diagnostic::Engine]
+    # @see ignore?
+    # @see raise?
     #
     def process(diagnostic)
       if ignore?(diagnostic)
@@ -71,6 +76,8 @@ module Parser
     protected
 
     ##
+    # Checks whether `diagnostic` should be ignored.
+    #
     # @param [Parser::Diagnostic] diagnostic
     # @return [TrueClass|FalseClass]
     #
@@ -80,6 +87,8 @@ module Parser
     end
 
     ##
+    # Checks whether `diagnostic` should be raised as an exception.
+    #
     # @param [Parser::Diagnostic] diagnostic
     # @return [TrueClass|FalseClass]
     #

data/lib/parser/lexer.rl

@@ -1648,10 +1648,20 @@ class Parser::Lexer
       # KEYWORDS AND PUNCTUATION
       #
 
+      # a({b=>c})
+      e_lbrace
+      => {
+        if @lambda_stack.last == @paren_nest
+          @lambda_stack.pop
+          emit(:tLAMBEG)
+        else
+          emit_table(PUNCTUATION_BEGIN)
+        end
+        fbreak;
+      };
+
       # a([1, 2])
       e_lbrack    |
-      # a({b=>c})
-      e_lbrace    |
       # a()
       e_lparen
       => { emit_table(PUNCTUATION_BEGIN)

data/lib/parser/rewriter.rb

@@ -22,11 +22,11 @@ module Parser
   #     end
   #     EOF
   #
-  #     buffer      = Parser::Source::Buffer.new('(example)')
-  #     buffer.code = code
-  #     parser      = Parser::CurrentRuby.new
-  #     ast         = parser.parse(buffer)
-  #     rewriter    = RemoveDo.new
+  #     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)

data/lib/parser/source/rewriter.rb

@@ -35,11 +35,12 @@ module Parser
       end
 
       def process
-        adjustment = 0
-        source     = @source_buffer.source.dup
-
-        @queue.sort_by { |action| action.range.begin_pos }.
-               each do |action|
+        adjustment   = 0
+        source       = @source_buffer.source.dup
+        sorted_queue = @queue.sort_by.with_index do |action, index|
+          [action.range.begin_pos, index]
+        end
+        sorted_queue.each do |action|
           begin_pos = action.range.begin_pos + adjustment
           end_pos   = begin_pos + action.range.length
 

data/lib/parser/version.rb

@@ -1,3 +1,3 @@
 module Parser
-  VERSION = '2.0.0.pre6'
+  VERSION = '2.0.0.pre7'
 end

data/test/test_parser.rb

@@ -2917,6 +2917,17 @@ class TestParser < Minitest::Test
         |~~~~~ expression},
       ALL_VERSIONS - %w(1.8))
 
+    assert_parses(
+      s(:block, s(:send, nil, :lambda),
+        s(:args, s(:restarg)), nil),
+      %q{-> * { }},
+      %q{~~ selector (send)
+        |     ^ begin
+        |       ^ end
+        |   ^ expression (args.restarg)
+        |~~~~~~~~ expression},
+      ALL_VERSIONS - %w(1.8))
+
     assert_parses(
       s(:block, s(:send, nil, :lambda),
         s(:args), nil),

data/test/test_source_rewriter.rb

@@ -56,6 +56,18 @@ class TestSourceRewriter < Minitest::Test
                     process
   end
 
+  def test_multiple_insertions_at_same_location
+    assert_equal '<([foo] bar) baz>',
+                 @rewriter.
+                   insert_before(range(0, 11), '<').
+                   insert_after( range(0, 11), '>').
+                   insert_before(range(0, 7), '(').
+                   insert_after( range(0, 7), ')').
+                   insert_before(range(0, 3), '[').
+                   insert_after( range(0, 3), ']').
+                   process
+  end
+
   def test_clobber
     diagnostics = []
     @rewriter.diagnostics.consumer = lambda do |diag|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parser
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre6
+  version: 2.0.0.pre7
 platform: ruby
 authors:
 - Peter Zotov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-02 00:00:00.000000000 Z
+date: 2013-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast