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

Store Vec<Token> inside @return rather than Value

Browse Source 
This is because we want to lazily evaluate variables
This commit is contained in:
ConnorSkees 2020-01-25 20:55:44 -05:00
parent 47ef4c1cda
commit 93497ed4a8
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/atrule.rs
View File

@ -1,13 +1,12 @@
use std::convert::TryFrom; use std::convert::TryFrom;
use std::iter::Peekable;
use std::fmt::{self, Display}; use std::fmt::{self, Display};
use std::iter::Peekable;
use crate::{Token, TokenKind};
use crate::common::{Pos, Scope, Symbol}; use crate::common::{Pos, Scope, Symbol};
use crate::function::Function; use crate::function::Function;
use crate::mixin::Mixin; use crate::mixin::Mixin;
use crate::utils::devour_whitespace; use crate::utils::devour_whitespace;
use crate::value::Value; use crate::{Token, TokenKind};
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub(crate) enum AtRule { pub(crate) enum AtRule {
@ -16,7 +15,7 @@ pub(crate) enum AtRule {
Debug(Pos, String), Debug(Pos, String),
Mixin(String, Box<Mixin>), Mixin(String, Box<Mixin>),
Function(String, Box<Function>), Function(String, Box<Function>),
Return(Value), Return(Vec<Token>),
} }
impl AtRule { impl AtRule {
@ -66,7 +65,11 @@ impl AtRule {
}; };
AtRule::Function(name, Box::new(func)) AtRule::Function(name, Box::new(func))
} }
AtRuleKind::Return => AtRule::Return(Value::from_tokens(toks, scope).unwrap()), AtRuleKind::Return => AtRule::Return(
// todo: return may not end in semicolon
toks.take_while(|t| t.kind != TokenKind::Symbol(Symbol::SemiColon))
.collect(),
),
AtRuleKind::Use => todo!("@use not yet implemented"), AtRuleKind::Use => todo!("@use not yet implemented"),
AtRuleKind::Annotation => todo!("@annotation not yet implemented"), AtRuleKind::Annotation => todo!("@annotation not yet implemented"),
AtRuleKind::AtRoot => todo!("@at-root not yet implemented"), AtRuleKind::AtRoot => todo!("@at-root not yet implemented"),