refactor function body to allow more than at-rules

src/atrule/function.rs

@@ -1,5 +1,7 @@
 use std::iter::Peekable;
 
+use super::eat_stmts;
+
 use crate::args::{eat_func_args, CallArgs, FuncArgs};
 use crate::atrule::AtRule;
 use crate::common::Symbol;
@@ -8,23 +10,23 @@ use crate::scope::Scope;
 use crate::selector::Selector;
 use crate::utils::devour_whitespace;
 use crate::value::Value;
-use crate::{Token, TokenKind};
+use crate::{Stmt, Token, TokenKind};
 
 #[derive(Debug, Clone)]
 pub(crate) struct Function {
     scope: Scope,
     args: FuncArgs,
-    body: Vec<AtRule>,
+    body: Vec<Stmt>,
 }
 
 impl Function {
-    pub fn new(scope: Scope, args: FuncArgs, body: Vec<AtRule>) -> Self {
+    pub fn new(scope: Scope, args: FuncArgs, body: Vec<Stmt>) -> Self {
         Function { scope, args, body }
     }
 
     pub fn decl_from_tokens<I: Iterator<Item = Token>>(
         toks: &mut Peekable<I>,
-        mut scope: Scope,
+        scope: Scope,
         super_selector: &Selector,
     ) -> SassResult<(String, Function)> {
         let Token { kind, .. } = toks
@@ -44,27 +46,9 @@ impl Function {
             _ => return Err("expected \"(\".".into()),
         };
 
-        let mut nesting = 1;
+        let body = eat_stmts(toks, &mut scope.clone(), super_selector)?;
-        let mut body: Vec<AtRule> = Vec::new();
-
-        while nesting > 0 {
-            if let Some(tok) = toks.next() {
-                match &tok.kind {
-                    TokenKind::AtRule(rule) => body.push(AtRule::from_tokens(
-                        rule,
-                        tok.pos(),
-                        toks,
-                        &mut scope,
-                        &Selector::new(),
-                    )?),
-                    TokenKind::Symbol(Symbol::CloseCurlyBrace) => nesting -= 1,
-                    _ => {}
-                }
-            } else {
-                return Err("unexpected EOF (TODO: better error message)".into());
-            }
-        }
         devour_whitespace(toks);
+
         Ok((name, Function::new(scope, args, body)))
     }
 
@@ -86,16 +70,16 @@ impl Function {
     }
 
     pub fn call(&self, super_selector: &Selector) -> SassResult<Value> {
-        for rule in &self.body {
+        for stmt in &self.body {
-            match rule {
+            match stmt {
-                AtRule::Return(toks) => {
+                Stmt::AtRule(AtRule::Return(toks)) => {
                     return Value::from_tokens(
                         &mut toks.clone().into_iter().peekable(),
                         &self.scope,
                         super_selector,
                     )
                 }
-                AtRule::For(..) => todo!("@for in function"),
+                Stmt::AtRule(AtRule::For(..)) => todo!("@for in function"),
                 _ => return Err("This at-rule is not allowed here.".into()),
             }
         }

src/lib.rs

@@ -466,6 +466,7 @@ impl<'a> StyleSheetParser<'a> {
                     AtRule::Content => {
                         return Err("@content is only allowed within mixin declarations.".into())
                     }
+                    AtRule::Return(..) => return Err("This at-rule is not allowed here.".into()),
                     r => stmts.push(Stmt::AtRule(r)),
                 },
                 Expr::Styles(s) => stmts.extend(s.into_iter().map(Box::new).map(Stmt::Style)),
@@ -637,7 +638,7 @@ pub(crate) fn eat_expr<I: Iterator<Item = Token>>(
                         AtRule::Debug(a, b) => Ok(Some(Expr::Debug(a, b))),
                         AtRule::Warn(a, b) => Ok(Some(Expr::Warn(a, b))),
                         AtRule::Error(pos, err) => Err(SassError::new(err, pos)),
-                        AtRule::Return(_) => Err("This at-rule is not allowed here.".into()),
+                        a @ AtRule::Return(_) => Ok(Some(Expr::AtRule(a))),
                         c @ AtRule::Content => Ok(Some(Expr::AtRule(c))),
                         f @ AtRule::If(..) => Ok(Some(Expr::AtRule(f))),
                         f @ AtRule::For(..) => Ok(Some(Expr::AtRule(f))),