Add a splay tree implementation to libstd#6360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
alexcrichton wants to merge 3 commits into from
Closed

Add a splay tree implementation to libstd #6360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
500a11f
Extract some of TreeMap's iterators to generic impls
alexcrichton May 9, 2013
1078caa
Add a splay tree implementation to libstd
alexcrichton May 9, 2013
398187c
Add Splay{Map,Set} to the benchmarks
alexcrichton May 9, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions src/libcore/cmp.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -127,6 +127,20 @@ totalord_impl!(uint)

totalord_impl!(char)

impl<'self, T: TotalEq> TotalEq for &'self T {
#[inline(always)]
fn equals(&self, other: & &'self T) -> bool {
(**self).equals(*other)
}
}

impl<'self, T: TotalOrd> TotalOrd for &'self T {
#[inline(always)]
fn cmp(&self, other: & &'self T) -> Ordering {
(**self).cmp(*other)
}
}

pub fn cmp2<A:TotalOrd,B:TotalOrd>(
a1: &A, b1: &B,
a2: &A, b2: &B) -> Ordering
Expand Down
234 changes: 234 additions & 0 deletions src/libcore/iterator.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ implementing the `Iterator` trait.
*/

use prelude::*;
use util;

pub trait Iterator<A> {
/// Advance the iterator and return the next value. Return `None` when the end is reached.
Expand All@@ -39,9 +40,17 @@ pub trait IteratorUtil<A> {
fn take_while<'r>(self, predicate: &'r fn(&A) -> bool) -> TakeWhileIterator<'r, A, Self>;
fn skip(self, n: uint) -> SkipIterator<Self>;
fn take(self, n: uint) -> TakeIterator<Self>;

fn scan<'r, St, B>(self, initial_state: St, f: &'r fn(&mut St, A) -> Option<B>)
-> ScanIterator<'r, A, B, Self, St>;
fn advance(&mut self, f: &fn(A) -> bool);

// Ordered iterators
// FIXME: #5898: shouldn't have the 'i' suffix
fn intersecti<U: Iterator<A>>(self, other: U) -> Intersect<A, Self, U>;
fn unioni<U: Iterator<A>>(self, other: U) -> Union<A, Self, U>;
fn xori<U: Iterator<A>>(self, other: U) -> Xor<A, Self, U>;
fn differencei<U: Iterator<A>>(self, other: U) -> Difference<A, Self, U>;
}

/// Iterator adaptors provided for every `Iterator` implementation. The adaptor objects are also
Expand DownExpand Up@@ -113,6 +122,52 @@ impl<A, T: Iterator<A>> IteratorUtil<A> for T {
}
}
}

/// Returns an interator which will iterate over the intersection of `self`
/// and `other`. This requires that the two iterators iterate over their
/// values in ascending order.
#[inline(always)]
fn intersecti<U: Iterator<A>>(self, mut other: U) -> Intersect<A, T, U> {
let mut self = self;
let a = self.next();
let b = other.next();
Intersect{ a: a, b: b, i1: self, i2: other }
}

/// Returns an interator which will iterate over the union of `self` and
/// `other`. This requires that the two iterators iterate over their values
/// in ascending order.
#[inline(always)]
fn unioni<U: Iterator<A>>(self, mut other: U) -> Union<A, T, U> {
let mut self = self;
let a = self.next();
let b = other.next();
Union{ a: a, b: b, i1: self, i2: other }
}

/// Returns an interator which will iterate over the symmetric difference of
/// `self` and `other`, or all values which are present in one, but not both
/// iterators. This requires that the two iterators iterate over their
/// values in ascending order.
#[inline(always)]
fn xori<U: Iterator<A>>(self, mut other: U) -> Xor<A, T, U> {
let mut self = self;
let a = self.next();
let b = other.next();
Xor{ a: a, b: b, i1: self, i2: other }
}

/// Returns an interator which will iterate over the difference of `self`
/// and `other`, or all values which are present in `self`, but not in
/// `other` iterators. This requires that the two iterators iterate over
/// their value in ascending order.
#[inline(always)]
fn differencei<U: Iterator<A>>(self, mut other: U) -> Difference<A, T, U> {
let mut self = self;
let a = self.next();
let b = other.next();
Difference{ a: a, b: b, i1: self, i2: other }
}
}

pub struct ChainIterator<T, U> {
Expand DownExpand Up@@ -348,6 +403,137 @@ impl<'self, A, St> Iterator<A> for UnfoldrIterator<'self, A, St> {
}
}

pub struct Intersect<A, T, U> {
priv i1: T,
priv i2: U,
priv a: Option<A>,
priv b: Option<A>,
}

impl<A: TotalOrd, T: Iterator<A>, U: Iterator<A>> Iterator<A> for
Intersect<A, T, U>
{
#[inline]
fn next(&mut self) -> Option<A> {
loop {
let cmp = match (&self.a, &self.b) {
(&Some(ref a), &Some(ref b)) => a.cmp(b),
_ => return None
};

match cmp {
Less => { util::replace(&mut self.a, self.i1.next()); }
Greater => { util::replace(&mut self.b, self.i2.next()); }
Equal => {
util::replace(&mut self.a, self.i1.next());
return util::replace(&mut self.b, self.i2.next());
}
}
}
}
}

pub struct Union<A, T, U> {
priv i1: T,
priv i2: U,
priv a: Option<A>,
priv b: Option<A>,
}

impl<A: TotalOrd, T: Iterator<A>, U: Iterator<A>> Iterator<A> for Union<A, T, U>
{
#[inline]
fn next(&mut self) -> Option<A> {
if self.a.is_none() && self.b.is_none() {
return None;
} else if self.a.is_none() {
return util::replace(&mut self.b, self.i2.next());
} else if self.b.is_none() {
return util::replace(&mut self.a, self.i1.next());
}
let cmp = match (&self.a, &self.b) {
(&Some(ref a), &Some(ref b)) => a.cmp(b),
_ => fail!()
};
match cmp {
Less => { return util::replace(&mut self.a, self.i1.next()); }
Greater => { return util::replace(&mut self.b, self.i2.next()); }
Equal => {
util::replace(&mut self.b, self.i2.next());
return util::replace(&mut self.a, self.i1.next());
}
}
}
}

pub struct Xor<A, T, U> {
priv i1: T,
priv i2: U,
priv a: Option<A>,
priv b: Option<A>,
}

impl<A: TotalOrd, T: Iterator<A>, U: Iterator<A>> Iterator<A> for Xor<A, T, U> {
#[inline]
fn next(&mut self) -> Option<A> {
loop {
if self.a.is_none() && self.b.is_none() {
return None;
} else if self.a.is_none() {
return util::replace(&mut self.b, self.i2.next());
} else if self.b.is_none() {
return util::replace(&mut self.a, self.i1.next());
}
let cmp = match (&self.a, &self.b) {
(&Some(ref a), &Some(ref b)) => a.cmp(b),
_ => fail!()
};
match cmp {
Less => { return util::replace(&mut self.a, self.i1.next()); }
Greater => { return util::replace(&mut self.b, self.i2.next()); }
Equal => {
util::replace(&mut self.a, self.i1.next());
util::replace(&mut self.b, self.i2.next());
}
}
}
}
}

pub struct Difference<A, T, U> {
priv i1: T,
priv i2: U,
priv a: Option<A>,
priv b: Option<A>,
}

impl<A: TotalOrd, T: Iterator<A>, U: Iterator<A>> Iterator<A> for
Difference<A, T, U>
{
#[inline]
fn next(&mut self) -> Option<A> {
loop {
if self.a.is_none() {
return None;
} else if self.b.is_none() {
return util::replace(&mut self.a, self.i1.next());
}
let cmp = match (&self.a, &self.b) {
(&Some(ref a), &Some(ref b)) => a.cmp(b),
_ => fail!()
};
match cmp {
Less => { return util::replace(&mut self.a, self.i1.next()); }
Greater => { util::replace(&mut self.b, self.i2.next()); }
Equal => {
util::replace(&mut self.b, self.i2.next());
util::replace(&mut self.a, self.i1.next());
}
}
}
}
}

/// An infinite iterator starting at `start` and advancing by `step` with each iteration
pub struct Counter<A> {
state: A,
Expand All@@ -370,6 +556,54 @@ impl<A: Add<A, A> + Clone> Iterator<A> for Counter<A> {
}
}

/// An interator which will iterate over a binary search tree. This is
/// parameterized over functions which take a node and return the left and right
/// children. It is required that the nodes form a tree which is a binary search
/// tree
pub struct BSTIterator<'self, N, T> {
priv f: &'self fn(&'self N) -> T,
priv left: &'self fn(&'self N) -> &'self Option<~N>,
priv right: &'self fn(&'self N) -> &'self Option<~N>,
priv stack: ~[&'self ~N],
priv node: &'self Option<~N>,
}

pub impl<'self, N, T> BSTIterator<'self, N, T> {
/// Creates a new iterator given the root node of a tree. The provided
/// functions are used for yielding iterator values and acquiring the left
/// and right children.
#[inline(always)]
fn new<'a>(root: &'a Option<~N>,
f: &'a fn(&'a N) -> T,
left: &'a fn(&'a N) -> &'a Option<~N>,
right: &'a fn(&'a N) -> &'a Option<~N>) -> BSTIterator<'a, N, T>
{
BSTIterator{ f: f, stack: ~[], node: root, left: left, right: right }
}
}

impl<'self, N, T> Iterator<T> for BSTIterator<'self, N, T> {
/// Advance the iterator to the next node (in order) and return a
/// tuple with a reference to the key and value. If there are no
/// more nodes, return `None`.
fn next(&mut self) -> Option<T> {
while !self.stack.is_empty() || self.node.is_some() {
match *self.node {
Some(ref x) => {
self.stack.push(x);
self.node = (self.left)(*x);
}
None => {
let res = self.stack.pop();
self.node = (self.right)(*res);
return Some((self.f)(*res));
}
}
}
None
}
}

