Fix exception output for module load exceptions

felixge · isaacs · commit bf9d8e9214e2 · 2012-05-09T11:54:43.000-07:00
So instead of: node.js:201 throw e; // process.nextTick error, or 'error' event on first tick ^ You will now see: path/to/foo.js:1 throw new Error('bar'); ^ This is a sub-set of isaacs patch here: nodejs/node-v0.x-archive#3235 The difference is that this patch purely adresses the exception output, but does not try to make any behavior changes / improvements.
diff --git a/lib/module.js b/lib/module.js
@@ -304,11 +304,16 @@ Module._load = function(request, parent, isMain) {
   }
 
   Module._cache[filename] = module;
+
+  var hadException = true;
+
   try {
     module.load(filename);
-  } catch (err) {
-    delete Module._cache[filename];
-    throw err;
+    hadException = false;
+  } finally {
+    if (hadException) {
+      delete Module._cache[filename];
+    }
   }
 
   return module.exports;
diff --git a/test/message/stack_overflow.out b/test/message/stack_overflow.out
@@ -1,6 +1,6 @@
 before
 
-module.js:311
-    throw err;
-          ^
+*test*message*stack_overflow.js:31
+function stackOverflow() {
+                      ^
 RangeError: Maximum call stack size exceeded
diff --git a/test/message/throw_custom_error.out b/test/message/throw_custom_error.out
@@ -1,6 +1,6 @@
 before
 
-module.js:311
-    throw err;
-          ^
+*test*message*throw_custom_error.js:31
+throw { name: 'MyCustomError', message: 'This is a custom message' };
+^
 MyCustomError: This is a custom message
diff --git a/test/message/throw_non_error.out b/test/message/throw_non_error.out
@@ -1,6 +1,6 @@
 before
 
-module.js:311
-    throw err;
-          ^
+*/test/message/throw_non_error.js:31
+throw { foo: 'bar' };
+^
 [object Object]
diff --git a/test/message/undefined_reference_in_new_context.out b/test/message/undefined_reference_in_new_context.out
@@ -1,8 +1,8 @@
 before
 
-module.js:311
-    throw err;
-          ^
+*test*message*undefined_reference_in_new_context.js:34
+script.runInNewContext();
+       ^
 ReferenceError: foo is not defined
     at evalmachine.<anonymous>:*
     at Object.<anonymous> (*test*message*undefined_reference_in_new_context.js:*)
