Attachment #650295 for bug #703537

Attachment #650295: Part 11 - Implement auxiliary functions 1-4 for bug #703537

View | Details | Raw Unified | Return to bug 703537
Collapse All | Expand All





        return false;
    }

    JS_ASSERT_IF(attrs & JSPROP_READONLY, !(attrs & (JSPROP_GETTER | JSPROP_SETTER)));

    return true;
}

void
PropDesc::complete()
{
    if (isGenericDescriptor() || isDataDescriptor()) {
        if (!hasValue_) {
            hasValue_ = true;
            value_.setUndefined();
        }
        if (!hasWritable_) {
            hasWritable_ = true;
            attrs |= JSPROP_READONLY;
        }
    } else {
        if (!hasGet_) {
            hasGet_ = true;
            get_.setUndefined();
        }
        if (!hasSet_) {
            hasSet_ = true;
            set_.setUndefined();
        }
    }
    if (!hasEnumerable_) {
        hasEnumerable_ = true;
        attrs |= JSPROP_ENUMERATE;
    }
    if (!hasConfigurable_) {
        hasConfigurable_ = true;
        attrs &= ~JSPROP_PERMANENT;
    }
}

namespace js {

bool
Throw(JSContext *cx, jsid id, unsigned errorNumber)
{
    JS_ASSERT(js_ErrorFormatString[errorNumber].argCount == 1);

    JSString *idstr = IdToString(cx, id);

-      Line
+  Link Here
-       Lines 1041-1056
      class ScriptedDirectProxyHandler : publi
+  Link Here
     virtual bool keys(JSContext *cx, JSObject *proxy, AutoIdVector &props);
     virtual bool iterate(JSContext *cx, JSObject *proxy, unsigned flags, Value *vp);
     static ScriptedDirectProxyHandler singleton;
 };
 static int sScriptedDirectProxyHandlerFamily = 0;
+/* Aux.2 FromGenericPropertyDescriptor(Desc) */
+static bool
+FromGenericPropertyDescriptor(JSContext *cx, PropDesc *desc, MutableHandleValue rval)
+{
+    /* Aux.2 step 1 */
+    if (desc->isUndefined()) {
+        rval.setUndefined();
+        return true;
+    }
+    /* Aux.2 steps 3-9 */
+    if (!desc->makeObject(cx))
+        return false;
+    *rval.address() = desc->pd();
+    return true;
+}
+/*
+ * Aux.3 NormalizePropertyDescriptor(Attributes)
+ *
+ * NOTE: to minimize code duplication, the code for this function is shared with
+ * that for Aux.4 NormalizeAndCompletePropertyDescriptor (see below). The
+ * argument complete is used to distinguish between the two.
+ */
+static bool
+NormalizePropertyDescriptor(JSContext *cx, MutableHandleValue vp, bool complete = false)
+{
+    /* Aux.4 step 1 */
+    if (complete && vp.isUndefined())
+        return true;
+    /* Aux.3 steps 1-2 / Aux.4 steps 2-3 */
+    AutoPropDescArrayRooter descs(cx);
+    PropDesc *desc = descs.append();
+    if (!desc || !desc->initialize(cx, *vp.address()))
+        return false;
+    if (complete)
+        desc->complete();
+    /*
+     * Aux.3 step 3 / Aux.4 step 4
+     *
+     * NOTE: Aux.4 step 4 actually specifies FromPropertyDescriptor here.
+     * However, the way FromPropertyDescriptor is implemented (PropDesc::
+     * makeObject) is actually closer to FromGenericPropertyDescriptor,
+     * and is in fact used to implement the latter, so we might as well call it
+     * directly.
+     */
+    if (!FromGenericPropertyDescriptor(cx, desc, vp))
+        return false;
+    if (vp.isUndefined())
+        return true;
+    RootedObject descObj(cx, &vp.toObject());
+    /* Aux.3 steps 4-5 / Aux.4 steps 5-6 */
+    AutoIdVector props(cx);
+    if (!GetPropertyNames(cx, descObj, JSITER_OWNONLY, &props))
+        return false;
+    size_t n = props.length();
+    for (size_t i = 0; i < n; ++n) {
+        RootedId id(cx, props[i]);
+        if (JSID_IS_ATOM(id)) {
+            JSAtom *atom = JSID_TO_ATOM(id);
+            const JSAtomState &atomState = cx->runtime->atomState;
+            if (atom == atomState.valueAtom || atom == atomState.writableAtom ||
+                atom == atomState.getAtom || atom == atomState.setAtom ||
+                atom == atomState.enumerableAtom || atom == atomState.configurableAtom) {
+                continue;
+            }
+        }
+        RootedValue v(cx);
+        if (!descObj->getGeneric(cx, descObj, id, &v))
+            return false;
+        if (!JS_DefinePropertyById(cx, descObj, id, v, NULL, NULL, JSPROP_ENUMERATE))
+            return false;
+    }
+    return true;
+}
+/* Aux.4 NormalizeAndCompletePropertyDescriptor(Attributes) */
+static inline bool
+NormalizeAndCompletePropertyDescriptor(JSContext *cx, MutableHandleValue vp)
+{
+    return NormalizePropertyDescriptor(cx, vp, true);
+}
 ScriptedDirectProxyHandler::ScriptedDirectProxyHandler()
         : DirectProxyHandler(&sScriptedDirectProxyHandlerFamily)
+{
+}
 ScriptedDirectProxyHandler::~ScriptedDirectProxyHandler()
+{
+}





     *
     * If checkAccessors is false, skip steps 7.b and 8.b, which throw a
     * TypeError if .get or .set is neither a callable object nor undefined.
     *
     * (DebuggerObject_defineProperty uses this: the .get and .set properties
     * are expected to be Debugger.Object wrappers of functions, which are not
     * themselves callable.)
     */
    bool initialize(JSContext *cx, const Value &v, bool checkAccessors = true);

    /*
     * If IsGenericDescriptor(desc) or IsDataDescriptor(desc) is true, then if
     * the value of an attribute field of desc, considered as a data
     * descriptor, is absent, set it to its default value. Else if the value of
     * an attribute field of desc, considered as an attribute descriptor, is
     * absent, set it to its default value.
     */
    void complete();

    /*
     * 8.10.4 FromPropertyDescriptor(Desc)
     *
     * initFromPropertyDescriptor sets pd to undefined and populates all the
     * other fields of this PropDesc from desc.
     *
     * makeObject populates pd based on the other fields of *this, creating a

Return to bug 703537