parser 2.2.2.1 → 2.2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 918d40074c3300d2fa2d060cabb74a87dbd20974
-  data.tar.gz: a9c8f078d218c36abdbfdbea05a45214016c061d
+  metadata.gz: e9642fd7259af701acf759e9083a66ca26a0c4de
+  data.tar.gz: a689a5f7b816813fb86845abeef9e92f9dbba73b
 SHA512:
-  metadata.gz: e4398ec85496d00494993e3a8246eb612b4c0531574cb4e4d5d08e7e5b3afc4bbb4da1c7d76e05714f324c8dd1a49cbc9bc5a0222e97e078421b19dccf4106f2
-  data.tar.gz: 6fa7af3a14f737508a75eb763dd6975bf2f6dfd51da35b74d1b00f0a0b805c170933cec74f462e9b66bc8ec0b60b802575ac38d75587f7adec578ab6dab3e531
+  metadata.gz: a9688dd01f3454ad7adc0c21e23de107529acc73709f49bf12845425db1e65cf75da35ac94d79bbabac731759695a85efbf67d9062a739e43aaf0d031aa0255b
+  data.tar.gz: f33b299a27fafb355fa0b44101e22cee7db03407fe16d8acf6c64ce7b0d0901fa042eb7c0a824f17aa8d9ae8b02323a47f90d5489299a4a8f0468f26d2bd411a

data/CHANGELOG.md

@@ -1,12 +1,21 @@
 Changelog
 =========
 
