diff options
| -rw-r--r-- | src/components/script/dom/bindings/node.rs | 12 | ||||
| -rw-r--r-- | src/components/script/dom/document.rs | 71 | ||||
| -rw-r--r-- | src/components/script/dom/element.rs | 11 | ||||
| -rw-r--r-- | src/components/script/dom/htmlimageelement.rs | 14 | ||||
| -rw-r--r-- | src/components/script/dom/node.rs | 135 | ||||
| -rw-r--r-- | src/components/script/dom/window.rs | 18 | ||||
| -rw-r--r-- | src/components/script/script_task.rs | 14 | ||||
| -rw-r--r-- | src/components/style/selector_matching.rs | 6 | ||||
| -rw-r--r-- | src/components/util/tree.rs | 99 |
9 files changed, 160 insertions, 220 deletions
diff --git a/src/components/script/dom/bindings/node.rs b/src/components/script/dom/bindings/node.rs index f0eba2a341a..5adf545f14c 100644 --- a/src/components/script/dom/bindings/node.rs +++ b/src/components/script/dom/bindings/node.rs @@ -101,15 +101,11 @@ pub fn create(cx: *JSContext, node: &mut AbstractNode<ScriptView>) -> *JSObject impl Reflectable for AbstractNode<ScriptView> { fn reflector<'a>(&'a self) -> &'a Reflector { - do self.with_base |base| { - unsafe { cast::transmute(base.reflector()) } - } + self.node().reflector() } fn mut_reflector<'a>(&'a mut self) -> &'a mut Reflector { - do self.with_mut_base |base| { - unsafe { cast::transmute(base.reflector()) } - } + self.mut_node().mut_reflector() } fn wrap_object_shared(@mut self, _cx: *JSContext, _scope: *JSObject) -> *JSObject { @@ -117,9 +113,7 @@ impl Reflectable for AbstractNode<ScriptView> { } fn GetParentObject(&self, cx: *JSContext) -> Option<@mut Reflectable> { - do self.with_mut_base |base| { - base.GetParentObject(cx) - } + self.node().GetParentObject(cx) } } diff --git a/src/components/script/dom/document.rs b/src/components/script/dom/document.rs index 931221cabe0..bd323e15f85 100644 --- a/src/components/script/dom/document.rs +++ b/src/components/script/dom/document.rs @@ -41,7 +41,7 @@ pub trait ReflectableDocument { #[deriving(Eq)] pub struct AbstractDocument { - document: *Document + document: *mut Box<Document> } impl AbstractDocument { @@ -52,6 +52,18 @@ impl AbstractDocument { } } + pub fn document<'a>(&'a self) -> &'a Document { + unsafe { + &(*self.document).data + } + } + + pub fn mut_document<'a>(&'a self) -> &'a mut Document { + unsafe { + &mut (*self.document).data + } + } + unsafe fn transmute<T, R>(&self, f: &fn(&T) -> R) -> R { let box: *Box<T> = cast::transmute(self.document); f(&(*box).data) @@ -62,20 +74,8 @@ impl AbstractDocument { f(&mut (*box).data) } - pub fn with_base<R>(&self, callback: &fn(&Document) -> R) -> R { - unsafe { - self.transmute(callback) - } - } - - pub fn with_mut_base<R>(&self, callback: &fn(&mut Document) -> R) -> R { - unsafe { - self.transmute_mut(callback) - } - } - pub fn with_html<R>(&self, callback: &fn(&HTMLDocument) -> R) -> R { - match self.with_base(|doc| doc.doctype) { + match self.document().doctype { HTML => unsafe { self.transmute(callback) }, _ => fail!("attempt to downcast a non-HTMLDocument to HTMLDocument") } @@ -83,23 +83,20 @@ impl AbstractDocument { pub fn from_box<T>(ptr: *mut Box<T>) -> AbstractDocument { AbstractDocument { - document: ptr as *Document + document: ptr as *mut Box<Document> } } pub fn set_root(&self, root: AbstractNode<ScriptView>) { - assert!(root.traverse_preorder().all(|node| { - do node.with_base |node| { - node.owner_doc() == *self - } - })); - self.with_mut_base(|document| { - document.root = Some(root); - // Register elements having "id" attribute to the owner doc. - document.register_nodes_with_id(&root); - - document.content_changed(); + assert!(do root.traverse_preorder().all |node| { + node.node().owner_doc() == *self }); + + let document = self.mut_document(); + document.root = Some(root); + // Register elements having "id" attribute to the owner doc. + document.register_nodes_with_id(&root); + document.content_changed(); } } @@ -154,19 +151,15 @@ impl ReflectableDocument for Document { impl Reflectable for AbstractDocument { fn reflector<'a>(&'a self) -> &'a Reflector { - do self.with_mut_base |doc| { - unsafe { cast::transmute(doc.reflector()) } - } + self.document().reflector() } fn mut_reflector<'a>(&'a mut self) -> &'a mut Reflector { - do self.with_mut_base |doc| { - unsafe { cast::transmute(doc.mut_reflector()) } - } + self.mut_document().mut_reflector() } fn wrap_object_shared(@mut self, cx: *JSContext, scope: *JSObject) -> *JSObject { - match self.with_base(|doc| doc.doctype) { + match self.document().doctype { HTML => { let doc: @mut HTMLDocument = unsafe { cast::transmute(self.document) }; doc.wrap_object_shared(cx, scope) @@ -178,9 +171,7 @@ impl Reflectable for AbstractDocument { } fn GetParentObject(&self, cx: *JSContext) -> Option<@mut Reflectable> { - do self.with_mut_base |doc| { - doc.GetParentObject(cx) - } + self.document().GetParentObject(cx) } } @@ -561,11 +552,9 @@ impl Traceable for Document { do "root".to_c_str().with_ref |name| { (*tracer).debugPrintArg = name as *libc::c_void; debug!("tracing root node"); - do root.with_base |node| { - JS_CallTracer(tracer as *JSTracer, - node.reflector_.object, - JSTRACE_OBJECT as u32); - } + JS_CallTracer(tracer as *JSTracer, + root.reflector().get_jsobject(), + JSTRACE_OBJECT as u32); } } } diff --git a/src/components/script/dom/element.rs b/src/components/script/dom/element.rs index 718e358762a..2ee2e8ade5a 100644 --- a/src/components/script/dom/element.rs +++ b/src/components/script/dom/element.rs @@ -199,9 +199,8 @@ impl<'self> Element { } if abstract_self.is_in_doc() { - do self.node.owner_doc().with_base |owner| { - owner.content_changed(); - } + let document = self.node.owner_doc(); + document.document().content_changed(); } } } @@ -286,8 +285,7 @@ impl Element { } pub fn GetClientRects(&self, abstract_self: AbstractNode<ScriptView>) -> @mut ClientRectList { - let document = self.node.owner_doc(); - let win = document.with_base(|doc| doc.window); + let win = self.node.owner_doc().document().window; let node = abstract_self; assert!(node.is_element()); let (port, chan) = comm::stream(); @@ -313,8 +311,7 @@ impl Element { } pub fn GetBoundingClientRect(&self, abstract_self: AbstractNode<ScriptView>) -> @mut ClientRect { - let document = self.node.owner_doc(); - let win = document.with_base(|doc| doc.window); + let win = self.node.owner_doc().document().window; let node = abstract_self; assert!(node.is_element()); let (port, chan) = comm::stream(); diff --git a/src/components/script/dom/htmlimageelement.rs b/src/components/script/dom/htmlimageelement.rs index d9d301b6dfe..dc60d560743 100644 --- a/src/components/script/dom/htmlimageelement.rs +++ b/src/components/script/dom/htmlimageelement.rs @@ -43,12 +43,10 @@ impl HTMLImageElement { pub fn AfterSetAttr(&mut self, name: &DOMString, _value: &DOMString) { let name = null_str_as_empty(name); if "src" == name { - let doc = self.htmlelement.element.node.owner_doc(); - do doc.with_base |doc| { - let window = doc.window; - let url = window.page.url.map(|&(ref url, _)| url.clone()); - self.update_image(window.image_cache_task.clone(), url); - } + let document = self.htmlelement.element.node.owner_doc(); + let window = document.document().window; + let url = window.page.url.map(|&(ref url, _)| url.clone()); + self.update_image(window.image_cache_task.clone(), url); } } @@ -100,7 +98,7 @@ impl HTMLImageElement { pub fn Width(&self, abstract_self: AbstractNode<ScriptView>) -> u32 { let node = &self.htmlelement.element.node; - let page = node.owner_doc().with_base(|doc| doc.window).page; + let page = node.owner_doc().document().window.page; let (port, chan) = stream(); match page.query_layout(ContentBoxQuery(abstract_self, chan), port) { ContentBoxResponse(rect) => { @@ -121,7 +119,7 @@ impl HTMLImageElement { pub fn Height(&self, abstract_self: AbstractNode<ScriptView>) -> u32 { let node = &self.htmlelement.element.node; - let page = node.owner_doc().with_base(|doc| doc.window).page; + let page = node.owner_doc().document().window.page; let (port, chan) = stream(); match page.query_layout(ContentBoxQuery(abstract_self, chan), port) { ContentBoxResponse(rect) => { diff --git a/src/components/script/dom/node.rs b/src/components/script/dom/node.rs index d0b0ec81671..6169864edac 100644 --- a/src/components/script/dom/node.rs +++ b/src/components/script/dom/node.rs @@ -52,7 +52,7 @@ pub struct LayoutView; /// FIXME: This should be replaced with a trait once they can inherit from structs. #[deriving(Eq)] pub struct AbstractNode<View> { - priv obj: *mut Node<View>, + priv obj: *mut Box<Node<View>>, } pub struct AbstractNodeChildrenIterator<View> { @@ -115,6 +115,18 @@ impl<View> Clone for AbstractNode<View> { } impl<View> TreeNodeRef<Node<View>> for AbstractNode<View> { + fn node<'a>(&'a self) -> &'a Node<View> { + unsafe { + &(*self.obj).data + } + } + + fn mut_node<'a>(&'a self) -> &'a mut Node<View> { + unsafe { + &mut (*self.obj).data + } + } + fn parent_node(node: &Node<View>) -> Option<AbstractNode<View>> { node.parent_node } @@ -147,15 +159,6 @@ impl<View> TreeNodeRef<Node<View>> for AbstractNode<View> { node.next_sibling = new_next_sibling } - // FIXME: The duplication between `with_base` and `with_mut_base` is ugly. - fn with_base<R>(&self, callback: &fn(&Node<View>) -> R) -> R { - self.transmute(callback) - } - - fn with_mut_base<R>(&self, callback: &fn(&mut Node<View>) -> R) -> R { - self.transmute_mut(callback) - } - fn is_element(&self) -> bool { match self.type_id() { ElementNodeTypeId(*) => true, @@ -194,7 +197,7 @@ impl<'self, View> AbstractNode<View> { /// chain for nodes. pub fn from_box<T>(ptr: *mut Box<T>) -> AbstractNode<View> { AbstractNode { - obj: ptr as *mut Node<View> + obj: ptr as *mut Box<Node<View>> } } @@ -202,32 +205,32 @@ impl<'self, View> AbstractNode<View> { /// Returns the type ID of this node. Fails if this node is borrowed mutably. pub fn type_id(self) -> NodeTypeId { - self.with_base(|b| b.type_id) + self.node().type_id } /// Returns the parent node of this node. Fails if this node is borrowed mutably. pub fn parent_node(self) -> Option<AbstractNode<View>> { - self.with_base(|b| b.parent_node) + self.node().parent_node } /// Returns the first child of this node. Fails if this node is borrowed mutably. pub fn first_child(self) -> Option<AbstractNode<View>> { - self.with_base(|b| b.first_child) + self.node().first_child } /// Returns the last child of this node. Fails if this node is borrowed mutably. pub fn last_child(self) -> Option<AbstractNode<View>> { - self.with_base(|b| b.last_child) + self.node().last_child } /// Returns the previous sibling of this node. Fails if this node is borrowed mutably. pub fn prev_sibling(self) -> Option<AbstractNode<View>> { - self.with_base(|b| b.prev_sibling) + self.node().prev_sibling } /// Returns the next sibling of this node. Fails if this node is borrowed mutably. pub fn next_sibling(self) -> Option<AbstractNode<View>> { - self.with_base(|b| b.next_sibling) + self.node().next_sibling } /// Is this node a root? @@ -381,11 +384,11 @@ impl<'self, View> AbstractNode<View> { self.type_id() == ElementNodeTypeId(HTMLStyleElementTypeId) } - pub unsafe fn raw_object(self) -> *mut Node<View> { + pub unsafe fn raw_object(self) -> *mut Box<Node<View>> { self.obj } - pub fn from_raw(raw: *mut Node<View>) -> AbstractNode<View> { + pub fn from_raw(raw: *mut Box<Node<View>>) -> AbstractNode<View> { AbstractNode { obj: raw } @@ -425,28 +428,25 @@ impl<'self, View> AbstractNode<View> { // Issue #1030: should not walk the tree pub fn is_in_doc(&self) -> bool { - do self.with_base |node| { - do node.owner_doc().with_base |document| { - match document.GetDocumentElement() { - None => false, - Some(root) => { - let mut node = *self; - let mut in_doc; - loop { - match node.parent_node() { - Some(parent) => { - node = parent; - }, - None => { - // Issue #1029: this is horrible. - in_doc = unsafe { node.raw_object() as uint == root.raw_object() as uint }; - break; - } - } + let document = self.node().owner_doc(); + match document.document().GetDocumentElement() { + None => false, + Some(root) => { + let mut node = *self; + let mut in_doc; + loop { + match node.parent_node() { + Some(parent) => { + node = parent; + }, + None => { + // Issue #1029: this is horrible. + in_doc = unsafe { node.raw_object() as uint == root.raw_object() as uint }; + break; } - in_doc } } + in_doc } } } @@ -486,34 +486,24 @@ impl Node<ScriptView> { let mut cur_node = self.first_child; while cur_node.is_some() { for node in cur_node.unwrap().traverse_preorder() { - do node.with_mut_base |node_base| { - node_base.set_owner_doc(doc); - } + node.mut_node().set_owner_doc(doc); }; cur_node = cur_node.unwrap().next_sibling(); } // Unregister elements having "id' from the old doc. - do old_doc.with_mut_base |old_doc| { - old_doc.unregister_nodes_with_id(&abstract_self); - } + old_doc.mut_document().unregister_nodes_with_id(&abstract_self); // Register elements having "id" attribute to the owner doc. - do doc.with_mut_base |doc| { - doc.register_nodes_with_id(&abstract_self); - } + doc.mut_document().register_nodes_with_id(&abstract_self); // Signal the old document that it needs to update its display if old_doc != doc { - do old_doc.with_base |old_doc| { - old_doc.content_changed(); - } + old_doc.document().content_changed(); } // Signal the new document that it needs to update its display - do doc.with_base |doc| { - doc.content_changed(); - } + doc.document().content_changed(); } pub fn new(type_id: NodeTypeId, doc: AbstractDocument) -> Node<ScriptView> { @@ -683,7 +673,7 @@ impl Node<ScriptView> { } pub fn get_scope_and_cx(&self) -> (*JSObject, *JSContext) { - let win = self.owner_doc().with_base(|doc| doc.window); + let win = self.owner_doc().document().window; (win.reflector().get_jsobject(), win.get_cx()) } @@ -715,10 +705,8 @@ impl Node<ScriptView> { let node = if is_empty { None } else { - let text_node = do self.owner_doc().with_base |document| { - document.CreateTextNode(self.owner_doc(), value) - }; - Some(text_node) + let document = self.owner_doc(); + Some(document.document().CreateTextNode(document, value)) }; self.replace_all(abstract_self, node); } @@ -729,9 +717,8 @@ impl Node<ScriptView> { characterdata.data = null_str_as_empty(value); // Notify the document that the content of this node is different - do self.owner_doc().with_base |doc| { - doc.content_changed(); - } + let document = self.owner_doc(); + document.document().content_changed(); } } DoctypeNodeTypeId => {} @@ -744,9 +731,8 @@ impl Node<ScriptView> { } fn wait_until_safe_to_modify_dom(&self) { - do self.owner_doc().with_base |doc| { - doc.wait_until_safe_to_modify_dom(); - } + let document = self.owner_doc(); + document.document().wait_until_safe_to_modify_dom(); } pub fn AppendChild(&mut self, @@ -784,9 +770,7 @@ impl Node<ScriptView> { // If the node already exists it is removed from current parent node. node.parent_node().map(|parent| parent.remove_child(node)); abstract_self.add_child(node); - do node.with_mut_base |node| { - node.add_to_doc(abstract_self, self.owner_doc()); - } + node.mut_node().add_to_doc(node, self.owner_doc()); Ok(node) } @@ -813,15 +797,12 @@ impl Node<ScriptView> { // Unregister elements having "id' from the owner doc. // This need be called before target nodes are removed from tree. - do self.owner_doc.with_mut_base |doc| { - doc.unregister_nodes_with_id(&abstract_self); - } + self.owner_doc.mut_document().unregister_nodes_with_id(&abstract_self); abstract_self.remove_child(node); // Signal the document that it needs to update its display. - do self.owner_doc().with_base |document| { - document.content_changed(); - } + let document = self.owner_doc(); + document.document().content_changed(); Ok(node) } @@ -949,14 +930,10 @@ impl AbstractNode<LayoutView> { // Node. Also this makes it easier to switch to RWArc if we decide that is // necessary. pub fn read_layout_data<R>(self, blk: &fn(data: &LayoutData) -> R) -> R { - do self.with_base |b| { - blk(&b.layout_data) - } + blk(&self.node().layout_data) } pub fn write_layout_data<R>(self, blk: &fn(data: &mut LayoutData) -> R) -> R { - do self.with_mut_base |b| { - blk(&mut b.layout_data) - } + blk(&mut self.mut_node().layout_data) } } diff --git a/src/components/script/dom/window.rs b/src/components/script/dom/window.rs index 1c42dde5d9d..6f1e931586e 100644 --- a/src/components/script/dom/window.rs +++ b/src/components/script/dom/window.rs @@ -253,16 +253,14 @@ impl Traceable for Window { unsafe { match self.page.frame { Some(frame) => { - do frame.document.with_base |doc| { - (*tracer).debugPrinter = ptr::null(); - (*tracer).debugPrintIndex = -1; - do "document".to_c_str().with_ref |name| { - (*tracer).debugPrintArg = name as *libc::c_void; - debug!("tracing document"); - JS_CallTracer(tracer as *JSTracer, - doc.reflector_.object, - JSTRACE_OBJECT as u32); - } + (*tracer).debugPrinter = ptr::null(); + (*tracer).debugPrintIndex = -1; + do "document".to_c_str().with_ref |name| { + (*tracer).debugPrintArg = name as *libc::c_void; + debug!("tracing document"); + JS_CallTracer(tracer as *JSTracer, + frame.document.reflector().get_jsobject(), + JSTRACE_OBJECT as u32); } } None => () diff --git a/src/components/script/script_task.rs b/src/components/script/script_task.rs index e025fdfc5d5..43a87eca228 100644 --- a/src/components/script/script_task.rs +++ b/src/components/script/script_task.rs @@ -214,9 +214,8 @@ impl<'self> Iterator<@mut Page> for PageTreeIterator<'self> { impl Page { /// Adds the given damage. fn damage(&mut self, level: DocumentDamageLevel) { - let root = do self.frame.get_ref().document.with_base |doc| { - doc.GetDocumentElement() - }; + let root = self.frame.get_ref().document.document(). + GetDocumentElement(); match root { None => {}, Some(root) => { @@ -277,9 +276,7 @@ impl Page { let root = match self.frame { None => fail!(~"Tried to relayout with no root frame!"), Some(ref frame) => { - do frame.document.with_base |doc| { - doc.GetDocumentElement() - } + frame.document.document().GetDocumentElement() } }; match root { @@ -804,9 +801,8 @@ impl ScriptTask { ClickEvent(_button, point) => { debug!("ClickEvent: clicked at %?", point); - let root = do page.frame.expect("root frame is None").document.with_base |doc| { - doc.GetDocumentElement() - }; + let document = page.frame.expect("root frame is None").document; + let root = document.document().GetDocumentElement(); if root.is_none() { return; } diff --git a/src/components/style/selector_matching.rs b/src/components/style/selector_matching.rs index 490d15c68ac..e7ef0ab1955 100644 --- a/src/components/style/selector_matching.rs +++ b/src/components/style/selector_matching.rs @@ -171,8 +171,10 @@ fn matches_compound_selector<N: TreeNode<T>, T: TreeNodeRefAsElement<N, E>, E: E }; let mut node = element.clone(); loop { - let next_node = do node.with_base |node| { - if siblings { node.prev_sibling() } else { node.parent_node() } + let next_node = if siblings { + node.node().prev_sibling() + } else { + node.node().parent_node() }; match next_node { None => return false, diff --git a/src/components/util/tree.rs b/src/components/util/tree.rs index 96ef2c77c86..73fdd14085d 100644 --- a/src/components/util/tree.rs +++ b/src/components/util/tree.rs @@ -37,7 +37,7 @@ impl<Node, Ref: TreeNodeRef<Node>> Iterator<Ref> for ChildIterator<Ref> { // FIXME: Do we need two clones here? let x = self.current.get_ref().clone(); - self.current = x.with_base(|n| TreeNodeRef::<Node>::next_sibling(n)); + self.current = TreeNodeRef::<Node>::next_sibling(x.node()); Some(x.clone()) } } @@ -54,7 +54,7 @@ impl<Node, Ref: TreeNodeRef<Node>> Iterator<Ref> for AncestorIterator<Ref> { // FIXME: Do we need two clones here? let x = self.current.get_ref().clone(); - self.current = x.with_base(|n| TreeNodeRef::<Node>::parent_node(n)); + self.current = TreeNodeRef::<Node>::parent_node(x.node()); Some(x.clone()) } } @@ -98,11 +98,9 @@ pub trait TreeNodeRef<Node>: Clone { // Fundamental operations on refs. /// Borrows this node as immutable. - fn with_base<R>(&self, callback: &fn(&Node) -> R) -> R; - + fn node<'a>(&'a self) -> &'a Node; /// Borrows this node as mutable. - fn with_mut_base<R>(&self, callback: &fn(&mut Node) -> R) -> R; - + fn mut_node<'a>(&'a self) -> &'a mut Node; // Fundamental operations on nodes. @@ -141,82 +139,73 @@ pub trait TreeNodeRef<Node>: Clone { /// Returns true if this node is disconnected from the tree or has no children. fn is_leaf(&self) -> bool { - do self.with_base |this_node| { - (get!(this_node, first_child)).is_none() - } + (get!(self.node(), first_child)).is_none() } /// Adds a new child to the end of this node's list of children. /// /// Fails unless `new_child` is disconnected from the tree. fn add_child(&self, new_child: Self) { - do self.with_mut_base |this_node| { - do new_child.with_mut_base |new_child_node| { - assert!((get!(new_child_node, parent_node)).is_none()); - assert!((get!(new_child_node, prev_sibling)).is_none()); - assert!((get!(new_child_node, next_sibling)).is_none()); - - match get!(this_node, last_child) { - None => set!(this_node, set_first_child, Some(new_child.clone())), - Some(last_child) => { - do last_child.with_mut_base |last_child_node| { - assert!((get!(last_child_node, next_sibling)).is_none()); - set!(last_child_node, set_next_sibling, Some(new_child.clone())); - set!(new_child_node, set_prev_sibling, Some(last_child.clone())); - } - } - } - - set!(this_node, set_last_child, Some(new_child.clone())); - set!(new_child_node, set_parent_node, Some((*self).clone())); + let this_node = self.mut_node(); + let new_child_node = new_child.mut_node(); + assert!((get!(new_child_node, parent_node)).is_none()); + assert!((get!(new_child_node, prev_sibling)).is_none()); + assert!((get!(new_child_node, next_sibling)).is_none()); + + match get!(this_node, last_child) { + None => set!(this_node, set_first_child, Some(new_child.clone())), + Some(last_child) => { + let last_child_node = last_child.mut_node(); + assert!((get!(last_child_node, next_sibling)).is_none()); + set!(last_child_node, set_next_sibling, Some(new_child.clone())); + set!(new_child_node, set_prev_sibling, Some(last_child.clone())); } } + + set!(this_node, set_last_child, Some(new_child.clone())); + set!(new_child_node, set_parent_node, Some((*self).clone())); } /// Removes the given child from this node's list of children. /// /// Fails unless `child` is a child of this node. (FIXME: This is not yet checked.) fn remove_child(&self, child: Self) { - do self.with_mut_base |this_node| { - do child.with_mut_base |child_node| { - assert!((get!(child_node, parent_node)).is_some()); - - match get!(child_node, prev_sibling) { - None => set!(this_node, set_first_child, get!(child_node, next_sibling)), - Some(prev_sibling) => { - do prev_sibling.with_mut_base |prev_sibling_node| { - set!(prev_sibling_node, set_next_sibling, get!(child_node, next_sibling)); - } - } - } - - match get!(child_node, next_sibling) { - None => set!(this_node, set_last_child, get!(child_node, prev_sibling)), - Some(next_sibling) => { - do next_sibling.with_mut_base |next_sibling_node| { - set!(next_sibling_node, set_prev_sibling, get!(child_node, prev_sibling)); - } - } - } - - set!(child_node, set_prev_sibling, None); - set!(child_node, set_next_sibling, None); - set!(child_node, set_parent_node, None); + let this_node = self.mut_node(); + let child_node = child.mut_node(); + assert!((get!(child_node, parent_node)).is_some()); + + match get!(child_node, prev_sibling) { + None => set!(this_node, set_first_child, get!(child_node, next_sibling)), + Some(prev_sibling) => { + let prev_sibling_node = prev_sibling.mut_node(); + set!(prev_sibling_node, set_next_sibling, get!(child_node, next_sibling)); } } + + match get!(child_node, next_sibling) { + None => set!(this_node, set_last_child, get!(child_node, prev_sibling)), + Some(next_sibling) => { + let next_sibling_node = next_sibling.mut_node(); + set!(next_sibling_node, set_prev_sibling, get!(child_node, prev_sibling)); + } + } + + set!(child_node, set_prev_sibling, None); + set!(child_node, set_next_sibling, None); + set!(child_node, set_parent_node, None); } /// Iterates over all children of this node. fn children(&self) -> ChildIterator<Self> { ChildIterator { - current: self.with_base(|n| get!(n, first_child)), + current: get!(self.node(), first_child), } } /// Iterates over all ancestors of this node. fn ancestors(&self) -> AncestorIterator<Self> { AncestorIterator { - current: self.with_base(|n| get!(n, parent_node)), + current: get!(self.node(), parent_node), } } |