parser 2.3.0.pre.5 → 2.3.0.pre.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8603dec71087cb78e504f3ed0175962f075dde01
-  data.tar.gz: 518d432e89bce2f3a03f9cbabc1e5917040e2c2c
+  metadata.gz: 76b617323cf8143b8935312b8ce39e4c2d847b63
+  data.tar.gz: 13f93cde47689ad2352602d2aac0555b674f860d
 SHA512:
-  metadata.gz: 10f802d02d6a4e4a80deb6e427fc68d123e86b51e00bdda09e06cbb30e4c33c795b11de47e58e5e370e0117bceca458c9660e416c0489e4601e680bf1c296f2b
-  data.tar.gz: 94dbc707d086703b9060687dceb6c7d806ad01c17619e4be7fd379bdbfb4dbe56212ac289443c513a4ba0c097f469390284e93dbd7708faf7b75dca4daa45158
+  metadata.gz: ddac7c4fdf0503ff15acbb45eedb8bdd9713ed38ceefd5f306044b68e8ce6c016919a689e543ad7b9648c0dcfee43870164194ed8f02fcfd90b9e383219ad9bf
+  data.tar.gz: 7831e67d2cb5ad9e65e1230a86c5117804e17e088e78f01c28632917c1cf0b3cce3abfb46ab889007acf7232f315989467d756a3a89d4b335d71022b53899c2a

data/CHANGELOG.md

@@ -1,6 +1,21 @@
 Changelog
 =========
 
+v2.3.0.pre.6 (2015-12-20)
+-------------------------
+
+API modifications:
+ * parser/current: update 2.2 warning to 2.2.4. (whitequark)
+ * ruby{22,23}.y: "1 ? p do end : 0". (whitequark)
+ * lexer.rl: "{%'a':1}": %-string cannot be a label. (whitequark)
+ * parser/current: update 2.1 warning to 2.1.8. (whitequark)
+
+Features implemented:
+ * ruby-parse: add --emit-ruby option. (whitequark)
+
+Bugs fixed:
+ * lexer.rl: "f(a ? 'a':1)": disallow quoted label at expr_value. (whitequark)
+
 v2.3.0.pre.5 (2015-12-16)
 -------------------------
 

data/lib/parser/current.rb

@@ -34,16 +34,16 @@ module Parser
     CurrentRuby = Ruby20
 
   when /^2\.1\./
-    if RUBY_VERSION != '2.1.7'
-      warn_syntax_deviation 'parser/ruby21', '2.1.7'
+    if RUBY_VERSION != '2.1.8'
+      warn_syntax_deviation 'parser/ruby21', '2.1.8'
     end
 
     require 'parser/ruby21'
     CurrentRuby = Ruby21
 
   when /^2\.2\./
-    if RUBY_VERSION != '2.2.3'
-      warn_syntax_deviation 'parser/ruby22', '2.2.3'
+    if RUBY_VERSION != '2.2.4'
+      warn_syntax_deviation 'parser/ruby22', '2.2.4'
     end
 
     require 'parser/ruby22'

data/lib/parser/lexer.rl

@@ -854,7 +854,8 @@ class Parser::Lexer
     end
 
     current_literal = literal
-    if !current_literal.heredoc? && (token = current_literal.nest_and_try_closing(string, @ts, @te, lookahead))
+    if !current_literal.heredoc? &&
+          (token = current_literal.nest_and_try_closing(string, @ts, @te, lookahead))
       if token[0] == :tLABEL_END
         p += 1
         pop_literal
@@ -1886,7 +1887,7 @@ class Parser::Lexer
     c_eof => do_eof;
   *|;
 
-  # Like expr_beg, but no 1.9 label possible.
+  # Like expr_beg, but no 1.9 label or 2.2 quoted label possible.
   #
   expr_value := |*
       # a:b: a(:b), a::B, A::B
@@ -1894,6 +1895,12 @@ class Parser::Lexer
       => { p = @ts - 1
            fgoto expr_end; };
 
