From d24c4683f713df695dd17da870a03c4cabca5440 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 2 May 2017 17:48:10 +0000
Subject: ripper/lexer.rb: nested indented heredoc

* ext/ripper/lib/ripper/lexer.rb (on_heredoc_dedent): fix for
  nested indedented here documents, where `Elem`s are nested too.
  [ruby-core:80977] [Bug #13536]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58545 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/ripper/lib/ripper/lexer.rb |  2 +-
 test/ripper/test_lexer.rb      | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 test/ripper/test_lexer.rb

diff --git a/ext/ripper/lib/ripper/lexer.rb b/ext/ripper/lib/ripper/lexer.rb
index 669314ad92..350b513c25 100644
--- a/ext/ripper/lib/ripper/lexer.rb
+++ b/ext/ripper/lib/ripper/lexer.rb
@@ -67,7 +67,7 @@ class Ripper
 
     def on_heredoc_dedent(v, w)
       @buf.last.each do |e|
-        if e.event == :on_tstring_content
+        if Elem === e and e.event == :on_tstring_content
           if (n = dedent_string(e.tok, w)) > 0
             e.pos[1] += n
           end
diff --git a/test/ripper/test_lexer.rb b/test/ripper/test_lexer.rb
new file mode 100644
index 0000000000..2ec66cd592
--- /dev/null
+++ b/test/ripper/test_lexer.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+begin
+  require_relative 'dummyparser'
+  require 'test/unit'
+  ripper_test = true
+  module TestRipper; end
+rescue LoadError
+end
+
+class TestRipper::Lexer < Test::Unit::TestCase
+  def test_nested_dedent_heredoc
+    bug = '[ruby-core:80977] [Bug #13536]'
+    str = <<~'E'
+    <<~"D"
+    #{
+    <<~"B"
+    this must be a valid ruby
+    B
+    }
+    D
+    E
+    assert_equal(str, Ripper.tokenize(str).join(""), bug)
+  end
+end
-- 
cgit v1.2.3