Changeset 26766

Timestamp:

12/15/08 17:03:28 (4 years ago)

Author:

kazuho

Message:

only try to determine error context if not given

Files:

• lang/perl/Text-MicroTemplate/trunk/lib/Text/MicroTemplate.pm (modified) (2 diffs)

lang/perl/Text-MicroTemplate/trunk/lib/Text/MicroTemplate.pm

@@ -304 +304 @@
 # Debug goodness
 sub _error {
-    my ($self, $error, $line_offset) = @_;
-
+    my ($self, $error, $line_offset, $from) = @_;
+    
+    unless (defined $from) {
+        $from = sub {
+            my $i = 1;
+            while (my @c = caller($i++)) {
+                if ($c[0] ne __PACKAGE__) {
+                    return "$c[1] at line $c[2]";
+                }
+            }
+            '';
+        }->();
+    }
+    $from = ' passed from ' . $from;
+    
     # Line
     if ($error =~ /^(.*)\s+at\s+\(eval\s+\d+\)\s+line\s+(\d+)/) {
@@ -311 +324 @@
         my $line   = $2 - $line_offset;
         my $delim  = '-' x 76;
-        
-        my $from = sub {
-            my $i = 1;
-            while (my @c = caller($i++)) {
-                if ($c[0] ne __PACKAGE__) {
-                    return " passed from $c[1] at line $c[2]";
-                }
-            }
-            '';
-        }->();
         
         my $report = "$reason at line $line of template$from.\n";