In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/86755f4c6f582e5c7a061c052ee0ab93941a9733?hp=a2d3de138935fbe8f4190ee9176b8fdd812a91d5>
- Log ----------------------------------------------------------------- commit 86755f4c6f582e5c7a061c052ee0ab93941a9733 Author: Josh ben Jore <[email protected]> Date: Sat Jul 10 07:54:55 2010 -0700 Die with $@ instead of empty message M lib/perl5db.pl commit dab8d6d0b1f96e63697336d8fd2d4b827ea88b22 Author: Josh ben Jore <[email protected]> Date: Sat Jul 10 07:54:32 2010 -0700 Remove extra/useless $@ check after eval { require PadWalker } (which is still checked) M lib/perl5db.pl commit 4a49187b4ff06d1d913d4bf83abf7388b9dfe065 Author: Josh ben Jore <[email protected]> Date: Sat Jul 10 07:53:35 2010 -0700 Promote eval( "require ..." ) to eval { require ... } M lib/perl5db.pl commit 999f23be0835e6ccd8ae052efccda4af3260d475 Author: Josh ben Jore <[email protected]> Date: Sat Jul 10 07:52:06 2010 -0700 Promote eval { require( ... )} || die to mere require( ... ) M lib/perl5db.pl commit bee4b460530bb2a72ada333b929a58f669d30a06 Author: Josh ben Jore <[email protected]> Date: Sat Jul 10 07:50:41 2010 -0700 Remove indirect object notation from debugger M lib/perl5db.pl commit 7e17a74c9021618e7f21df7f5d5c943c593d6cae Author: Josh ben Jore <[email protected]> Date: Sat Jul 10 07:38:31 2010 -0700 Document that @{$main::{'_<'.$filename}} lines are dualvar to (COP*). M lib/perl5db.pl ----------------------------------------------------------------------- Summary of changes: lib/perl5db.pl | 30 ++++++++++++++++-------------- 1 files changed, 16 insertions(+), 14 deletions(-) diff --git a/lib/perl5db.pl b/lib/perl5db.pl index 6337974..b49fc41 100644 --- a/lib/perl5db.pl +++ b/lib/perl5db.pl @@ -173,9 +173,11 @@ Send in a patch if you can clear up, fill out, or clarify an C<XXX>. There are a number of special data structures provided to the debugger by the Perl interpreter. -The array C<@{$main::{'_<'.$filename}}> (aliased locally to C<@dbline> via glob -assignment) contains the text from C<$filename>, with each element -corresponding to a single line of C<$filename>. +The array C<@{$main::{'_<'.$filename}}> (aliased locally to C<@dbline> +via glob assignment) contains the text from C<$filename>, with each +element corresponding to a single line of C<$filename>. Additionally, +breakable lines will be dualvars with the numeric component being the +memory address of a COP node. Non-breakable lines are dualvar to 0. The hash C<%{'_<'.$filename}> (aliased locally to C<%dbline> via glob assignment) contains breakpoints and actions. The keys are line numbers; @@ -1700,7 +1702,7 @@ and then tries to connect the input and output filehandles to it. # If RemotePort was defined in the options, connect input and output # to the socket. require IO::Socket; - $OUT = new IO::Socket::INET( + $OUT = IO::Socket::INET->new( Timeout => '10', PeerAddr => $remoteport, Proto => 'tcp', @@ -5998,7 +6000,7 @@ sub setterm { # Load Term::Readline, but quietly; don't debug it and don't trace it. local $frame = 0; local $doret = -2; - eval { require Term::ReadLine } or die $@; + require Term::ReadLine; # If noTTY is set, but we have a TTY name, go ahead and hook up to it. if ($notty) { @@ -6016,14 +6018,14 @@ sub setterm { # We don't have a TTY - try to find one via Term::Rendezvous. else { - eval "require Term::Rendezvous;" or die; + require Term::Rendezvous; # See if we have anything to pass to Term::Rendezvous. # Use $HOME/.perldbtty$$ if not. my $rv = $ENV{PERLDB_NOTTY} || "$ENV{HOME}/.perldbtty$$"; # Rendezvous and get the filehandles. - my $term_rv = new Term::Rendezvous $rv; + my $term_rv = Term::Rendezvous->new( $rv ); $IN = $term_rv->IN; $OUT = $term_rv->OUT; } ## end else [ if ($tty) @@ -6036,12 +6038,12 @@ sub setterm { # If we shouldn't use Term::ReadLine, don't. if ( !$rl ) { - $term = new Term::ReadLine::Stub 'perldb', $IN, $OUT; + $term = Term::ReadLine::Stub->new( 'perldb', $IN, $OUT ); } # We're using Term::ReadLine. Get all the attributes for this terminal. else { - $term = new Term::ReadLine 'perldb', $IN, $OUT; + $term = Term::ReadLine->new( 'perldb', $IN, $OUT ); $rl_attribs = $term->Attribs; $rl_attribs->{basic_word_break_characters} .= '-:+/*,[])}' @@ -6148,12 +6150,12 @@ qq[3>&1 xterm -title "Daughter Perl debugger $pids $name" -e sh -c 'tty 1>&3;\ # We need $term defined or we can not switch to the newly created xterm if ($tty ne '' && !defined $term) { - eval { require Term::ReadLine } or die $@; + require Term::ReadLine; if ( !$rl ) { - $term = new Term::ReadLine::Stub 'perldb', $IN, $OUT; + $term = Term::ReadLine::Stub->new( 'perldb', $IN, $OUT ); } else { - $term = new Term::ReadLine 'perldb', $IN, $OUT; + $term = Term::ReadLine->new( 'perldb', $IN, $OUT ); } } # There's our new TTY. @@ -6658,7 +6660,7 @@ sub parse_options { local \$doret = -2; require '$optionRequire{$option}'; 1; - } || die # XXX: shouldn't happen + } || die $@ # XXX: shouldn't happen if defined $optionRequire{$option} && defined $val; @@ -8615,7 +8617,7 @@ if PadWalker could be loaded. =cut - if (not $text =~ /::/ and eval "require PadWalker; 1" and not $@ ) { + if (not $text =~ /::/ and eval { require PadWalker } ) { my $level = 1; while (1) { my @info = caller($level); -- Perl5 Master Repository
