parser 2.4.0.0 → 2.4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 255b58022cc99fb078d57e0fcc881d5892401872
-  data.tar.gz: e00f38a300cc9c62b6bab48a155e6dc3639e51ac
+  metadata.gz: 0d6d941bf457d9da60c736d24713d5aa983a961f
+  data.tar.gz: fdd23f47888aff4b9845ef491a1cda609c3df29d
 SHA512:
-  metadata.gz: ad1ae6b22370cd26b56a39791984aae59e440bd58ce2f738522b71224b07cf3d0db45abf4bf8b2765c659d81dfa4117f57c03da7e7696f63da9ee25389a40a88
-  data.tar.gz: c3e9d34d73795b90501ce47cae91886198358dd3d5bb62de1e44485b3280537463e79da30ae652c4fc21da017a9d5be0fa57a86acdcdca4439414e5049de6607
+  metadata.gz: 34386bd586b1ea4bc287f36141794c8c69ede511cb7a922c9807dae21375a551dcabdd5fb1aa377c16e3ec7d11abaecfed325850497110f29c9eb49cb8742e0c
+  data.tar.gz: 17af7b4e7a0a8c6d69d51078a5e0173104af739b73c90061721b8f39603e44aed783ff600998818218b57bfd09af1bd1f2817fd8fce7488f550ac29d697e99df

data/.gitignore

@@ -26,5 +26,6 @@ lib/parser/ruby21.rb
 lib/parser/ruby22.rb
 lib/parser/ruby23.rb
 lib/parser/ruby24.rb
+lib/parser/ruby25.rb
 lib/parser/macruby.rb
 lib/parser/rubymotion.rb

data/.travis.yml

@@ -1,3 +1,4 @@
+dist: trusty
 language: ruby
 rvm:
  - 1.9.2
@@ -5,18 +6,17 @@ rvm:
  - 2.0.0
  - 2.2.5
  - 2.3.1
+ - 2.4.0
  - ruby-head
- - jruby-18mode
- - jruby-19mode
+ - jruby-9.1.14.0
  - rbx-2
 matrix:
  allow_failures:
   - rvm: ruby-head
   - rvm: rbx-2
 before_install:
- - gem update bundler
+ - gem install bundler
  - bundle --version
- - gem update --system 2.6.6
  - gem --version
 script:
  - bundle exec rake test_cov

data/CHANGELOG.md

@@ -1,6 +1,24 @@
 Changelog
 =========
 
+Not released (2017-11-13)
+-------------------------
+
+API modifications:
+ * parser/current: update for 2.3.4 release. (whitequark)
+ * parser/current: update for Ruby 2.1.10 and 2.2.7. (Koichi ITO)
+
+Features implemented:
+ * Allow rescue/else/ensure inside do/end blocks. [Feature #12906] (Ilya Bylich)
+ * ruby25.y: branch parser. (Ilya Bylich)
+
+Bugs fixed:
+ * Source::Comment::Associator: skip -*- magic comments -*-. (Denis Defreyne)
+ * lexer.rl: "- 5": allow whitespace after tUNARY_NUM. (whitequark)
+ * *ruby*.y, Builders::Default: "+5": don't lose location of the "+". (whitequark)
+ * ruby-rewrite: allow passing paths to --load. (whitequark)
+ * builders/default: "def x; else; end": don't crash. (whitequark)
+
 v2.4.0.0 (2017-02-07)
 ---------------------
 
@@ -41,9 +59,6 @@ Bugs fixed:
  * ruby24.y: "x = raise y rescue nil": bind rescue tighter than =. (whitequark)
  * Builders::Default: "begin; else; 1; end": fix a crash. (whitequark)
 
-v2.3.1.4 (2016-09-19)
----------------------
-
 v2.3.1.3 (2016-09-17)
 ---------------------
 
@@ -116,9 +131,6 @@ v2.3.0.5 (2016-02-12)
 Bugs fixed:
  * lexer.rl: "%Q{\あ}": fix encoding of UTF-8 noop escapes. (whitequark)
 
-v2.3.0.4 (2016-02-09)
----------------------
-
 v2.3.0.3 (2016-02-06)
 ---------------------
 
@@ -132,9 +144,6 @@ Bugs fixed:
  * Add :csend to Parser::Meta::NODE_TYPES (Markus Schirp)
  * lexer/dedenter: "\<\<x\n  y\\n  z\nx": don't dedent after escaped newline. (whitequark)
 
-v2.4.0.0 (2016-01-16)
----------------------
-
 v2.3.0.1 (2016-01-14)
 ---------------------
 
@@ -264,9 +273,6 @@ 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)
 ---------------------
 
