parser 2.0.0.beta2 → 2.0.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07879ee1d09632725a820a2ebe8cffd8ab8b96df
-  data.tar.gz: e6e2daa3f5ce930d63f72457fceded6a319309aa
+  metadata.gz: d3c90abfdc392d6c6d0c73d73138f073428117e6
+  data.tar.gz: d0c947aa1ada143e47b3558ae215a4f245f2ccff
 SHA512:
-  metadata.gz: ebb7af02e3f6c83c57d221857c8a4c3f3606aa61ab84f33cb1ccc10ec6b3433da0fbc44af7a26bc8beb7e3cc6df1ef1feafc30734fa20a86060db212adc92d05
-  data.tar.gz: 97d3ba4a5f88a4dbdaaa9521aa5a24ecae3397d9d5d7f39691a757b74f2aadaa48e14b08fd8b28343ec94c8d6d7b5254663d57407c60f384bb4c17019e5bc9db
+  metadata.gz: 76e1c1063a7ab852b19cc2b6a6eb1121cd7f9aa13ec40b3712dc568dfd24b8ac7b72610386d4a33932e22331eac5fca2575efdf302b3daf9cfe398edac1d13be
+  data.tar.gz: 4647419022b86a8d8a53f9a126d0c47fa6d9f23d5b2ed2b5ce60277b6803a0202f7701e24c8905ce41d072954aa60408198fd98087584f9fdf44f688b176420b

data/CHANGELOG.md

@@ -1,14 +1,23 @@
 Changelog
 =========
 
-2.0.0.beta2 (2013-05-27)
-------------------------
+v2.0.0.beta3 (2013-05-29)
+-------------------------
+
+Bugs fixed:
+ * AST::Processor: traverse "A, B = foo" (fixes #55). (Peter Zotov)
+ * lexer.rl: correctly handle CRLF line endings (fixes #56). (Peter Zotov)
+ * Fix traversing of "case; when a?; when b?; end" by AST::Processor. (Peter Zotov)
+ * Correctly lex "foo a, b # comment\nbar" (fixes #54). (Peter Zotov)
+
+v2.0.0.beta2 (2013-05-27)
+-------------------------
 
 Bugs fixed:
  * Actually return comments from Parser::Base#tokenize instead of nil. (Peter Zotov)
 
-v2.0.0 (2013-05-25)
--------------------
+v2.0.0.beta1 (2013-05-25)
+-------------------------
 
 API modifications:
  * Completely rewrite whitespace handling in lexer (fixes #36). (Peter Zotov)

data/Gemfile

@@ -3,6 +3,4 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in parser.gemspec
 gemspec
 
-group :development do
-  gem 'rubocop', :platform => [:ruby_19, :ruby_20]
-end
+gem 'rubocop', :platform => [:ruby_19, :ruby_20]

data/Rakefile

@@ -67,8 +67,8 @@ task :changelog do
             match(/^(?: \((.*)\))?#{fs}(.*)#{fs}(.*)#{fs}(.*)$/o).captures
       date = Date.parse(date)
 
-      current_version = "#{$1} (#{date})" if version =~ /(v\d+.\d+.\d+)/
-      current_version = "#{Parser::VERSION} (#{date})" if version =~ /HEAD/
+      current_version = "#{$1} (#{date})" if version =~ /(v[\d\w.]+)/
+      current_version = "v#{Parser::VERSION} (#{date})" if version =~ /HEAD/
 
       next if current_version.nil? || message !~ /^[+*-]/
 

data/lib/parser/ast/processor.rb

@@ -75,7 +75,7 @@ module Parser
         scope_node, name, value_node = *node
 
         scope_node = process(scope_node) if scope_node
-        value_node = process(value_node)
+        value_node = process(value_node) if value_node
         node.updated(nil, [ scope_node, name, value_node ])
       end
 
@@ -184,9 +184,10 @@ module Parser
         cond_node, *bodies = *node
         when_nodes, else_node = bodies[0..-2], bodies[-1]
 
+        cond_node = process(cond_node) if cond_node
         else_node = process(else_node) if else_node
         node.updated(nil, [
-          process(cond_node),
+          cond_node,
           *(process_all(when_nodes) << else_node)
         ])
       end

data/lib/parser/lexer.rl

@@ -154,7 +154,7 @@ class Parser::Lexer
       #
       # Patches accepted.
       #
-      @source = @source_buffer.source.gsub(/\r\n/, "\n") + "\0\0\0"
+      @source = @source_buffer.source + "\0\0\0"
     else
       @source = nil
     end
@@ -377,7 +377,7 @@ class Parser::Lexer
     @newline_s = p
   }
 
-  c_nl       = '\n' $ do_nl;
+  c_nl       = '\r'? '\n' $ do_nl;
   c_space    = [ \t\r\f\v];
   c_space_nl = c_space | c_nl;
   c_eof      = 0x04 | 0x1a | 0; # ^D, ^Z, EOF
@@ -1241,7 +1241,7 @@ class Parser::Lexer
         fgoto expr_end;
       };
 
-      w_space? w_newline
+      w_space* w_newline
       => { fhold; fgoto expr_end; };
 
       c_any

data/lib/parser/version.rb

@@ -1,3 +1,3 @@
 module Parser
-  VERSION = '2.0.0.beta2'
+  VERSION = '2.0.0.beta3'
 end

data/test/test_lexer.rb

@@ -2523,6 +2523,13 @@ class TestLexer < Minitest::Test
                    :tIDENTIFIER,  "foo")
   end
 
+  def test_bug_expr_arg_comment_newline
+    @lex.state = :expr_arg
+    util_lex_token(" #\nfoo",
+                   :tNL,         nil,
+                   :tIDENTIFIER, 'foo')
+  end
+
   def test_bug_heredoc_backspace_nl
     util_lex_token(" <<'XXX'\nf \\\nXXX\n",
                    :tSTRING_BEG,     "'",

data/test/test_parser.rb

@@ -4135,6 +4135,25 @@ class TestParser < Minitest::Test
   # Miscellanea
   #
 
+  def test_crlf_line_endings
+    with_versions(ALL_VERSIONS) do |_ver, parser|
+      source_file = Parser::Source::Buffer.new('(comments)')
+      source_file.source = "\r\nfoo"
+
+      range = lambda do |from, to|
+        Parser::Source::Range.new(source_file, from, to)
+      end
+
+      ast = parser.parse(source_file)
+
+      assert_equal s(:lvar, :foo),
+                   ast
+
+      assert_equal range.call(2, 5),
+                   ast.loc.expression
+    end
+  end
+
   def test_begin_cmdarg
     assert_parses(
       s(:send, nil, :p,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parser
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta2
+  version: 2.0.0.beta3
 platform: ruby
 authors:
 - Peter Zotov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-27 00:00:00.000000000 Z
+date: 2013-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast