parser 3.3.7.3 → 3.3.7.4

data/lib/parser/lexer-strings.rb

@@ -3419,7 +3419,7 @@ begin # ragel flat
 			_acts += 1
 			case _lex_actions[_acts - 1]
 	when 0 then
-# line 525 "lib/parser/lexer-strings.rl"
+# line 534 "lib/parser/lexer-strings.rl"
 		begin
 
     # Record position of a newline for precise location reporting on tNL
@@ -3430,116 +3430,116 @@ begin # ragel flat
     @newline_s = p
   		end
 	when 1 then
-# line 581 "lib/parser/lexer-strings.rl"
+# line 590 "lib/parser/lexer-strings.rl"
 		begin
 
     unicode_points(p)
   		end
 	when 2 then
-# line 585 "lib/parser/lexer-strings.rl"
+# line 594 "lib/parser/lexer-strings.rl"
 		begin
 
     unescape_char(p)
   		end
 	when 3 then
-# line 589 "lib/parser/lexer-strings.rl"
+# line 598 "lib/parser/lexer-strings.rl"
 		begin
 
     diagnostic :fatal, :invalid_escape
   		end
 	when 4 then
-# line 593 "lib/parser/lexer-strings.rl"
+# line 602 "lib/parser/lexer-strings.rl"
 		begin
 
     read_post_meta_or_ctrl_char(p)
   		end
 	when 5 then
-# line 597 "lib/parser/lexer-strings.rl"
+# line 606 "lib/parser/lexer-strings.rl"
 		begin
 
     slash_c_char
   		end
 	when 6 then
-# line 601 "lib/parser/lexer-strings.rl"
+# line 610 "lib/parser/lexer-strings.rl"
 		begin
 
     slash_m_char
   		end
 	when 7 then
-# line 607 "lib/parser/lexer-strings.rl"
+# line 616 "lib/parser/lexer-strings.rl"
 		begin
  encode_escaped_char(p) 		end
 	when 8 then
-# line 613 "lib/parser/lexer-strings.rl"
+# line 622 "lib/parser/lexer-strings.rl"
 		begin
  @escape = "\x7f" 		end
 	when 9 then
-# line 614 "lib/parser/lexer-strings.rl"
+# line 623 "lib/parser/lexer-strings.rl"
 		begin
  encode_escaped_char(p) 		end
 	when 10 then
-# line 621 "lib/parser/lexer-strings.rl"
+# line 630 "lib/parser/lexer-strings.rl"
 		begin
  @escape = encode_escape(tok(@escape_s, p).to_i(8) % 0x100) 		end
 	when 11 then
-# line 625 "lib/parser/lexer-strings.rl"
+# line 634 "lib/parser/lexer-strings.rl"
 		begin
  @escape = encode_escape(tok(@escape_s + 1, p).to_i(16)) 		end
 	when 12 then
-# line 629 "lib/parser/lexer-strings.rl"
+# line 638 "lib/parser/lexer-strings.rl"
 		begin
 
         diagnostic :fatal, :invalid_hex_escape, nil, range(@escape_s - 1, p + 2)
       		end
 	when 13 then
-# line 635 "lib/parser/lexer-strings.rl"
+# line 644 "lib/parser/lexer-strings.rl"
 		begin
  @escape = tok(@escape_s + 1, p).to_i(16).chr(Encoding::UTF_8) 		end
 	when 14 then
-# line 639 "lib/parser/lexer-strings.rl"
+# line 648 "lib/parser/lexer-strings.rl"
 		begin
 
         check_invalid_escapes(p)
       		end
 	when 15 then
-# line 645 "lib/parser/lexer-strings.rl"
+# line 654 "lib/parser/lexer-strings.rl"
 		begin
 
         check_invalid_escapes(p)
       		end
 	when 16 then
