diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-03-12 11:18:06 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-03-12 11:18:06 +0100 |
| commit | ba74a4174d2cd6ccbabbc5aa6f4ffdf74b48f45c (patch) | |
| tree | 42296be483ab2f1f3042f5aca8ce91c2aa669ec3 /js | |
| parent | eda34d02aa8159def0d811846e9417c37cea15cd (diff) | |
| parent | 519775b8d9d823b8cee786bc668e050110a8aa67 (diff) | |
| download | uxp-ba74a4174d2cd6ccbabbc5aa6f4ffdf74b48f45c.tar.gz | |
Merge branch 'ported-moebius'
Diffstat (limited to 'js')
| -rw-r--r-- | js/src/js.msg | 2 | ||||
| -rw-r--r-- | js/src/jsobj.cpp | 12 | ||||
| -rw-r--r-- | js/src/jsobj.h | 3 |
3 files changed, 1 insertions, 16 deletions
diff --git a/js/src/js.msg b/js/src/js.msg index 246e363c37..cb5fc383bd 100644 --- a/js/src/js.msg +++ b/js/src/js.msg @@ -65,7 +65,7 @@ MSG_DEF(JSMSG_BAD_GETTER_OR_SETTER, 1, JSEXN_TYPEERR, "invalid {0} usage") MSG_DEF(JSMSG_BAD_ARRAY_LENGTH, 0, JSEXN_RANGEERR, "invalid array length") MSG_DEF(JSMSG_REDECLARED_VAR, 2, JSEXN_SYNTAXERR, "redeclaration of {0} {1}") MSG_DEF(JSMSG_UNDECLARED_VAR, 1, JSEXN_REFERENCEERR, "assignment to undeclared variable {0}") -MSG_DEF(JSMSG_GETTER_ONLY, 0, JSEXN_TYPEERR, "setting a property that has only a getter") +MSG_DEF(JSMSG_GETTER_ONLY, 1, JSEXN_TYPEERR, "setting getter-only property {0}") MSG_DEF(JSMSG_OVERWRITING_ACCESSOR, 1, JSEXN_TYPEERR, "can't overwrite accessor property {0}") MSG_DEF(JSMSG_UNDEFINED_PROP, 1, JSEXN_REFERENCEERR, "reference to undefined property {0}") MSG_DEF(JSMSG_INVALID_MAP_ITERABLE, 1, JSEXN_TYPEERR, "iterable for {0} should have array-like objects") diff --git a/js/src/jsobj.cpp b/js/src/jsobj.cpp index a39a4b0a04..33feb0a546 100644 --- a/js/src/jsobj.cpp +++ b/js/src/jsobj.cpp @@ -3298,18 +3298,6 @@ GetObjectSlotNameFunctor::operator()(JS::CallbackTracer* trc, char* buf, size_t } } -bool -js::ReportGetterOnlyAssignment(JSContext* cx, bool strict) -{ - return JS_ReportErrorFlagsAndNumberASCII(cx, - strict - ? JSREPORT_ERROR - : JSREPORT_WARNING | JSREPORT_STRICT, - GetErrorMessage, nullptr, - JSMSG_GETTER_ONLY); -} - - /*** Debugging routines **************************************************************************/ #ifdef DEBUG diff --git a/js/src/jsobj.h b/js/src/jsobj.h index fbf4e47bec..af79131af7 100644 --- a/js/src/jsobj.h +++ b/js/src/jsobj.h @@ -1320,9 +1320,6 @@ template<XDRMode mode> bool XDRObjectLiteral(XDRState<mode>* xdr, MutableHandleObject obj); -extern bool -ReportGetterOnlyAssignment(JSContext* cx, bool strict); - /* * Report a TypeError: "so-and-so is not an object". * Using NotNullObject is usually less code. |