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

consolidate inspect implementations

Browse Source
This commit is contained in:
ConnorSkees 2020-04-06 00:27:09 -04:00
parent 4ab4f401d5
commit ef282c5c18
3 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/atrule/mod.rs
View File

@ -83,17 +83,7 @@ impl AtRule {
toks.next();
}
devour_whitespace(toks);
AtRule::Debug(
pos,
match message {
Value::List(v, _, brackets) if v.is_empty() => match brackets {
Brackets::None => "()".to_string(),
Brackets::Bracketed => "[]".to_string(),
},
Value::Function(f) => format!("get-function(\"{}\")", f.name()),
v => v.to_string(),
},
)
AtRule::Debug(pos, message.inspect())
}
AtRuleKind::Mixin => {
let (name, mixin) = Mixin::decl_from_tokens(toks, scope, super_selector)?;

11
src/builtin/meta.rs
View File

@ -1,7 +1,7 @@
use std::collections::HashMap;
use super::{Builtin, GLOBAL_FUNCTIONS};
use crate::common::{Brackets, QuoteKind};
use crate::common::QuoteKind;
use crate::scope::global_var_exists;
use crate::unit::Unit;
use crate::value::{SassFunction, Value};
@ -80,14 +80,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
Builtin::new(|mut args, scope, super_selector| {
max_args!(args, 1);
Ok(Value::Ident(
match arg!(args, scope, super_selector, 0, "value") {
Value::List(v, _, brackets) if v.is_empty() => match brackets {
Brackets::None => "()".to_string(),
Brackets::Bracketed => "[]".to_string(),
},
Value::Function(f) => format!("get-function(\"{}\")", f.name()),
v => v.to_string(),
},
arg!(args, scope, super_selector, 0, "value").inspect(),
QuoteKind::None,
))
}),

11
src/value/mod.rs
View File

@ -186,6 +186,17 @@ impl Value {
}
}
pub fn inspect(&self) -> String {
match self {
Value::List(v, _, brackets) if v.is_empty() => match brackets {
Brackets::None => "()".to_string(),
Brackets::Bracketed => "[]".to_string(),
},
Value::Function(f) => format!("get-function(\"{}\")", f.name()),
v => v.to_string(),
}
}
pub fn equals(self, other: Value) -> SassResult<bool> {
Ok(match self.eval()? {
Self::Ident(s1, ..) => match other {