potion #9 for p2: save and restore the overwritten P fields.

source, yypos, input. skip pbuf
perl11 · Sep 16, 2013 · e97da72 · e97da72
1 parent d23c65c
commit e97da72
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/syn/syntax-p5.y b/syn/syntax-p5.y
@@ -519,6 +519,9 @@ arg2 = !arg2-sigil t:arg2-type m:arg-modifier n:arg2-name { SRC_TPL3(n,t,m) }
 
 PN p2_parse(Potion *P, PN code, char *filename) {
   GREG *G = YY_NAME(parse_new)(P);
+  int oldyypos = P->yypos;
+  PN oldinput = P->input;
+  PN oldsource = P->source;
   P->yypos = 0;
   P->input = code;
   P->source = PN_NIL;
@@ -533,7 +536,9 @@ PN p2_parse(Potion *P, PN code, char *filename) {
   YY_NAME(parse_free)(G);
 
   code = P->source;
-  P->source = PN_NIL;
+  P->source = oldsource;
+  P->yypos = oldyypos;
+  P->input = oldinput;
   return code;
 }
 
@@ -544,6 +549,9 @@ PN potion_sig(Potion *P, char *fmt) {
   if (fmt[0] == '\0') return PN_FALSE;
 
   GREG *G = YY_NAME(parse_new)(P);
+  int oldyypos = P->yypos;
+  PN oldinput = P->input;
+  PN oldsource = P->source;
   P->yypos = 0;
   P->input = potion_byte_str(P, fmt);
   P->source = out = PN_TUP0();
@@ -555,7 +563,9 @@ PN potion_sig(Potion *P, char *fmt) {
   YY_NAME(parse_free)(G);
 
   out = P->source;
-  P->source = PN_NIL;
+  P->source = oldsource;
+  P->yypos = oldyypos;
+  P->input = oldinput;
   return out;
 }
 
@@ -565,6 +575,9 @@ PN p2_sig(Potion *P, char *fmt) {
   if (fmt[0] == '\0') return PN_FALSE; // empty signature, no args
 
   GREG *G = YY_NAME(parse_new)(P);
+  int oldyypos = P->yypos;
+  PN oldinput = P->input;
+  PN oldsource = P->source;
   P->yypos = 0;
   P->input = potion_byte_str(P, fmt);
   P->source = out = PN_TUP0();
@@ -576,7 +589,9 @@ PN p2_sig(Potion *P, char *fmt) {
   YY_NAME(parse_free)(G);
 
   out = P->source;
-  P->source = PN_NIL;
+  P->source = oldsource;
+  P->yypos = oldyypos;
+  P->input = oldinput;
   return out;
 }
 

diff --git a/test/runtests.sh b/test/runtests.sh
@@ -136,5 +136,5 @@ if [ -z `grep DDEBUG config.inc` ]; then
         time bin/p2 $f 2>&1 | tee -a $log
     done
 fi
-	    
+
 export LD_LIBRARY_PATH="$old_LIBRARY_PATH"