-# line 659 "lib/parser/lexer-strings.rl"
+# line 668 "lib/parser/lexer-strings.rl"
 		begin
 
           diagnostic :fatal, :unterminated_unicode, nil, range(p - 1, p)
         		end
 	when 17 then
-# line 685 "lib/parser/lexer-strings.rl"
+# line 694 "lib/parser/lexer-strings.rl"
 		begin
 
       diagnostic :fatal, :escape_eof, nil, range(p - 1, p)
     		end
 	when 18 then
-# line 691 "lib/parser/lexer-strings.rl"
+# line 700 "lib/parser/lexer-strings.rl"
 		begin
 
     @escape_s = p
     @escape   = nil
   		end
 	when 19 then
-# line 808 "lib/parser/lexer-strings.rl"
+# line 817 "lib/parser/lexer-strings.rl"
 		begin
  interp_var_kind = :gvar 		end
 	when 20 then
-# line 809 "lib/parser/lexer-strings.rl"
+# line 818 "lib/parser/lexer-strings.rl"
 		begin
  interp_var_kind = :cvar 		end
 	when 21 then
-# line 810 "lib/parser/lexer-strings.rl"
+# line 819 "lib/parser/lexer-strings.rl"
 		begin
  interp_var_kind = :ivar 		end
 	when 22 then
-# line 944 "lib/parser/lexer-strings.rl"
+# line 953 "lib/parser/lexer-strings.rl"
 		begin
  @escape = nil 		end
 	when 25 then
@@ -3548,7 +3548,7 @@ begin # ragel flat
  @te = p+1
 		end
 	when 26 then
-# line 842 "lib/parser/lexer-strings.rl"
+# line 851 "lib/parser/lexer-strings.rl"
 		begin
  @te = p+1
  begin 
@@ -3565,7 +3565,7 @@ begin # ragel flat
    end
 		end
 	when 27 then
-# line 761 "lib/parser/lexer-strings.rl"
+# line 770 "lib/parser/lexer-strings.rl"
 		begin
  @te = p+1
  begin 
@@ -3616,7 +3616,7 @@ begin # ragel flat
    end
 		end
 	when 28 then
-# line 731 "lib/parser/lexer-strings.rl"
+# line 740 "lib/parser/lexer-strings.rl"
 		begin
  @te = p+1
  begin 
@@ -3649,7 +3649,7 @@ begin # ragel flat
    end
 		end
 	when 29 then
-# line 824 "lib/parser/lexer-strings.rl"
+# line 833 "lib/parser/lexer-strings.rl"
 		begin
  @te = p
 p = p - 1; begin 
@@ -3657,7 +3657,7 @@ p = p - 1; begin
    end
 		end
 	when 30 then
-# line 813 "lib/parser/lexer-strings.rl"
+# line 822 "lib/parser/lexer-strings.rl"
 		begin
  @te = p
 p = p - 1; begin 
@@ -3667,7 +3667,7 @@ p = p - 1; begin
    end
 		end
 	when 31 then
-# line 754 "lib/parser/lexer-strings.rl"
+# line 763 "lib/parser/lexer-strings.rl"
 		begin
  @te = p
 p = p - 1; begin 
@@ -3675,7 +3675,7 @@ p = p - 1; begin
    end
 		end
 	when 32 then
-# line 796 "lib/parser/lexer-strings.rl"
+# line 805 "lib/parser/lexer-strings.rl"
 		begin
  @te = p
 p = p - 1; begin 
@@ -3683,7 +3683,7 @@ p = p - 1; begin
    end
 		end
 	when 33 then
-# line 731 "lib/parser/lexer-strings.rl"
+# line 740 "lib/parser/lexer-strings.rl"
 		begin
  @te = p
 p = p - 1; begin 
@@ -3716,7 +3716,7 @@ p = p - 1; begin
    end
 		end
 	when 34 then
-# line 754 "lib/parser/lexer-strings.rl"
+# line 763 "lib/parser/lexer-strings.rl"
 		begin
  begin p = (( @te))-1; end
  begin 
