parser 2.5.0.5 → 2.5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eae6cafd7a3fce8e37c8659d938ebaf9c07809373b09e67aadfce5812e270798
-  data.tar.gz: f5c5cbe528398b002fd7663fcd87083a4a6674a9c506b2d57c0c94015a3a006a
+  metadata.gz: 3d4445244332537a2a91b8b6f6a2d35b750ffb1dbc3869c91f1a4de840a89600
+  data.tar.gz: 800b3adeae6c64459f2b604c3c4b935eb728018bfe4136debae16c96df0384bf
 SHA512:
-  metadata.gz: 8721c4dd25927f9913423c7a5a1076b40d9652b2e327b6d74d02f9994e45a4bb53a69c1889d0fa271f1fb4756600a809cf11876add173fd4c65e64c4316c4225
-  data.tar.gz: 6b356ff3f6889594738f9b5c2ded84bc0abf20cf506caaaa627ff2ce5759edc68f0b73f6e4a9c0cab4dbf377df821979cd2fb179bf24ee3939868ec871fe3396
+  metadata.gz: 99138e99f88e016a3da7cac3fe45c492068fe5fa5ecb6df640ade2f6890c05fdc2aff096d255e0fd57f75f4e5c3300c15f16fa9be177e9fdc56711c6e6ea29ac
+  data.tar.gz: 71504873b9c22a3adfd0d0ee304e69e3317b93d52a7e2506c6225e2c768cea2ddd9bf1a874a04c8b0706047f78dc97f49b7841307f64198678f03a3336ad2675

data/.gitignore

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

data/CHANGELOG.md

@@ -1,6 +1,24 @@
 Changelog
 =========
 
