parser 2.2.2.2 → 2.2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9642fd7259af701acf759e9083a66ca26a0c4de
-  data.tar.gz: a689a5f7b816813fb86845abeef9e92f9dbba73b
+  metadata.gz: ab4cd18ca1c0a175a8631f5b33b00d1b74a87138
+  data.tar.gz: 84d9cd1a7216ab854b704080977bfec9dcd86023
 SHA512:
-  metadata.gz: a9688dd01f3454ad7adc0c21e23de107529acc73709f49bf12845425db1e65cf75da35ac94d79bbabac731759695a85efbf67d9062a739e43aaf0d031aa0255b
-  data.tar.gz: f33b299a27fafb355fa0b44101e22cee7db03407fe16d8acf6c64ce7b0d0901fa042eb7c0a824f17aa8d9ae8b02323a47f90d5489299a4a8f0468f26d2bd411a
+  metadata.gz: cdf15aa367699423e2b475cc9e90c90eb52e6fdbd0c8560e63ea9f3e85ed8dd0963052f2413363460dda0b2adfde1738abf059cba398983c2937f3c5860fd4ac
+  data.tar.gz: 6be794d016744e9d7a0ffab004983bb6af6030c88ba1ccd11c31776d1108d8f45391fa2455d82fc14ca30b89d2c25951648ae3cf186111fc5397f6721978d17c

data/CHANGELOG.md

@@ -1,6 +1,15 @@
 Changelog
 =========
 
+v2.2.2.3 (2015-05-17)
+---------------------
+
+API modifications:
+ * lexer.rl: "a?? 1 : 0": squelch "invalid character syntax" warning. (whitequark)
+
+Bugs fixed:
+ * Source::Map: do not include :node in to_hash. (whitequark)
+
 v2.2.2.2 (2015-04-28)
 ---------------------
 

data/Rakefile

@@ -81,7 +81,10 @@ task :changelog do
     end
   end
 
-  IO.popen("git log --pretty='#{format}' remotes/origin/2.0 remotes/origin/2.1 master", 'r') do |io|
+  branch = `git describe HEAD --all`.strip.gsub(/.+\/([^\/]+)$/, '\1')
+
+  IO.popen("git log --pretty='#{format}' " \
+           "remotes/origin/2.0 remotes/origin/2.1 remotes/origin/2.2 #{branch}", 'r') do |io|
     current_version = nil
 
     io.each_line do |line|
@@ -90,7 +93,8 @@ task :changelog do
       date = Date.parse(date)
 
       current_version = "#{$1} (#{date})" if version =~ /(v[\d\w.]+)/
-      current_version = "v#{Parser::VERSION} (#{date})" if version =~ /(^|[^\/])master/
+      current_version = "v#{Parser::VERSION} (#{date})" \
+        if version =~ /(^| |\/)#{Regexp.escape branch}$/
 
       next if current_version.nil?
       changelog[current_version] # add a hash

data/lib/parser/lexer.rl

@@ -1401,8 +1401,17 @@ class Parser::Lexer
       # AMBIGUOUS TOKENS RESOLVED VIA EXPR_BEG
       #
 
-      # a ?b
-      # Character literal.
+      # a??
+      # Ternary operator
+      '?' c_space_nl
+      => {
+        # Unlike expr_beg as invoked in the next rule, do not warn
+        p = @ts - 1
+        fgoto expr_end;
+      };
+
+      # a ?b, a? ?
+      # Character literal or ternary operator
       w_space* '?'
       => { fhold; fgoto expr_beg; };
 

data/lib/parser/source/map.rb

@@ -144,9 +144,11 @@ module Parser
       # @return [Hash(Symbol, Parser::Source::Range)]
       #
       def to_hash
-        Hash[instance_variables.map do |ivar|
-          [ ivar[1..-1].to_sym, instance_variable_get(ivar) ]
-        end]
+        instance_variables.inject({}) do |hash, ivar|
+          next hash if ivar.to_sym == :@node
+          hash[ivar[1..-1].to_sym] = instance_variable_get(ivar)
+          hash
+        end
       end
 
       protected

data/lib/parser/version.rb

@@ -1,3 +1,3 @@
 module Parser
-  VERSION = '2.2.2.2'
+  VERSION = '2.2.2.3'
 end

data/test/test_source_map.rb

@@ -0,0 +1,13 @@
+require 'helper'
+require 'parse_helper'
+
+class TestSourceComment < Minitest::Test
+  include ParseHelper
+
+  def test_to_hash
+    buf = Parser::Source::Buffer.new("<input>")
+    buf.source = "1"
+    ast = parser_for_ruby_version('1.8').parse(buf)
+    assert_equal [:expression, :operator], ast.loc.to_hash.keys.sort_by(&:to_s)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parser
 version: !ruby/object:Gem::Version
-  version: 2.2.2.2
+  version: 2.2.2.3
 platform: ruby
 authors:
 - Peter Zotov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-28 00:00:00.000000000 Z
+date: 2015-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast
@@ -327,6 +327,7 @@ files:
 - test/test_source_buffer.rb
 - test/test_source_comment.rb
 - test/test_source_comment_associator.rb
+- test/test_source_map.rb
 - test/test_source_range.rb
 - test/test_source_rewriter.rb
 - test/test_source_rewriter_action.rb
@@ -375,6 +376,7 @@ test_files:
 - test/test_source_buffer.rb
 - test/test_source_comment.rb
 - test/test_source_comment_associator.rb
+- test/test_source_map.rb
 - test/test_source_range.rb
 - test/test_source_rewriter.rb
 - test/test_source_rewriter_action.rb