shadowfacts/grass
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

interpolated_ident_body doesn't allocate its own string

Browse Source
This commit is contained in:
ConnorSkees 2020-05-02 11:47:49 -04:00
parent cf0cb01141
commit 3ca48702a1
1 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/utils/strings.rs
View File

@ -84,33 +84,32 @@ fn interpolated_ident_body<I: Iterator<Item = Token>>(
scope: &Scope, scope: &Scope,
super_selector: &Selector, super_selector: &Selector,
mut span: Span, mut span: Span,
) -> SassResult<Spanned<String>> { buf: &mut String,
let mut buf = String::new(); ) -> SassResult<Span> {
while let Some(tok) = toks.peek() { while let Some(tok) = toks.peek() {
if tok.kind == '_' match tok.kind {
|| tok.kind.is_alphanumeric() 'a'..='z' | 'A'..='Z' | '0'..='9' | '_' | '-' | '\u{80}'..=std::char::MAX => {
|| tok.kind == '-' span = span.merge(tok.pos());
|| tok.kind as u32 >= 0x0080 buf.push(toks.next().unwrap().kind);
{
span = span.merge(tok.pos());
buf.push(toks.next().unwrap().kind);
} else if tok.kind == '\\' {
toks.next();
buf.push_str(&escape(toks, false)?);
} else if tok.kind == '#' {
toks.next();
// TODO: peekmore
let next = toks.next().unwrap();
if next.kind == '{' {
// TODO: if ident, interpolate literally
let interpolation = parse_interpolation(toks, scope, super_selector)?;
buf.push_str(&interpolation.node.to_css_string(interpolation.span)?);
} }
} else { '\\' => {
break; toks.next();
buf.push_str(&escape(toks, false)?);
}
'#' => {
toks.next();
// TODO: peekmore
let next = toks.next().unwrap();
if next.kind == '{' {
// TODO: if ident, interpolate literally
let interpolation = parse_interpolation(toks, scope, super_selector)?;
buf.push_str(&interpolation.node.to_css_string(interpolation.span)?);
}
}
_ => break,
} }
} }
Ok(Spanned { node: buf, span }) Ok(span)
} }
fn escape<I: Iterator<Item = Token>>( fn escape<I: Iterator<Item = Token>>(
@ -176,7 +175,8 @@ pub(crate) fn eat_ident<I: Iterator<Item = Token>>(
if toks.peek().unwrap().kind == '-' { if toks.peek().unwrap().kind == '-' {
toks.next(); toks.next();
text.push('-'); text.push('-');
text.push_str(&interpolated_ident_body(toks, scope, super_selector, span)?.node); let body_span = interpolated_ident_body(toks, scope, super_selector, span, &mut text)?;
span = span.merge(body_span);
return Ok(Spanned { node: text, span }); return Ok(Spanned { node: text, span });
} }
} }
@ -214,9 +214,8 @@ pub(crate) fn eat_ident<I: Iterator<Item = Token>>(
return Err(("Expected identifier.", pos).into()); return Err(("Expected identifier.", pos).into());
} }
let body = interpolated_ident_body(toks, scope, super_selector, pos)?; let body_span = interpolated_ident_body(toks, scope, super_selector, pos, &mut text)?;
span = span.merge(body.span); span = span.merge(body_span);
text.push_str(&body.node);
Ok(Spanned { node: text, span }) Ok(Spanned { node: text, span })
} }