-v2.2.2.1 (2015-04-17)
+v2.2.2.2 (2015-04-28)
+---------------------
+
+Bugs fixed:
+ * lexer.rl: "%r.\..", "%r'\''": leave regexp metacharacters escaped (fixes #192). (whitequark)
+
+v2.2.2.1 (2015-04-18)
 ---------------------
 
 Bugs fixed:
  * builders/default: don't falsely diagnose multiline regexps (fixes #190). (whitequark)
 
+v2.2.2.0 (2015-04-15)
+---------------------
+
 v2.2.0.4 (2015-04-15)
 ---------------------
 
@@ -14,6 +23,12 @@ Features implemented:
  * Add Parser::Source::Map#node. (whitequark)
  * Add Parser::Source::Comment.associate_locations. (kubicle)
 
+v2.2.0.3 (2015-02-13)
+---------------------
+
+v2.2.0.2 (2015-01-09)
+---------------------
+
 v2.2.0.1 (2014-12-27)
 ---------------------
 
@@ -205,6 +220,9 @@ 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.pre6 (2013-08-02)
+------------------------
+
 v2.0.0.pre5 (2013-07-31)
 ------------------------
 
@@ -290,6 +308,9 @@ Features implemented:
 Bugs fixed:
  * Don't treat byte order mark as an identifier (closes #91). (Peter Zotov)
 
+v2.0.0.pre1 (2013-07-04)
+------------------------
+
 v2.0.0.beta10 (2013-07-02)
 --------------------------
 
@@ -495,6 +516,9 @@ Bugs fixed:
  * ruby18.y, ruby19.y: BEGIN{} does not introduce a scope. (Peter Zotov)
  * lexer.rl: improve whitespace handling. (Peter Zotov)
 
+v0.9.1 (2013-04-15)
+-------------------
+
 v0.9.0 (2013-04-15)
 -------------------
 

data/CONTRIBUTING.md

@@ -1,10 +1,17 @@
 Contributing to Parser
 ----------------------
 
-Parser uses [Semantic Versioning](http://semver.org). Additionally, Parser employs a script to extract information from VCS (git) log and form a Changelog file. Thus, each commit which affects the public API in any way must be marked with one of the following sigils, or characters at the beginning of line:
+Parser employs a script to extract information from VCS (git) log and form a Changelog file. Thus, each commit which affects the public API in any way must be marked with one of the following sigils, or characters at the beginning of line:
 
  * `-` for bugfixes. For example: `- lexer.rl: fixed lexing of "alias $foo $bar".`
  * `+` for features. For example: `+ Implemented Parser::Rewriter, a module for non-intrusive rewriting of source code.`
  * `*` for miscellaneous changes. For example: `* Converted measurement units from metric to imperial.`
 
-These categories map nicely to semantic versioning: `-` bugfixes increment patchlevel, `+` features increment minor version, `*` API changes increment major version.
+Versioning
+----------
+
+Parser is versioned as follows:
+ * The version starts with the most recent Ruby version that Parser supports (which should be also the most recent released Ruby version).
+ * After that, a `.x` is appended, where `x` is incremented for every change.
+
+No breaking changes to API will be ever made, except for changes that correct behavior which did not match documentation or Ruby MRI behavior.

data/Rakefile

@@ -90,10 +90,12 @@ task :changelog do
       date = Date.parse(date)
 
       current_version = "#{$1} (#{date})" if version =~ /(v[\d\w.]+)/
-      current_version = "v#{Parser::VERSION} (#{date})" if version =~ /HEAD/
+      current_version = "v#{Parser::VERSION} (#{date})" if version =~ /(^|[^\/])master/
 
-      next if current_version.nil? || message !~ /^[+*-]/
+      next if current_version.nil?
+      changelog[current_version] # add a hash
 
+      next if message !~ /^[+*-]/
       changelog[current_version][message[0]] << "#{message[1..-1]} (#{author})"
     end
   end

data/lib/parser/lexer.rl

@@ -865,9 +865,15 @@ class Parser::Lexer
         # or closing delimiter, it is an escape sequence for that
         # particular character. Write it without the backslash.
 
-        if literal.regexp? && escaped_char == '\\'
-          # Regular expressions should include backslashes in their escaped
-          # form.
+        if literal.regexp? && "\\$()*+.<>?[]^{|}".include?(escaped_char)
+          # Regular expressions should include escaped delimiters in their
+          # escaped form, except when the escaped character is
+          # a closing delimiter but not a regexp metacharacter.
+          #
+          # The backslash itself cannot be used as a closing delimiter
+          # at the same time as an escape symbol, but it is always munged,
+          # so this branch also executes for the non-closing-delimiter case
+          # for the backslash.
           literal.extend_string(tok, @ts, @te)
         else
           literal.extend_string(escaped_char, @ts, @te)

data/lib/parser/version.rb

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

data/test/test_lexer.rb

@@ -1597,7 +1597,7 @@ class TestLexer < Minitest::Test
   def test_regexp_escape_backslash_terminator_meta1
     assert_scanned('%r{blah\\}blah}',
                    :tREGEXP_BEG,     "%r{",
-                   :tSTRING_CONTENT, "blah}blah",
+                   :tSTRING_CONTENT, "blah\\}blah",
                    :tSTRING_END,     "}",
                    :tREGEXP_OPT,     "")
   end
@@ -1714,6 +1714,22 @@ class TestLexer < Minitest::Test
                    :tREGEXP_OPT,     "")
   end
 
+  def test_regexp_escape_delimiter_meta
+    assert_scanned("%r(\\))",
+                   :tREGEXP_BEG,     "%r(",
+                   :tSTRING_CONTENT, "\\)",
+                   :tSTRING_END,     ")",
+                   :tREGEXP_OPT,     "")
+  end
+
+  def test_regexp_escape_delimiter_nonmeta
+    assert_scanned("%r'\\''",
+                   :tREGEXP_BEG,     "%r'",
+                   :tSTRING_CONTENT, "'",
+                   :tSTRING_END,     "'",
+                   :tREGEXP_OPT,     "")
+  end
+
   def test_regexp_nm
     assert_scanned("/.*/nm",
                    :tREGEXP_BEG,     "/",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parser
 version: !ruby/object:Gem::Version
-  version: 2.2.2.1
+  version: 2.2.2.2
 platform: ruby
 authors:
 - Peter Zotov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-18 00:00:00.000000000 Z
+date: 2015-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast