From 8028f6393e214eda293cebcb2fabf88f33183556 Mon Sep 17 00:00:00 2001 From: Jim Blandy Date: Fri, 7 Aug 2009 10:45:27 -0700 Subject: [PATCH] Bug 508637: Allow trailing commas in object initializers in strict mode. r=igor --- js/src/js.msg | 2 +- js/src/jsparse.cpp | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/js/src/js.msg b/js/src/js.msg index 6a564531cc00..3c7fbfc23d1f 100644 --- a/js/src/js.msg +++ b/js/src/js.msg @@ -240,7 +240,7 @@ MSG_DEF(JSMSG_ANON_NO_RETURN_VALUE, 157, 0, JSEXN_TYPEERR, "anonymous function MSG_DEF(JSMSG_DEPRECATED_USAGE, 158, 1, JSEXN_REFERENCEERR, "deprecated {0} usage") MSG_DEF(JSMSG_BAD_URI, 159, 0, JSEXN_URIERR, "malformed URI sequence") MSG_DEF(JSMSG_GETTER_ONLY, 160, 0, JSEXN_TYPEERR, "setting a property that has only a getter") -MSG_DEF(JSMSG_TRAILING_COMMA, 161, 0, JSEXN_SYNTAXERR, "trailing comma is not legal in ECMA-262 object initializers") +MSG_DEF(JSMSG_UNUSED161, 161, 0, JSEXN_NONE, "unused161") MSG_DEF(JSMSG_UNDEFINED_PROP, 162, 1, JSEXN_REFERENCEERR, "reference to undefined property {0}") MSG_DEF(JSMSG_USELESS_EXPR, 163, 0, JSEXN_TYPEERR, "useless expression") MSG_DEF(JSMSG_REDECLARED_PARAM, 164, 1, JSEXN_TYPEERR, "redeclaration of formal parameter {0}") diff --git a/js/src/jsparse.cpp b/js/src/jsparse.cpp index 35cd45dd9d63..c8aaf13d51ce 100644 --- a/js/src/jsparse.cpp +++ b/js/src/jsparse.cpp @@ -7945,13 +7945,6 @@ PrimaryExpr(JSContext *cx, JSTokenStream *ts, JSTreeContext *tc, pn3->pn_atom = CURRENT_TOKEN(ts).t_atom; break; case TOK_RC: - if (afterComma && - !js_ReportCompileErrorNumber(cx, ts, NULL, - JSREPORT_WARNING | - JSREPORT_STRICT, - JSMSG_TRAILING_COMMA)) { - return NULL; - } goto end_obj_init; default: js_ReportCompileErrorNumber(cx, ts, NULL, JSREPORT_ERROR,