[Bps-public-commit] Carp-REPL branch, master, updated. 98ae56e26bd8b9c6deb0bb44d78f11471a53f582

[Thomas Sibley]

The branch, master has been updated
       via  98ae56e26bd8b9c6deb0bb44d78f11471a53f582 (commit)
       via  93c35c37aae56abe97affe1ea69c430436e8fd72 (commit)
       via  e3636d0108764d146a72bb474e77f9d2be463097 (commit)
       via  95760dc39528d6de7aae6a8a99a95da2aca5aa0f (commit)
      from  1e8f2bc5ea611777db1dcd15a83c1e5a3cd956ed (commit)

Summary of changes:
 lib/Devel/REPL/Plugin/Carp/REPL.pm | 5 +++++
 t/13-list.t                        | 4 ++--
 t/scripts/12-env.pl                | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

- Log -----------------------------------------------------------------
commit 95760dc39528d6de7aae6a8a99a95da2aca5aa0f
Author: Jesse Luehrs <doy at tozt.net>
Date:   Wed Jun 8 15:33:58 2011 -0500

    don't return stack frames inside Carp

diff --git a/lib/Devel/REPL/Plugin/Carp/REPL.pm b/lib/Devel/REPL/Plugin/Carp/REPL.pm
index f1dfdd4..dbb9026 100644
--- a/lib/Devel/REPL/Plugin/Carp/REPL.pm
+++ b/lib/Devel/REPL/Plugin/Carp/REPL.pm
@@ -24,6 +24,11 @@ has stacktrace => (
             until @{ $stacktrace->{raw} } == 0
                || $stacktrace->{raw}[0]{caller}[3] eq 'Carp::REPL::repl';
 
+        # get out of Carp::
+        shift @{ $stacktrace->{raw} }
+            until @{ $stacktrace->{raw} } == 0
+               || $stacktrace->{raw}[0]{caller}[0] !~ /^Carp(?:::|$)/;
+
         shift @{ $stacktrace->{raw} }
             until @{ $stacktrace->{raw} } == 0
                || $Carp::REPL::bottom_frame-- <= 0;

commit e3636d0108764d146a72bb474e77f9d2be463097
Author: Dagfinn Ilmari Mannsåker <ilmari at ilmari.org>
Date:   Wed May 22 12:25:00 2013 +0200

    Fix hash ordering dependence in test
    
    Before perl 5.18, 'values %args' happened to return the values in the
    right order, but now they are more actively perturbed, so sort them.

diff --git a/t/13-list.t b/t/13-list.t
index 494f230..9f48676 100644
--- a/t/13-list.t
+++ b/t/13-list.t
@@ -17,7 +17,7 @@ expect_like(qr/\b2\b/, 'in the REPL');
 expect_send(':l');
 expect_like(qr/12-env\.pl/, 'filename is given');
 expect_like(qr/^\*49:     die \@_;/m, 'line with the error has a star');
-expect_like(qr/^ 44:     \$closure->\(values \%args\);/m);
+expect_like(qr/^ 44:     \$closure->\(sort values \%args\);/m);
 expect_like(qr/^ 45: }/m);
 expect_like(qr/^ 46: /m);
 expect_like(qr/^ 47: sub five/m);
@@ -39,7 +39,7 @@ expect_like(qr/^ 40:     my \$closure = sub {/m);
 expect_like(qr/^ 41:         my \(\$alpha, \$beta, \$gamma, \$delta\) = \@_;/m);
 expect_like(qr/^\*42:         five\(\$alpha \+ \$beta \+ \$gamma \+ \$delta\);/m);
 expect_like(qr/^ 43:     };/m);
-expect_like(qr/^ 44:     \$closure->\(values %args\);/m);
+expect_like(qr/^ 44:     \$closure->\(sort values %args\);/m);
 expect_like(qr/^ 45: }/m);
 expect_like(qr/^ 46: /m);
 expect_like(qr/^ 47: sub five/m);
diff --git a/t/scripts/12-env.pl b/t/scripts/12-env.pl
index 4c33216..493ca85 100755
--- a/t/scripts/12-env.pl
+++ b/t/scripts/12-env.pl
@@ -41,7 +41,7 @@ sub four
         my ($alpha, $beta, $gamma, $delta) = @_;
         five($alpha + $beta + $gamma + $delta);
     };
-    $closure->(values %args);
+    $closure->(sort values %args);
 }
 
 sub five

commit 93c35c37aae56abe97affe1ea69c430436e8fd72
Merge: 1e8f2bc 95760dc
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Tue May 28 15:07:20 2013 -0700

    Merge remote-tracking branch 'github/pr/1'


commit 98ae56e26bd8b9c6deb0bb44d78f11471a53f582
Merge: 93c35c3 e3636d0
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Tue May 28 15:08:46 2013 -0700

    Merge remote-tracking branch 'github/pr/2'


-----------------------------------------------------------------------