In location, always use :: suffix after package.

rocky · Aug 12, 2012 · fedb2bc · fedb2bc
1 parent 69c5612
commit fedb2bc
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/lib/Devel/Trepan/CmdProcessor/Location.pm b/lib/Devel/Trepan/CmdProcessor/Location.pm
@@ -158,9 +158,8 @@ sub format_location($;$$$)
 
     my $loc = $self->source_location_info;
     my $suffix = ($event eq 'return' && defined($DB::_[0])) ? " $DB::_[0]" : '';
-    my $pkg = $self->{frame}{pkg};
-    $pkg .= '::' unless $pkg =~ /::/;
-    "${ev} $pkg(${loc})$suffix"
+    my $pkg = $self->{frame}{pkg} || '??' ;
+    "${ev} ${pkg}::(${loc})$suffix";
 }
 
 sub print_location($;$)

diff --git a/t/20test-trace.t b/t/20test-trace.t
@@ -11,7 +11,7 @@ my $opts = {
 	my @result = ();
 	for my $line (split("\n", $got_lines)) {
 	    $line =~ s/\((?:.*\/)?(.+\:\d+)\)/($1)/;
-	    last if (0 == index($line, '-- File::Temp(Temp.pm:'));
+	    last if (0 == index($line, '-- File::Temp::(Temp.pm:'));
 	    push @result, $line;
 	}
 

diff --git a/t/data/list1.right b/t/data/list1.right
@@ -16,13 +16,13 @@ test-require.pl [1-9]
 my $require_file = File::Spec->catfile($DIR, "test-module.pm");
 -- main::(test-require.pl:5)
 require $require_file;
--- Test::Module(test-module.pm:5)
+-- Test::Module::(test-module.pm:5)
 my $x = 1;
--- Test::Module(test-module.pm:6)
+-- Test::Module::(test-module.pm:6)
 my $y = 2;
 -- main::(test-require.pl:6)
 my $x = Test::Module::five();
--- Test::Module(test-module.pm:3)
+-- Test::Module::(test-module.pm:3)
     return 5;
 test-module.pm [1-6]
   1    	package Test::Module;

diff --git a/t/data/list3.right b/t/data/list3.right
@@ -2,7 +2,7 @@
 my $DIR = dirname(__FILE__);
 basename is on.
 highlight is off.
--- File::Basename(Basename.pm:284)
+-- File::Basename::(Basename.pm:284)
     my $path = shift;
 Basename.pm [280-289]
 280    	=cut