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

Remove nesting check in ruleset parsing

Browse Source
This commit is contained in:
ConnorSkees 2020-01-17 10:43:03 -05:00
parent 5b631fb588
commit d4f50c8acc
1 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/mixin.rs
View File

@ -1,25 +1,17 @@
use crate::common::{Pos, Scope, Symbol};
use crate::common::Scope;
use crate::selector::Selector;
use crate::style::Style;
use crate::utils::{devour_whitespace, eat_variable_value_ref};
use crate::{eat_expr, Expr, RuleSet, Stmt, Token, TokenKind};
use std::vec::IntoIter;
use crate::{eat_expr, Expr, RuleSet, Stmt, Token};
use std::iter::Peekable;
use std::vec::IntoIter;
#[derive(Debug, Clone)]
pub struct Mixin {
scope: Scope,
args: FuncArgs,
// body: Vec<Token>,
body: Peekable<IntoIter<Token>>,
nesting: u32,
}
// struct MixinEvaluator<'a> {
// body: Vec<Token>,
// nesting: u32,
// }
impl Mixin {
pub fn new(scope: Scope, args: FuncArgs, body: Vec<Token>) -> Self {
let body = body.clone().into_iter().peekable();
@ -40,7 +32,6 @@ impl Mixin {
Expr::MixinDecl(_, _) => todo!(),
Expr::Selector(s) => {
self.nesting += 1;
dbg!(&self.nesting);
let rules = self.eval(&super_selector.clone().zip(s.clone()), scope);
stmts.push(Stmt::RuleSet(RuleSet {
super_selector: super_selector.clone(),
@ -48,9 +39,6 @@ impl Mixin {
rules,
}));
self.nesting -= 1;
if self.nesting == 0 {
return stmts;
}
}
Expr::VariableDecl(name, val) => {
if self.nesting == 0 {