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

Properly parse single quoted strings and string interpolation

Browse Source
This commit is contained in:
ConnorSkees 2020-02-24 09:36:17 -05:00
parent 4c3f5e24ee
commit e8ee76f7dc
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/value/parse.rs
View File

@ -286,14 +286,25 @@ impl Value {
} }
} }
} }
TokenKind::Symbol(Symbol::DoubleQuote) => { q @ TokenKind::Symbol(Symbol::DoubleQuote) |
q @ TokenKind::Symbol(Symbol::SingleQuote) => {
let mut s = String::new(); let mut s = String::new();
let mut is_escaped = false; let mut is_escaped = false;
while let Some(tok) = toks.next() { while let Some(tok) = toks.next() {
match tok.kind { match tok.kind {
TokenKind::Symbol(Symbol::DoubleQuote) if !is_escaped => break, TokenKind::Symbol(Symbol::DoubleQuote) if !is_escaped && q == TokenKind::Symbol(Symbol::DoubleQuote) => break,
TokenKind::Symbol(Symbol::SingleQuote) if !is_escaped && q == TokenKind::Symbol(Symbol::SingleQuote) => break,
TokenKind::Symbol(Symbol::BackSlash) if !is_escaped => is_escaped = true, TokenKind::Symbol(Symbol::BackSlash) if !is_escaped => is_escaped = true,
TokenKind::Symbol(Symbol::BackSlash) => s.push('\\'), TokenKind::Symbol(Symbol::BackSlash) => s.push('\\'),
TokenKind::Interpolation => {
s.push_str(
&parse_interpolation(toks, scope)?
.iter()
.map(|x| x.kind.to_string())
.collect::<String>(),
);
continue;
}
_ => {} _ => {}
} }
if is_escaped && tok.kind != TokenKind::Symbol(Symbol::BackSlash) { if is_escaped && tok.kind != TokenKind::Symbol(Symbol::BackSlash) {
@ -301,17 +312,12 @@ impl Value {
} }
s.push_str(&tok.kind.to_string()); s.push_str(&tok.kind.to_string());
} }
Ok(Value::Ident(s, QuoteKind::Double)) let quotes = match q {
} TokenKind::Symbol(Symbol::DoubleQuote) => QuoteKind::Double,
TokenKind::Symbol(Symbol::SingleQuote) => { TokenKind::Symbol(Symbol::SingleQuote) => QuoteKind::Single,
let mut s = String::new(); _ => unreachable!()
while let Some(tok) = toks.next() { };
if tok.kind == TokenKind::Symbol(Symbol::SingleQuote) { Ok(Value::Ident(s, quotes))
break;
}
s.push_str(&tok.kind.to_string());
}
Ok(Value::Ident(s, QuoteKind::Single))
} }
TokenKind::Variable(ref v) => Ok(scope.get_var(v)?.clone()), TokenKind::Variable(ref v) => Ok(scope.get_var(v)?.clone()),
TokenKind::Interpolation => { TokenKind::Interpolation => {