#[cfg(test)]
mod tests {
use super::*;
Expand Down
8 changes: 4 additions & 4 deletions src/libstd/bitv.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -72,7 +72,7 @@ pub impl SmallBitv {
}

#[inline(always)]
fn equals(&self, b: &SmallBitv, nbits: uint) -> bool {
fn iseq(&self, b: &SmallBitv, nbits: uint) -> bool {
let mask = small_mask(nbits);
mask & self.bits == mask & b.bits
}
Expand DownExpand Up@@ -193,7 +193,7 @@ pub impl BigBitv {
}

#[inline(always)]
fn equals(&self, b: &BigBitv, nbits: uint) -> bool {
fn iseq(&self, b: &BigBitv, nbits: uint) -> bool {
let len = b.storage.len();
for uint::iterate(0, len) |i| {
let mask = big_mask(nbits, i);
Expand DownExpand Up@@ -327,11 +327,11 @@ pub impl Bitv {
if self.nbits != v1.nbits { return false; }
match self.rep {
Small(ref b) => match v1.rep {
Small(ref b1) => b.equals(*b1, self.nbits),
Small(ref b1) => b.iseq(*b1, self.nbits),
_ => false
},
Big(ref s) => match v1.rep {
Big(ref s1) => s.equals(*s1, self.nbits),
Big(ref s1) => s.iseq(*s1, self.nbits),
Small(_) => return false
}
}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Add a splay tree implementation to libstd#6360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

alexcrichton
wants to merge
3
commits into

from

 Closed


Add a splay tree implementation to libstd
#6360
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
500a11f

Extract some of TreeMap's iterators to generic impls


alexcrichton May 9, 2013
1078caa

Add a splay tree implementation to libstd


alexcrichton May 9, 2013
398187c

Add Splay{Map,Set} to the benchmarks


alexcrichton May 9, 2013

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 14 additions & 0 deletions
src/libcore/cmp.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -127,6 +127,20 @@ totalord_impl!(uint)

totalord_impl!(char)

impl<'self, T: TotalEq> TotalEq for &'self T {
 #[inline(always)]
 fn equals(&self, other: & &'self T) -> bool {
 (**self).equals(*other)
 }
}

impl<'self, T: TotalOrd> TotalOrd for &'self T {
 #[inline(always)]
 fn cmp(&self, other: & &'self T) -> Ordering {
 (**self).cmp(*other)
 }
}

pub fn cmp2<A:TotalOrd,B:TotalOrd>(
 a1: &A, b1: &B,
 a2: &A, b2: &B) -> Ordering
Expand Down

234 changes: 234 additions & 0 deletions
src/libcore/iterator.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ implementing the `Iterator` trait.
*/

use prelude::*;
use util;

pub trait Iterator<A> {
 /// Advance the iterator and return the next value. Return `None` when the end is reached.
Expand All@@ -39,9 +40,17 @@ pub trait IteratorUtil<A> {
 fn take_while<'r>(self, predicate: &'r fn(&A) -> bool) -> TakeWhileIterator<'r, A, Self>;
 fn skip(self, n: uint) -> SkipIterator<Self>;
 fn take(self, n: uint) -> TakeIterator<Self>;

 fn scan<'r, St, B>(self, initial_state: St, f: &'r fn(&mut St, A) -> Option<B>)
 -> ScanIterator<'r, A, B, Self, St>;
 fn advance(&mut self, f: &fn(A) -> bool);

 // Ordered iterators
 // FIXME: #5898: shouldn't have the 'i' suffix
 fn intersecti<U: Iterator<A>>(self, other: U) -> Intersect<A, Self, U>;
 fn unioni<U: Iterator<A>>(self, other: U) -> Union<A, Self, U>;
 fn xori<U: Iterator<A>>(self, other: U) -> Xor<A, Self, U>;
 fn differencei<U: Iterator<A>>(self, other: U) -> Difference<A, Self, U>;
}

/// Iterator adaptors provided for every `Iterator` implementation. The adaptor objects are also
Expand DownExpand Up@@ -113,6 +122,52 @@ impl<A, T: Iterator<A>> IteratorUtil<A> for T {
 }
 }
 }

 /// Returns an interator which will iterate over the intersection of `self`
 /// and `other`. This requires that the two iterators iterate over their
 /// values in ascending order.
 #[inline(always)]
 fn intersecti<U: Iterator<A>>(self, mut other: U) -> Intersect<A, T, U> {
 let mut self = self;
 let a = self.next();
 let b = other.next();
 Intersect{ a: a, b: b, i1: self, i2: other }
 }

 /// Returns an interator which will iterate over the union of `self` and
 /// `other`. This requires that the two iterators iterate over their values
 /// in ascending order.
 #[inline(always)]
 fn unioni<U: Iterator<A>>(self, mut other: U) -> Union<A, T, U> {
 let mut self = self;
 let a = self.next();
 let b = other.next();
 Union{ a: a, b: b, i1: self, i2: other }
 }

 /// Returns an interator which will iterate over the symmetric difference of
 /// `self` and `other`, or all values which are present in one, but not both
 /// iterators. This requires that the two iterators iterate over their
 /// values in ascending order.
 #[inline(always)]
 fn xori<U: Iterator<A>>(self, mut other: U) -> Xor<A, T, U> {
 let mut self = self;
 let a = self.next();
 let b = other.next();
 Xor{ a: a, b: b, i1: self, i2: other }
 }

 /// Returns an interator which will iterate over the difference of `self`
 /// and `other`, or all values which are present in `self`, but not in
 /// `other` iterators. This requires that the two iterators iterate over
 /// their value in ascending order.
 #[inline(always)]
 fn differencei<U: Iterator<A>>(self, mut other: U) -> Difference<A, T, U> {
 let mut self = self;
 let a = self.next();
 let b = other.next();
 Difference{ a: a, b: b, i1: self, i2: other }
 }
}

pub struct ChainIterator<T, U> {
Expand DownExpand Up@@ -348,6 +403,137 @@ impl<'self, A, St> Iterator<A> for UnfoldrIterator<'self, A, St> {
 }
}

pub struct Intersect<A, T, U> {
 priv i1: T,
 priv i2: U,
 priv a: Option<A>,
 priv b: Option<A>,
}

impl<A: TotalOrd, T: Iterator<A>, U: Iterator<A>> Iterator<A> for
 Intersect<A, T, U>
{
 #[inline]
 fn next(&mut self) -> Option<A> {
 loop {
 let cmp = match (&self.a, &self.b) {
 (&Some(ref a), &Some(ref b)) => a.cmp(b),
 _ => return None
 };

 match cmp {
 Less => { util::replace(&mut self.a, self.i1.next()); }
 Greater => { util::replace(&mut self.b, self.i2.next()); }
 Equal => {
 util::replace(&mut self.a, self.i1.next());
 return util::replace(&mut self.b, self.i2.next());
 }
 }
 }
 }
}

pub struct Union<A, T, U> {
 priv i1: T,
 priv i2: U,
 priv a: Option<A>,
 priv b: Option<A>,
}

impl<A: TotalOrd, T: Iterator<A>, U: Iterator<A>> Iterator<A> for Union<A, T, U>
{
 #[inline]
 fn next(&mut self) -> Option<A> {
 if self.a.is_none() && self.b.is_none() {
 return None;
 } else if self.a.is_none() {
 return util::replace(&mut self.b, self.i2.next());
 } else if self.b.is_none() {
 return util::replace(&mut self.a, self.i1.next());
 }
 let cmp = match (&self.a, &self.b) {
 (&Some(ref a), &Some(ref b)) => a.cmp(b),
 _ => fail!()
 };
 match cmp {
 Less => { return util::replace(&mut self.a, self.i1.next()); }
 Greater => { return util::replace(&mut self.b, self.i2.next()); }
 Equal => {
 util::replace(&mut self.b, self.i2.next());
 return util::replace(&mut self.a, self.i1.next());
 }
 }
 }
}

pub struct Xor<A, T, U> {
 priv i1: T,
 priv i2: U,
 priv a: Option<A>,
 priv b: Option<A>,
}

impl<A: TotalOrd, T: Iterator<A>, U: Iterator<A>> Iterator<A> for Xor<A, T, U> {
 #[inline]
 fn next(&mut self) -> Option<A> {
 loop {
 if self.a.is_none() && self.b.is_none() {
 return None;
 } else if self.a.is_none() {
 return util::replace(&mut self.b, self.i2.next());
 } else if self.b.is_none() {
 return util::replace(&mut self.a, self.i1.next());
 }
 let cmp = match (&self.a, &self.b) {
 (&Some(ref a), &Some(ref b)) => a.cmp(b),
 _ => fail!()
 };
 match cmp {
 Less => { return util::replace(&mut self.a, self.i1.next()); }
 Greater => { return util::replace(&mut self.b, self.i2.next()); }
 Equal => {
 util::replace(&mut self.a, self.i1.next());
 util::replace(&mut self.b, self.i2.next());
 }
 }
 }
 }
}

pub struct Difference<A, T, U> {
 priv i1: T,
 priv i2: U,
 priv a: Option<A>,
 priv b: Option<A>,
}

impl<A: TotalOrd, T: Iterator<A>, U: Iterator<A>> Iterator<A> for
 Difference<A, T, U>
{
 #[inline]
 fn next(&mut self) -> Option<A> {
 loop {
 if self.a.is_none() {
 return None;
 } else if self.b.is_none() {
 return util::replace(&mut self.a, self.i1.next());
 }
 let cmp = match (&self.a, &self.b) {
 (&Some(ref a), &Some(ref b)) => a.cmp(b),
 _ => fail!()
 };
 match cmp {
 Less => { return util::replace(&mut self.a, self.i1.next()); }
 Greater => { util::replace(&mut self.b, self.i2.next()); }
 Equal => {
 util::replace(&mut self.b, self.i2.next());
 util::replace(&mut self.a, self.i1.next());
 }
 }
 }
 }
}

/// An infinite iterator starting at `start` and advancing by `step` with each iteration
pub struct Counter<A> {
 state: A,
Expand All@@ -370,6 +556,54 @@ impl<A: Add<A, A> + Clone> Iterator<A> for Counter<A> {
 }
}

/// An interator which will iterate over a binary search tree. This is
/// parameterized over functions which take a node and return the left and right
/// children. It is required that the nodes form a tree which is a binary search
/// tree
pub struct BSTIterator<'self, N, T> {
 priv f: &'self fn(&'self N) -> T,
 priv left: &'self fn(&'self N) -> &'self Option<~N>,
 priv right: &'self fn(&'self N) -> &'self Option<~N>,
 priv stack: ~[&'self ~N],
 priv node: &'self Option<~N>,
}

pub impl<'self, N, T> BSTIterator<'self, N, T> {
 /// Creates a new iterator given the root node of a tree. The provided
 /// functions are used for yielding iterator values and acquiring the left
 /// and right children.
 #[inline(always)]
 fn new<'a>(root: &'a Option<~N>,
 f: &'a fn(&'a N) -> T,
 left: &'a fn(&'a N) -> &'a Option<~N>,
 right: &'a fn(&'a N) -> &'a Option<~N>) -> BSTIterator<'a, N, T>
 {
 BSTIterator{ f: f, stack: ~[], node: root, left: left, right: right }
 }
}

impl<'self, N, T> Iterator<T> for BSTIterator<'self, N, T> {
 /// Advance the iterator to the next node (in order) and return a
 /// tuple with a reference to the key and value. If there are no
 /// more nodes, return `None`.
 fn next(&mut self) -> Option<T> {
 while !self.stack.is_empty() || self.node.is_some() {
 match *self.node {
 Some(ref x) => {
 self.stack.push(x);
 self.node = (self.left)(*x);
 }
 None => {
 let res = self.stack.pop();
 self.node = (self.right)(*res);
 return Some((self.f)(*res));
 }
 }
 }
 None
 }
}

#[cfg(test)]
mod tests {
 use super::*;
Expand Down

8 changes: 4 additions & 4 deletions
src/libstd/bitv.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,7 +72,7 @@ pub impl SmallBitv {
 }

