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

Handle variables in binary ops in function calls

Browse Source
This commit is contained in:
ConnorSkees 2020-02-29 18:58:09 -05:00
parent c5f2d04c6c
commit 7949699229
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/args.rs
View File

@ -143,7 +143,8 @@ pub(crate) fn eat_call_args<I: Iterator<Item = Token>>(
TokenKind::Variable(_) => { TokenKind::Variable(_) => {
let v = toks.next().unwrap(); let v = toks.next().unwrap();
devour_whitespace_or_comment(toks); devour_whitespace_or_comment(toks);
if toks.next().unwrap().is_symbol(Symbol::Colon) { if toks.peek().unwrap().is_symbol(Symbol::Colon) {
toks.next();
name = v.kind.to_string(); name = v.kind.to_string();
} else { } else {
val.push(v); val.push(v);

5
tests/functions.rs
View File

@ -48,3 +48,8 @@ test!(
"@function a() {\n @return 1; @return 2;\n}\n\nb {\ncolor: a();\n}\n", "@function a() {\n @return 1; @return 2;\n}\n\nb {\ncolor: a();\n}\n",
"b {\n color: 1;\n}\n" "b {\n color: 1;\n}\n"
); );
test!(
value_after_variable,
"$x: 0;\na {\n color: if($x != 0, a, b);\n}\n",
"a {\n color: b;\n}\n"
);