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

Implement function to convert IceResult into a BreadcrumbTreeElement.

Browse Source
This commit is contained in:
Tom Alexander 2020-06-06 18:37:35 -04:00
parent 18c1687064
commit 7253c7d99e
Signed by: talexander
GPG Key ID: D3A179C9A53C0EDE
2 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/renderer/breadcrumb_tree.rs
View File

@ -1,3 +1,4 @@
use crate::renderer::context_element::IceResult;
use crate::renderer::context_element::IntoContextElement;
use std::borrow::Borrow;
use std::rc::Rc;
@ -17,6 +18,17 @@ pub enum BreadcrumbTreeElement<'a> {
Borrowed(&'a dyn IntoContextElement),
}
impl<'a> From<&'a IceResult<'a>> for BreadcrumbTreeElement<'a> {
fn from(inp: &'a IceResult<'a>) -> Self {
match inp {
IceResult::Owned(rc_ce) => {
BreadcrumbTreeElement::Borrowed(rc_ce.from_context_element())
}
IceResult::Borrowed(ce) => BreadcrumbTreeElement::Borrowed(ce.from_context_element()),
}
}
}
impl<'a> BreadcrumbTree<'a> {
pub fn new(parent: Option<&'a BreadcrumbTree>, element: BreadcrumbTreeElement<'a>) -> Self {
BreadcrumbTree {

25
src/renderer/parameters_context.rs
View File

@ -27,8 +27,8 @@ pub struct ParametersContext<'a> {
impl<'a> ParametersContext<'a> {
pub fn new(
renderer: &DustRenderer,
breadcrumbs: Option<&BreadcrumbTree>,
params: &Vec<KVPair>,
breadcrumbs: Option<&'a BreadcrumbTree>,
params: &'a Vec<KVPair>,
) -> Self {
// If the parameter is a Path, then we resolve it immediately
// to a context element because those are resolved using the
@ -38,8 +38,27 @@ impl<'a> ParametersContext<'a> {
// then those are resolved at the time of access rather than
// the time of assignment, so we leave them into their
// original IntoContextElement state.
let rendered_params = params
.iter()
.map(|kvpair| {
let k = kvpair.key;
let v: &dyn IntoContextElement = match &kvpair.value {
RValue::RVLiteral(owned_literal) => &kvpair.value,
/*RValue::RVPath(path) => kvpair
.value
.into_context_element(renderer, breadcrumbs)
.unwrap()
.get_context_element_reference()
.from_context_element(),*/
RValue::RVPath(path) => todo!(),
RValue::RVTemplate(template) => todo!(),
};
(k, v)
})
.collect();
ParametersContext {
params: HashMap::new(),
params: rendered_params,
}
}
}