 #[inline(always)]
 fn equals(&self, b: &SmallBitv, nbits: uint) -> bool {
 fn iseq(&self, b: &SmallBitv, nbits: uint) -> bool {
 let mask = small_mask(nbits);
 mask & self.bits == mask & b.bits
 }
Expand DownExpand Up@@ -193,7 +193,7 @@ pub impl BigBitv {
 }

 #[inline(always)]
 fn equals(&self, b: &BigBitv, nbits: uint) -> bool {
 fn iseq(&self, b: &BigBitv, nbits: uint) -> bool {
 let len = b.storage.len();
 for uint::iterate(0, len) |i| {
 let mask = big_mask(nbits, i);
Expand DownExpand Up@@ -327,11 +327,11 @@ pub impl Bitv {
 if self.nbits != v1.nbits { return false; }
 match self.rep {
 Small(ref b) => match v1.rep {
 Small(ref b1) => b.equals(*b1, self.nbits),
 Small(ref b1) => b.iseq(*b1, self.nbits),
 _ => false
 },
 Big(ref s) => match v1.rep {
 Big(ref s1) => s.equals(*s1, self.nbits),
 Big(ref s1) => s.iseq(*s1, self.nbits),
 Small(_) => return false
 }
 }
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add a splay tree implementation to libstd#6360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

alexcrichton
wants to merge
3
commits into

from

 Closed


Add a splay tree implementation to libstd
#6360
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
500a11f

Extract some of TreeMap's iterators to generic impls


alexcrichton May 9, 2013
1078caa

Add a splay tree implementation to libstd


alexcrichton May 9, 2013
398187c

Add Splay{Map,Set} to the benchmarks


alexcrichton May 9, 2013

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 14 additions & 0 deletions
src/libcore/cmp.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -127,6 +127,20 @@ totalord_impl!(uint)

totalord_impl!(char)

impl<'self, T: TotalEq> TotalEq for &'self T {
 #[inline(always)]
 fn equals(&self, other: & &'self T) -> bool {
 (**self).equals(*other)
 }
}

impl<'self, T: TotalOrd> TotalOrd for &'self T {
 #[inline(always)]
 fn cmp(&self, other: & &'self T) -> Ordering {
 (**self).cmp(*other)
 }
}

pub fn cmp2<A:TotalOrd,B:TotalOrd>(
 a1: &A, b1: &B,
 a2: &A, b2: &B) -> Ordering
Expand Down

234 changes: 234 additions & 0 deletions
src/libcore/iterator.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ implementing the `Iterator` trait.
*/

use prelude::*;
use util;

pub trait Iterator<A> {
 /// Advance the iterator and return the next value. Return `None` when the end is reached.
Expand All@@ -39,9 +40,17 @@ pub trait IteratorUtil<A> {
 fn take_while<'r>(self, predicate: &'r fn(&A) -> bool) -> TakeWhileIterator<'r, A, Self>;
 fn skip(self, n: uint) -> SkipIterator<Self>;
 fn take(self, n: uint) -> TakeIterator<Self>;

 fn scan<'r, St, B>(self, initial_state: St, f: &'r fn(&mut St, A) -> Option<B>)
 -> ScanIterator<'r, A, B, Self, St>;
 fn advance(&mut self, f: &fn(A) -> bool);

 // Ordered iterators
 // FIXME: #5898: shouldn't have the 'i' suffix
 fn intersecti<U: Iterator<A>>(self, other: U) -> Intersect<A, Self, U>;
 fn unioni<U: Iterator<A>>(self, other: U) -> Union<A, Self, U>;
 fn xori<U: Iterator<A>>(self, other: U) -> Xor<A, Self, U>;
 fn differencei<U: Iterator<A>>(self, other: U) -> Difference<A, Self, U>;
}

/// Iterator adaptors provided for every `Iterator` implementation. The adaptor objects are also
Expand DownExpand Up@@ -113,6 +122,52 @@ impl<A, T: Iterator<A>> IteratorUtil<A> for T {
 }
 }
 }

 /// Returns an interator which will iterate over the intersection of `self`
 /// and `other`. This requires that the two iterators iterate over their
 /// values in ascending order.
 #[inline(always)]
 fn intersecti<U: Iterator<A>>(self, mut other: U) -> Intersect<A, T, U> {
 let mut self = self;
 let a = self.next();
 let b = other.next();
 Intersect{ a: a, b: b, i1: self, i2: other }
 }

 /// Returns an interator which will iterate over the union of `self` and
 /// `other`. This requires that the two iterators iterate over their values
 /// in ascending order.
 #[inline(always)]
 fn unioni<U: Iterator<A>>(self, mut other: U) -> Union<A, T, U> {
 let mut self = self;
 let a = self.next();
 let b = other.next();
 Union{ a: a, b: b, i1: self, i2: other }
 }

 /// Returns an interator which will iterate over the symmetric difference of
 /// `self` and `other`, or all values which are present in one, but not both
 /// iterators. This requires that the two iterators iterate over their
 /// values in ascending order.
 #[inline(always)]
 fn xori<U: Iterator<A>>(self, mut other: U) -> Xor<A, T, U> {
 let mut self = self;
 let a = self.next();
 let b = other.next();
 Xor{ a: a, b: b, i1: self, i2: other }
 }

 /// Returns an interator which will iterate over the difference of `self`
 /// and `other`, or all values which are present in `self`, but not in
 /// `other` iterators. This requires that the two iterators iterate over
 /// their value in ascending order.
 #[inline(always)]
 fn differencei<U: Iterator<A>>(self, mut other: U) -> Difference<A, T, U> {
 let mut self = self;
 let a = self.next();
 let b = other.next();
 Difference{ a: a, b: b, i1: self, i2: other }
 }
}

pub struct ChainIterator<T, U> {
Expand DownExpand Up@@ -348,6 +403,137 @@ impl<'self, A, St> Iterator<A> for UnfoldrIterator<'self, A, St> {
 }
}

pub struct Intersect<A, T, U> {
 priv i1: T,
 priv i2: U,
 priv a: Option<A>,
 priv b: Option<A>,
}

impl<A: TotalOrd, T: Iterator<A>, U: Iterator<A>> Iterator<A> for
 Intersect<A, T, U>
{
 #[inline]
 fn next(&mut self) -> Option<A> {
 loop {
 let cmp = match (&self.a, &self.b) {
 (&Some(ref a), &Some(ref b)) => a.cmp(b),
 _ => return None
 };

 match cmp {
 Less => { util::replace(&mut self.a, self.i1.next()); }
 Greater => { util::replace(&mut self.b, self.i2.next()); }
 Equal => {
 util::replace(&mut self.a, self.i1.next());
 return util::replace(&mut self.b, self.i2.next());
 }
 }
 }
 }
}

pub struct Union<A, T, U> {
 priv i1: T,
 priv i2: U,
 priv a: Option<A>,
 priv b: Option<A>,
}

impl<A: TotalOrd, T: Iterator<A>, U: Iterator<A>> Iterator<A> for Union<A, T, U>
{
 #[inline]
 fn next(&mut self) -> Option<A> {
 if self.a.is_none() && self.b.is_none() {
 return None;
 } else if self.a.is_none() {
 return util::replace(&mut self.b, self.i2.next());
 } else if self.b.is_none() {
 return util::replace(&mut self.a, self.i1.next());
 }
 let cmp = match (&self.a, &self.b) {
 (&Some(ref a), &Some(ref b)) => a.cmp(b),
 _ => fail!()
 };
 match cmp {
 Less => { return util::replace(&mut self.a, self.i1.next()); }
 Greater => { return util::replace(&mut self.b, self.i2.next()); }
 Equal => {
 util::replace(&mut self.b, self.i2.next());
 return util::replace(&mut self.a, self.i1.next());
 }
 }
 }
}

pub struct Xor<A, T, U> {
 priv i1: T,
 priv i2: U,
 priv a: Option<A>,
 priv b: Option<A>,
}

impl<A: TotalOrd, T: Iterator<A>, U: Iterator<A>> Iterator<A> for Xor<A, T, U> {
 #[inline]
 fn next(&mut self) -> Option<A> {
 loop {
 if self.a.is_none() && self.b.is_none() {
 return None;
 } else if self.a.is_none() {
 return util::replace(&mut self.b, self.i2.next());
 } else if self.b.is_none() {
 return util::replace(&mut self.a, self.i1.next());
 }
 let cmp = match (&self.a, &self.b) {
 (&Some(ref a), &Some(ref b)) => a.cmp(b),
 _ => fail!()
 };
 match cmp {
 Less => { return util::replace(&mut self.a, self.i1.next()); }
 Greater => { return util::replace(&mut self.b, self.i2.next()); }
 Equal => {
 util::replace(&mut self.a, self.i1.next());
 util::replace(&mut self.b, self.i2.next());
 }
 }
 }
 }
}

pub struct Difference<A, T, U> {
 priv i1: T,
 priv i2: U,
 priv a: Option<A>,
 priv b: Option<A>,
}

impl<A: TotalOrd, T: Iterator<A>, U: Iterator<A>> Iterator<A> for
 Difference<A, T, U>
{
 #[inline]
 fn next(&mut self) -> Option<A> {
 loop {
 if self.a.is_none() {
 return None;
 } else if self.b.is_none() {
 return util::replace(&mut self.a, self.i1.next());
 }
 let cmp = match (&self.a, &self.b) {
 (&Some(ref a), &Some(ref b)) => a.cmp(b),
 _ => fail!()
 };
 match cmp {
 Less => { return util::replace(&mut self.a, self.i1.next()); }
 Greater => { util::replace(&mut self.b, self.i2.next()); }
 Equal => {
 util::replace(&mut self.b, self.i2.next());
 util::replace(&mut self.a, self.i1.next());
 }
 }
 }
 }
}

/// An infinite iterator starting at `start` and advancing by `step` with each iteration
pub struct Counter<A> {
 state: A,
Expand All@@ -370,6 +556,54 @@ impl<A: Add<A, A> + Clone> Iterator<A> for Counter<A> {
 }
}

/// An interator which will iterate over a binary search tree. This is
/// parameterized over functions which take a node and return the left and right
/// children. It is required that the nodes form a tree which is a binary search
/// tree
pub struct BSTIterator<'self, N, T> {
 priv f: &'self fn(&'self N) -> T,
 priv left: &'self fn(&'self N) -> &'self Option<~N>,
 priv right: &'self fn(&'self N) -> &'self Option<~N>,
 priv stack: ~[&'self ~N],
 priv node: &'self Option<~N>,
}

pub impl<'self, N, T> BSTIterator<'self, N, T> {
 /// Creates a new iterator given the root node of a tree. The provided
 /// functions are used for yielding iterator values and acquiring the left
 /// and right children.
 #[inline(always)]
 fn new<'a>(root: &'a Option<~N>,
 f: &'a fn(&'a N) -> T,
 left: &'a fn(&'a N) -> &'a Option<~N>,
 right: &'a fn(&'a N) -> &'a Option<~N>) -> BSTIterator<'a, N, T>
 {
 BSTIterator{ f: f, stack: ~[], node: root, left: left, right: right }
 }
}

impl<'self, N, T> Iterator<T> for BSTIterator<'self, N, T> {
 /// Advance the iterator to the next node (in order) and return a
 /// tuple with a reference to the key and value. If there are no
 /// more nodes, return `None`.
 fn next(&mut self) -> Option<T> {
 while !self.stack.is_empty() || self.node.is_some() {
 match *self.node {
 Some(ref x) => {
 self.stack.push(x);
 self.node = (self.left)(*x);
 }
 None => {
 let res = self.stack.pop();
 self.node = (self.right)(*res);
 return Some((self.f)(*res));
 }
 }
 }
 None
 }
}

#[cfg(test)]
mod tests {
 use super::*;
Expand Down

8 changes: 4 additions & 4 deletions
src/libstd/bitv.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,7 +72,7 @@ pub impl SmallBitv {
 }

