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

Implemented none and any, but I need to implement early termination.

Browse Source
This commit is contained in:
Tom Alexander 2020-06-07 18:52:09 -04:00
parent f1b868ce33
commit 0fac063c8d
Signed by: talexander
GPG Key ID: D3A179C9A53C0EDE
2 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/test_cases/helpers_select/main.dust
View File

@ -100,3 +100,11 @@ Early termination stand-alone comparison{~n}
If your pet was a {type} we'd name it {pet_name}{~n} If your pet was a {type} we'd name it {pet_name}{~n}
{/pet_names} {/pet_names}
{/select}{~n} {/select}{~n}
@any alone{~n}
=========={~n}
{@any}{person} has a pet!{~n}{/any}
@none alone{~n}
==========={~n}
{@none}I don't know what to name {person}'s pet...{~n}{/none}

36
src/renderer/renderer.rs
View File

@ -601,8 +601,40 @@ impl<'a> DustRenderer<'a> {
} }
} }
} }
DustTag::DTHelperAny(parameterized_block) => todo!(), DustTag::DTHelperAny(parameterized_block) => match select_context {
DustTag::DTHelperNone(parameterized_block) => todo!(), Some(sc) if sc.were_any_true => {
let new_breadcrumbs = self.new_breadcrumbs_partial(
breadcrumbs,
breadcrumbs,
None,
&parameterized_block.explicit_context,
);
return self.render_maybe_body(
&parameterized_block.contents,
new_breadcrumbs.as_ref().unwrap_or(breadcrumbs),
blocks,
None,
);
}
_ => return Ok("".to_owned()),
},
DustTag::DTHelperNone(parameterized_block) => match select_context {
Some(sc) if !sc.were_any_true => {
let new_breadcrumbs = self.new_breadcrumbs_partial(
breadcrumbs,
breadcrumbs,
None,
&parameterized_block.explicit_context,
);
return self.render_maybe_body(
&parameterized_block.contents,
new_breadcrumbs.as_ref().unwrap_or(breadcrumbs),
blocks,
None,
);
}
_ => return Ok("".to_owned()),
},
} }
Ok("".to_owned()) Ok("".to_owned())