@@ -3724,7 +3724,7 @@ p = p - 1; begin
    end
 		end
 	when 35 then
-# line 731 "lib/parser/lexer-strings.rl"
+# line 740 "lib/parser/lexer-strings.rl"
 		begin
  begin p = (( @te))-1; end
  begin 
@@ -3757,7 +3757,7 @@ p = p - 1; begin
    end
 		end
 	when 36 then
-# line 842 "lib/parser/lexer-strings.rl"
+# line 851 "lib/parser/lexer-strings.rl"
 		begin
  @te = p+1
  begin 
@@ -3774,7 +3774,7 @@ p = p - 1; begin
    end
 		end
 	when 37 then
-# line 761 "lib/parser/lexer-strings.rl"
+# line 770 "lib/parser/lexer-strings.rl"
 		begin
  @te = p+1
  begin 
@@ -3825,7 +3825,7 @@ p = p - 1; begin
    end
 		end
 	when 38 then
-# line 731 "lib/parser/lexer-strings.rl"
+# line 740 "lib/parser/lexer-strings.rl"
 		begin
  @te = p+1
  begin 
@@ -3858,7 +3858,7 @@ p = p - 1; begin
    end
 		end
 	when 39 then
-# line 824 "lib/parser/lexer-strings.rl"
+# line 833 "lib/parser/lexer-strings.rl"
 		begin
  @te = p
 p = p - 1; begin 
@@ -3866,7 +3866,7 @@ p = p - 1; begin
    end
 		end
 	when 40 then
-# line 813 "lib/parser/lexer-strings.rl"
+# line 822 "lib/parser/lexer-strings.rl"
 		begin
  @te = p
 p = p - 1; begin 
@@ -3876,7 +3876,7 @@ p = p - 1; begin
    end
 		end
 	when 41 then
-# line 754 "lib/parser/lexer-strings.rl"
+# line 763 "lib/parser/lexer-strings.rl"
 		begin
  @te = p
 p = p - 1; begin 
@@ -3884,7 +3884,7 @@ p = p - 1; begin
    end
 		end
 	when 42 then
-# line 731 "lib/parser/lexer-strings.rl"
+# line 740 "lib/parser/lexer-strings.rl"
 		begin
  @te = p
 p = p - 1; begin 
@@ -3917,7 +3917,7 @@ p = p - 1; begin
    end
 		end
 	when 43 then
-# line 754 "lib/parser/lexer-strings.rl"
+# line 763 "lib/parser/lexer-strings.rl"
 		begin
  begin p = (( @te))-1; end
  begin 
@@ -3925,7 +3925,7 @@ p = p - 1; begin
    end
 		end
 	when 44 then
-# line 731 "lib/parser/lexer-strings.rl"
+# line 740 "lib/parser/lexer-strings.rl"
 		begin
  begin p = (( @te))-1; end
  begin 
@@ -3958,7 +3958,7 @@ p = p - 1; begin
    end
 		end
 	when 45 then
-# line 754 "lib/parser/lexer-strings.rl"
+# line 763 "lib/parser/lexer-strings.rl"
 		begin
  @te = p+1
  begin 
@@ -3966,7 +3966,7 @@ p = p - 1; begin
    end
 		end
 	when 46 then
-# line 761 "lib/parser/lexer-strings.rl"
+# line 770 "lib/parser/lexer-strings.rl"
 		begin
  @te = p+1
  begin 
@@ -4017,7 +4017,7 @@ p = p - 1; begin
    end
 		end
 	when 47 then
-# line 731 "lib/parser/lexer-strings.rl"
+# line 740 "lib/parser/lexer-strings.rl"
 		begin
  @te = p+1
  begin 
@@ -4050,7 +4050,7 @@ p = p - 1; begin
    end
 		end
 	when 48 then
-# line 796 "lib/parser/lexer-strings.rl"
+# line 805 "lib/parser/lexer-strings.rl"
 		begin
  @te = p
 p = p - 1; begin 