 #[inline(always)]
 fn equals(&self, b: &SmallBitv, nbits: uint) -> bool {
 fn iseq(&self, b: &SmallBitv, nbits: uint) -> bool {
 let mask = small_mask(nbits);
 mask & self.bits == mask & b.bits
 }
Expand DownExpand Up@@ -193,7 +193,7 @@ pub impl BigBitv {
 }

 #[inline(always)]
 fn equals(&self, b: &BigBitv, nbits: uint) -> bool {
 fn iseq(&self, b: &BigBitv, nbits: uint) -> bool {
 let len = b.storage.len();
 for uint::iterate(0, len) |i| {
 let mask = big_mask(nbits, i);
Expand DownExpand Up@@ -327,11 +327,11 @@ pub impl Bitv {
 if self.nbits != v1.nbits { return false; }
 match self.rep {
 Small(ref b) => match v1.rep {
 Small(ref b1) => b.equals(*b1, self.nbits),
 Small(ref b1) => b.iseq(*b1, self.nbits),
 _ => false
 },
 Big(ref s) => match v1.rep {
 Big(ref s1) => s.equals(*s1, self.nbits),
 Big(ref s1) => s.iseq(*s1, self.nbits),
 Small(_) => return false
 }
 }
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add a splay tree implementation to libstd#6360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

alexcrichton
wants to merge
3
commits into

from

 Closed


Add a splay tree implementation to libstd
#6360
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
500a11f

Extract some of TreeMap's iterators to generic impls


alexcrichton May 9, 2013
1078caa

Add a splay tree implementation to libstd


alexcrichton May 9, 2013
398187c

Add Splay{Map,Set} to the benchmarks


alexcrichton May 9, 2013

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 14 additions & 0 deletions
src/libcore/cmp.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -127,6 +127,20 @@ totalord_impl!(uint)

totalord_impl!(char)

impl<'self, T: TotalEq> TotalEq for &'self T {
 #[inline(always)]
 fn equals(&self, other: & &'self T) -> bool {
 (**self).equals(*other)
 }
}

impl<'self, T: TotalOrd> TotalOrd for &'self T {
 #[inline(always)]
 fn cmp(&self, other: & &'self T) -> Ordering {
 (**self).cmp(*other)
 }
}

pub fn cmp2<A:TotalOrd,B:TotalOrd>(
 a1: &A, b1: &B,
 a2: &A, b2: &B) -> Ordering
Expand Down

234 changes: 234 additions & 0 deletions
src/libcore/iterator.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ implementing the `Iterator` trait.
*/

use prelude::*;
use util;

pub trait Iterator<A> {
 /// Advance the iterator and return the next value. Return `None` when the end is reached.
Expand All@@ -39,9 +40,17 @@ pub trait IteratorUtil<A> {
 fn take_while<'r>(self, predicate: &'r fn(&A) -> bool) -> TakeWhileIterator<'r, A, Self>;
 fn skip(self, n: uint) -> SkipIterator<Self>;
 fn take(self, n: uint) -> TakeIterator<Self>;

 fn scan<'r, St, B>(self, initial_state: St, f: &'r fn(&mut St, A) -> Option<B>)
 -> ScanIterator<'r, A, B, Self, St>;
 fn advance(&mut self, f: &fn(A) -> bool);

 // Ordered iterators
 // FIXME: #5898: shouldn't have the 'i' suffix
 fn intersecti<U: Iterator<A>>(self, other: U) -> Intersect<A, Self, U>;
 fn unioni<U: Iterator<A>>(self, other: U) -> Union<A, Self, U>;
 fn xori<U: Iterator<A>>(self, other: U) -> Xor<A, Self, U>;
 fn differencei<U: Iterator<A>>(self, other: U) -> Difference<A, Self, U>;
}

/// Iterator adaptors provided for every `Iterator` implementation. The adaptor objects are also
Expand DownExpand Up@@ -113,6 +122,52 @@ impl<A, T: Iterator<A>> IteratorUtil<A> for T {
 }
 }
 }

 /// Returns an interator which will iterate over the intersection of `self`
 /// and `other`. This requires that the two iterators iterate over their
 /// values in ascending order.
 #[inline(always)]
 fn intersecti<U: Iterator<A>>(self, mut other: U) -> Intersect<A, T, U> {
 let mut self = self;
 let a = self.next();
 let b = other.next();
 Intersect{ a: a, b: b, i1: self, i2: other }
 }

 /// Returns an interator which will iterate over the union of `self` and
 /// `other`. This requires that the two iterators iterate over their values
 /// in ascending order.
 #[inline(always)]
 fn unioni<U: Iterator<A>>(self, mut other: U) -> Union<A, T, U> {
 let mut self = self;
 let a = self.next();
 let b = other.next();
 Union{ a: a, b: b, i1: self, i2: other }
 }

 /// Returns an interator which will iterate over the symmetric difference of
 /// `self` and `other`, or all values which are present in one, but not both
 /// iterators. This requires that the two iterators iterate over their
 /// values in ascending order.
 #[inline(always)]
 fn xori<U: Iterator<A>>(self, mut other: U) -> Xor<A, T, U> {
 let mut self = self;
 let a = self.next();
 let b = other.next();
 Xor{ a: a, b: b, i1: self, i2: other }
 }

 /// Returns an interator which will iterate over the difference of `self`
 /// and `other`, or all values which are present in `self`, but not in
 /// `other` iterators. This requires that the two iterators iterate over
 /// their value in ascending order.
 #[inline(always)]
 fn differencei<U: Iterator<A>>(self, mut other: U) -> Difference<A, T, U> {
 let mut self = self;
 let a = self.next();
 let b = other.next();
 Difference{ a: a, b: b, i1: self, i2: other }
 }
}

pub struct ChainIterator<T, U> {
Expand DownExpand Up@@ -348,6 +403,137 @@ impl<'self, A, St> Iterator<A> for UnfoldrIterator<'self, A, St> {
 }
}

pub struct Intersect<A, T, U> {
 priv i1: T,
 priv i2: U,
 priv a: Option<A>,
 priv b: Option<A>,
}

impl<A: TotalOrd, T: Iterator<A>, U: Iterator<A>> Iterator<A> for
 Intersect<A, T, U>
{
 #[inline]
 fn next(&mut self) -> Option<A> {
 loop {
 let cmp = match (&self.a, &self.b) {
 (&Some(ref a), &Some(ref b)) => a.cmp(b),
 _ => return None
 };

 match cmp {
 Less => { util::replace(&mut self.a, self.i1.next()); }
 Greater => { util::replace(&mut self.b, self.i2.next()); }
 Equal => {
 util::replace(&mut self.a, self.i1.next());
 return util::replace(&mut self.b, self.i2.next());
 }
 }
 }
 }
}

pub struct Union<A, T, U> {
 priv i1: T,
 priv i2: U,
 priv a: Option<A>,
 priv b: Option<A>,
}

impl<A: TotalOrd, T: Iterator<A>, U: Iterator<A>> Iterator<A> for Union<A, T, U>
{
 #[inline]
 fn next(&mut self) -> Option<A> {
 if self.a.is_none() && self.b.is_none() {
 return None;
 } else if self.a.is_none() {
 return util::replace(&mut self.b, self.i2.next());
 } else if self.b.is_none() {
 return util::replace(&mut self.a, self.i1.next());
 }
 let cmp = match (&self.a, &self.b) {
 (&Some(ref a), &Some(ref b)) => a.cmp(b),
 _ => fail!()
 };
 match cmp {
 Less => { return util::replace(&mut self.a, self.i1.next()); }
 Greater => { return util::replace(&mut self.b, self.i2.next()); }
 Equal => {
 util::replace(&mut self.b, self.i2.next());
 return util::replace(&mut self.a, self.i1.next());
 }
 }
 }
}

pub struct Xor<A, T, U> {
 priv i1: T,
 priv i2: U,
 priv a: Option<A>,
 priv b: Option<A>,
}

impl<A: TotalOrd, T: Iterator<A>, U: Iterator<A>> Iterator<A> for Xor<A, T, U> {
 #[inline]
 fn next(&mut self) -> Option<A> {
 loop {
 if self.a.is_none() && self.b.is_none() {
 return None;
 } else if self.a.is_none() {
 return util::replace(&mut self.b, self.i2.next());
 } else if self.b.is_none() {
 return util::replace(&mut self.a, self.i1.next());
 }
 let cmp = match (&self.a, &self.b) {
 (&Some(ref a), &Some(ref b)) => a.cmp(b),
 _ => fail!()
 };
 match cmp {
 Less => { return util::replace(&mut self.a, self.i1.next()); }
 Greater => { return util::replace(&mut self.b, self.i2.next()); }
 Equal => {
 util::replace(&mut self.a, self.i1.next());
 util::replace(&mut self.b, self.i2.next());
 }
 }
 }
 }
}

pub struct Difference<A, T, U> {
 priv i1: T,
 priv i2: U,
 priv a: Option<A>,
 priv b: Option<A>,
}

impl<A: TotalOrd, T: Iterator<A>, U: Iterator<A>> Iterator<A> for
 Difference<A, T, U>
{
 #[inline]
 fn next(&mut self) -> Option<A> {
 loop {
 if self.a.is_none() {
 return None;
 } else if self.b.is_none() {
 return util::replace(&mut self.a, self.i1.next());
 }
 let cmp = match (&self.a, &self.b) {
 (&Some(ref a), &Some(ref b)) => a.cmp(b),
 _ => fail!()
 };
 match cmp {
 Less => { return util::replace(&mut self.a, self.i1.next()); }
 Greater => { util::replace(&mut self.b, self.i2.next()); }
 Equal => {
 util::replace(&mut self.b, self.i2.next());
 util::replace(&mut self.a, self.i1.next());
 }
 }
 }
 }
}

/// An infinite iterator starting at `start` and advancing by `step` with each iteration
pub struct Counter<A> {
 state: A,
Expand All@@ -370,6 +556,54 @@ impl<A: Add<A, A> + Clone> Iterator<A> for Counter<A> {
 }
}

/// An interator which will iterate over a binary search tree. This is
/// parameterized over functions which take a node and return the left and right
/// children. It is required that the nodes form a tree which is a binary search
/// tree
pub struct BSTIterator<'self, N, T> {
 priv f: &'self fn(&'self N) -> T,
 priv left: &'self fn(&'self N) -> &'self Option<~N>,
 priv right: &'self fn(&'self N) -> &'self Option<~N>,
 priv stack: ~[&'self ~N],
 priv node: &'self Option<~N>,
}

pub impl<'self, N, T> BSTIterator<'self, N, T> {
 /// Creates a new iterator given the root node of a tree. The provided
 /// functions are used for yielding iterator values and acquiring the left
 /// and right children.
 #[inline(always)]
 fn new<'a>(root: &'a Option<~N>,
 f: &'a fn(&'a N) -> T,
 left: &'a fn(&'a N) -> &'a Option<~N>,
 right: &'a fn(&'a N) -> &'a Option<~N>) -> BSTIterator<'a, N, T>
 {
 BSTIterator{ f: f, stack: ~[], node: root, left: left, right: right }
 }
}

impl<'self, N, T> Iterator<T> for BSTIterator<'self, N, T> {
 /// Advance the iterator to the next node (in order) and return a
 /// tuple with a reference to the key and value. If there are no
 /// more nodes, return `None`.
 fn next(&mut self) -> Option<T> {
 while !self.stack.is_empty() || self.node.is_some() {
 match *self.node {
 Some(ref x) => {
 self.stack.push(x);
 self.node = (self.left)(*x);
 }
 None => {
 let res = self.stack.pop();
 self.node = (self.right)(*res);
 return Some((self.f)(*res));
 }
 }
 }
 None
 }
}

#[cfg(test)]
mod tests {
 use super::*;
Expand Down

8 changes: 4 additions & 4 deletions
src/libstd/bitv.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,7 +72,7 @@ pub impl SmallBitv {
 }

