mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 370372: function::name assignments now work under with (xmllist). r=brendan,jwalden.

This commit is contained in:
igor.bukanov%gmail.com 2007-02-21 09:42:14 +00:00
Родитель dfe1e18476
Коммит 747621d302
1 изменённых файлов: 380 добавлений и 380 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

760
js/src/jsxml.c
Просмотреть файл

@ -4057,44 +4057,53 @@ SyncInScopeNamespaces(JSContext *cx, JSXML *xml)
} }
static JSBool static JSBool
GetNamedProperty(JSContext *cx, JSXML *xml, JSXMLQName* nameqn, GetNamedProperty(JSContext *cx, JSXML *xml, JSXMLQName* nameqn, JSXML *list)
JSBool attributes, JSXML *list)
{ {
JSXMLArray *array; JSXMLArray *array;
JSXMLNameMatcher matcher; JSXMLNameMatcher matcher;
JSXMLArrayCursor cursor; JSXMLArrayCursor cursor;
JSXML *kid; JSXML *kid;
JSBool ok; JSBool attrs;
if (!JSXML_HAS_KIDS(xml)) if (xml->xml_class == JSXML_CLASS_LIST) {
return JS_TRUE; XMLArrayCursorInit(&cursor, &xml->xml_kids);
while ((kid = (JSXML *) XMLArrayCursorNext(&cursor)) != NULL) {
if (attributes) { if (kid->xml_class == JSXML_CLASS_ELEMENT &&
array = &xml->xml_attrs; !GetNamedProperty(cx, kid, nameqn, list)) {
matcher = MatchAttrName; break;
} else {
array = &xml->xml_kids;
matcher = MatchElemName;
}
XMLArrayCursorInit(&cursor, array);
while ((kid = (JSXML *) XMLArrayCursorNext(&cursor)) != NULL) {
if (matcher(nameqn, kid)) {
if (!attributes && kid->xml_class == JSXML_CLASS_ELEMENT) {
ok = SyncInScopeNamespaces(cx, kid);
if (!ok)
goto out;
} }
ok = Append(cx, list, kid);
if (!ok)
goto out;
} }
} XMLArrayCursorFinish(&cursor);
ok = JS_TRUE; if (kid)
return JS_FALSE;
} else if (xml->xml_class == JSXML_CLASS_ELEMENT) {
attrs = (OBJ_GET_CLASS(cx, nameqn->object) == &js_AttributeNameClass);
if (attrs) {
array = &xml->xml_attrs;
matcher = MatchAttrName;
} else {
array = &xml->xml_kids;
matcher = MatchElemName;
}
out: XMLArrayCursorInit(&cursor, array);
XMLArrayCursorFinish(&cursor); while ((kid = (JSXML *) XMLArrayCursorNext(&cursor)) != NULL) {
return ok; if (matcher(nameqn, kid)) {
if (!attrs &&
kid->xml_class == JSXML_CLASS_ELEMENT &&
!SyncInScopeNamespaces(cx, kid)) {
break;
}
if (!Append(cx, list, kid))
break;
}
}
XMLArrayCursorFinish(&cursor);
if (kid)
return JS_FALSE;
}
return JS_TRUE;
} }
/* ECMA-357 9.1.1.1 XML [[Get]] and 9.2.1.1 XMLList [[Get]]. */ /* ECMA-357 9.1.1.1 XML [[Get]] and 9.2.1.1 XMLList [[Get]]. */
@ -4108,8 +4117,6 @@ GetProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
jsid funid; jsid funid;
jsval roots[2]; jsval roots[2];
JSTempValueRooter tvr; JSTempValueRooter tvr;
JSBool attributes;
JSXMLArrayCursor cursor;
xml = (JSXML *) JS_GetInstancePrivate(cx, obj, &js_XMLClass, NULL); xml = (JSXML *) JS_GetInstancePrivate(cx, obj, &js_XMLClass, NULL);
if (!xml) if (!xml)
@ -4162,35 +4169,20 @@ GetProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
tvr.count++; tvr.count++;
list = (JSXML *) JS_GetPrivate(cx, listobj); list = (JSXML *) JS_GetPrivate(cx, listobj);
attributes = (OBJ_GET_CLASS(cx, nameqn->object) == if (!GetNamedProperty(cx, xml, nameqn, list)) {
&js_AttributeNameClass); listobj = NULL;
if (xml->xml_class == JSXML_CLASS_LIST) {
XMLArrayCursorInit(&cursor, &xml->xml_kids);
while ((kid = (JSXML *) XMLArrayCursorNext(&cursor)) != NULL) {
if (kid->xml_class == JSXML_CLASS_ELEMENT &&
!GetNamedProperty(cx, kid, nameqn, attributes, list)) {
listobj = NULL;
break;
}
}
XMLArrayCursorFinish(&cursor);
} else { } else {
if (!GetNamedProperty(cx, xml, nameqn, attributes, list)) /*
listobj = NULL; * Erratum: ECMA-357 9.1.1.1 misses that [[Append]] sets the
* given list's [[TargetProperty]] to the property that is being
* appended. This means that any use of the internal [[Get]]
* property returns a list which, when used by e.g. [[Insert]]
* duplicates the last element matched by id. See bug 336921.
*/
list->xml_target = xml;
list->xml_targetprop = nameqn;
*vp = OBJECT_TO_JSVAL(listobj);
} }
/*
* Erratum: ECMA-357 9.1.1.1 misses that [[Append]] sets the given
* list's [[TargetProperty]] to the property that is being appended.
* This means that any use of the internal [[Get]] property returns
* a list which, when used by e.g. [[Insert]] duplicates the last
* element matched by id.
* See bug 336921.
*/
list->xml_target = xml;
list->xml_targetprop = nameqn;
*vp = OBJECT_TO_JSVAL(listobj);
} }
JS_POP_TEMP_ROOT(cx, &tvr); JS_POP_TEMP_ROOT(cx, &tvr);
@ -4270,293 +4262,313 @@ PutProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
roots[VAL_ROOT] = *vp; roots[VAL_ROOT] = *vp;
JS_PUSH_TEMP_ROOT(cx, 3, roots, &tvr); JS_PUSH_TEMP_ROOT(cx, 3, roots, &tvr);
if (xml->xml_class == JSXML_CLASS_LIST) { if (js_IdIsIndex(id, &index)) {
/* ECMA-357 9.2.1.2. */ if (xml->xml_class != JSXML_CLASS_LIST) {
if (js_IdIsIndex(id, &index)) { /* See NOTE in spec: this variation is reserved for future use. */
/* Step 1 sets i to the property index. */ ReportBadXMLName(cx, id);
i = index; goto bad;
}
/* 2(a-b). */ /*
if (xml->xml_target) { * Step 1 of ECMA-357 9.2.1.2 index case sets i to the property index.
ok = ResolveValue(cx, xml->xml_target, &rxml); */
if (!ok) i = index;
goto out;
if (!rxml)
goto out;
JS_ASSERT(rxml->object);
} else {
rxml = NULL;
}
/* 2(c). */ /* 2(a-b). */
if (index >= xml->xml_kids.length) { if (xml->xml_target) {
/* 2(c)(i). */ ok = ResolveValue(cx, xml->xml_target, &rxml);
if (rxml) { if (!ok)
if (rxml->xml_class == JSXML_CLASS_LIST) { goto out;
if (rxml->xml_kids.length != 1) if (!rxml)
goto out; goto out;
rxml = XMLARRAY_MEMBER(&rxml->xml_kids, 0, JSXML); JS_ASSERT(rxml->object);
if (!rxml) } else {
goto out; rxml = NULL;
ok = js_GetXMLObject(cx, rxml) != NULL; }
if (!ok)
goto out;
}
/* /* 2(c). */
* Erratum: ECMA-357 9.2.1.2 step 2(c)(ii) sets if (index >= xml->xml_kids.length) {
* _y.[[Parent]] = r_ where _r_ is the result of /* 2(c)(i). */
* [[ResolveValue]] called on _x.[[TargetObject]] in if (rxml) {
* 2(a)(i). This can result in text parenting text: if (rxml->xml_class == JSXML_CLASS_LIST) {
* if (rxml->xml_kids.length != 1)
* var MYXML = new XML(); goto out;
* MYXML.appendChild(new XML("<TEAM>Giants</TEAM>")); rxml = XMLARRAY_MEMBER(&rxml->xml_kids, 0, JSXML);
* if (!rxml)
* (testcase from Werner Sharp <wsharp@macromedia.com>). goto out;
* ok = js_GetXMLObject(cx, rxml) != NULL;
* To match insertChildAfter, insertChildBefore, if (!ok)
* prependChild, and setChildren, we should silently
* do nothing in this case.
*/
if (!JSXML_HAS_KIDS(rxml))
goto out; goto out;
} }
/* 2(c)(ii) is distributed below as several js_NewXML calls. */ /*
targetprop = xml->xml_targetprop; * Erratum: ECMA-357 9.2.1.2 step 2(c)(ii) sets
if (!targetprop || IS_STAR(targetprop->localName)) { * _y.[[Parent]] = r_ where _r_ is the result of
/* 2(c)(iv)(1-2), out of order w.r.t. 2(c)(iii). */ * [[ResolveValue]] called on _x.[[TargetObject]] in
kid = js_NewXML(cx, JSXML_CLASS_TEXT); * 2(a)(i). This can result in text parenting text:
if (!kid) *
goto bad; * var MYXML = new XML();
} else { * MYXML.appendChild(new XML("<TEAM>Giants</TEAM>"));
nameobj = js_GetXMLQNameObject(cx, targetprop); *
if (!nameobj) * (testcase from Werner Sharp <wsharp@macromedia.com>).
goto bad; *
if (OBJ_GET_CLASS(cx, nameobj) == &js_AttributeNameClass) { * To match insertChildAfter, insertChildBefore,
/* * prependChild, and setChildren, we should silently
* 2(c)(iii)(1-3). * do nothing in this case.
* Note that rxml can't be null here, because target */
* and targetprop are non-null. if (!JSXML_HAS_KIDS(rxml))
*/
ok = GetProperty(cx, rxml->object, id, &attrval);
if (!ok)
goto out;
attrobj = JSVAL_TO_OBJECT(attrval);
attr = (JSXML *) JS_GetPrivate(cx, attrobj);
if (JSXML_LENGTH(attr) != 0)
goto out;
kid = js_NewXML(cx, JSXML_CLASS_ATTRIBUTE);
} else {
/* 2(c)(v). */
kid = js_NewXML(cx, JSXML_CLASS_ELEMENT);
}
if (!kid)
goto bad;
/* An important bit of 2(c)(ii). */
kid->name = targetprop;
}
/* Final important bit of 2(c)(ii). */
kid->parent = rxml;
/* 2(c)(vi-vii). */
i = xml->xml_kids.length;
if (kid->xml_class != JSXML_CLASS_ATTRIBUTE) {
/*
* 2(c)(vii)(1) tests whether _y.[[Parent]]_ is not null.
* y.[[Parent]] is here called kid->parent, which we know
* from 2(c)(ii) is _r_, here called rxml. So let's just
* test that! Erratum, the spec should be simpler here.
*/
if (rxml) {
JS_ASSERT(JSXML_HAS_KIDS(rxml));
n = rxml->xml_kids.length;
j = n - 1;
if (n != 0 && i != 0) {
for (n = j, j = 0; j < n; j++) {
if (rxml->xml_kids.vector[j] ==
xml->xml_kids.vector[i-1]) {
break;
}
}
}
kidobj = js_GetXMLObject(cx, kid);
if (!kidobj)
goto bad;
ok = Insert(cx, rxml, j + 1, OBJECT_TO_JSVAL(kidobj));
if (!ok)
goto out;
}
/*
* 2(c)(vii)(2-3).
* Erratum: [[PropertyName]] in 2(c)(vii)(3) must be a
* typo for [[TargetProperty]].
*/
if (vxml) {
kid->name = (vxml->xml_class == JSXML_CLASS_LIST)
? vxml->xml_targetprop
: vxml->name;
}
}
/* 2(c)(viii). */
ok = Append(cx, xml, kid);
if (!ok)
goto out; goto out;
} }
/* 2(d). */ /* 2(c)(ii) is distributed below as several js_NewXML calls. */
if (!vxml || targetprop = xml->xml_targetprop;
vxml->xml_class == JSXML_CLASS_TEXT || if (!targetprop || IS_STAR(targetprop->localName)) {
vxml->xml_class == JSXML_CLASS_ATTRIBUTE) { /* 2(c)(iv)(1-2), out of order w.r.t. 2(c)(iii). */
ok = JS_ConvertValue(cx, *vp, JSTYPE_STRING, vp); kid = js_NewXML(cx, JSXML_CLASS_TEXT);
if (!ok) if (!kid)
goto out; goto bad;
roots[VAL_ROOT] = *vp; } else {
} nameobj = js_GetXMLQNameObject(cx, targetprop);
/* 2(e). */
kid = XMLARRAY_MEMBER(&xml->xml_kids, i, JSXML);
if (!kid)
goto out;
parent = kid->parent;
if (kid->xml_class == JSXML_CLASS_ATTRIBUTE) {
nameobj = js_GetAttributeNameObject(cx, kid->name);
if (!nameobj) if (!nameobj)
goto bad; goto bad;
id = OBJECT_TO_JSVAL(nameobj); if (OBJ_GET_CLASS(cx, nameobj) == &js_AttributeNameClass) {
/*
if (parent) { * 2(c)(iii)(1-3).
/* 2(e)(i). */ * Note that rxml can't be null here, because target
parentobj = parent->object; * and targetprop are non-null.
ok = PutProperty(cx, parentobj, id, vp); */
ok = GetProperty(cx, rxml->object, id, &attrval);
if (!ok) if (!ok)
goto out; goto out;
attrobj = JSVAL_TO_OBJECT(attrval);
attr = (JSXML *) JS_GetPrivate(cx, attrobj);
if (JSXML_LENGTH(attr) != 0)
goto out;
/* 2(e)(ii). */ kid = js_NewXML(cx, JSXML_CLASS_ATTRIBUTE);
ok = GetProperty(cx, parentobj, id, vp); } else {
/* 2(c)(v). */
kid = js_NewXML(cx, JSXML_CLASS_ELEMENT);
}
if (!kid)
goto bad;
/* An important bit of 2(c)(ii). */
kid->name = targetprop;
}
/* Final important bit of 2(c)(ii). */
kid->parent = rxml;
/* 2(c)(vi-vii). */
i = xml->xml_kids.length;
if (kid->xml_class != JSXML_CLASS_ATTRIBUTE) {
/*
* 2(c)(vii)(1) tests whether _y.[[Parent]]_ is not null.
* y.[[Parent]] is here called kid->parent, which we know
* from 2(c)(ii) is _r_, here called rxml. So let's just
* test that! Erratum, the spec should be simpler here.
*/
if (rxml) {
JS_ASSERT(JSXML_HAS_KIDS(rxml));
n = rxml->xml_kids.length;
j = n - 1;
if (n != 0 && i != 0) {
for (n = j, j = 0; j < n; j++) {
if (rxml->xml_kids.vector[j] ==
xml->xml_kids.vector[i-1]) {
break;
}
}
}
kidobj = js_GetXMLObject(cx, kid);
if (!kidobj)
goto bad;
ok = Insert(cx, rxml, j + 1, OBJECT_TO_JSVAL(kidobj));
if (!ok) if (!ok)
goto out; goto out;
attr = (JSXML *) JS_GetPrivate(cx, JSVAL_TO_OBJECT(*vp)); }
/* 2(e)(iii). */ /*
xml->xml_kids.vector[i] = attr->xml_kids.vector[0]; * 2(c)(vii)(2-3).
* Erratum: [[PropertyName]] in 2(c)(vii)(3) must be a
* typo for [[TargetProperty]].
*/
if (vxml) {
kid->name = (vxml->xml_class == JSXML_CLASS_LIST)
? vxml->xml_targetprop
: vxml->name;
} }
} }
/* 2(f). */ /* 2(c)(viii). */
else if (vxml && vxml->xml_class == JSXML_CLASS_LIST) { ok = Append(cx, xml, kid);
/* 2(f)(i) Create a shallow copy _c_ of _V_. */ if (!ok)
copyobj = js_NewXMLObject(cx, JSXML_CLASS_LIST); goto out;
if (!copyobj) }
goto bad;
copy = (JSXML *) JS_GetPrivate(cx, copyobj); /* 2(d). */
n = vxml->xml_kids.length; if (!vxml ||
ok = XMLArraySetCapacity(cx, &copy->xml_kids, n); vxml->xml_class == JSXML_CLASS_TEXT ||
vxml->xml_class == JSXML_CLASS_ATTRIBUTE) {
ok = JS_ConvertValue(cx, *vp, JSTYPE_STRING, vp);
if (!ok)
goto out;
roots[VAL_ROOT] = *vp;
}
/* 2(e). */
kid = XMLARRAY_MEMBER(&xml->xml_kids, i, JSXML);
if (!kid)
goto out;
parent = kid->parent;
if (kid->xml_class == JSXML_CLASS_ATTRIBUTE) {
nameobj = js_GetAttributeNameObject(cx, kid->name);
if (!nameobj)
goto bad;
id = OBJECT_TO_JSVAL(nameobj);
if (parent) {
/* 2(e)(i). */
parentobj = parent->object;
ok = PutProperty(cx, parentobj, id, vp);
if (!ok) if (!ok)
goto out; goto out;
for (k = 0; k < n; k++) {
kid2 = XMLARRAY_MEMBER(&vxml->xml_kids, k, JSXML);
XMLARRAY_SET_MEMBER(&copy->xml_kids, k, kid2);
}
JS_ASSERT(parent != xml); /* 2(e)(ii). */
if (parent) { ok = GetProperty(cx, parentobj, id, vp);
q = XMLARRAY_FIND_MEMBER(&parent->xml_kids, kid, NULL); if (!ok)
JS_ASSERT(q != XML_NOT_FOUND); goto out;
attr = (JSXML *) JS_GetPrivate(cx, JSVAL_TO_OBJECT(*vp));
ok = IndexToIdVal(cx, q, &id); /* 2(e)(iii). */
if (!ok) xml->xml_kids.vector[i] = attr->xml_kids.vector[0];
goto out; }
ok = Replace(cx, parent, id, OBJECT_TO_JSVAL(copyobj)); }
if (!ok)
goto out; /* 2(f). */
else if (vxml && vxml->xml_class == JSXML_CLASS_LIST) {
/* 2(f)(i) Create a shallow copy _c_ of _V_. */
copyobj = js_NewXMLObject(cx, JSXML_CLASS_LIST);
if (!copyobj)
goto bad;
copy = (JSXML *) JS_GetPrivate(cx, copyobj);
n = vxml->xml_kids.length;
ok = XMLArraySetCapacity(cx, &copy->xml_kids, n);
if (!ok)
goto out;
for (k = 0; k < n; k++) {
kid2 = XMLARRAY_MEMBER(&vxml->xml_kids, k, JSXML);
XMLARRAY_SET_MEMBER(&copy->xml_kids, k, kid2);
}
JS_ASSERT(parent != xml);
if (parent) {
q = XMLARRAY_FIND_MEMBER(&parent->xml_kids, kid, NULL);
JS_ASSERT(q != XML_NOT_FOUND);
ok = IndexToIdVal(cx, q, &id);
if (!ok)
goto out;
ok = Replace(cx, parent, id, OBJECT_TO_JSVAL(copyobj));
if (!ok)
goto out;
#ifdef DEBUG #ifdef DEBUG
/* Erratum: this loop in the spec is useless. */ /* Erratum: this loop in the spec is useless. */
for (j = 0, n = copy->xml_kids.length; j < n; j++) { for (j = 0, n = copy->xml_kids.length; j < n; j++) {
kid2 = XMLARRAY_MEMBER(&parent->xml_kids, q + j, JSXML); kid2 = XMLARRAY_MEMBER(&parent->xml_kids, q + j, JSXML);
JS_ASSERT(XMLARRAY_MEMBER(&copy->xml_kids, j, JSXML) JS_ASSERT(XMLARRAY_MEMBER(&copy->xml_kids, j, JSXML)
== kid2); == kid2);
} }
#endif #endif
}
/*
* 2(f)(iv-vi).
* Erratum: notice the unhandled zero-length V basis case and
* the off-by-one errors for the n != 0 cases in the spec.
*/
if (n == 0) {
XMLArrayDelete(cx, &xml->xml_kids, i, JS_TRUE);
} else {
ok = XMLArrayInsert(cx, &xml->xml_kids, i + 1, n - 1);
if (!ok)
goto out;
for (j = 0; j < n; j++)
xml->xml_kids.vector[i + j] = copy->xml_kids.vector[j];
}
} }
/* 2(g). */ /*
else if (vxml || JSXML_HAS_VALUE(kid)) { * 2(f)(iv-vi).
if (parent) { * Erratum: notice the unhandled zero-length V basis case and
q = XMLARRAY_FIND_MEMBER(&parent->xml_kids, kid, NULL); * the off-by-one errors for the n != 0 cases in the spec.
JS_ASSERT(q != XML_NOT_FOUND); */
if (n == 0) {
ok = IndexToIdVal(cx, q, &id); XMLArrayDelete(cx, &xml->xml_kids, i, JS_TRUE);
if (!ok) } else {
goto out; ok = XMLArrayInsert(cx, &xml->xml_kids, i + 1, n - 1);
ok = Replace(cx, parent, id, *vp);
if (!ok)
goto out;
vxml = XMLARRAY_MEMBER(&parent->xml_kids, q, JSXML);
if (!vxml)
goto out;
roots[VAL_ROOT] = *vp = OBJECT_TO_JSVAL(vxml->object);
}
/*
* 2(g)(iii).
* Erratum: _V_ may not be of type XML, but all index-named
* properties _x[i]_ in an XMLList _x_ must be of type XML,
* according to 9.2.1.1 Overview and other places in the spec.
*
* Thanks to 2(d), we know _V_ (*vp here) is either a string
* or an XML/XMLList object. If *vp is a string, call ToXML
* on it to satisfy the constraint.
*/
if (!vxml) {
JS_ASSERT(JSVAL_IS_STRING(*vp));
vobj = ToXML(cx, *vp);
if (!vobj)
goto bad;
roots[VAL_ROOT] = *vp = OBJECT_TO_JSVAL(vobj);
vxml = (JSXML *) JS_GetPrivate(cx, vobj);
}
XMLARRAY_SET_MEMBER(&xml->xml_kids, i, vxml);
}
/* 2(h). */
else {
kidobj = js_GetXMLObject(cx, kid);
if (!kidobj)
goto bad;
id = ATOM_KEY(cx->runtime->atomState.starAtom);
ok = PutProperty(cx, kidobj, id, vp);
if (!ok) if (!ok)
goto out; goto out;
for (j = 0; j < n; j++)
xml->xml_kids.vector[i + j] = copy->xml_kids.vector[j];
} }
} else { }
/* 2(g). */
else if (vxml || JSXML_HAS_VALUE(kid)) {
if (parent) {
q = XMLARRAY_FIND_MEMBER(&parent->xml_kids, kid, NULL);
JS_ASSERT(q != XML_NOT_FOUND);
ok = IndexToIdVal(cx, q, &id);
if (!ok)
goto out;
ok = Replace(cx, parent, id, *vp);
if (!ok)
goto out;
vxml = XMLARRAY_MEMBER(&parent->xml_kids, q, JSXML);
if (!vxml)
goto out;
roots[VAL_ROOT] = *vp = OBJECT_TO_JSVAL(vxml->object);
}
/* /*
* 3. * 2(g)(iii).
* Erratum: _V_ may not be of type XML, but all index-named
* properties _x[i]_ in an XMLList _x_ must be of type XML,
* according to 9.2.1.1 Overview and other places in the spec.
*
* Thanks to 2(d), we know _V_ (*vp here) is either a string
* or an XML/XMLList object. If *vp is a string, call ToXML
* on it to satisfy the constraint.
*/
if (!vxml) {
JS_ASSERT(JSVAL_IS_STRING(*vp));
vobj = ToXML(cx, *vp);
if (!vobj)
goto bad;
roots[VAL_ROOT] = *vp = OBJECT_TO_JSVAL(vobj);
vxml = (JSXML *) JS_GetPrivate(cx, vobj);
}
XMLARRAY_SET_MEMBER(&xml->xml_kids, i, vxml);
}
/* 2(h). */
else {
kidobj = js_GetXMLObject(cx, kid);
if (!kidobj)
goto bad;
id = ATOM_KEY(cx->runtime->atomState.starAtom);
ok = PutProperty(cx, kidobj, id, vp);
if (!ok)
goto out;
}
} else {
/*
* ECMA-357 9.2.1.2/9.1.1.2 qname case.
*/
nameqn = ToXMLName(cx, id, &funid);
if (!nameqn)
goto bad;
if (funid) {
ok = js_SetProperty(cx, obj, funid, vp);
goto out;
}
nameobj = nameqn->object;
roots[ID_ROOT] = OBJECT_TO_JSVAL(nameqn);
if (xml->xml_class == JSXML_CLASS_LIST) {
/*
* Step 3 of 9.2.1.2.
* Erratum: if x.[[Length]] > 1 or [[ResolveValue]] returns null * Erratum: if x.[[Length]] > 1 or [[ResolveValue]] returns null
* or an r with r.[[Length]] != 1, throw TypeError. * or an r with r.[[Length]] != 1, throw TypeError.
*/ */
@ -4574,36 +4586,23 @@ PutProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
goto out; goto out;
} }
JS_ASSERT(JSXML_LENGTH(xml) == 1); JS_ASSERT(JSXML_LENGTH(xml) == 1);
kid = XMLARRAY_MEMBER(&xml->xml_kids, 0, JSXML); xml = XMLARRAY_MEMBER(&xml->xml_kids, 0, JSXML);
if (!kid) if (!xml)
goto out; goto out;
kidobj = js_GetXMLObject(cx, kid); JS_ASSERT(xml->xml_class != JSXML_CLASS_LIST);
if (!kidobj) obj = js_GetXMLObject(cx, xml);
if (!obj)
goto bad; goto bad;
ok = PutProperty(cx, kidobj, id, vp); roots[OBJ_ROOT] = OBJECT_TO_JSVAL(obj);
if (!ok)
goto out; /* FALL THROUGH to non-list case */
} }
} else {
/* /*
* ECMA-357 9.1.1.2. * ECMA-357 9.1.1.2.
* Erratum: move steps 3 and 4 to before 1 and 2, to avoid wasted * Erratum: move steps 3 and 4 to before 1 and 2, to avoid wasted
* effort in ToString or [[DeepCopy]]. * effort in ToString or [[DeepCopy]].
*/ */
if (js_IdIsIndex(id, &index)) {
/* See NOTE in spec: this variation is reserved for future use. */
ReportBadXMLName(cx, id);
goto bad;
}
nameqn = ToXMLName(cx, id, &funid);
if (!nameqn)
goto bad;
if (funid) {
ok = js_SetProperty(cx, obj, funid, vp);
goto out;
}
nameobj = nameqn->object;
if (JSXML_HAS_VALUE(xml)) if (JSXML_HAS_VALUE(xml))
goto out; goto out;
@ -4951,62 +4950,30 @@ ResolveValue(JSContext *cx, JSXML *list, JSXML **result)
? OBJ_DROP_PROPERTY(cx, pobj, prop) \ ? OBJ_DROP_PROPERTY(cx, pobj, prop) \
: (void) 0) : (void) 0)
/* ECMA-357 9.1.1.6 XML [[HasProperty]] and 9.2.1.5 XMLList [[HasProperty]]. */
static JSBool static JSBool
HasProperty(JSContext *cx, JSObject *obj, jsval id, JSObject **objp, HasNamedProperty(JSXML *xml, JSXMLQName *nameqn)
JSProperty **propp)
{ {
JSXML *xml, *kid; JSBool found;
JSXMLArrayCursor cursor; JSXMLArrayCursor cursor;
JSObject *kidobj; JSXML *kid;
JSXMLQName *qn;
jsid funid;
JSXMLArray *array; JSXMLArray *array;
JSXMLNameMatcher matcher; JSXMLNameMatcher matcher;
uint32 i, n; uint32 i, n;
*objp = NULL;
*propp = NULL;
xml = (JSXML *) JS_GetPrivate(cx, obj);
if (xml->xml_class == JSXML_CLASS_LIST) { if (xml->xml_class == JSXML_CLASS_LIST) {
n = JSXML_LENGTH(xml); found = JS_FALSE;
if (js_IdIsIndex(id, &i)) {
if (i < n)
*propp = FOUND_XML_PROPERTY;
return JS_TRUE;
}
XMLArrayCursorInit(&cursor, &xml->xml_kids); XMLArrayCursorInit(&cursor, &xml->xml_kids);
while ((kid = (JSXML *) XMLArrayCursorNext(&cursor)) != NULL) { while ((kid = (JSXML *) XMLArrayCursorNext(&cursor)) != NULL) {
if (kid->xml_class == JSXML_CLASS_ELEMENT) { found = HasNamedProperty(kid, nameqn);
kidobj = js_GetXMLObject(cx, kid); if (found)
if (!kidobj || !HasProperty(cx, kidobj, id, objp, propp)) break;
break;
if (*propp)
break;
}
} }
XMLArrayCursorFinish(&cursor); XMLArrayCursorFinish(&cursor);
if (kid) return found;
return *propp != NULL; }
} else {
if (xml->xml_class == JSXML_CLASS_ELEMENT && js_IdIsIndex(id, &i)) {
if (i == 0)
*propp = FOUND_XML_PROPERTY;
return JS_TRUE;
}
qn = ToXMLName(cx, id, &funid); if (xml->xml_class == JSXML_CLASS_ELEMENT) {
if (!qn) if (OBJ_GET_CLASS(cx, nameqn->object) == &js_AttributeNameClass) {
return JS_FALSE;
if (funid)
return js_LookupProperty(cx, obj, funid, objp, propp);
if (xml->xml_class != JSXML_CLASS_ELEMENT)
return JS_TRUE;
if (OBJ_GET_CLASS(cx, qn->object) == &js_AttributeNameClass) {
array = &xml->xml_attrs; array = &xml->xml_attrs;
matcher = MatchAttrName; matcher = MatchAttrName;
} else { } else {
@ -5015,13 +4982,46 @@ HasProperty(JSContext *cx, JSObject *obj, jsval id, JSObject **objp,
} }
for (i = 0, n = array->length; i < n; i++) { for (i = 0, n = array->length; i < n; i++) {
kid = XMLARRAY_MEMBER(array, i, JSXML); kid = XMLARRAY_MEMBER(array, i, JSXML);
if (kid && matcher(qn, kid)) { if (kid && matcher(nameqn, kid))
*propp = FOUND_XML_PROPERTY;
return JS_TRUE; return JS_TRUE;
}
} }
} }
return JS_FALSE;
}
/* ECMA-357 9.1.1.6 XML [[HasProperty]] and 9.2.1.5 XMLList [[HasProperty]]. */
static JSBool
HasProperty(JSContext *cx, JSObject *obj, jsval id, JSObject **objp,
JSProperty **propp)
{
JSXML *xml;
uint32 i;
JSBool found;
JSXMLQName *nameqn;
jsid funid;
xml = (JSXML *) JS_GetPrivate(cx, obj);
if (js_IdIsIndex(id, &i)) {
if (xml->xml_class == JSXML_CLASS_LIST)
found = (i < JSXML_LENGTH(xml));
else if (xml->xml_class == JSXML_CLASS_ELEMENT)
found = (i == 0);
else
found = JS_FALSE;
} else {
nameqn = ToXMLName(cx, id, &funid);
if (!nameqn)
return JS_FALSE;
if (funid)
return js_LookupProperty(cx, obj, funid, objp, propp);
found = HasNamedProperty(xml, nameqn);
}
*objp = NULL;
*propp = found ? FOUND_XML_PROPERTY : NULL;
return JS_TRUE; return JS_TRUE;
} }