From 2ed88ba80bb4702faa554a82789e0e2ddac5801c Mon Sep 17 00:00:00 2001 From: "rogerl%netscape.com" Date: Fri, 29 Oct 1999 22:20:23 +0000 Subject: [PATCH] r=norris Upgrading to new ECMA - conversionError subsumed by TypeError. git-svn-id: svn://10.0.0.236/trunk@52273 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/js/src/jsexn.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/mozilla/js/src/jsexn.c b/mozilla/js/src/jsexn.c index 8fb08201bc4..698722ea5d2 100644 --- a/mozilla/js/src/jsexn.c +++ b/mozilla/js/src/jsexn.c @@ -231,7 +231,6 @@ typedef enum JSExnType { JSEXN_NONE = -1, JSEXN_ERR, JSEXN_INTERNALERR, - JSEXN_CONVERSIONERR, JSEXN_EVALERR, JSEXN_RANGEERR, JSEXN_REFERENCEERR, @@ -249,7 +248,6 @@ struct JSExnSpec { static struct JSExnSpec exceptions[] = { { JSEXN_NONE, "Error" }, { JSEXN_ERR, "InternalError" }, - { JSEXN_ERR, "ConversionError" }, { JSEXN_ERR, "EvalError" }, { JSEXN_ERR, "RangeError" }, { JSEXN_ERR, "ReferenceError" }, @@ -289,10 +287,8 @@ Exception(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) } else { message = cx->runtime->emptyString; } - if (!JS_DefineProperty(cx, obj, "message", STRING_TO_JSVAL(message), - NULL, NULL, JSPROP_ENUMERATE)); - - return JS_TRUE; + return JS_DefineProperty(cx, obj, "message", STRING_TO_JSVAL(message), + NULL, NULL, JSPROP_ENUMERATE); } /*