@@ -4058,7 +4058,7 @@ p = p - 1; begin
    end
 		end
 	when 49 then
-# line 731 "lib/parser/lexer-strings.rl"
+# line 740 "lib/parser/lexer-strings.rl"
 		begin
  @te = p
 p = p - 1; begin 
@@ -4091,7 +4091,7 @@ p = p - 1; begin
    end
 		end
 	when 50 then
-# line 761 "lib/parser/lexer-strings.rl"
+# line 770 "lib/parser/lexer-strings.rl"
 		begin
  @te = p+1
  begin 
@@ -4142,7 +4142,7 @@ p = p - 1; begin
    end
 		end
 	when 51 then
-# line 754 "lib/parser/lexer-strings.rl"
+# line 763 "lib/parser/lexer-strings.rl"
 		begin
  @te = p+1
  begin 
@@ -4150,7 +4150,7 @@ p = p - 1; begin
    end
 		end
 	when 52 then
-# line 761 "lib/parser/lexer-strings.rl"
+# line 770 "lib/parser/lexer-strings.rl"
 		begin
  @te = p+1
  begin 
@@ -4201,7 +4201,7 @@ p = p - 1; begin
    end
 		end
 	when 53 then
-# line 731 "lib/parser/lexer-strings.rl"
+# line 740 "lib/parser/lexer-strings.rl"
 		begin
  @te = p+1
  begin 
@@ -4234,7 +4234,7 @@ p = p - 1; begin
    end
 		end
 	when 54 then
-# line 731 "lib/parser/lexer-strings.rl"
+# line 740 "lib/parser/lexer-strings.rl"
 		begin
  @te = p
 p = p - 1; begin 
@@ -4267,7 +4267,7 @@ p = p - 1; begin
    end
 		end
 	when 55 then
-# line 842 "lib/parser/lexer-strings.rl"
+# line 851 "lib/parser/lexer-strings.rl"
 		begin
  @te = p+1
  begin 
@@ -4284,7 +4284,7 @@ p = p - 1; begin
    end
 		end
 	when 56 then
-# line 761 "lib/parser/lexer-strings.rl"
+# line 770 "lib/parser/lexer-strings.rl"
 		begin
  @te = p+1
  begin 
@@ -4335,7 +4335,7 @@ p = p - 1; begin
    end
 		end
 	when 57 then
-# line 731 "lib/parser/lexer-strings.rl"
+# line 740 "lib/parser/lexer-strings.rl"
 		begin
  @te = p+1
  begin 
@@ -4368,7 +4368,7 @@ p = p - 1; begin
    end
 		end
 	when 58 then
-# line 824 "lib/parser/lexer-strings.rl"
+# line 833 "lib/parser/lexer-strings.rl"
 		begin
  @te = p
 p = p - 1; begin 
@@ -4376,7 +4376,7 @@ p = p - 1; begin
    end
 		end
 	when 59 then
-# line 813 "lib/parser/lexer-strings.rl"
+# line 822 "lib/parser/lexer-strings.rl"
 		begin
  @te = p
 p = p - 1; begin 
@@ -4386,7 +4386,7 @@ p = p - 1; begin
    end
 		end
 	when 60 then
-# line 731 "lib/parser/lexer-strings.rl"
+# line 740 "lib/parser/lexer-strings.rl"
 		begin
  @te = p
 p = p - 1; begin 
@@ -4419,7 +4419,7 @@ p = p - 1; begin
    end
 		end
 	when 61 then
-# line 731 "lib/parser/lexer-strings.rl"
+# line 740 "lib/parser/lexer-strings.rl"
 		begin
  begin p = (( @te))-1; end
  begin 
@@ -4452,7 +4452,7 @@ p = p - 1; begin
    end
 		end
 	when 62 then
-# line 761 "lib/parser/lexer-strings.rl"
+# line 770 "lib/parser/lexer-strings.rl"
 		begin
  @te = p+1
  begin 