@@ -274,12 +280,6 @@ 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)
 ---------------------
 
@@ -471,9 +471,6 @@ 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)
 ------------------------
 
@@ -559,9 +556,6 @@ 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)
 --------------------------
 
@@ -767,9 +761,6 @@ 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/Rakefile

@@ -3,6 +3,7 @@
 require 'bundler/gem_tasks'
 require 'rake/testtask'
 require 'rake/clean'
+require 'date'
 
 task :default => [:test]
 
@@ -27,17 +28,20 @@ GENERATED_FILES = %w(lib/parser/lexer.rb
                      lib/parser/ruby22.rb
                      lib/parser/ruby23.rb
                      lib/parser/ruby24.rb
+                     lib/parser/ruby25.rb
                      lib/parser/macruby.rb
                      lib/parser/rubymotion.rb)
 
 CLEAN.include(GENERATED_FILES)
 
+ENCODING_COMMENT = "# -*- encoding:utf-8; warn-indent:false; frozen_string_literal: true  -*-\n"
+
 desc 'Generate the Ragel lexer and Racc parser.'
 task :generate => GENERATED_FILES do
   Rake::Task[:ragel_check].invoke
   GENERATED_FILES.each do |filename|
     content = File.read(filename)
-    content = "# -*- encoding:utf-8; warn-indent:false; frozen_string_literal: true  -*-\n" + content
+    content = ENCODING_COMMENT + content unless content.start_with?(ENCODING_COMMENT)
 
     File.open(filename, 'w') do |io|
       io.write content
@@ -98,7 +102,7 @@ task :changelog do
       date = Date.parse(date)
 
       current_version = "#{$1} (#{date})" if version =~ /(v[\d\w.]+)/
-      current_version = "v#{Parser::VERSION} (#{date})" \
+      current_version = "Not released (#{date})" \
         if version =~ /(^| |\/)#{Regexp.escape branch}$/
 
       next if current_version.nil?
@@ -121,6 +125,7 @@ task :changelog do
     io.puts
 
     changelog.each do |version, commits|
+      next if commits.empty?
       io.puts version
       io.puts '-' * version.length
       io.puts

data/doc/AST_FORMAT.md

@@ -626,15 +626,6 @@ Format:
 "@a += 1"
 ~~~
 
-Ruby_parser output for reference:
-~~~
-"a += 1"
-s(:lasgn, :a, s(:call, s(:lvar, :a), :+, s(:int, 1)))
-
-"@a += 1"
-s(:iasgn, :@a, s(:call, s(:ivar, :@a), :+, s(:int, 1)))
-~~~
-
 #### Method binary operator-assignment
 
 Format:
@@ -655,15 +646,6 @@ Format:
  ~~~~~~~~~~~~~ expression (op-asgn)
 ~~~
 