+Not released (2018-04-12)
+-------------------------
+
+API modifications:
+ * Parser::Current: bump latest 2.2 branch to 2.2.10. (Ilya Bylich)
+
+Features implemented:
+ * ruby26.y: Raise a syntax error on 'else' without 'rescue'. This commit tracks upstream commit ruby/ruby@140512d. (Ilya Bylich)
+
+Bugs fixed:
+ * lexer.rl, Dedenter: Treat slash in heredocs as a line continuation. (Ilya Bylich)
+ * lexer.rl: Fix parsing of `a ? b + '': nil`. (Ilya Bylich)
+ * lexer.rl: Reject `m a: {} {}` and `m [] {}` since 25. (Ilya Bylich)
+ * builders/default: allow class/module/dynamic constant definition in the method body if there's a sclass between them. (bug #490) (Ilya Bylich)
+ * lexer.rl: Emit :!@ as :!, :~@ as :~. (Ilya Bylich)
+ * parse{23,24,25}.y: use only CMDARG/COND _PUSH/POP for cmdarg/cond management. (bug #481) (Ilya Bylich)
+ * lexer.rl: emit tSTRING_BEG and tSTRING_DBEG one by one to allow parser to properly manipulate cmdarg stack. (bug #480) (Ilya Bylich)
+
 v2.5.0.4 (2018-03-13)
 ---------------------
 

data/Rakefile

@@ -30,6 +30,7 @@ GENERATED_FILES = %w(lib/parser/lexer.rb
                      lib/parser/ruby23.rb
                      lib/parser/ruby24.rb
                      lib/parser/ruby25.rb
+                     lib/parser/ruby26.rb
                      lib/parser/macruby.rb
                      lib/parser/rubymotion.rb)
 

data/lib/parser/all.rb

@@ -8,3 +8,4 @@ require 'parser/ruby22'
 require 'parser/ruby23'
 require 'parser/ruby24'
 require 'parser/ruby25'
+require 'parser/ruby26'

data/lib/parser/builders/default.rb

@@ -527,7 +527,7 @@ module Parser
         node.updated(:gvasgn)
 
       when :const
-        if @parser.context.indirectly_in_def?
+        unless @parser.context.dynamic_const_definition_allowed?
           diagnostic :error, :dynamic_const, nil, node.loc.expression
         end
 

data/lib/parser/context.rb

@@ -38,5 +38,14 @@ module Parser
     def indirectly_in_def?
       @stack.include?(:def) || @stack.include?(:defs)
     end
+
+    def class_definition_allowed?
+      def_index = stack.rindex { |item| [:def, :defs].include?(item) }
+      sclass_index = stack.rindex(:sclass)
+
+      def_index.nil? || (!sclass_index.nil? && sclass_index > def_index)
+    end
+    alias module_definition_allowed? class_definition_allowed?
+    alias dynamic_const_definition_allowed? class_definition_allowed?
   end
 end

data/lib/parser/current.rb

@@ -30,7 +30,7 @@ module Parser
     CurrentRuby = Ruby21
 
   when /^2\.2\./
-    current_version = '2.2.9'
+    current_version = '2.2.10'
     if RUBY_VERSION != current_version
       warn_syntax_deviation 'parser/ruby22', current_version
     end
@@ -39,7 +39,7 @@ module Parser
     CurrentRuby = Ruby22
 
   when /^2\.3\./
-    current_version = '2.3.6'
+    current_version = '2.3.7'
     if RUBY_VERSION != current_version
       warn_syntax_deviation 'parser/ruby23', current_version
     end
@@ -48,7 +48,7 @@ module Parser
     CurrentRuby = Ruby23
 
   when /^2\.4\./
-    current_version = '2.4.3'
+    current_version = '2.4.4'
     if RUBY_VERSION != current_version
       warn_syntax_deviation 'parser/ruby24', current_version
     end
@@ -57,7 +57,7 @@ module Parser
     CurrentRuby = Ruby24
 
   when /^2\.5\./
-    current_version = '2.5.0'
+    current_version = '2.5.1'
     if RUBY_VERSION != current_version
       warn_syntax_deviation 'parser/ruby25', current_version
     end
@@ -65,6 +65,15 @@ module Parser
     require 'parser/ruby25'
     CurrentRuby = Ruby25
 
+  when /^2\.6\./
+    current_version = '2.6.0-dev'
+    if RUBY_VERSION != current_version
+      warn_syntax_deviation 'parser/ruby26', current_version
+    end
+
+    require 'parser/ruby26'
+    CurrentRuby = Ruby26
+
   else # :nocov:
     # Keep this in sync with released Ruby.
     warn_syntax_deviation 'parser/ruby25', '2.5.x'

data/lib/parser/lexer.rl

@@ -379,27 +379,30 @@ class Parser::Lexer
   def push_literal(*args)
     new_literal = Literal.new(self, *args)
     @literal_stack.push(new_literal)
+    next_state_for_literal(new_literal)
+  end
 
-    if new_literal.words? && new_literal.backslash_delimited?
-      if new_literal.interpolate?
+  def next_state_for_literal(literal)
+    if literal.words? && literal.backslash_delimited?
+      if literal.interpolate?
         self.class.lex_en_interp_backslash_delimited_words
       else
         self.class.lex_en_plain_backslash_delimited_words
       end
-    elsif new_literal.words? && !new_literal.backslash_delimited?
-      if new_literal.interpolate?
+    elsif literal.words? && !literal.backslash_delimited?
+      if literal.interpolate?
         self.class.lex_en_interp_words
       else
         self.class.lex_en_plain_words
       end
-    elsif !new_literal.words? && new_literal.backslash_delimited?
-      if new_literal.interpolate?
+    elsif !literal.words? && literal.backslash_delimited?
+      if literal.interpolate?
         self.class.lex_en_interp_backslash_delimited
       else
         self.class.lex_en_plain_backslash_delimited
       end
     else
-      if new_literal.interpolate?
+      if literal.interpolate?
         self.class.lex_en_interp_string
       else
         self.class.lex_en_plain_string
@@ -894,6 +897,23 @@ class Parser::Lexer
         # Regular expressions should include escape sequences in their
         # escaped form. On the other hand, escaped newlines are removed.
         current_literal.extend_string(tok.gsub("\\\n".freeze, ''.freeze), @ts, @te)
+      elsif current_literal.heredoc? && escaped_char == "\n".freeze
+        if current_literal.squiggly_heredoc?
+          # Squiggly heredocs like
+          #   <<~-HERE
+          #     1\
+          #     2
+          #   HERE
+          # treat '\' as a line continuation, but still dedent the body, so the heredoc above becomes "12\n".
+          # This information is emitted as is, without escaping,
+          # later this escape sequence (\\n) gets handled manually in the Lexer::Dedenter
+          current_literal.extend_string(tok, @ts, @te)
+        else
+          # Plain heredocs also parse \\n as a line continuation,
+          # but they don't need to know that there was originally a newline in the
+          # code, so we escape it and emit as "  1  2\n"
+          current_literal.extend_string(tok.gsub("\\\n".freeze, ''.freeze), @ts, @te)
+        end
       else
         current_literal.extend_string(@escape || tok, @ts, @te)
       end
@@ -1018,6 +1038,13 @@ class Parser::Lexer
       if current_literal.end_interp_brace_and_try_closing
         if version?(18, 19)
           emit(:tRCURLY, '}'.freeze, p - 1, p)
+          if @version < 24
+            @cond.lexpop
+            @cmdarg.lexpop
+          else
+            @cond.pop
+            @cmdarg.pop
+          end
         else
           emit(:tSTRING_DEND, '}'.freeze, p - 1, p)
         end
@@ -1026,8 +1053,9 @@ class Parser::Lexer
           @herebody_s = current_literal.saved_herebody_s
         end
 
+
         fhold;
-        fnext *stack_pop;
+        fnext *next_state_for_literal(current_literal);
         fbreak;
       end
     end
@@ -1046,7 +1074,8 @@ class Parser::Lexer
     end
 
     current_literal.start_interp_brace
-    fcall expr_value;
+    fnext expr_value;
+    fbreak;
   }
 
   # Actual string parsers are simply combined from the primitives defined
@@ -1748,6 +1777,14 @@ class Parser::Lexer
         fgoto *push_literal(type, delimiter, @ts);
       };
 
