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

Better mixin error messages

Browse Source
This commit is contained in:
ConnorSkees 2020-02-28 01:06:51 -05:00
parent 46b96d03b1
commit 1dfe77bcff
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mixin.rs
View File

@ -98,7 +98,9 @@ impl Mixin {
Expr::Style(s) => stmts.push(Stmt::Style(*s)), Expr::Style(s) => stmts.push(Stmt::Style(*s)),
Expr::Styles(s) => stmts.extend(s.into_iter().map(Stmt::Style)), Expr::Styles(s) => stmts.extend(s.into_iter().map(Stmt::Style)),
Expr::Include(s) => stmts.extend(s), Expr::Include(s) => stmts.extend(s),
Expr::MixinDecl(..) | Expr::FunctionDecl(..) | Expr::Debug(..) | Expr::Warn(..) => { Expr::FunctionDecl(..) => return Err("Mixins may not contain function declarations.".into()),
Expr::MixinDecl(..) => return Err("Mixins may not contain mixin declarations.".into()),
Expr::Debug(..) | Expr::Warn(..) => {
todo!() todo!()
} }
Expr::Selector(selector) => { Expr::Selector(selector) => {
@ -131,7 +133,7 @@ pub(crate) fn eat_include<I: Iterator<Item = Token>>(
.expect("this must exist because we have already peeked"); .expect("this must exist because we have already peeked");
let name = match kind { let name = match kind {
TokenKind::Ident(s) => s, TokenKind::Ident(s) => s,
_ => return Err(SassError::new("Expected identifier.", pos)), _ => return Err("Expected identifier.".into()),
}; };
devour_whitespace(toks); devour_whitespace(toks);