Revert "Fix 'uncaughtException' for top level exceptions"

ry · ry · commit 8a52fb7aebcd · 2010-07-01T11:10:22.000-07:00
This reverts commit 8f8dcf8.
diff --git a/lib/module.js b/lib/module.js
@@ -437,11 +437,9 @@ Module.prototype._waitChildrenLoad = function (callback) {
 
 
 // bootstrap main module.
-exports.runMain = function (filename) {
+exports.runMain = function () {
 
   // Load the main module--the command line argument.
   process.mainModule = new Module(".");
-  process.mainModule.load(filename, function (err) {
-    if (err) throw err;
-  });
+  process.mainModule.loadSync(process.argv[1]);
 }
diff --git a/src/node.cc b/src/node.cc
@@ -1805,8 +1805,9 @@ static void Load(int argc, char *argv[]) {
 
   f->Call(global, 1, args);
 
-  if (try_catch.HasCaught()) {
-    FatalException(try_catch);
+  if (try_catch.HasCaught())  {
+    ReportException(try_catch, true);
+    exit(11);
   }
 }
 
diff --git a/src/node.js b/src/node.js
@@ -239,7 +239,7 @@ if (process.argv[1]) {
     process.argv[1] = path.join(cwd, process.argv[1]);
   }
 
-  module.runMain(process.argv[1]);
+  module.runMain();
 } else {
   // No arguments, run the repl
   var repl = module.requireNative('repl');
diff --git a/test/simple/test-error-reporting.js b/test/simple/test-error-reporting.js
@@ -33,14 +33,14 @@ errExec('throws_error.js', function (err, stdout, stderr) {
 });
 
 
-// Trying to JSON.parse(undefined) in nextTick
-errExec('throws_error3.js', function (err, stdout, stderr) {
+// Trying to JSON.parse(undefined)
+errExec('throws_error2.js', function (err, stdout, stderr) {
   assert.ok(/JSON/.test(stderr));
 });
 
 
-// Trying to JSON.parse(undefined)
-errExec('throws_error2.js', function (err, stdout, stderr) {
+// Trying to JSON.parse(undefined) in nextTick
+errExec('throws_error3.js', function (err, stdout, stderr) {
   assert.ok(/JSON/.test(stderr));
 });
 
diff --git a/test/simple/test-uncaught-exception.js b/test/simple/test-uncaught-exception.js

Original file line number	Diff line number	Diff line change
`@@ -1805,8 +1805,9 @@ static void Load(int argc, char *argv[]) {`
`1805`	`1805`
`1806`	`1806`	`f->Call(global, 1, args);`
`1807`	`1807`
`1808`		`- if (try_catch.HasCaught()) {`
`1809`		`- FatalException(try_catch);`
	`1808`	`+ if (try_catch.HasCaught()) {`
	`1809`	`+ ReportException(try_catch, true);`
	`1810`	`+ exit(11);`
`1810`	`1811`	`}`
`1811`	`1812`	`}`
`1812`	`1813`
Original file line number	Diff line number	Diff line change
`@@ -239,7 +239,7 @@ if (process.argv[1]) {`
`239`	`239`	`process.argv[1] = path.join(cwd, process.argv[1]);`
`240`	`240`	`}`
`241`	`241`
`242`		`- module.runMain(process.argv[1]);`
	`242`	`+ module.runMain();`
`243`	`243`	`} else {`
`244`	`244`	`// No arguments, run the repl`
`245`	`245`	`var repl = module.requireNative('repl');`