nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-25 16:24:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

More fool-proof API

Browse Source
This commit is contained in:
Aleksey Kladov 2018-07-31 13:49:03 +03:00
parent 87b5e14c75
commit 407ebbc552
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/yellow/red.rs
View File

@ -61,9 +61,12 @@ impl RedNode {
self.green.children().len()
}
pub(crate) fn nth_child(&self, idx: usize) -> ptr::NonNull<RedNode> {
pub(crate) fn get_child(&self, idx: usize) -> Option<ptr::NonNull<RedNode>> {
if idx >= self.n_children() {
return None
}
match &self.children.read().unwrap()[idx] {
Some(child) => return child.into(),
Some(child) => return Some(child.into()),
None => (),
}
let mut children = self.children.write().unwrap();
@ -78,7 +81,7 @@ impl RedNode {
RedNode::new_child(green_children[idx].clone(), self.into(), start_offset, idx);
children[idx] = Some(child)
}
children[idx].as_ref().unwrap().into()
Some(children[idx].as_ref().unwrap().into())
}
pub(crate) fn parent(&self) -> Option<ptr::NonNull<RedNode>> {

17
src/yellow/syntax.rs
View File

@ -6,8 +6,10 @@ use {
TextRange, TextUnit,
};
pub trait TreeRoot: Deref<Target = SyntaxRoot> + Clone {}
pub trait TreeRoot: Deref<Target=SyntaxRoot> + Clone {}
impl TreeRoot for Arc<SyntaxRoot> {}
impl<'a> TreeRoot for &'a SyntaxRoot {}
#[derive(Clone, Copy)]
@ -18,14 +20,13 @@ pub struct SyntaxNode<R: TreeRoot = Arc<SyntaxRoot>> {
red: ptr::NonNull<RedNode>,
}
impl <R1: TreeRoot, R2: TreeRoot> PartialEq<SyntaxNode<R1>> for SyntaxNode<R2> {
impl<R1: TreeRoot, R2: TreeRoot> PartialEq<SyntaxNode<R1>> for SyntaxNode<R2> {
fn eq(&self, other: &SyntaxNode<R1>) -> bool {
self.red == other.red
}
}
impl <R: TreeRoot> Eq for SyntaxNode<R> {
}
impl<R: TreeRoot> Eq for SyntaxNode<R> {}
pub type SyntaxNodeRef<'a> = SyntaxNode<&'a SyntaxRoot>;
@ -88,7 +89,7 @@ impl<R: TreeRoot> SyntaxNode<R> {
(0..n_children).map(move |i| {
SyntaxNode {
root: self.root.clone(),
red: red.nth_child(i),
red: red.get_child(i).unwrap(),
}
})
}
@ -109,12 +110,10 @@ impl<R: TreeRoot> SyntaxNode<R> {
let red = self.red();
let parent = self.parent()?;
let next_sibling_idx = red.index_in_parent()? + 1;
if next_sibling_idx == parent.red().n_children() {
return None;
}
let sibling_red = parent.red().get_child(next_sibling_idx)?;
Some(SyntaxNode {
root: self.root.clone(),
red: parent.red().nth_child(next_sibling_idx),
red: sibling_red,
})
}