Changeset 80

Timestamp:

10/16/06 21:28:52 (7 years ago)

Author:

max

Message:

Fixed die to display text and line number.

Files:

• shepherd (modified) (2 diffs)

shepherd

@@ -1521 +1521 @@
 sub my_die {
     my ($arg,@rest) = @_;
-    my ($pack,$file,$line,$sub) = caller(1);
+    my ($pack,$file,$line,$sub) = caller(0);
 
     # check if we are in an eval()
@@ -1527 +1527 @@
         printf STDERR "  shepherd caught a die() within eval{} from file $file line $line\n";
     } else {
-        if (!ref($arg)) {
-            printf STDERR "DIE at line %d in file %s\n",$line,$file;
-            CORE::die(join("",@rest));
-        } else {
-            CORE::die($arg,@rest);
-        }
-    }
-}
-
+            printf STDERR "\nDIE: line %d in file %s\n",$line,$file;
+            if ($arg) {
+                CORE::die($arg,@rest);
+            } else {
+                CORE::die(join("",@rest));
+            }
+    }
+}
+