+      # "bar", 'baz'
+      ['"] # '
+      => {
+        fgoto *push_literal(tok, tok, @ts, nil, false, false);
+      };
+
       w_space_comment;
 
       w_newline
@@ -2087,7 +2094,7 @@ class Parser::Lexer
       '`' | ['"] # '
       => {
         type, delimiter = tok, tok[-1].chr
-        fgoto *push_literal(type, delimiter, @ts);
+        fgoto *push_literal(type, delimiter, @ts, nil, false, true);
       };
 
       #

data/lib/parser/lexer/literal.rb

@@ -37,7 +37,8 @@ module Parser
     attr_reader   :heredoc_e, :str_s
     attr_accessor :saved_herebody_s
 
-    def initialize(lexer, str_type, delimiter, str_s, heredoc_e = nil, indent = false)
+    def initialize(lexer, str_type, delimiter, str_s, heredoc_e = nil,
+                   indent = false, label_allowed = false)
       @lexer       = lexer
       @nesting     = 1
 
@@ -60,8 +61,9 @@ module Parser
       @start_delim = DELIMITERS.include?(delimiter) ? delimiter : nil
       @end_delim   = DELIMITERS.fetch(delimiter, delimiter)
 
-      @heredoc_e   = heredoc_e
-      @indent      = indent
+      @heredoc_e     = heredoc_e
+      @indent        = indent
+      @label_allowed = label_allowed
 
       @interp_braces = 0
 
@@ -130,7 +132,7 @@ module Parser
         end
 
         if lookahead && lookahead[0] == ?: && lookahead[1] != ?: &&
-           %w(' ").include?(delimiter) && @start_tok == :tSTRING_BEG
+           @label_allowed && @start_tok == :tSTRING_BEG
           # This is a quoted label.
           flush_string
           emit(:tLABEL_END, @end_delim, ts, te + 1)

data/lib/parser/ruby22.y

@@ -784,25 +784,10 @@ rule
                     {
                       result = @builder.keyword_cmd(:defined?, val[0], nil, [ val[2] ], nil)
                     }
-
-                # Note: MRI eventually came to rely on disambiguation based on
-                # the lexer state, but it is too contrived with the Ragel lexer,
-                # so we kept this approach. See ruby/ruby@b0c03f63e5 for
-                # the initial commit, and ruby/ruby@23352f62a for MRI revert,
-                # which we decided not to track.
-                | arg tEH
-                    {
-                      @lexer.push_cond
-                      @lexer.cond.push(true)
-                    }
-                  arg opt_nl tCOLON
-                    {
-                      @lexer.pop_cond
-                    }
-                  arg
+                | arg tEH arg opt_nl tCOLON arg
                     {
                       result = @builder.ternary(val[0], val[1],
-                                                val[3], val[5], val[7])
+                                                val[2], val[4], val[5])
                     }
                 | primary
 

data/lib/parser/ruby23.y

@@ -784,25 +784,10 @@ rule
                     {
                       result = @builder.keyword_cmd(:defined?, val[0], nil, [ val[2] ], nil)
                     }
-
-                # Note: MRI eventually came to rely on disambiguation based on
-                # the lexer state, but it is too contrived with the Ragel lexer,
-                # so we kept this approach. See ruby/ruby@b0c03f63e5 for
-                # the initial commit, and ruby/ruby@23352f62a for MRI revert,
-                # which we decided not to track.
-                | arg tEH
-                    {
-                      @lexer.push_cond
-                      @lexer.cond.push(true)
-                    }
-                  arg opt_nl tCOLON
-                    {
-                      @lexer.pop_cond
-                    }
-                  arg
+                | arg tEH arg opt_nl tCOLON arg
                     {
                       result = @builder.ternary(val[0], val[1],
-                                                val[3], val[5], val[7])
+                                                val[2], val[4], val[5])
                     }
                 | primary
 

data/lib/parser/runner/ruby_parse.rb

@@ -93,6 +93,7 @@ module Parser
       super
 
       @locate = false
+      @emit_ruby = false
     end
 
     private
@@ -113,6 +114,10 @@ module Parser
 
         Lexer.send :include, Lexer::Explanation
       end
+
+      opts.on '--emit-ruby', 'Emit S-expressions as valid Ruby code' do
+        @emit_ruby = true
+      end
     end
 
     def process_all_input
@@ -129,7 +134,11 @@ module Parser
       if @locate
         LocationProcessor.new.process(ast)
       elsif !@benchmark
-        p ast
+        if @emit_ruby
+          puts ast.inspect
+        else
+          puts ast.to_s
+        end
       end
     end
   end

data/lib/parser/version.rb

@@ -1,3 +1,3 @@
 module Parser
-  VERSION = '2.3.0.pre.5'
+  VERSION = '2.3.0.pre.6'
 end

data/parser.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^test/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency             'ast',       ['>= 1.1', '< 3.0']
+  spec.add_dependency             'ast',       '~> 2.2'
 
   spec.add_development_dependency 'bundler',   '~> 1.2'
   spec.add_development_dependency 'rake',      '~> 10.0'

data/test/test_lexer.rb

@@ -308,6 +308,17 @@ class TestLexer < Minitest::Test
                    :tCOLON2, '::')
   end
 
+  def test_pct_string_colon__22
+    setup_lexer 22
+
+    assert_scanned("{%'a':",
+                   :tLBRACE,         '{',
+                   :tSTRING_BEG,     "%'",
+                   :tSTRING_CONTENT, 'a',
+                   :tSTRING_END,     "'",
+                   :tCOLON,          ':')
+  end
+
   def test_command_start__19
     setup_lexer 19
 

data/test/test_parser.rb

@@ -5052,6 +5052,49 @@ class TestParser < Minitest::Test
       ALL_VERSIONS - %w(1.8 1.9 mac ios 2.0))
   end
 
+  def test_ruby_bug_10653
+    assert_parses(
+      s(:if,
+        s(:true),
+        s(:block,
+          s(:send,
+            s(:int, 1), :tap),
+          s(:args,
+            s(:arg, :n)),
+          s(:send, nil, :p,
+            s(:lvar, :n))),
+        s(:int, 0)),
+      %q{true ? 1.tap do |n| p n end : 0},
+      %q{},
+      ALL_VERSIONS)
+
+    assert_parses(
+      s(:if,
+        s(:false),
+        s(:block,
+          s(:send, nil, :raise),
+          s(:args), nil),
+        s(:block,
+          s(:send, nil, :tap),
+          s(:args), nil)),
+      %q{false ? raise {} : tap {}},
+      %q{},
+      ALL_VERSIONS)
+
+    assert_parses(
+      s(:if,
+        s(:false),
+        s(:block,
+          s(:send, nil, :raise),
+          s(:args), nil),
+        s(:block,
+          s(:send, nil, :tap),
+          s(:args), nil)),
+      %q{false ? raise do end : tap do end},
+      %q{},
+      ALL_VERSIONS)
+  end
+
   def test_ruby_bug_11107
     assert_parses(
       s(:send, nil, :p,

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: parser
 version: !ruby/object:Gem::Version
-  version: 2.3.0.pre.5
+  version: 2.3.0.pre.6
 platform: ruby
 authors:
 - whitequark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-16 00:00:00.000000000 Z
+date: 2015-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement