Revision: 18115
Author: [email protected]
Date: Thu Nov 28 08:59:45 2013 UTC
Log: Shorten autogenerated error message.
[email protected]
BUG=v8:3019
LOG=Y
Review URL: https://codereview.chromium.org/88393002
http://code.google.com/p/v8/source/detail?r=18115
Added:
/branches/bleeding_edge/test/mjsunit/error-tostring-omit.js
Modified:
/branches/bleeding_edge/src/messages.js
=======================================
--- /dev/null
+++ /branches/bleeding_edge/test/mjsunit/error-tostring-omit.js Thu Nov 28
08:59:45 2013 UTC
@@ -0,0 +1,61 @@
+// Copyright 2013 the V8 project authors. All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+// * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following
+// disclaimer in the documentation and/or other materials provided
+// with the distribution.
+// * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived
+// from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+function veryLongString() {
+ return "Lorem ipsum dolor sit amet, consectetur adipiscing elit." +
+ "Nam vulputate metus est. Maecenas quis pellentesque eros," +
+ "ac mattis augue. Nam porta purus vitae tincidunt blandit." +
+ "Aliquam lacus dui, blandit id consectetur id, hendrerit ut" +
+ "felis. Class aptent taciti sociosqu ad litora torquent per" +
+ "conubia nostra, per inceptos himenaeos. Ut posuere eros et" +
+ "tempus luctus. Nullam condimentum aliquam odio, at dignissim" +
+ "augue tincidunt in. Nam mattis vitae mauris eget dictum." +
+ "Nam accumsan dignissim turpis a turpis duis.";
+}
+
+
+var re = /omitted/;
+
+try {
+ veryLongString.nonexistentMethod();
+} catch (e) {
+ assertTrue(e.message.length < 350);
+ assertTrue(re.test(e.message));
+}
+
+try {
+ veryLongString().nonexistentMethod();
+} catch (e) {
+ assertTrue(e.message.length < 350);
+ assertTrue(re.test(e.message));
+}
+
+try {
+ throw Error(veryLongString());
+} catch (e) {
+ assertEquals(veryLongString(), e.message);
+}
=======================================
--- /branches/bleeding_edge/src/messages.js Wed Nov 27 17:21:40 2013 UTC
+++ /branches/bleeding_edge/src/messages.js Thu Nov 28 08:59:45 2013 UTC
@@ -198,6 +198,10 @@
// str is one of %0, %1, %2 or %3.
try {
str = NoSideEffectToString(args[arg_num]);
+ if (str.length > 256) {
+ str = %SubString(str, 0, 239) + "...<omitted>..." +
+ %SubString(str, str.length - 2, str.length);
+ }
} catch (e) {
if (%IsJSModule(args[arg_num]))
str = "module";
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
