From: Father Chrysostomos <sprout@cpan.org>
Date: Sat, 7 Sep 2013 06:45:36 +0000 (-0700)
Subject: toke.c: In sublex_push use multi_close to detect here-doc
X-Git-Tag: upstream/5.20.0~1972
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=801d32ac4fd337a99a83ad6098cda0f368bb8b03;p=platform%2Fupstream%2Fperl.git

toke.c: In sublex_push use multi_close to detect here-doc

It is a lot simpler this way.  scan_heredoc already sets PL_multi_close
to '<' (the only code that does it).  That value does not appear to
be used anywhere.  Now it is.

Furthermore, this removes assumptions that the next commit will
likely violate.
---

diff --git a/toke.c b/toke.c
index 01073d5..32a5a42 100644
--- a/toke.c
+++ b/toke.c
@@ -2594,13 +2594,9 @@ S_sublex_push(pTHX)
 {
     dVAR;
     LEXSHARED *shared;
-    const bool is_heredoc =
-	CopLINE(PL_curcop) == (line_t)PL_multi_start - 1;
+    const bool is_heredoc = PL_multi_close == '<';
     ENTER;
 
-    assert(CopLINE(PL_curcop) == (line_t)PL_multi_start
-	|| CopLINE(PL_curcop) == (line_t)PL_multi_start - 1);
-
     PL_lex_state = PL_sublex_info.super_state;
     SAVEBOOL(PL_lex_dojoin);
     SAVEI32(PL_lex_brackets);