 #[inline(always)]
 fn equals(&self, b: &SmallBitv, nbits: uint) -> bool {
 fn iseq(&self, b: &SmallBitv, nbits: uint) -> bool {
 let mask = small_mask(nbits);
 mask & self.bits == mask & b.bits
 }
Expand DownExpand Up@@ -193,7 +193,7 @@ pub impl BigBitv {
 }

 #[inline(always)]
 fn equals(&self, b: &BigBitv, nbits: uint) -> bool {
 fn iseq(&self, b: &BigBitv, nbits: uint) -> bool {
 let len = b.storage.len();
 for uint::iterate(0, len) |i| {
 let mask = big_mask(nbits, i);
Expand DownExpand Up@@ -327,11 +327,11 @@ pub impl Bitv {
 if self.nbits != v1.nbits { return false; }
 match self.rep {
 Small(ref b) => match v1.rep {
 Small(ref b1) => b.equals(*b1, self.nbits),
 Small(ref b1) => b.iseq(*b1, self.nbits),
 _ => false
 },
 Big(ref s) => match v1.rep {
 Big(ref s1) => s.equals(*s1, self.nbits),
 Big(ref s1) => s.iseq(*s1, self.nbits),
 Small(_) => return false
 }
 }
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Add a splay tree implementation to libstd#6360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

alexcrichton
wants to merge
3
commits into

from

 Closed


Add a splay tree implementation to libstd
#6360
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
500a11f

Extract some of TreeMap's iterators to generic impls


alexcrichton May 9, 2013
1078caa

Add a splay tree implementation to libstd


alexcrichton May 9, 2013
398187c

Add Splay{Map,Set} to the benchmarks


alexcrichton May 9, 2013

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 14 additions & 0 deletions
src/libcore/cmp.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -127,6 +127,20 @@ totalord_impl!(uint)

totalord_impl!(char)

impl<'self, T: TotalEq> TotalEq for &'self T {
 #[inline(always)]
 fn equals(&self, other: & &'self T) -> bool {
 (**self).equals(*other)
 }
}

impl<'self, T: TotalOrd> TotalOrd for &'self T {
 #[inline(always)]
 fn cmp(&self, other: & &'self T) -> Ordering {
 (**self).cmp(*other)
 }
}

pub fn cmp2<A:TotalOrd,B:TotalOrd>(
 a1: &A, b1: &B,
 a2: &A, b2: &B) -> Ordering
Expand Down

234 changes: 234 additions & 0 deletions
src/libcore/iterator.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ implementing the `Iterator` trait.
*/

use prelude::*;
use util;

pub trait Iterator<A> {
 /// Advance the iterator and return the next value. Return `None` when the end is reached.
Expand All@@ -39,9 +40,17 @@ pub trait IteratorUtil<A> {
 fn take_while<'r>(self, predicate: &'r fn(&A) -> bool) -> TakeWhileIterator<'r, A, Self>;
 fn skip(self, n: uint) -> SkipIterator<Self>;
 fn take(self, n: uint) -> TakeIterator<Self>;

 fn scan<'r, St, B>(self, initial_state: St, f: &'r fn(&mut St, A) -> Option<B>)
 -> ScanIterator<'r, A, B, Self, St>;
 fn advance(&mut self, f: &fn(A) -> bool);

 // Ordered iterators
 // FIXME: #5898: shouldn't have the 'i' suffix
 fn intersecti<U: Iterator<A>>(self, other: U) -> Intersect<A, Self, U>;
 fn unioni<U: Iterator<A>>(self, other: U) -> Union<A, Self, U>;
 fn xori<U: Iterator<A>>(self, other: U) -> Xor<A, Self, U>;
 fn differencei<U: Iterator<A>>(self, other: U) -> Difference<A, Self, U>;
}

/// Iterator adaptors provided for every `Iterator` implementation. The adaptor objects are also
Expand DownExpand Up@@ -113,6 +122,52 @@ impl<A, T: Iterator<A>> IteratorUtil<A> for T {
 }
 }
 }

 /// Returns an interator which will iterate over the intersection of `self`
 /// and `other`. This requires that the two iterators iterate over their
 /// values in ascending order.
 #[inline(always)]
 fn intersecti<U: Iterator<A>>(self, mut other: U) -> Intersect<A, T, U> {
 let mut self = self;
 let a = self.next();
 let b = other.next();
 Intersect{ a: a, b: b, i1: self, i2: other }
 }

 /// Returns an interator which will iterate over the union of `self` and
 /// `other`. This requires that the two iterators iterate over their values
 /// in ascending order.
 #[inline(always)]
 fn unioni<U: Iterator<A>>(self, mut other: U) -> Union<A, T, U> {
 let mut self = self;
 let a = self.next();
 let b = other.next();
 Union{ a: a, b: b, i1: self, i2: other }
 }

 /// Returns an interator which will iterate over the symmetric difference of
 /// `self` and `other`, or all values which are present in one, but not both
 /// iterators. This requires that the two iterators iterate over their
 /// values in ascending order.
 #[inline(always)]
 fn xori<U: Iterator<A>>(self, mut other: U) -> Xor<A, T, U> {
 let mut self = self;
 let a = self.next();
 let b = other.next();
 Xor{ a: a, b: b, i1: self, i2: other }
 }

 /// Returns an interator which will iterate over the difference of `self`
 /// and `other`, or all values which are present in `self`, but not in
 /// `other` iterators. This requires that the two iterators iterate over
 /// their value in ascending order.
 #[inline(always)]
 fn differencei<U: Iterator<A>>(self, mut other: U) -> Difference<A, T, U> {
 let mut self = self;
 let a = self.next();
 let b = other.next();
 Difference{ a: a, b: b, i1: self, i2: other }
 }
}

pub struct ChainIterator<T, U> {
Expand DownExpand Up@@ -348,6 +403,137 @@ impl<'self, A, St> Iterator<A> for UnfoldrIterator<'self, A, St> {
 }
}

pub struct Intersect<A, T, U> {
 priv i1: T,
 priv i2: U,
 priv a: Option<A>,
 priv b: Option<A>,
}

impl<A: TotalOrd, T: Iterator<A>, U: Iterator<A>> Iterator<A> for
 Intersect<A, T, U>
{
 #[inline]
 fn next(&mut self) -> Option<A> {
 loop {
 let cmp = match (&self.a, &self.b) {
 (&Some(ref a), &Some(ref b)) => a.cmp(b),
 _ => return None
 };

 match cmp {
 Less => { util::replace(&mut self.a, self.i1.next()); }
 Greater => { util::replace(&mut self.b, self.i2.next()); }
 Equal => {
 util::replace(&mut self.a, self.i1.next());
 return util::replace(&mut self.b, self.i2.next());
 }
 }
 }
 }
}

pub struct Union<A, T, U> {
 priv i1: T,
 priv i2: U,
 priv a: Option<A>,
 priv b: Option<A>,
}

impl<A: TotalOrd, T: Iterator<A>, U: Iterator<A>> Iterator<A> for Union<A, T, U>
{
 #[inline]
 fn next(&mut self) -> Option<A> {
 if self.a.is_none() && self.b.is_none() {
 return None;
 } else if self.a.is_none() {
 return util::replace(&mut self.b, self.i2.next());
 } else if self.b.is_none() {
 return util::replace(&mut self.a, self.i1.next());
 }
 let cmp = match (&self.a, &self.b) {
 (&Some(ref a), &Some(ref b)) => a.cmp(b),
 _ => fail!()
 };
 match cmp {
 Less => { return util::replace(&mut self.a, self.i1.next()); }
 Greater => { return util::replace(&mut self.b, self.i2.next()); }
 Equal => {
 util::replace(&mut self.b, self.i2.next());
 return util::replace(&mut self.a, self.i1.next());
 }
 }
 }
}

pub struct Xor<A, T, U> {
 priv i1: T,
 priv i2: U,
 priv a: Option<A>,
 priv b: Option<A>,
}

impl<A: TotalOrd, T: Iterator<A>, U: Iterator<A>> Iterator<A> for Xor<A, T, U> {
 #[inline]
 fn next(&mut self) -> Option<A> {
 loop {
 if self.a.is_none() && self.b.is_none() {
 return None;
 } else if self.a.is_none() {
 return util::replace(&mut self.b, self.i2.next());
 } else if self.b.is_none() {
 return util::replace(&mut self.a, self.i1.next());
 }
 let cmp = match (&self.a, &self.b) {
 (&Some(ref a), &Some(ref b)) => a.cmp(b),
 _ => fail!()
 };
 match cmp {
 Less => { return util::replace(&mut self.a, self.i1.next()); }
 Greater => { return util::replace(&mut self.b, self.i2.next()); }
 Equal => {
 util::replace(&mut self.a, self.i1.next());
 util::replace(&mut self.b, self.i2.next());
 }
 }
 }
 }
}

pub struct Difference<A, T, U> {
 priv i1: T,
 priv i2: U,
 priv a: Option<A>,
 priv b: Option<A>,
}

impl<A: TotalOrd, T: Iterator<A>, U: Iterator<A>> Iterator<A> for
 Difference<A, T, U>
{
 #[inline]
 fn next(&mut self) -> Option<A> {
 loop {
 if self.a.is_none() {
 return None;
 } else if self.b.is_none() {
 return util::replace(&mut self.a, self.i1.next());
 }
 let cmp = match (&self.a, &self.b) {
 (&Some(ref a), &Some(ref b)) => a.cmp(b),
 _ => fail!()
 };
 match cmp {
 Less => { return util::replace(&mut self.a, self.i1.next()); }
 Greater => { util::replace(&mut self.b, self.i2.next()); }
 Equal => {
 util::replace(&mut self.b, self.i2.next());
 util::replace(&mut self.a, self.i1.next());
 }
 }
 }
 }
}

/// An infinite iterator starting at `start` and advancing by `step` with each iteration
pub struct Counter<A> {
 state: A,
Expand All@@ -370,6 +556,54 @@ impl<A: Add<A, A> + Clone> Iterator<A> for Counter<A> {
 }
}

/// An interator which will iterate over a binary search tree. This is
/// parameterized over functions which take a node and return the left and right
/// children. It is required that the nodes form a tree which is a binary search
/// tree
pub struct BSTIterator<'self, N, T> {
 priv f: &'self fn(&'self N) -> T,
 priv left: &'self fn(&'self N) -> &'self Option<~N>,
 priv right: &'self fn(&'self N) -> &'self Option<~N>,
 priv stack: ~[&'self ~N],
 priv node: &'self Option<~N>,
}

pub impl<'self, N, T> BSTIterator<'self, N, T> {
 /// Creates a new iterator given the root node of a tree. The provided
 /// functions are used for yielding iterator values and acquiring the left
 /// and right children.
 #[inline(always)]
 fn new<'a>(root: &'a Option<~N>,
 f: &'a fn(&'a N) -> T,
 left: &'a fn(&'a N) -> &'a Option<~N>,
 right: &'a fn(&'a N) -> &'a Option<~N>) -> BSTIterator<'a, N, T>
 {
 BSTIterator{ f: f, stack: ~[], node: root, left: left, right: right }
 }
}

impl<'self, N, T> Iterator<T> for BSTIterator<'self, N, T> {
 /// Advance the iterator to the next node (in order) and return a
 /// tuple with a reference to the key and value. If there are no
 /// more nodes, return `None`.
 fn next(&mut self) -> Option<T> {
 while !self.stack.is_empty() || self.node.is_some() {
 match *self.node {
 Some(ref x) => {
 self.stack.push(x);
 self.node = (self.left)(*x);
 }
 None => {
 let res = self.stack.pop();
 self.node = (self.right)(*res);
 return Some((self.f)(*res));
 }
 }
 }
 None
 }
}

#[cfg(test)]
mod tests {
 use super::*;
Expand Down

8 changes: 4 additions & 4 deletions
src/libstd/bitv.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,7 +72,7 @@ pub impl SmallBitv {
 }

