Ensure that exception message is printed.

frog/frogsh

 #!/usr/bin/env node
 //  ********** Library dart:core **************
 //  ********** Natives dart:core **************
 /**
  * Generates a dynamic call stub for a function.
  * Our goal is to create a stub method like this on-the-fly:
  *   function($0, $1, capture) { this($0, $1, true, capture); }
  *
  * This stub then replaces the dynamic one on Function, with one that is
  * specialized for that particular function, taking into account its default
@@ skipping 55 matching lines @@
   }
 
   // Note: using Function instead of 'eval' to get a clean scope.
   // TODO(jmesserly): evaluate the performance of these stubs.
   var f = 'function(' + a.join(',') + '){return $f(' + p.join(',') + ');}';
   return new Function('$f', 'return ' + f + '').call(null, this);
 }
 // Translate a JavaScript exception to a Dart exception
 // TODO(jmesserly): cross browser support. This is Chrome specific.
 function $toDartException(e) {
-  var res = e;
+  function attachStack(dartEx) {
+    // TODO(jmesserly): setting the stack property is not a long term solution.
+    var stack = e.stack;
+    // The stack contains the error message, and the stack is all that is
+    // printed (the exception's toString() is never called).  Attempt to replace
+    // the JS message (e.g. TypeError) with the Dart exception's toString().
+    if (typeof stack == 'string') {
+      try {  // toString is in a try-catch due to Issue 470.
+        var message = dartEx.toString();
+        if (/^(Type|Range)Error:/.test(stack)) {
+          // Remove JS message.
+          stack = stack.substring(stack.indexOf('\n') + 1);
+        }
+        stack = message + '\n' + stack;
+      } catch(_) {
+        stack = '' + dartEx.constructor.name + ': (corrupt)\n' + stack;
+      }
+    }
+    dartEx.stack = stack;
+    return dartEx;
+  }
+
   if (e instanceof TypeError) {
     switch(e.type) {
       case 'property_not_function':
       case 'called_non_callable':
         if (e.arguments[0] == null) {
-          res = new NullPointerException();
+          return attachStack(new NullPointerException());
         } else {
-          res = new ObjectNotClosureException();
+          return attachStack(new ObjectNotClosureException());
         }
         break;
       case 'non_object_property_call':
       case 'non_object_property_load':
-        res = new NullPointerException();
+        return attachStack(new NullPointerException());
         break;
       case 'undefined_method':
         if (e.arguments[0] == 'call' || e.arguments[0] == 'apply') {
-          res = new ObjectNotClosureException();
+          return attachStack(new ObjectNotClosureException());
         } else {
           // TODO(jmesserly): can this ever happen?
-          res = new NoSuchMethodException('', e.arguments[0], []);
+          // sra: Yes.
+          return attachStack(new NoSuchMethodException('', e.arguments[0], []));
         }
         break;
     }
   } else if (e instanceof RangeError) {
     if (e.message.indexOf('call stack') >= 0) {
-      res = new StackOverflowException();
+      return attachStack(new StackOverflowException());
     }
   }
-  if (res) {
-    // TODO(jmesserly): setting the stack property is not a long term solution.
-    // Also it causes the exception to print as if it were a JS TypeError or
-    // RangeError, instead of using the proper toString.
-    res.stack = e.stack;
-  }
-  return res;
+  return e;
 }
 function $notnull_bool(test) {
   return (test === true || test === false) ? test : test.is$bool(); // TypeError
 }
 function $assert(test, text, url, line, column) {
   if (typeof test == 'function') test = test();
   if (!test) $throw(new AssertError(text, url, line, column));
 }
 function $throw(e) {
   // If e is not a value, we can use V8's captureStackTrace utility method.
@@ skipping 12025 matching lines @@
     w.writeln("function $varMethod(name, methods) {\n  Object.prototype[name] = function() {\n    $patchMethod(this, name, methods);\n    return this[name].apply(this, Array.prototype.slice.call(arguments));\n  };\n}\nfunction $patchMethod(obj, name, methods) {\n  // Get the prototype to patch.\n  // Don't overwrite an existing stub, like the one on Object.prototype\n  var proto = Object.getPrototypeOf(obj);\n  if (!proto || proto.hasOwnProperty(name)) proto = obj;\n  var method;\n  while (obj && !(method = methods[obj.$typeNameOf()])) {\n    obj = Object.getPrototypeOf(obj);\n  }\n  obj[name] = method || methods['Object'];\n}");
   }
   if ($notnull_bool(this.useGenStub)) {
     this.useThrow = true;
     w.writeln("/**\n * Generates a dynamic call stub for a function.\n * Our goal is to create a stub method like this on-the-fly:\n *   function($0, $1, capture) { this($0, $1, true, capture); }\n *\n * This stub then replaces the dynamic one on Function, with one that is\n * specialized for that particular function, taking into account its default\n * arguments.\n */\nFunction.prototype.$genStub = function(argsLength, names) {\n  // TODO(jmesserly): only emit $genStub if actually needed\n\n  // Fast path: if no named arguments and arg count matches\n  if (this.length == argsLength && !names) {\n    return this;\n  }\n\n  function $throwArgMismatch() {\n    // TODO(jmesserly): better error message\n    $throw(new ClosureArgumentMismatchException());\n  }\n\n  var paramsNamed = this.$optional ? (this.$optional.length / 2) : 0;\n  var paramsBare = this.length - paramsNamed;\n  var argsNamed = names ? names.length : 0;\n  var argsBare = argsLength - argsNamed;\n\n  // Check we got the right number of arguments\n  if (argsBare < paramsBare || argsLength > this.length ||\n      argsNamed > paramsNamed) {\n    return $throwArgMismatch;\n  }\n\n  // First, fill in all of the default values\n  var p = new Array(paramsBare);\n  if (paramsNamed) {\n    p = p.concat(this.$optional.slice(paramsNamed));\n  }\n  // Fill in positional args\n  var a = new Array(argsLength);\n  for (var i = 0; i < argsBare; i++) {\n    p[i] = a[i] = '$' + i;\n  }\n  // Then overwrite with supplied values for optional args\n  var lastParameterIndex;\n  var namesInOrder = true;\n  for (var i = 0; i < argsNamed; i++) {\n    var name = names[i];\n    a[i + argsBare] = name;\n    var j = this.$optional.indexOf(name, 0);\n    if (j < 0 || j >= paramsNamed) {\n      return $throwArgMismatch;\n    } else if (lastParameterIndex && lastParameterIndex > j) {\n      namesInOrder = false;\n    }\n    p[j + paramsBare] = name;\n    lastParameterIndex = j;\n  }\n\n  if (this.length == argsLength && namesInOrder) {\n    // Fast path #2: named arguments, but they're in order.\n    return this;\n  }\n\n  // Note: using Function instead of 'eval' to get a clean scope.\n  // TODO(jmesserly): evaluate the performance of these stubs.\n  var f = 'function(' + a.join(',') + '){return $f(' + p.join(',') + ');}';\n  return new Function('$f', 'return ' + f + '').call(null, this);\n}");
   }
   if ($notnull_bool(this.useStackTraceOf)) {
     w.writeln("function $stackTraceOf(e) {\n  // TODO(jmesserly): we shouldn't be relying on the e.stack property.\n  // Need to mangle it.\n  return  (e && e.stack) ? e.stack : null;\n}");
   }
   if ($notnull_bool(this.useToDartException)) {
-    w.writeln("// Translate a JavaScript exception to a Dart exception\n// TODO(jmesserly): cross browser support. This is Chrome specific.\nfunction $toDartException(e) {\n  var res = e;\n  if (e instanceof TypeError) {\n    switch(e.type) {\n      case 'property_not_function':\n      case 'called_non_callable':\n        if (e.arguments[0] == null) {\n          res = new NullPointerException();\n        } else {\n          res = new ObjectNotClosureException();\n        }\n        break;\n      case 'non_object_property_call':\n      case 'non_object_property_load':\n        res = new NullPointerException();\n        break;\n      case 'undefined_method':\n        if (e.arguments[0] == 'call' || e.arguments[0] == 'apply') {\n          res = new ObjectNotClosureException();\n        } else {\n          // TODO(jmesserly): can this ever happen?\n          res = new NoSuchMethodException('', e.arguments[0], []);\n        }\n        break;\n    }\n  } else if (e instanceof RangeError) {\n    if (e.message.indexOf('call stack') >= 0) {\n      res = new StackOverflowException();\n    }\n  }\n  if (res) {\n    // TODO(jmesserly): setting the stack property is not a long term solution.\n    // Also it causes the exception to print as if it were a JS TypeError or\n    // RangeError, instead of using the proper toString.\n    res.stack = e.stack;\n  }\n  return res;\n}");
+    w.writeln("// Translate a JavaScript exception to a Dart exception\n// TODO(jmesserly): cross browser support. This is Chrome specific.\nfunction $toDartException(e) {\n  function attachStack(dartEx) {\n    // TODO(jmesserly): setting the stack property is not a long term solution.\n    var stack = e.stack;\n    // The stack contains the error message, and the stack is all that is\n    // printed (the exception's toString() is never called).  Attempt to replace\n    // the JS message (e.g. TypeError) with the Dart exception's toString().\n    if (typeof stack == 'string') {\n      try {  // toString is in a try-catch due to Issue 470.\n        var message = dartEx.toString();\n        if (/^(Type|Range)Error:/.test(stack)) {\n          // Remove JS message.\n          stack = stack.substring(stack.indexOf('\\n') + 1);\n        }\n        stack = message + '\\n' + stack;\n      } catch(_) {\n        stack = '' + dartEx.constructor.name + ': (corrupt)\\n' + stack;\n      }\n    }\n    dartEx.stack = stack;\n    return dartEx;\n  }\n\n  if (e instanceof TypeError) {\n    switch(e.type) {\n      case 'property_not_function':\n      case 'called_non_callable':\n        if (e.arguments[0] == null) {\n          return attachStack(new NullPointerException());\n        } else {\n          return attachStack(new ObjectNotClosureException());\n        }\n        break;\n      case 'non_object_property_call':\n      case 'non_object_property_load':\n        return attachStack(new NullPointerException());\n        break;\n      case 'undefined_method':\n        if (e.arguments[0] == 'call' || e.arguments[0] == 'apply') {\n          return attachStack(new ObjectNotClosureException());\n        } else {\n          // TODO(jmesserly): can this ever happen?\n          // sra: Yes.\n          return attachStack(new NoSuchMethodException('', e.arguments[0], []));\n        }\n        break;\n    }\n  } else if (e instanceof RangeError) {\n    if (e.message.indexOf('call stack') >= 0) {\n      return attachStack(new StackOverflowException());\n    }\n  }\n  return e;\n}");
   }
   if ($notnull_bool(this.useNotNullBool)) {
     this.useThrow = true;
     w.writeln("function $notnull_bool(test) {\n  return (test === true || test === false) ? test : test.is$bool(); // TypeError\n}");
   }
   if ($notnull_bool(this.useAssert)) {
     this.useThrow = true;
     w.writeln("function $assert(test, text, url, line, column) {\n  if (typeof test == 'function') test = test();\n  if (!test) $throw(new AssertError(text, url, line, column));\n}");
   }
   if ($notnull_bool(this.useThrow)) {
@@ skipping 11687 matching lines @@
       NATIVE,
       NEGATE,
       OPERATOR,
       SET,
       SOURCE,
       STATIC,
       TYPEDEF ]*/;
 var $globals = {};
 $static_init();
 main();