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

Properly handle calling mixin with empty args

Browse Source
This commit is contained in:
ConnorSkees 2020-01-26 13:52:47 -05:00
parent 620e33f541
commit 05eb03a38b
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/mixin.rs
View File

@ -94,8 +94,8 @@ impl Mixin {
while let Some(expr) = eat_expr(&mut self.body, &self.scope, super_selector)? { while let Some(expr) = eat_expr(&mut self.body, &self.scope, super_selector)? {
match expr { match expr {
Expr::Style(s) => stmts.push(Stmt::Style(s)), Expr::Style(s) => stmts.push(Stmt::Style(s)),
Expr::Include(..) Expr::Include(s) => stmts.extend(s),
| Expr::MixinDecl(..) Expr::MixinDecl(..)
| Expr::FunctionDecl(..) | Expr::FunctionDecl(..)
| Expr::Debug(..) | Expr::Debug(..)
| Expr::Warn(..) => todo!(), | Expr::Warn(..) => todo!(),
@ -137,7 +137,14 @@ pub(crate) fn eat_include<I: Iterator<Item = Token>>(
let args = if let Some(tok) = toks.next() { let args = if let Some(tok) = toks.next() {
match tok.kind { match tok.kind {
TokenKind::Symbol(Symbol::SemiColon) => CallArgs::new(), TokenKind::Symbol(Symbol::SemiColon) => CallArgs::new(),
TokenKind::Symbol(Symbol::OpenParen) => eat_call_args(toks, scope), TokenKind::Symbol(Symbol::OpenParen) => {
let tmp = eat_call_args(toks, scope);
devour_whitespace(toks);
if let Some(tok) = toks.next() {
assert_eq!(tok.kind, TokenKind::Symbol(Symbol::SemiColon));
}
tmp
},
_ => return Err((pos, String::from("expected `(` or `;`"))), _ => return Err((pos, String::from("expected `(` or `;`"))),
} }
} else { } else {
@ -146,14 +153,6 @@ pub(crate) fn eat_include<I: Iterator<Item = Token>>(
devour_whitespace(toks); devour_whitespace(toks);
if !args.is_empty() {
if let Some(tok) = toks.next() {
assert_eq!(tok.kind, TokenKind::Symbol(Symbol::SemiColon));
}
}
devour_whitespace(toks);
let mixin = match scope.mixins.get(&name) { let mixin = match scope.mixins.get(&name) {
Some(m) => m.clone(), Some(m) => m.clone(),
_ => return Err((pos, String::from("Expected identifier."))), _ => return Err((pos, String::from("Expected identifier."))),