 #[inline(always)]
 fn equals(&self, b: &SmallBitv, nbits: uint) -> bool {
 fn iseq(&self, b: &SmallBitv, nbits: uint) -> bool {
 let mask = small_mask(nbits);
 mask & self.bits == mask & b.bits
 }
Expand DownExpand Up@@ -193,7 +193,7 @@ pub impl BigBitv {
 }

 #[inline(always)]
 fn equals(&self, b: &BigBitv, nbits: uint) -> bool {
 fn iseq(&self, b: &BigBitv, nbits: uint) -> bool {
 let len = b.storage.len();
 for uint::iterate(0, len) |i| {
 let mask = big_mask(nbits, i);
Expand DownExpand Up@@ -327,11 +327,11 @@ pub impl Bitv {
 if self.nbits != v1.nbits { return false; }
 match self.rep {
 Small(ref b) => match v1.rep {
 Small(ref b1) => b.equals(*b1, self.nbits),
 Small(ref b1) => b.iseq(*b1, self.nbits),
 _ => false
 },
 Big(ref s) => match v1.rep {
 Big(ref s1) => s.equals(*s1, self.nbits),
 Big(ref s1) => s.iseq(*s1, self.nbits),
 Small(_) => return false
 }
 }
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add a splay tree implementation to libstd#6360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

alexcrichton
wants to merge
3
commits into

from

 Closed


Add a splay tree implementation to libstd
#6360
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
500a11f

Extract some of TreeMap's iterators to generic impls


alexcrichton May 9, 2013
1078caa

Add a splay tree implementation to libstd


alexcrichton May 9, 2013
398187c

Add Splay{Map,Set} to the benchmarks


alexcrichton May 9, 2013

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 14 additions & 0 deletions
src/libcore/cmp.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -127,6 +127,20 @@ totalord_impl!(uint)

totalord_impl!(char)

impl<'self, T: TotalEq> TotalEq for &'self T {
 #[inline(always)]
 fn equals(&self, other: & &'self T) -> bool {
 (**self).equals(*other)
 }
}

impl<'self, T: TotalOrd> TotalOrd for &'self T {
 #[inline(always)]
 fn cmp(&self, other: & &'self T) -> Ordering {
 (**self).cmp(*other)
 }
}

pub fn cmp2<A:TotalOrd,B:TotalOrd>(
 a1: &A, b1: &B,
 a2: &A, b2: &B) -> Ordering
Expand Down

234 changes: 234 additions & 0 deletions
src/libcore/iterator.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ implementing the `Iterator` trait.
*/

use prelude::*;
use util;

pub trait Iterator<A> {
 /// Advance the iterator and return the next value. Return `None` when the end is reached.
Expand All@@ -39,9 +40,17 @@ pub trait IteratorUtil<A> {
 fn take_while<'r>(self, predicate: &'r fn(&A) -> bool) -> TakeWhileIterator<'r, A, Self>;
 fn skip(self, n: uint) -> SkipIterator<Self>;
 fn take(self, n: uint) -> TakeIterator<Self>;

 fn scan<'r, St, B>(self, initial_state: St, f: &'r fn(&mut St, A) -> Option<B>)
 -> ScanIterator<'r, A, B, Self, St>;
 fn advance(&mut self, f: &fn(A) -> bool);

 // Ordered iterators
 // FIXME: #5898: shouldn't have the 'i' suffix
 fn intersecti<U: Iterator<A>>(self, other: U) -> Intersect<A, Self, U>;
 fn unioni<U: Iterator<A>>(self, other: U) -> Union<A, Self, U>;
 fn xori<U: Iterator<A>>(self, other: U) -> Xor<A, Self, U>;
 fn differencei<U: Iterator<A>>(self, other: U) -> Difference<A, Self, U>;
}

/// Iterator adaptors provided for every `Iterator` implementation. The adaptor objects are also
Expand DownExpand Up@@ -113,6 +122,52 @@ impl<A, T: Iterator<A>> IteratorUtil<A> for T {
 }
 }
 }

 /// Returns an interator which will iterate over the intersection of `self`
 /// and `other`. This requires that the two iterators iterate over their
 /// values in ascending order.
 #[inline(always)]
 fn intersecti<U: Iterator<A>>(self, mut other: U) -> Intersect<A, T, U> {
 let mut self = self;
 let a = self.next();
 let b = other.next();
 Intersect{ a: a, b: b, i1: self, i2: other }
 }

 /// Returns an interator which will iterate over the union of `self` and
 /// `other`. This requires that the two iterators iterate over their values
 /// in ascending order.
 #[inline(always)]
 fn unioni<U: Iterator<A>>(self, mut other: U) -> Union<A, T, U> {
 let mut self = self;
 let a = self.next();
 let b = other.next();
 Union{ a: a, b: b, i1: self, i2: other }
 }

 /// Returns an interator which will iterate over the symmetric difference of
 /// `self` and `other`, or all values which are present in one, but not both
 /// iterators. This requires that the two iterators iterate over their
 /// values in ascending order.
 #[inline(always)]
 fn xori<U: Iterator<A>>(self, mut other: U) -> Xor<A, T, U> {
 let mut self = self;
 let a = self.next();
 let b = other.next();
 Xor{ a: a, b: b, i1: self, i2: other }
 }

 /// Returns an interator which will iterate over the difference of `self`
 /// and `other`, or all values which are present in `self`, but not in
 /// `other` iterators. This requires that the two iterators iterate over
 /// their value in ascending order.
 #[inline(always)]
 fn differencei<U: Iterator<A>>(self, mut other: U) -> Difference<A, T, U> {
 let mut self = self;
 let a = self.next();
 let b = other.next();
 Difference{ a: a, b: b, i1: self, i2: other }
 }
}

pub struct ChainIterator<T, U> {
Expand DownExpand Up@@ -348,6 +403,137 @@ impl<'self, A, St> Iterator<A> for UnfoldrIterator<'self, A, St> {
 }
}

pub struct Intersect<A, T, U> {
 priv i1: T,
 priv i2: U,
 priv a: Option<A>,
 priv b: Option<A>,
}

impl<A: TotalOrd, T: Iterator<A>, U: Iterator<A>> Iterator<A> for
 Intersect<A, T, U>
{
 #[inline]
 fn next(&mut self) -> Option<A> {
 loop {
 let cmp = match (&self.a, &self.b) {
 (&Some(ref a), &Some(ref b)) => a.cmp(b),
 _ => return None
 };

 match cmp {
 Less => { util::replace(&mut self.a, self.i1.next()); }
 Greater => { util::replace(&mut self.b, self.i2.next()); }
 Equal => {
 util::replace(&mut self.a, self.i1.next());
 return util::replace(&mut self.b, self.i2.next());
 }
 }
 }
 }
}

pub struct Union<A, T, U> {
 priv i1: T,
 priv i2: U,
 priv a: Option<A>,
 priv b: Option<A>,
}

impl<A: TotalOrd, T: Iterator<A>, U: Iterator<A>> Iterator<A> for Union<A, T, U>
{
 #[inline]
 fn next(&mut self) -> Option<A> {
 if self.a.is_none() && self.b.is_none() {
 return None;
 } else if self.a.is_none() {
 return util::replace(&mut self.b, self.i2.next());
 } else if self.b.is_none() {
 return util::replace(&mut self.a, self.i1.next());
 }
 let cmp = match (&self.a, &self.b) {
 (&Some(ref a), &Some(ref b)) => a.cmp(b),
 _ => fail!()
 };
 match cmp {
 Less => { return util::replace(&mut self.a, self.i1.next()); }
 Greater => { return util::replace(&mut self.b, self.i2.next()); }
 Equal => {
 util::replace(&mut self.b, self.i2.next());
 return util::replace(&mut self.a, self.i1.next());
 }
 }
 }
}

pub struct Xor<A, T, U> {
 priv i1: T,
 priv i2: U,
 priv a: Option<A>,
 priv b: Option<A>,
}

impl<A: TotalOrd, T: Iterator<A>, U: Iterator<A>> Iterator<A> for Xor<A, T, U> {
 #[inline]
 fn next(&mut self) -> Option<A> {
 loop {
 if self.a.is_none() && self.b.is_none() {
 return None;
 } else if self.a.is_none() {
 return util::replace(&mut self.b, self.i2.next());
 } else if self.b.is_none() {
 return util::replace(&mut self.a, self.i1.next());
 }
 let cmp = match (&self.a, &self.b) {
 (&Some(ref a), &Some(ref b)) => a.cmp(b),
 _ => fail!()
 };
 match cmp {
 Less => { return util::replace(&mut self.a, self.i1.next()); }
 Greater => { return util::replace(&mut self.b, self.i2.next()); }
 Equal => {
 util::replace(&mut self.a, self.i1.next());
 util::replace(&mut self.b, self.i2.next());
 }
 }
 }
 }
}

pub struct Difference<A, T, U> {
 priv i1: T,
 priv i2: U,
 priv a: Option<A>,
 priv b: Option<A>,
}

impl<A: TotalOrd, T: Iterator<A>, U: Iterator<A>> Iterator<A> for
 Difference<A, T, U>
{
 #[inline]
 fn next(&mut self) -> Option<A> {
 loop {
 if self.a.is_none() {
 return None;
 } else if self.b.is_none() {
 return util::replace(&mut self.a, self.i1.next());
 }
 let cmp = match (&self.a, &self.b) {
 (&Some(ref a), &Some(ref b)) => a.cmp(b),
 _ => fail!()
 };
 match cmp {
 Less => { return util::replace(&mut self.a, self.i1.next()); }
 Greater => { util::replace(&mut self.b, self.i2.next()); }
 Equal => {
 util::replace(&mut self.b, self.i2.next());
 util::replace(&mut self.a, self.i1.next());
 }
 }
 }
 }
}

/// An infinite iterator starting at `start` and advancing by `step` with each iteration
pub struct Counter<A> {
 state: A,
Expand All@@ -370,6 +556,54 @@ impl<A: Add<A, A> + Clone> Iterator<A> for Counter<A> {
 }
}

/// An interator which will iterate over a binary search tree. This is
/// parameterized over functions which take a node and return the left and right
/// children. It is required that the nodes form a tree which is a binary search
/// tree
pub struct BSTIterator<'self, N, T> {
 priv f: &'self fn(&'self N) -> T,
 priv left: &'self fn(&'self N) -> &'self Option<~N>,
 priv right: &'self fn(&'self N) -> &'self Option<~N>,
 priv stack: ~[&'self ~N],
 priv node: &'self Option<~N>,
}

pub impl<'self, N, T> BSTIterator<'self, N, T> {
 /// Creates a new iterator given the root node of a tree. The provided
 /// functions are used for yielding iterator values and acquiring the left
 /// and right children.
 #[inline(always)]
 fn new<'a>(root: &'a Option<~N>,
 f: &'a fn(&'a N) -> T,
 left: &'a fn(&'a N) -> &'a Option<~N>,
 right: &'a fn(&'a N) -> &'a Option<~N>) -> BSTIterator<'a, N, T>
 {
 BSTIterator{ f: f, stack: ~[], node: root, left: left, right: right }
 }
}

impl<'self, N, T> Iterator<T> for BSTIterator<'self, N, T> {
 /// Advance the iterator to the next node (in order) and return a
 /// tuple with a reference to the key and value. If there are no
 /// more nodes, return `None`.
 fn next(&mut self) -> Option<T> {
 while !self.stack.is_empty() || self.node.is_some() {
 match *self.node {
 Some(ref x) => {
 self.stack.push(x);
 self.node = (self.left)(*x);
 }
 None => {
 let res = self.stack.pop();
 self.node = (self.right)(*res);
 return Some((self.f)(*res));
 }
 }
 }
 None
 }
}

#[cfg(test)]
mod tests {
 use super::*;
Expand Down

8 changes: 4 additions & 4 deletions
src/libstd/bitv.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,7 +72,7 @@ pub impl SmallBitv {
 }

