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

eat whitespace after silent comments

Browse Source
This commit is contained in:
ConnorSkees 2020-05-02 12:49:42 -04:00
parent 07f12b6fb4
commit 4321a383f2
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/utils/read_until.rs
View File

@ -69,7 +69,10 @@ pub(crate) fn read_until_closing_curly_brace<I: Iterator<Item = Token>>(
'/' => { '/' => {
let next = toks.next().unwrap(); let next = toks.next().unwrap();
match toks.peek().unwrap().kind { match toks.peek().unwrap().kind {
'/' => read_until_newline(toks), '/' => {
read_until_newline(toks);
devour_whitespace(toks);
}
_ => t.push(next), _ => t.push(next),
}; };
continue; continue;
@ -162,7 +165,10 @@ pub(crate) fn read_until_semicolon_or_closing_curly_brace<I: Iterator<Item = Tok
'/' => { '/' => {
let next = toks.next().unwrap(); let next = toks.next().unwrap();
match toks.peek().unwrap().kind { match toks.peek().unwrap().kind {
'/' => read_until_newline(toks), '/' => {
read_until_newline(toks);
devour_whitespace(toks);
}
_ => t.push(next), _ => t.push(next),
}; };
continue; continue;
@ -215,6 +221,7 @@ pub(crate) fn read_until_closing_square_brace<I: Iterator<Item = Token>>(
let mut t = Vec::new(); let mut t = Vec::new();
let mut scope = 0; let mut scope = 0;
while let Some(tok) = toks.next() { while let Some(tok) = toks.next() {
// TODO: comments
match tok.kind { match tok.kind {
']' => { ']' => {
if scope < 1 { if scope < 1 {