@@ -4503,7 +4503,7 @@ p = p - 1; begin
    end
 		end
 	when 63 then
-# line 731 "lib/parser/lexer-strings.rl"
+# line 740 "lib/parser/lexer-strings.rl"
 		begin
  @te = p+1
  begin 
@@ -4536,7 +4536,7 @@ p = p - 1; begin
    end
 		end
 	when 64 then
-# line 842 "lib/parser/lexer-strings.rl"
+# line 851 "lib/parser/lexer-strings.rl"
 		begin
  @te = p+1
  begin 
@@ -4553,7 +4553,7 @@ p = p - 1; begin
    end
 		end
 	when 65 then
-# line 761 "lib/parser/lexer-strings.rl"
+# line 770 "lib/parser/lexer-strings.rl"
 		begin
  @te = p+1
  begin 
@@ -4604,7 +4604,7 @@ p = p - 1; begin
    end
 		end
 	when 66 then
-# line 731 "lib/parser/lexer-strings.rl"
+# line 740 "lib/parser/lexer-strings.rl"
 		begin
  @te = p+1
  begin 
@@ -4637,7 +4637,7 @@ p = p - 1; begin
    end
 		end
 	when 67 then
-# line 824 "lib/parser/lexer-strings.rl"
+# line 833 "lib/parser/lexer-strings.rl"
 		begin
  @te = p
 p = p - 1; begin 
@@ -4645,7 +4645,7 @@ p = p - 1; begin
    end
 		end
 	when 68 then
-# line 813 "lib/parser/lexer-strings.rl"
+# line 822 "lib/parser/lexer-strings.rl"
 		begin
  @te = p
 p = p - 1; begin 
@@ -4655,7 +4655,7 @@ p = p - 1; begin
    end
 		end
 	when 69 then
-# line 796 "lib/parser/lexer-strings.rl"
+# line 805 "lib/parser/lexer-strings.rl"
 		begin
  @te = p
 p = p - 1; begin 
@@ -4663,7 +4663,7 @@ p = p - 1; begin
    end
 		end
 	when 70 then
-# line 731 "lib/parser/lexer-strings.rl"
+# line 740 "lib/parser/lexer-strings.rl"
 		begin
  @te = p
 p = p - 1; begin 
@@ -4696,7 +4696,7 @@ p = p - 1; begin
    end
 		end
 	when 71 then
-# line 731 "lib/parser/lexer-strings.rl"
+# line 740 "lib/parser/lexer-strings.rl"
 		begin
  begin p = (( @te))-1; end
  begin 
@@ -4729,7 +4729,7 @@ p = p - 1; begin
    end
 		end
 	when 72 then
-# line 761 "lib/parser/lexer-strings.rl"
+# line 770 "lib/parser/lexer-strings.rl"
 		begin
  @te = p+1
  begin 
@@ -4780,7 +4780,7 @@ p = p - 1; begin
    end
 		end
 	when 73 then
-# line 731 "lib/parser/lexer-strings.rl"
+# line 740 "lib/parser/lexer-strings.rl"
 		begin
  @te = p+1
  begin 
@@ -4813,7 +4813,7 @@ p = p - 1; begin
    end
 		end
 	when 74 then
-# line 796 "lib/parser/lexer-strings.rl"
+# line 805 "lib/parser/lexer-strings.rl"
 		begin
  @te = p
 p = p - 1; begin 
@@ -4821,7 +4821,7 @@ p = p - 1; begin
    end
 		end
 	when 75 then
-# line 928 "lib/parser/lexer-strings.rl"
+# line 937 "lib/parser/lexer-strings.rl"
 		begin
  @te = p+1
  begin 
@@ -4838,7 +4838,7 @@ p = p - 1; begin
        end
 		end
 	when 76 then