 #[inline(always)]
 fn equals(&self, b: &SmallBitv, nbits: uint) -> bool {
 fn iseq(&self, b: &SmallBitv, nbits: uint) -> bool {
 let mask = small_mask(nbits);
 mask & self.bits == mask & b.bits
 }
Expand DownExpand Up@@ -193,7 +193,7 @@ pub impl BigBitv {
 }

 #[inline(always)]
 fn equals(&self, b: &BigBitv, nbits: uint) -> bool {
 fn iseq(&self, b: &BigBitv, nbits: uint) -> bool {
 let len = b.storage.len();
 for uint::iterate(0, len) |i| {
 let mask = big_mask(nbits, i);
Expand DownExpand Up@@ -327,11 +327,11 @@ pub impl Bitv {
 if self.nbits != v1.nbits { return false; }
 match self.rep {
 Small(ref b) => match v1.rep {
 Small(ref b1) => b.equals(*b1, self.nbits),
 Small(ref b1) => b.iseq(*b1, self.nbits),
 _ => false
 },
 Big(ref s) => match v1.rep {
 Big(ref s1) => s.equals(*s1, self.nbits),
 Big(ref s1) => s.iseq(*s1, self.nbits),
 Small(_) => return false
 }
 }
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add a splay tree implementation to libstd#6360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

alexcrichton
wants to merge
3
commits into

from

 Closed


Add a splay tree implementation to libstd
#6360
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
500a11f

Extract some of TreeMap's iterators to generic impls


alexcrichton May 9, 2013
1078caa

Add a splay tree implementation to libstd


alexcrichton May 9, 2013
398187c

Add Splay{Map,Set} to the benchmarks


alexcrichton May 9, 2013

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 14 additions & 0 deletions
src/libcore/cmp.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -127,6 +127,20 @@ totalord_impl!(uint)

totalord_impl!(char)

impl<'self, T: TotalEq> TotalEq for &'self T {
 #[inline(always)]
 fn equals(&self, other: & &'self T) -> bool {
 (**self).equals(*other)
 }
}

impl<'self, T: TotalOrd> TotalOrd for &'self T {
 #[inline(always)]
 fn cmp(&self, other: & &'self T) -> Ordering {
 (**self).cmp(*other)
 }
}

pub fn cmp2<A:TotalOrd,B:TotalOrd>(
 a1: &A, b1: &B,
 a2: &A, b2: &B) -> Ordering
Expand Down

234 changes: 234 additions & 0 deletions
src/libcore/iterator.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ implementing the `Iterator` trait.
*/

use prelude::*;
use util;

pub trait Iterator<A> {
 /// Advance the iterator and return the next value. Return `None` when the end is reached.
Expand All@@ -39,9 +40,17 @@ pub trait IteratorUtil<A> {
 fn take_while<'r>(self, predicate: &'r fn(&A) -> bool) -> TakeWhileIterator<'r, A, Self>;
 fn skip(self, n: uint) -> SkipIterator<Self>;
 fn take(self, n: uint) -> TakeIterator<Self>;

 fn scan<'r, St, B>(self, initial_state: St, f: &'r fn(&mut St, A) -> Option<B>)
 -> ScanIterator<'r, A, B, Self, St>;
 fn advance(&mut self, f: &fn(A) -> bool);

 // Ordered iterators
 // FIXME: #5898: shouldn't have the 'i' suffix
 fn intersecti<U: Iterator<A>>(self, other: U) -> Intersect<A, Self, U>;
 fn unioni<U: Iterator<A>>(self, other: U) -> Union<A, Self, U>;
 fn xori<U: Iterator<A>>(self, other: U) -> Xor<A, Self, U>;
 fn differencei<U: Iterator<A>>(self, other: U) -> Difference<A, Self, U>;
}

/// Iterator adaptors provided for every `Iterator` implementation. The adaptor objects are also
Expand DownExpand Up@@ -113,6 +122,52 @@ impl<A, T: Iterator<A>> IteratorUtil<A> for T {
 }
 }
 }

 /// Returns an interator which will iterate over the intersection of `self`
 /// and `other`. This requires that the two iterators iterate over their
 /// values in ascending order.
 #[inline(always)]
 fn intersecti<U: Iterator<A>>(self, mut other: U) -> Intersect<A, T, U> {
 let mut self = self;
 let a = self.next();
 let b = other.next();
 Intersect{ a: a, b: b, i1: self, i2: other }
 }

 /// Returns an interator which will iterate over the union of `self` and
 /// `other`. This requires that the two iterators iterate over their values
 /// in ascending order.
 #[inline(always)]
 fn unioni<U: Iterator<A>>(self, mut other: U) -> Union<A, T, U> {
 let mut self = self;
 let a = self.next();
 let b = other.next();
 Union{ a: a, b: b, i1: self, i2: other }
 }

 /// Returns an interator which will iterate over the symmetric difference of
 /// `self` and `other`, or all values which are present in one, but not both
 /// iterators. This requires that the two iterators iterate over their
 /// values in ascending order.
 #[inline(always)]
 fn xori<U: Iterator<A>>(self, mut other: U) -> Xor<A, T, U> {
 let mut self = self;
 let a = self.next();
 let b = other.next();
 Xor{ a: a, b: b, i1: self, i2: other }
 }

 /// Returns an interator which will iterate over the difference of `self`
 /// and `other`, or all values which are present in `self`, but not in
 /// `other` iterators. This requires that the two iterators iterate over
 /// their value in ascending order.
 #[inline(always)]
 fn differencei<U: Iterator<A>>(self, mut other: U) -> Difference<A, T, U> {
 let mut self = self;
 let a = self.next();
 let b = other.next();
 Difference{ a: a, b: b, i1: self, i2: other }
 }
}

pub struct ChainIterator<T, U> {
Expand DownExpand Up@@ -348,6 +403,137 @@ impl<'self, A, St> Iterator<A> for UnfoldrIterator<'self, A, St> {
 }
}

pub struct Intersect<A, T, U> {
 priv i1: T,
 priv i2: U,
 priv a: Option<A>,
 priv b: Option<A>,
}

impl<A: TotalOrd, T: Iterator<A>, U: Iterator<A>> Iterator<A> for
 Intersect<A, T, U>
{
 #[inline]
 fn next(&mut self) -> Option<A> {
 loop {
 let cmp = match (&self.a, &self.b) {
 (&Some(ref a), &Some(ref b)) => a.cmp(b),
 _ => return None
 };

 match cmp {
 Less => { util::replace(&mut self.a, self.i1.next()); }
 Greater => { util::replace(&mut self.b, self.i2.next()); }
 Equal => {
 util::replace(&mut self.a, self.i1.next());
 return util::replace(&mut self.b, self.i2.next());
 }
 }
 }
 }
}

pub struct Union<A, T, U> {
 priv i1: T,
 priv i2: U,
 priv a: Option<A>,
 priv b: Option<A>,
}

impl<A: TotalOrd, T: Iterator<A>, U: Iterator<A>> Iterator<A> for Union<A, T, U>
{
 #[inline]
 fn next(&mut self) -> Option<A> {
 if self.a.is_none() && self.b.is_none() {
 return None;
 } else if self.a.is_none() {
 return util::replace(&mut self.b, self.i2.next());
 } else if self.b.is_none() {
 return util::replace(&mut self.a, self.i1.next());
 }
 let cmp = match (&self.a, &self.b) {
 (&Some(ref a), &Some(ref b)) => a.cmp(b),
 _ => fail!()
 };
 match cmp {
 Less => { return util::replace(&mut self.a, self.i1.next()); }
 Greater => { return util::replace(&mut self.b, self.i2.next()); }
 Equal => {
 util::replace(&mut self.b, self.i2.next());
 return util::replace(&mut self.a, self.i1.next());
 }
 }
 }
}

pub struct Xor<A, T, U> {
 priv i1: T,
 priv i2: U,
 priv a: Option<A>,
 priv b: Option<A>,
}

impl<A: TotalOrd, T: Iterator<A>, U: Iterator<A>> Iterator<A> for Xor<A, T, U> {
 #[inline]
 fn next(&mut self) -> Option<A> {
 loop {
 if self.a.is_none() && self.b.is_none() {
 return None;
 } else if self.a.is_none() {
 return util::replace(&mut self.b, self.i2.next());
 } else if self.b.is_none() {
 return util::replace(&mut self.a, self.i1.next());
 }
 let cmp = match (&self.a, &self.b) {
 (&Some(ref a), &Some(ref b)) => a.cmp(b),
 _ => fail!()
 };
 match cmp {
 Less => { return util::replace(&mut self.a, self.i1.next()); }
 Greater => { return util::replace(&mut self.b, self.i2.next()); }
 Equal => {
 util::replace(&mut self.a, self.i1.next());
 util::replace(&mut self.b, self.i2.next());
 }
 }
 }
 }
}

pub struct Difference<A, T, U> {
 priv i1: T,
 priv i2: U,
 priv a: Option<A>,
 priv b: Option<A>,
}

impl<A: TotalOrd, T: Iterator<A>, U: Iterator<A>> Iterator<A> for
 Difference<A, T, U>
{
 #[inline]
 fn next(&mut self) -> Option<A> {
 loop {
 if self.a.is_none() {
 return None;
 } else if self.b.is_none() {
 return util::replace(&mut self.a, self.i1.next());
 }
 let cmp = match (&self.a, &self.b) {
 (&Some(ref a), &Some(ref b)) => a.cmp(b),
 _ => fail!()
 };
 match cmp {
 Less => { return util::replace(&mut self.a, self.i1.next()); }
 Greater => { util::replace(&mut self.b, self.i2.next()); }
 Equal => {
 util::replace(&mut self.b, self.i2.next());
 util::replace(&mut self.a, self.i1.next());
 }
 }
 }
 }
}

/// An infinite iterator starting at `start` and advancing by `step` with each iteration
pub struct Counter<A> {
 state: A,
Expand All@@ -370,6 +556,54 @@ impl<A: Add<A, A> + Clone> Iterator<A> for Counter<A> {
 }
}

/// An interator which will iterate over a binary search tree. This is
/// parameterized over functions which take a node and return the left and right
/// children. It is required that the nodes form a tree which is a binary search
/// tree
pub struct BSTIterator<'self, N, T> {
 priv f: &'self fn(&'self N) -> T,
 priv left: &'self fn(&'self N) -> &'self Option<~N>,
 priv right: &'self fn(&'self N) -> &'self Option<~N>,
 priv stack: ~[&'self ~N],
 priv node: &'self Option<~N>,
}

pub impl<'self, N, T> BSTIterator<'self, N, T> {
 /// Creates a new iterator given the root node of a tree. The provided
 /// functions are used for yielding iterator values and acquiring the left
 /// and right children.
 #[inline(always)]
 fn new<'a>(root: &'a Option<~N>,
 f: &'a fn(&'a N) -> T,
 left: &'a fn(&'a N) -> &'a Option<~N>,
 right: &'a fn(&'a N) -> &'a Option<~N>) -> BSTIterator<'a, N, T>
 {
 BSTIterator{ f: f, stack: ~[], node: root, left: left, right: right }
 }
}

impl<'self, N, T> Iterator<T> for BSTIterator<'self, N, T> {
 /// Advance the iterator to the next node (in order) and return a
 /// tuple with a reference to the key and value. If there are no
 /// more nodes, return `None`.
 fn next(&mut self) -> Option<T> {
 while !self.stack.is_empty() || self.node.is_some() {
 match *self.node {
 Some(ref x) => {
 self.stack.push(x);
 self.node = (self.left)(*x);
 }
 None => {
 let res = self.stack.pop();
 self.node = (self.right)(*res);
 return Some((self.f)(*res));
 }
 }
 }
 None
 }
}

#[cfg(test)]
mod tests {
 use super::*;
Expand Down

8 changes: 4 additions & 4 deletions
src/libstd/bitv.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,7 +72,7 @@ pub impl SmallBitv {
 }