+      # :!@ is :!
+      # :~@ is :~
+      ':' [!~] '@'
+      => {
+        emit(:tSYMBOL, tok(@ts + 1, @ts + 2))
+        fnext expr_end; fbreak;
+      };
+
       ':' bareword ambiguous_symbol_suffix
       => {
         emit(:tSYMBOL, tok(@ts + 1, tm), @ts, tm)
@@ -1775,7 +1812,7 @@ class Parser::Lexer
         value = @escape || tok(@ts + 1)
 
         if version?(18)
-          emit(:tINTEGER, value.dup.force_encoding(Encoding::BINARY)[0].ord)
+          emit(:tINTEGER, value.getbyte(0))
         else
           emit(:tCHARACTER, value)
         end
@@ -2206,10 +2243,16 @@ class Parser::Lexer
       # OPERATORS
       #
 
-      ( e_lparen
-      | operator_arithmetic
-      | operator_rest
-      )
+      # When '|', '~', '!', '=>' are used as operators
+      # they do not accept any symbols (or quoted labels) after.
+      # Other binary operators accept it.
+      ( operator_arithmetic | operator_rest ) - ( '|' | '~' | '!' )
+      => {
+        emit_table(PUNCTUATION);
+        fnext expr_value; fbreak;
+      };
+
+      ( e_lparen | '|' | '~' | '!' )
       => { emit_table(PUNCTUATION)
            fnext expr_beg; fbreak; };
 
@@ -2217,17 +2260,16 @@ class Parser::Lexer
       => {
         emit_table(PUNCTUATION)
 
-        @cond.lexpop
         if @version < 24
+          @cond.lexpop
           @cmdarg.lexpop
         else
+          @cond.pop
           @cmdarg.pop
         end
 
-        if tok == '}'.freeze
-          fnext expr_endarg;
-        elsif tok == ']'
-          if @version >= 24
+        if tok == '}'.freeze || tok == ']'.freeze
+          if @version >= 25
             fnext expr_end;
           else
             fnext expr_endarg;

data/lib/parser/lexer/dedenter.rb

@@ -12,13 +12,41 @@ module Parser
     def dedent(string)
       space_begin = space_end = offset = 0
       last_index  = string.length - 1
+      escape = false
+      _at_line_begin = nil
+
       string.chars.each_with_index do |char, index|
-        if @at_line_begin
+        if char == '\\'
+          # entering escape mode
+          escape = true
+          string.slice!(index - offset)
+          offset += 1
+          _at_line_begin = @at_line_begin
+          @at_line_begin = false
+        elsif escape
+          if char == ?\n
+            # trimming \n, starting a new line
+            string.slice!(index - offset)
+            offset += 1
+            @at_line_begin = true
+            space_begin = space_end = index - offset
+            @indent_level = 0
+          elsif char == ?n
+            # replacing \\n to \n
+            string.slice!(index - offset)
+            string.insert(index - offset, ?\n)
+          else
+            # exiting escape mode as it's not an escape sequence
+            @at_line_begin = _at_line_begin
+            escape = false
+            redo
+          end
+          escape = false
+        elsif @at_line_begin
           if char == ?\n || @indent_level >= @dedent_level
             string.slice!(space_begin...space_end)
-            offset += space_end - space_begin - 1
+            offset += space_end - space_begin
             @at_line_begin = false
-            redo if char == ?\n
           end
 
           case char

data/lib/parser/lexer/literal.rb

@@ -103,6 +103,14 @@ module Parser
       !!@heredoc_e
     end
 
+    def plain_heredoc?
+      heredoc? && !@dedent_body
+    end
+
+    def squiggly_heredoc?
+      heredoc? && @dedent_body
+    end
+
     def backslash_delimited?
       @end_delim == '\\'.freeze
     end

data/lib/parser/macruby.y

@@ -1128,7 +1128,7 @@ rule
                     }
                     bodystmt kEND
                     {
-                      if @context.indirectly_in_def?
+                      unless @context.class_definition_allowed?
                         diagnostic :error, :class_in_def, nil, val[0]
                       end
 
@@ -1163,7 +1163,7 @@ rule
                     }
                     bodystmt kEND
                     {
-                      if @context.indirectly_in_def?
+                      unless @context.module_definition_allowed?
                         diagnostic :error, :module_in_def, nil, val[0]
                       end
 

data/lib/parser/ruby18.y

@@ -1128,7 +1128,7 @@ rule
                     }
                     bodystmt kEND
                     {
-                      if @context.indirectly_in_def?
+                      unless @context.class_definition_allowed?
                         diagnostic :error, :class_in_def, nil, val[0]
                       end
 
@@ -1159,7 +1159,7 @@ rule
                     }
                     bodystmt kEND
                     {
-                      if @context.indirectly_in_def?
+                      unless @context.module_definition_allowed?
                         diagnostic :error, :module_in_def, nil, val[0]
                       end
 

data/lib/parser/ruby19.y

@@ -1095,7 +1095,7 @@ rule
                     }
                     bodystmt kEND
                     {
-                      if @context.indirectly_in_def?
+                      unless @context.class_definition_allowed?
                         diagnostic :error, :class_in_def, nil, val[0]
                       end
 
@@ -1130,7 +1130,7 @@ rule
                     }
                     bodystmt kEND
                     {
-                      if @context.indirectly_in_def?
+                      unless @context.module_definition_allowed?
                         diagnostic :error, :module_in_def, nil, val[0]
                       end
 

data/lib/parser/ruby20.y

@@ -1125,7 +1125,7 @@ rule
                     }
                     bodystmt kEND
                     {
-                      if @context.indirectly_in_def?
+                      unless @context.class_definition_allowed?
                         diagnostic :error, :class_in_def, nil, val[0]
                       end
 
@@ -1160,7 +1160,7 @@ rule
                     }
                     bodystmt kEND
                     {
-                      if @context.indirectly_in_def?
+                      unless @context.module_definition_allowed?
                         diagnostic :error, :module_in_def, nil, val[0]
                       end
 

data/lib/parser/ruby21.y

@@ -1115,7 +1115,7 @@ rule
                     }
                     bodystmt kEND
                     {
-                      if @context.indirectly_in_def?
+                      unless @context.class_definition_allowed?
                         diagnostic :error, :class_in_def, nil, val[0]
                       end
 
@@ -1150,7 +1150,7 @@ rule
                     }
                     bodystmt kEND
                     {
-                      if @context.indirectly_in_def?
+                      unless @context.module_definition_allowed?
                         diagnostic :error, :module_in_def, nil, val[0]
                       end