Need to substitute out the placeholder '$RV' for earlier perls too.

[perl5.git] / ext / Devel / Peek / t / Peek.t

diff --git a/ext/Devel/Peek/t/Peek.t b/ext/Devel/Peek/t/Peek.t
index 65937e7..24cac95 100644 (file)
--- a/ext/Devel/Peek/t/Peek.t
+++ b/ext/Devel/Peek/t/Peek.t
@@ -14,7 +14,7 @@ BEGIN { require "./test.pl"; }
 
 use Devel::Peek;
 
-plan(48);
+plan(50);
 
 our $DEBUG = 0;
 open(SAVERR, ">&STDERR") or die "Can't dup STDERR: $!";
@@ -44,7 +44,12 @@ sub do_test {
            $pattern =~ s/^ *\$IVNV *\n/
                ($] < 5.009) ? "    IV = 0\n    NV = 0\n" : '';
            /mge;
-           $pattern =~ s/\$RV/IV/g if $] >= 5.011;
+           $pattern =~ s/\$RV/
+               ($] < 5.011) ? 'RV' : 'IV';
+           /mge;
+           $pattern =~ s/^ *\$NV *\n/
+               ($] < 5.011) ? "    NV = 0\n" : '';
+           /mge;
 
            print $pattern, "\n" if $DEBUG;
            my ($dump, $dump2) = split m/\*\*\*\*\*\n/, scalar <IN>;
@@ -282,18 +287,13 @@ do_test(15,
   REFCNT = 1
   FLAGS = \\(ROK\\)
   RV = $ADDR
-  SV = ORANGE\\($ADDR\\) at $ADDR
-    REFCNT = 1
-    FLAGS = \\(OBJECT,SMG\\)
+  SV = REGEXP\\($ADDR\\) at $ADDR
+    REFCNT = 2
+    FLAGS = \\(OBJECT,POK,pPOK\\)
     IV = 0
-    NV = 0
-    PV = 0
-    MAGIC = $ADDR
-      MG_VIRTUAL = $ADDR
-      MG_TYPE = PERL_MAGIC_qr\(r\)
-      MG_OBJ = $ADDR
-        PAT = "\(\?-xism:tic\)"
-        REFCNT = 2
+    PV = $ADDR "\\(\\?-xism:tic\\)"\\\0
+    CUR = 12
+    LEN = \\d+
     STASH = $ADDR\\t"Regexp"');
 } else {
 do_test(15,
@@ -546,3 +546,28 @@ do_test(24,
   UV = \d+
   NV = 0
   PV = 0');
+
+do_test(25,
+       *STDOUT{IO},
+'SV = $RV\\($ADDR\\) at $ADDR
+  REFCNT = 1
+  FLAGS = \\(ROK\\)
+  RV = $ADDR
+  SV = PVIO\\($ADDR\\) at $ADDR
+    REFCNT = 3
+    FLAGS = \\(OBJECT\\)
+    IV = 0
+    $NV
+    STASH = $ADDR\s+"IO::Handle"
+    IFP = $ADDR
+    OFP = $ADDR
+    DIRP = 0x0
+    LINES = 0
+    PAGE = 0
+    PAGE_LEN = 60
+    LINES_LEFT = 0
+    TOP_GV = 0x0
+    FMT_GV = 0x0
+    BOTTOM_GV = 0x0
+    TYPE = \'>\'
+    FLAGS = 0x0');