 #[inline(always)]
 fn equals(&self, b: &SmallBitv, nbits: uint) -> bool {
 fn iseq(&self, b: &SmallBitv, nbits: uint) -> bool {
 let mask = small_mask(nbits);
 mask & self.bits == mask & b.bits
 }
Expand DownExpand Up@@ -193,7 +193,7 @@ pub impl BigBitv {
 }

 #[inline(always)]
 fn equals(&self, b: &BigBitv, nbits: uint) -> bool {
 fn iseq(&self, b: &BigBitv, nbits: uint) -> bool {
 let len = b.storage.len();
 for uint::iterate(0, len) |i| {
 let mask = big_mask(nbits, i);
Expand DownExpand Up@@ -327,11 +327,11 @@ pub impl Bitv {
 if self.nbits != v1.nbits { return false; }
 match self.rep {
 Small(ref b) => match v1.rep {
 Small(ref b1) => b.equals(*b1, self.nbits),
 Small(ref b1) => b.iseq(*b1, self.nbits),
 _ => false
 },
 Big(ref s) => match v1.rep {
 Big(ref s1) => s.equals(*s1, self.nbits),
 Big(ref s1) => s.iseq(*s1, self.nbits),
 Small(_) => return false
 }
 }
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Add a splay tree implementation to libstd#6360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

alexcrichton
wants to merge
3
commits into

from

 Closed


Add a splay tree implementation to libstd
#6360
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
500a11f

Extract some of TreeMap's iterators to generic impls


alexcrichton May 9, 2013
1078caa

Add a splay tree implementation to libstd


alexcrichton May 9, 2013
398187c

Add Splay{Map,Set} to the benchmarks


alexcrichton May 9, 2013

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 14 additions & 0 deletions
src/libcore/cmp.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -127,6 +127,20 @@ totalord_impl!(uint)

totalord_impl!(char)

impl<'self, T: TotalEq> TotalEq for &'self T {
 #[inline(always)]
 fn equals(&self, other: & &'self T) -> bool {
 (**self).equals(*other)
 }
}

impl<'self, T: TotalOrd> TotalOrd for &'self T {
 #[inline(always)]
 fn cmp(&self, other: & &'self T) -> Ordering {
 (**self).cmp(*other)
 }
}

pub fn cmp2<A:TotalOrd,B:TotalOrd>(
 a1: &A, b1: &B,
 a2: &A, b2: &B) -> Ordering
Expand Down

234 changes: 234 additions & 0 deletions
src/libcore/iterator.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ implementing the `Iterator` trait.
*/

use prelude::*;
use util;

pub trait Iterator<A> {
 /// Advance the iterator and return the next value. Return `None` when the end is reached.
Expand All@@ -39,9 +40,17 @@ pub trait IteratorUtil<A> {
 fn take_while<'r>(self, predicate: &'r fn(&A) -> bool) -> TakeWhileIterator<'r, A, Self>;
 fn skip(self, n: uint) -> SkipIterator<Self>;
 fn take(self, n: uint) -> TakeIterator<Self>;

 fn scan<'r, St, B>(self, initial_state: St, f: &'r fn(&mut St, A) -> Option<B>)
 -> ScanIterator<'r, A, B, Self, St>;
 fn advance(&mut self, f: &fn(A) -> bool);

 // Ordered iterators
 // FIXME: #5898: shouldn't have the 'i' suffix
 fn intersecti<U: Iterator<A>>(self, other: U) -> Intersect<A, Self, U>;
 fn unioni<U: Iterator<A>>(self, other: U) -> Union<A, Self, U>;
 fn xori<U: Iterator<A>>(self, other: U) -> Xor<A, Self, U>;
 fn differencei<U: Iterator<A>>(self, other: U) -> Difference<A, Self, U>;
}

/// Iterator adaptors provided for every `Iterator` implementation. The adaptor objects are also
Expand DownExpand Up@@ -113,6 +122,52 @@ impl<A, T: Iterator<A>> IteratorUtil<A> for T {
 }
 }
 }

 /// Returns an interator which will iterate over the intersection of `self`
 /// and `other`. This requires that the two iterators iterate over their
 /// values in ascending order.
 #[inline(always)]
 fn intersecti<U: Iterator<A>>(self, mut other: U) -> Intersect<A, T, U> {
 let mut self = self;
 let a = self.next();
 let b = other.next();
 Intersect{ a: a, b: b, i1: self, i2: other }
 }

 /// Returns an interator which will iterate over the union of `self` and
 /// `other`. This requires that the two iterators iterate over their values
 /// in ascending order.
 #[inline(always)]
 fn unioni<U: Iterator<A>>(self, mut other: U) -> Union<A, T, U> {
 let mut self = self;
 let a = self.next();
 let b = other.next();
 Union{ a: a, b: b, i1: self, i2: other }
 }

 /// Returns an interator which will iterate over the symmetric difference of
 /// `self` and `other`, or all values which are present in one, but not both
 /// iterators. This requires that the two iterators iterate over their
 /// values in ascending order.
 #[inline(always)]
 fn xori<U: Iterator<A>>(self, mut other: U) -> Xor<A, T, U> {
 let mut self = self;
 let a = self.next();
 let b = other.next();
 Xor{ a: a, b: b, i1: self, i2: other }
 }

 /// Returns an interator which will iterate over the difference of `self`
 /// and `other`, or all values which are present in `self`, but not in
 /// `other` iterators. This requires that the two iterators iterate over
 /// their value in ascending order.
 #[inline(always)]
 fn differencei<U: Iterator<A>>(self, mut other: U) -> Difference<A, T, U> {
 let mut self = self;
 let a = self.next();
 let b = other.next();
 Difference{ a: a, b: b, i1: self, i2: other }
 }
}

pub struct ChainIterator<T, U> {
Expand DownExpand Up@@ -348,6 +403,137 @@ impl<'self, A, St> Iterator<A> for UnfoldrIterator<'self, A, St> {
 }
}

pub struct Intersect<A, T, U> {
 priv i1: T,
 priv i2: U,
 priv a: Option<A>,
 priv b: Option<A>,
}

impl<A: TotalOrd, T: Iterator<A>, U: Iterator<A>> Iterator<A> for
 Intersect<A, T, U>
{
 #[inline]
 fn next(&mut self) -> Option<A> {
 loop {
 let cmp = match (&self.a, &self.b) {
 (&Some(ref a), &Some(ref b)) => a.cmp(b),
 _ => return None
 };

 match cmp {
 Less => { util::replace(&mut self.a, self.i1.next()); }
 Greater => { util::replace(&mut self.b, self.i2.next()); }
 Equal => {
 util::replace(&mut self.a, self.i1.next());
 return util::replace(&mut self.b, self.i2.next());
 }
 }
 }
 }
}

pub struct Union<A, T, U> {
 priv i1: T,
 priv i2: U,
 priv a: Option<A>,
 priv b: Option<A>,
}

impl<A: TotalOrd, T: Iterator<A>, U: Iterator<A>> Iterator<A> for Union<A, T, U>
{
 #[inline]
 fn next(&mut self) -> Option<A> {
 if self.a.is_none() && self.b.is_none() {
 return None;
 } else if self.a.is_none() {
 return util::replace(&mut self.b, self.i2.next());
 } else if self.b.is_none() {
 return util::replace(&mut self.a, self.i1.next());
 }
 let cmp = match (&self.a, &self.b) {
 (&Some(ref a), &Some(ref b)) => a.cmp(b),
 _ => fail!()
 };
 match cmp {
 Less => { return util::replace(&mut self.a, self.i1.next()); }
 Greater => { return util::replace(&mut self.b, self.i2.next()); }
 Equal => {
 util::replace(&mut self.b, self.i2.next());
 return util::replace(&mut self.a, self.i1.next());
 }
 }
 }
}

pub struct Xor<A, T, U> {
 priv i1: T,
 priv i2: U,
 priv a: Option<A>,
 priv b: Option<A>,
}

impl<A: TotalOrd, T: Iterator<A>, U: Iterator<A>> Iterator<A> for Xor<A, T, U> {
 #[inline]
 fn next(&mut self) -> Option<A> {
 loop {
 if self.a.is_none() && self.b.is_none() {
 return None;
 } else if self.a.is_none() {
 return util::replace(&mut self.b, self.i2.next());
 } else if self.b.is_none() {
 return util::replace(&mut self.a, self.i1.next());
 }
 let cmp = match (&self.a, &self.b) {
 (&Some(ref a), &Some(ref b)) => a.cmp(b),
 _ => fail!()
 };
 match cmp {
 Less => { return util::replace(&mut self.a, self.i1.next()); }
 Greater => { return util::replace(&mut self.b, self.i2.next()); }
 Equal => {
 util::replace(&mut self.a, self.i1.next());
 util::replace(&mut self.b, self.i2.next());
 }
 }
 }
 }
}

pub struct Difference<A, T, U> {
 priv i1: T,
 priv i2: U,
 priv a: Option<A>,
 priv b: Option<A>,
}

impl<A: TotalOrd, T: Iterator<A>, U: Iterator<A>> Iterator<A> for
 Difference<A, T, U>
{
 #[inline]
 fn next(&mut self) -> Option<A> {
 loop {
 if self.a.is_none() {
 return None;
 } else if self.b.is_none() {
 return util::replace(&mut self.a, self.i1.next());
 }
 let cmp = match (&self.a, &self.b) {
 (&Some(ref a), &Some(ref b)) => a.cmp(b),
 _ => fail!()
 };
 match cmp {
 Less => { return util::replace(&mut self.a, self.i1.next()); }
 Greater => { util::replace(&mut self.b, self.i2.next()); }
 Equal => {
 util::replace(&mut self.b, self.i2.next());
 util::replace(&mut self.a, self.i1.next());
 }
 }
 }
 }
}

/// An infinite iterator starting at `start` and advancing by `step` with each iteration
pub struct Counter<A> {
 state: A,
Expand All@@ -370,6 +556,54 @@ impl<A: Add<A, A> + Clone> Iterator<A> for Counter<A> {
 }
}

/// An interator which will iterate over a binary search tree. This is
/// parameterized over functions which take a node and return the left and right
/// children. It is required that the nodes form a tree which is a binary search
/// tree
pub struct BSTIterator<'self, N, T> {
 priv f: &'self fn(&'self N) -> T,
 priv left: &'self fn(&'self N) -> &'self Option<~N>,
 priv right: &'self fn(&'self N) -> &'self Option<~N>,
 priv stack: ~[&'self ~N],
 priv node: &'self Option<~N>,
}

pub impl<'self, N, T> BSTIterator<'self, N, T> {
 /// Creates a new iterator given the root node of a tree. The provided
 /// functions are used for yielding iterator values and acquiring the left
 /// and right children.
 #[inline(always)]
 fn new<'a>(root: &'a Option<~N>,
 f: &'a fn(&'a N) -> T,
 left: &'a fn(&'a N) -> &'a Option<~N>,
 right: &'a fn(&'a N) -> &'a Option<~N>) -> BSTIterator<'a, N, T>
 {
 BSTIterator{ f: f, stack: ~[], node: root, left: left, right: right }
 }
}

impl<'self, N, T> Iterator<T> for BSTIterator<'self, N, T> {
 /// Advance the iterator to the next node (in order) and return a
 /// tuple with a reference to the key and value. If there are no
 /// more nodes, return `None`.
 fn next(&mut self) -> Option<T> {
 while !self.stack.is_empty() || self.node.is_some() {
 match *self.node {
 Some(ref x) => {
 self.stack.push(x);
 self.node = (self.left)(*x);
 }
 None => {
 let res = self.stack.pop();
 self.node = (self.right)(*res);
 return Some((self.f)(*res));
 }
 }
 }
 None
 }
}

#[cfg(test)]
mod tests {
 use super::*;
Expand Down

8 changes: 4 additions & 4 deletions
src/libstd/bitv.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,7 +72,7 @@ pub impl SmallBitv {
 }

 #[inline(always)]
 fn equals(&self, b: &SmallBitv, nbits: uint) -> bool {
 fn iseq(&self, b: &SmallBitv, nbits: uint) -> bool {
 let mask = small_mask(nbits);
 mask & self.bits == mask & b.bits
 }
Expand DownExpand Up@@ -193,7 +193,7 @@ pub impl BigBitv {
 }

 #[inline(always)]
 fn equals(&self, b: &BigBitv, nbits: uint) -> bool {
 fn iseq(&self, b: &BigBitv, nbits: uint) -> bool {
 let len = b.storage.len();
 for uint::iterate(0, len) |i| {
 let mask = big_mask(nbits, i);
Expand DownExpand Up@@ -327,11 +327,11 @@ pub impl Bitv {
 if self.nbits != v1.nbits { return false; }
 match self.rep {
 Small(ref b) => match v1.rep {
 Small(ref b1) => b.equals(*b1, self.nbits),
 Small(ref b1) => b.iseq(*b1, self.nbits),
 _ => false
 },
 Big(ref s) => match v1.rep {
 Big(ref s1) => s.equals(*s1, self.nbits),
 Big(ref s1) => s.iseq(*s1, self.nbits),
 Small(_) => return false
 }
 }
Expand Down
Loading