Skip to content
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.

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

Reference count TokenStream in fallback mode #335

Merged
merged 1 commit into from Jul 25, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
36 changes: 22 additions & 14 deletions src/fallback.rs
Expand Up @@ -11,6 +11,7 @@ use std::ops::RangeBounds;
#[cfg(procmacro2_semver_exempt)]
use std::path::Path;
use std::path::PathBuf;
use std::rc::Rc;
use std::str::FromStr;
use std::vec;

Expand All @@ -30,7 +31,7 @@ pub fn unforce() {

#[derive(Clone)]
pub(crate) struct TokenStream {
inner: Vec<TokenTree>,
inner: Rc<Vec<TokenTree>>,
}

#[derive(Debug)]
Expand All @@ -52,15 +53,17 @@ impl LexError {

impl TokenStream {
pub fn new() -> Self {
TokenStream { inner: Vec::new() }
TokenStream {
inner: Rc::new(Vec::new()),
}
}

pub fn is_empty(&self) -> bool {
self.inner.len() == 0
}

fn take_inner(&mut self) -> Vec<TokenTree> {
mem::replace(&mut self.inner, Vec::new())
mem::replace(Rc::make_mut(&mut self.inner), Vec::new())
}

fn push_token(&mut self, token: TokenTree) {
Expand All @@ -87,36 +90,41 @@ impl TokenStream {
if literal.repr.starts_with('-') {
push_negative_literal(self, literal);
} else {
self.inner
Rc::make_mut(&mut self.inner)
.push(TokenTree::Literal(crate::Literal::_new_stable(literal)));
}
}
_ => self.inner.push(token),
_ => Rc::make_mut(&mut self.inner).push(token),
}

#[cold]
fn push_negative_literal(stream: &mut TokenStream, mut literal: Literal) {
literal.repr.remove(0);
let mut punct = crate::Punct::new('-', Spacing::Alone);
punct.set_span(crate::Span::_new_stable(literal.span));
stream.inner.push(TokenTree::Punct(punct));
stream
.inner
.push(TokenTree::Literal(crate::Literal::_new_stable(literal)));
let inner = Rc::make_mut(&mut stream.inner);
inner.push(TokenTree::Punct(punct));
inner.push(TokenTree::Literal(crate::Literal::_new_stable(literal)));
}
}
}

impl From<Vec<TokenTree>> for TokenStream {
fn from(inner: Vec<TokenTree>) -> Self {
TokenStream { inner }
TokenStream {
inner: Rc::new(inner),
}
}
}

// Nonrecursive to prevent stack overflow.
impl Drop for TokenStream {
fn drop(&mut self) {
while let Some(token) = self.inner.pop() {
let inner = match Rc::get_mut(&mut self.inner) {
Some(inner) => inner,
None => return,
};
while let Some(token) = inner.pop() {
let group = match token {
TokenTree::Group(group) => group.inner,
_ => continue,
Expand All @@ -127,7 +135,7 @@ impl Drop for TokenStream {
crate::imp::Group::Compiler(_) => continue,
};
let mut group = group;
self.inner.extend(group.stream.take_inner());
inner.extend(group.stream.take_inner());
}
}
}
Expand Down Expand Up @@ -242,7 +250,7 @@ impl FromIterator<TokenStream> for TokenStream {
v.extend(stream.take_inner());
}

TokenStream { inner: v }
TokenStream { inner: Rc::new(v) }
}
}

Expand All @@ -254,7 +262,7 @@ impl Extend<TokenTree> for TokenStream {

impl Extend<TokenStream> for TokenStream {
fn extend<I: IntoIterator<Item = TokenStream>>(&mut self, streams: I) {
self.inner.extend(streams.into_iter().flatten());
Rc::make_mut(&mut self.inner).extend(streams.into_iter().flatten());
}
}

Expand Down