-Ruby_parser output for reference:
-~~~
-"@a.b += 1"
-s(:op_asgn2, s(:ivar, :@a), :b=, :+, s(:int, 1))
-
-"@a[0, 1] += 1"
-s(:op_asgn1, s(:ivar, :@a), s(:arglist, s(:int, 0), s(:int, 1)), :+, s(:int, 1))
-~~~
-
 ### Logical operator-assignment
 
 Logical operator-assignment features the same "incomplete assignments" and "incomplete calls" as [multiple assignment](#assignment-1).
@@ -684,15 +666,6 @@ Format:
  ~~~~~~~ expression
 ~~~
 
-Ruby_parser output for reference:
-~~~
-"@a ||= 1"
-s(:op_asgn_or, s(:ivar, :@a), s(:ivasgn, :@a, s(:int, 1)))
-
-"a &&= 1"
-s(:op_asgn_and, s(:lvar, :a), s(:lvasgn, :a, s(:int, 1)))
-~~~
-
 #### Method logical operator-assignment
 
 Format:
@@ -721,16 +694,6 @@ Format:
 
 ~~~
 
-Ruby_parser output for reference:
-~~~
-"@foo.bar &&= 1"
-s(:op_asgn2, s(:ivar, :@foo), :bar=, :"&&", s(:int, 1))
-
-"@foo[0] ||= 1"
-s(:op_asgn1, s(:ivar, :@foo), s(:arglist, s(:int, 0)), :"||", s(:int, 1))
-
-~~~
-
 ## Class and module definition
 
 ### Module
@@ -1135,6 +1098,7 @@ Format:
 ### To superclass
 
 Format of super with arguments:
+
 ~~~
 (super (lvar :a))
 "super a"
@@ -1150,6 +1114,7 @@ Format of super with arguments:
 ~~~
 
 Format of super without arguments (**z**ero-arity):
+
 ~~~
 (zsuper)
 "super"

data/lib/parser/all.rb

@@ -5,3 +5,4 @@ require 'parser/ruby21'
 require 'parser/ruby22'
 require 'parser/ruby23'
 require 'parser/ruby24'
+require 'parser/ruby25'

data/lib/parser/builders/default.rb

@@ -120,11 +120,18 @@ module Parser
     end
     private :numeric
 
-    def negate(uminus_t, numeric)
+    def unary_num(unary_t, numeric)
       value, = *numeric
-      operator_loc = loc(uminus_t)
+      operator_loc = loc(unary_t)
 
-      numeric.updated(nil, [ -value ],
+      case value(unary_t)
+      when '+'
+        value = +value
+      when '-'
+        value = -value
+      end
+
+      numeric.updated(nil, [ value ],
         :location =>
           Source::Map::Operator.new(
             operator_loc,
@@ -878,7 +885,7 @@ module Parser
 
     def not_op(not_t, begin_t=nil, receiver=nil, end_t=nil)
       if @parser.version == 18
-        n(:not, [ receiver ],
+        n(:not, [ check_condition(receiver) ],
           unary_op_map(not_t, receiver))
       else
         if receiver.nil?
@@ -888,7 +895,7 @@ module Parser
             nil_node, :'!'
           ], send_unary_op_map(not_t, nil_node))
         else
-          n(:send, [ receiver, :'!' ],
+          n(:send, [ check_condition(receiver), :'!' ],
             send_map(nil, nil, not_t, begin_t, [receiver], end_t))
         end
       end
@@ -1097,6 +1104,8 @@ module Parser
       when :masgn
         if @parser.version <= 23
           diagnostic :error, :masgn_as_condition, nil, cond.loc.expression
+        else
+          cond
         end
 
       when :begin
@@ -1271,6 +1280,10 @@ module Parser
       if begin_t.nil? || end_t.nil?
         if parts.any?
           expr_l = join_exprs(parts.first, parts.last)
+        elsif !begin_t.nil?
+          expr_l = loc(begin_t)
+        elsif !end_t.nil?
+          expr_l = loc(end_t)
         end
       else
         expr_l = loc(begin_t).join(loc(end_t))

data/lib/parser/current.rb

@@ -37,7 +37,7 @@ module Parser
     CurrentRuby = Ruby20
 
   when /^2\.1\./
-    current_version = '2.1.8'
+    current_version = '2.1.10'
     if RUBY_VERSION != current_version
       warn_syntax_deviation 'parser/ruby21', current_version
     end
@@ -46,7 +46,7 @@ module Parser
     CurrentRuby = Ruby21
 
   when /^2\.2\./
-    current_version = '2.2.6'
+    current_version = '2.2.8'
     if RUBY_VERSION != current_version
       warn_syntax_deviation 'parser/ruby22', current_version
     end
@@ -55,7 +55,7 @@ module Parser
     CurrentRuby = Ruby22
 
   when /^2\.3\./
-    current_version = '2.3.3'
+    current_version = '2.3.4'
     if RUBY_VERSION != current_version
       warn_syntax_deviation 'parser/ruby23', current_version
     end
@@ -72,6 +72,15 @@ module Parser
     require 'parser/ruby24'
     CurrentRuby = Ruby24
 
+  when /^2\.5\./
+    current_version = '2.5.0'
+    if RUBY_VERSION != current_version
+      warn_syntax_deviation 'parser/ruby25', current_version
+    end
+
+    require 'parser/ruby25'
+    CurrentRuby = Ruby25
+
   else # :nocov:
     # Keep this in sync with released Ruby.
     warn_syntax_deviation 'parser/ruby24', '2.4.x'

data/lib/parser/lexer.rl

@@ -1621,16 +1621,11 @@ class Parser::Lexer
   # explodes.
   #
   expr_beg := |*
-      # Numeric processing. Converts:
-      #   +5 to [tINTEGER, 5]
-      #   -5 to [tUMINUS_NUM] [tINTEGER, 5]
-      [+\-][0-9]
+      # +5, -5, -  5
+      [+\-] w_any* [0-9]
       => {
-        fhold;
-        if tok.start_with? '-'.freeze
-          emit(:tUMINUS_NUM, '-'.freeze, @ts, @ts + 1)
-          fnext expr_end; fbreak;
-        end
+        emit(:tUNARY_NUM, tok(@ts, @ts + 1), @ts, @ts + 1)
+        fhold; fnext expr_end; fbreak;
       };
 
       # splat *a

data/lib/parser/lexer/literal.rb

@@ -187,7 +187,7 @@ module Parser
       @buffer_s ||= ts
       @buffer_e = te
 
-      @buffer += string
+      @buffer << string
     end
 
     def flush_string

data/lib/parser/macruby.y

@@ -7,7 +7,7 @@ token kCLASS kMODULE kDEF kUNDEF kBEGIN kRESCUE kENSURE kEND kIF kUNLESS
       kUNTIL_MOD kRESCUE_MOD kALIAS kDEFINED klBEGIN klEND k__LINE__
       k__FILE__ k__ENCODING__ tIDENTIFIER tFID tGVAR tIVAR tCONSTANT
       tLABEL tCVAR tNTH_REF tBACK_REF tSTRING_CONTENT tINTEGER tFLOAT
-      tUPLUS tUMINUS tUMINUS_NUM tPOW tCMP tEQ tEQQ tNEQ
+      tUPLUS tUMINUS tUNARY_NUM tPOW tCMP tEQ tEQQ tNEQ
       tGEQ tLEQ tANDOP tOROP tMATCH tNMATCH tDOT tDOT2 tDOT3 tAREF
       tASET tLSHFT tRSHFT tCOLON2 tCOLON3 tOP_ASGN tASSOC tLPAREN
       tLPAREN2 tRPAREN tLPAREN_ARG tLBRACK tLBRACK2 tRBRACK tLBRACE
@@ -21,7 +21,7 @@ token kCLASS kMODULE kDEF kUNDEF kBEGIN kRESCUE kENSURE kEND kIF kUNLESS
 prechigh
   right    tBANG tTILDE tUPLUS
   right    tPOW
-  right    tUMINUS_NUM tUMINUS
+  right    tUNARY_NUM tUMINUS
   left     tSTAR2 tDIVIDE tPERCENT
   left     tPLUS tMINUS
   left     tLSHFT tRSHFT
@@ -670,14 +670,14 @@ rule
                     {
                       result = @builder.binary_op(val[0], val[1], val[2])
                     }
-                | tUMINUS_NUM tINTEGER tPOW arg
+                | tUNARY_NUM tINTEGER tPOW arg
                     {
                       result = @builder.unary_op(val[0],
                                   @builder.binary_op(
                                     @builder.integer(val[1]),
                                       val[2], val[3]))
                     }
-                | tUMINUS_NUM tFLOAT tPOW arg
+                | tUNARY_NUM tFLOAT tPOW arg
                     {
                       result = @builder.unary_op(val[0],
                                   @builder.binary_op(
@@ -1786,15 +1786,25 @@ regexp_contents: # nothing
                     {
                       result = @builder.float(val[0])
                     }
-                | tUMINUS_NUM tINTEGER =tLOWEST
+                | tUNARY_NUM tINTEGER =tLOWEST
                     {
-                      result = @builder.negate(val[0],
-                                  @builder.integer(val[1]))
+                      num = @builder.integer(val[1])
+                      if @builder.respond_to? :negate
+                        # AST builder interface compatibility
+                        result = @builder.negate(val[0], num)
+                      else
+                        result = @builder.unary_num(val[0], num)
+                      end
                     }
-                | tUMINUS_NUM tFLOAT   =tLOWEST
+                | tUNARY_NUM tFLOAT   =tLOWEST
                     {
-                      result = @builder.negate(val[0],
-                                  @builder.float(val[1]))
+                      num = @builder.float(val[1])
+                      if @builder.respond_to? :negate
+                        # AST builder interface compatibility
+                        result = @builder.negate(val[0], num)
+                      else
+                        result = @builder.unary_num(val[0], num)
+                      end
                     }
 
         variable: tIDENTIFIER