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

allow != in variables

Browse Source
This commit is contained in:
Connor Skees 2020-07-02 15:54:33 -04:00
parent bf0665bbcd
commit 1ef93c082b
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/parse/variable.rs
View File

@ -155,19 +155,25 @@ impl<'a> Parser<'a> {
}
'!' => {
let pos = tok.pos();
if self.toks.peek_forward(1).is_none() {
return Err(("Expected identifier.", pos).into());
match self.toks.peek_forward(1) {
Some(Token { kind: '=', .. }) => {
self.toks.reset_cursor();
val_toks.push(self.toks.next().unwrap());
continue;
}
Some(..) => {}
None => return Err(("Expected identifier.", pos).into()),
}
// todo: it should not be possible to declare the same flag more than once
let mut ident = peek_ident_no_interpolation(self.toks, false, pos)?;
ident.node.make_ascii_lowercase();
match ident.node.as_str() {
"global" => {
self.toks.take(7).for_each(drop);
self.toks.truncate_iterator_to_cursor();
global = true;
}
"default" => {
self.toks.take(8).for_each(drop);
self.toks.truncate_iterator_to_cursor();
default = true;
}
"important" => {

5
tests/variables.rs
View File

@ -133,6 +133,11 @@ test!(
"$a: red;\n\na {\n $a: green !\\67 lobal;\n}\n\na {\n color: $a;\n}\n",
"a {\n color: green;\n}\n"
);
test!(
not_equal_in_variable_decl,
"$a: red != blue;\n\na {\n color: $a;\n}\n",
"a {\n color: true;\n}\n"
);
error!(ends_with_bang, "$a: red !;", "Error: Expected identifier.");
error!(unknown_flag, "$a: red !foo;", "Error: Invalid flag name.");
error!(