fix parse error on C<{ use strict }> and other constructs that

make the parser reenter while LEX_KNOWNEXT is active

p4raw-id: //depot/perl@5004

diff --git a/t/comp/use.t b/t/comp/use.t
index 1099547..2594f0a 100755 (executable)
--- a/t/comp/use.t
+++ b/t/comp/use.t
@@ -44,9 +44,7 @@ unless ($@) {
 print "ok ",$i++,"\n";
 
 
-
-use lib; # I know that this module will be there.
-
+{ use lib }    # check that subparse saves pending tokens
 
 local $lib::VERSION = 1.0;
 

diff --git a/toke.c b/toke.c
index e1eb817..b9a12c4 100644 (file)
--- a/toke.c
+++ b/toke.c
@@ -376,6 +376,15 @@ Perl_lex_start(pTHX_ SV *line)
     SAVEI32(PL_lex_state);
     SAVEVPTR(PL_lex_inpat);
     SAVEI32(PL_lex_inwhat);
+    if (PL_lex_state == LEX_KNOWNEXT) {
+       I32 toke = PL_nexttoke;
+       while (--toke >= 0) {
+           SAVEI32(PL_nexttype[toke]);
+           SAVEVPTR(PL_nextval[toke]);
+       }
+       SAVEI32(PL_nexttoke);
+       PL_nexttoke = 0;
+    }
     SAVECOPLINE(PL_curcop);
     SAVEPPTR(PL_bufptr);
     SAVEPPTR(PL_bufend);