From: Stephen McCamant Date: Sun, 9 Feb 2003 17:28:38 +0000 (-0500) Subject: More B::Concise fixes X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=40b5b14f3b4cb7bd3fa8a9b351a18c2cc9240db0;p=p5sagit%2Fp5-mst-13.2.git More B::Concise fixes Message-ID: <15942.54806.381678.173391@syllepsis.MIT.EDU> p4raw-id: //depot/perl@18694 --- diff --git a/ext/B/B/Concise.pm b/ext/B/B/Concise.pm index b0ea7ea..188c199 100644 --- a/ext/B/B/Concise.pm +++ b/ext/B/B/Concise.pm @@ -8,7 +8,7 @@ use warnings; use Exporter (); -our $VERSION = "0.53"; +our $VERSION = "0.54"; our @ISA = qw(Exporter); our @EXPORT_OK = qw(set_style add_callback); @@ -132,17 +132,15 @@ sub compile { if (!@args or $do_main) { print "main program:\n" if $do_main; sequence(main_start); + $curcv = main_cv; if ($order eq "exec") { return if class(main_start) eq "NULL"; - $curcv = main_cv; walk_exec(main_start); } elsif ($order eq "tree") { return if class(main_root) eq "NULL"; - $curcv = main_cv; print tree(main_root, 0); } elsif ($order eq "basic") { return if class(main_root) eq "NULL"; - $curcv = main_cv; walk_topdown(main_root, sub { $_[0]->concise($_[1]) }, 0); } @@ -393,13 +391,13 @@ sub concise_sv { $sv = $sv->RV; } if (class($sv) eq "SPECIAL") { - $hr->{svval} = ["Null", "sv_undef", "sv_yes", "sv_no"]->[$$sv]; + $hr->{svval} .= ["Null", "sv_undef", "sv_yes", "sv_no"]->[$$sv]; } elsif ($sv->FLAGS & SVf_NOK) { - $hr->{svval} = $sv->NV; + $hr->{svval} .= $sv->NV; } elsif ($sv->FLAGS & SVf_IOK) { - $hr->{svval} = $sv->IV; + $hr->{svval} .= $sv->IV; } elsif ($sv->FLAGS & SVf_POK) { - $hr->{svval} = cstring($sv->PV); + $hr->{svval} .= cstring($sv->PV); } return $hr->{svclass} . " " . $hr->{svval}; }