-# line 915 "lib/parser/lexer-strings.rl"
+# line 924 "lib/parser/lexer-strings.rl"
 		begin
  @te = p
 p = p - 1; begin 
@@ -4860,7 +4860,7 @@ p = p - 1; begin
        end
 		end
 	when 77 then
-# line 953 "lib/parser/lexer-strings.rl"
+# line 962 "lib/parser/lexer-strings.rl"
 		begin
  @te = p+1
  begin 
@@ -4879,7 +4879,7 @@ p = p - 1; begin
        end
 		end
 	when 78 then
-# line 946 "lib/parser/lexer-strings.rl"
+# line 955 "lib/parser/lexer-strings.rl"
 		begin
  @te = p
 p = p - 1; begin 
@@ -4895,7 +4895,7 @@ p = p - 1; begin
        end
 		end
 	when 79 then
-# line 964 "lib/parser/lexer-strings.rl"
+# line 973 "lib/parser/lexer-strings.rl"
 		begin
  @te = p
 p = p - 1; begin 
@@ -4911,7 +4911,7 @@ p = p - 1; begin
        end
 		end
 	when 80 then
-# line 946 "lib/parser/lexer-strings.rl"
+# line 955 "lib/parser/lexer-strings.rl"
 		begin
  begin p = (( @te))-1; end
  begin 
@@ -4927,7 +4927,7 @@ p = p - 1; begin
        end
 		end
 	when 81 then
-# line 972 "lib/parser/lexer-strings.rl"
+# line 981 "lib/parser/lexer-strings.rl"
 		begin
  @te = p+1
  begin  raise 'bug'  end
@@ -5338,6 +5338,15 @@ p = p - 1; begin
           break
         end
 
+        # UTF-16 surrogate pairs. These are actually accepted before Ruby 2.4
+        # but can't be represented in the AST. Make them a syntax error in
+        # all versions instead, Ruby would raise an exception otherwise.
+        if codepoint & 0xfffff800 == 0xd800
+          diagnostic :error, :invalid_unicode_escape, nil,
+                     range(codepoint_s, codepoint_s + codepoint_str.length)
+          break
+        end
+
         @escape += codepoint.chr(Encoding::UTF_8)
         codepoint_s += codepoint_str.length
       end
@@ -5417,7 +5426,7 @@ p = p - 1; begin
   }
 
   
-# line 975 "lib/parser/lexer-strings.rl"
+# line 984 "lib/parser/lexer-strings.rl"
 
   # %
 

data/lib/parser/ruby27.rb

@@ -10871,11 +10871,12 @@ end
 
 def _reduce_527(val, _values, result)
                       name = val[1][0]
+                      lvar = @builder.accessible(@builder.ident(val[1]))
+
                       unless static_env.declared?(name)
                         diagnostic :error, :undefined_lvar, { :name => name }, val[1]
                       end
 
-                      lvar = @builder.accessible(@builder.ident(val[1]))
                       result = @builder.pin(val[0], lvar)
 
     result

data/lib/parser/ruby30.rb

@@ -11162,11 +11162,12 @@ end
 
 def _reduce_538(val, _values, result)
                       name = val[1][0]
+                      lvar = @builder.accessible(@builder.ident(val[1]))
+
                       unless static_env.declared?(name)
                         diagnostic :error, :undefined_lvar, { :name => name }, val[1]
                       end
 
-                      lvar = @builder.accessible(@builder.ident(val[1]))
                       result = @builder.pin(val[0], lvar)
 
     result

data/lib/parser/ruby31.rb

@@ -11589,11 +11589,12 @@ end
 
 def _reduce_548(val, _values, result)
                       name = val[1][0]
+                      lvar = @builder.accessible(@builder.ident(val[1]))
+
                       unless static_env.declared?(name)
                         diagnostic :error, :undefined_lvar, { :name => name }, val[1]
                       end
 
-                      lvar = @builder.accessible(@builder.ident(val[1]))
                       result = @builder.pin(val[0], lvar)
 
     result