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

simplify ident addition/subtraction

Browse Source
This commit is contained in:
ConnorSkees 2020-04-18 13:44:11 -04:00
parent fc51798595
commit 759e5fdfef
2 changed files with 12 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/value/mod.rs
View File

@ -122,7 +122,7 @@ impl Value {
} }
Self::True => "true".to_string(), Self::True => "true".to_string(),
Self::False => "false".to_string(), Self::False => "false".to_string(),
Self::Null => "null".to_string(), Self::Null => String::new(),
Self::ArgList(args) => format!( Self::ArgList(args) => format!(
"{}", "{}",
args.iter() args.iter()
@ -194,6 +194,7 @@ impl Value {
Brackets::Bracketed => "[]".to_string(), Brackets::Bracketed => "[]".to_string(),
}, },
Value::Function(f) => format!("get-function(\"{}\")", f.name()), Value::Function(f) => format!("get-function(\"{}\")", f.name()),
Value::Null => "null".to_string(),
v => v.to_css_string(span)?, v => v.to_css_string(span)?,
}) })
} }

42
src/value/ops.rs
View File

@ -113,19 +113,9 @@ impl Value {
} }
} }
Self::UnaryOp(..) | Self::Paren(..) => self.eval(span)?.node.add(other, span)?, Self::UnaryOp(..) | Self::Paren(..) => self.eval(span)?.node.add(other, span)?,
Self::Ident(s1, quotes1) => match other { Self::Ident(text, quotes) => match other {
Self::Ident(s2, _) => Value::Ident(format!("{}{}", s1, s2), quotes1), Self::Ident(text2, ..) => Self::Ident(text + &text2, quotes),
Self::Important | Self::True | Self::False | Self::Dimension(..) => { _ => Value::Ident(text + &other.to_css_string(span)?, quotes),
Value::Ident(format!("{}{}", s1, other.to_css_string(span)?), quotes1)
}
Self::Null => Value::Ident(s1, quotes1),
Self::Color(c) => Value::Ident(format!("{}{}", s1, c), quotes1),
Self::List(..) => {
Value::Ident(format!("{}{}", s1, other.to_css_string(span)?), quotes1)
}
Self::UnaryOp(..) | Self::BinaryOp(..) => todo!(),
Self::Paren(..) => Self::Ident(s1, quotes1).add(other.eval(span)?.node, span)?,
Self::Function(..) | Self::ArgList(..) | Self::Map(..) => todo!(),
}, },
Self::List(..) => match other { Self::List(..) => match other {
Self::Ident(s, q) => Value::Ident(format!("{}{}", self.to_css_string(span)?, s), q), Self::Ident(s, q) => Value::Ident(format!("{}{}", self.to_css_string(span)?, s), q),
@ -223,26 +213,14 @@ impl Value {
} }
} }
Self::Paren(..) => self.eval(span)?.node.sub(other, span)?, Self::Paren(..) => self.eval(span)?.node.sub(other, span)?,
Self::Ident(s1, q1) => match other { Self::Ident(..) => Self::Ident(
Self::Ident(s2, q2) => Value::Ident( format!(
format!("{}{}{}-{}{}{}", q1, s1, q1, q2, s2, q2), "{}-{}",
QuoteKind::None, self.to_css_string(span)?,
other.to_css_string(span)?
), ),
Self::Important QuoteKind::None,
| Self::True ),
| Self::False
| Self::Dimension(..)
| Self::Color(..) => Value::Ident(
format!("{}{}{}-{}", q1, s1, q1, other.to_css_string(span)?),
QuoteKind::None,
),
Self::Null => Value::Ident(format!("{}{}{}-", q1, s1, q1), QuoteKind::None),
Self::List(..) => Value::Ident(
format!("{}{}{}-{}", q1, s1, q1, other.to_css_string(span)?),
QuoteKind::None,
),
_ => todo!(),
},
Self::List(..) => match other { Self::List(..) => match other {
Self::Ident(s, q) => Value::Ident( Self::Ident(s, q) => Value::Ident(
format!("{}-{}{}{}", self.to_css_string(span)?, q, s, q), format!("{}-{}{}{}", self.to_css_string(span)?, q, s, q),