talexander/duster
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Have greater than helper very close to correct. Just need to make it compare arrays of scalars.

Browse Source
This commit is contained in:
Tom Alexander
2020-05-16 16:24:36 -04:00
parent 48e35c54bb
commit 6758d515f1
3 changed files with 65 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/renderer/renderer.rs
View File

@@ -340,6 +340,53 @@ impl<'a> DustRenderer<'a> {
.iter()
.map(|pair: &KVPair<'a>| (pair.key, &pair.value))
.collect();
let left_side: Result<&dyn ContextElement, WalkError> = match param_map.get("key") {
None => return Ok("".to_owned()),
Some(rval) => match rval {
RValue::RVString(text) => Ok(text),
RValue::RVPath(path) => walk_path(breadcrumbs, &path.keys),
RValue::RVPositiveInteger(num) => Ok(num),
},
};
let right_side: Result<&dyn ContextElement, WalkError> =
match param_map.get("value") {
None => Err(WalkError::CantWalk),
Some(rval) => match rval {
RValue::RVString(text) => Ok(text),
RValue::RVPath(path) => walk_path(breadcrumbs, &path.keys),
RValue::RVPositiveInteger(num) => Ok(num),
},
};
match (left_side, right_side) {
(Err(_), _) | (_, Err(_)) => match &parameterized_block.else_contents {
None => return Ok("".to_owned()),
Some(body) => {
let rendered_content = self.render_body(body, breadcrumbs, blocks)?;
return Ok(rendered_content);
}
},
(Ok(left_side_unwrapped), Ok(right_side_unwrapped)) => {
if left_side_unwrapped > right_side_unwrapped {
match &parameterized_block.contents {
None => return Ok("".to_owned()),
Some(body) => {
let rendered_content =
self.render_body(body, breadcrumbs, blocks)?;
return Ok(rendered_content);
}
}
} else {
match &parameterized_block.else_contents {
None => return Ok("".to_owned()),
Some(body) => {
let rendered_content =
self.render_body(body, breadcrumbs, blocks)?;
return Ok(rendered_content);
}
}
}
}
}
}
_ => (), // TODO: Implement the rest
}