Tom Alexander
680fc167ea
Turns out it was just a lifetime issue.
2020-05-31 20:43:07 -04:00
Tom Alexander
2b8894f9c2
Most of new_breadcrumbs_partial, just need to get the return working.
2020-05-31 20:41:27 -04:00
Tom Alexander
6bde22b667
Re-enabled compiling templates from bin.rs.
2020-05-31 19:08:10 -04:00
Tom Alexander
f1ec0ffb9e
Got rid of most of the Clone traits on the parser types since some of the parser results now contain owned values rather than just references.
2020-05-31 19:01:51 -04:00
Tom Alexander
15c8e3bf28
Get rid of the CloneIntoBoxedContextElement trait for now because I don't know if its still going to be necessary with this overhaul.
2020-05-31 18:31:49 -04:00
Tom Alexander
b8b4759d45
Remove iteration_context, parameters_context, and most of bin.rs.
...
Since I'm changing a pretty core concept of the renderer, I'm going to be rebuilding it piece by piece. In the interest of being able to rapidly change things and check if they are valid through compilation, I need to eliminate most of the old code so I do not have that weighing me down.
2020-05-31 18:27:55 -04:00
Tom Alexander
acb8dfb58e
Replaced the old renderer file with a new renderer file.
2020-05-31 18:18:21 -04:00
Tom Alexander
283430a45b
Merge the breadcrumb tree trait and struct into just a struct.
2020-05-31 18:14:26 -04:00
Tom Alexander
439601bbb5
First I'll try to eliminate the duplication between the BreadcrumbTree and BreadcrumbTreeNode.
2020-05-31 18:05:49 -04:00
Tom Alexander
1111b48270
Due to traits I am going to have to start hard-replacing the old renderer file.
2020-05-31 18:02:02 -04:00
Tom Alexander
de5914417e
All but explicit context for new_breadcrumbs_section.
2020-05-31 17:56:07 -04:00
Tom Alexander
b381789422
Slight progress on new_breadcrumbs_section.
2020-05-31 17:32:06 -04:00
Tom Alexander
2b532e7eb4
Going to try switching to boxed owned values to remove the template.
2020-05-31 17:25:41 -04:00
Tom Alexander
92dca74505
Running into issue where I need to know the type to create new tree node elements.
2020-05-31 16:40:39 -04:00
Tom Alexander
ff27c2c85d
Basic structure for the new tree renderer.
2020-05-31 16:21:13 -04:00
Tom Alexander
65445cc8fc
Finished implementing the new tree walking.
2020-05-31 16:16:21 -04:00
Tom Alexander
863744c42d
Got rid of the IceTreeIterator by using map().
2020-05-31 16:02:30 -04:00
Tom Alexander
781b8f645a
Switch IntoIter over to the breadcrumb iterator.
2020-05-31 15:58:29 -04:00
Tom Alexander
ff13d22ab6
Renamed BreadcrumbTreeIterator to IceTreeIterator.
2020-05-31 15:52:46 -04:00
Tom Alexander
89c751e849
I think I need to implement iterating on the tree nodes.
2020-05-31 15:51:18 -04:00
Tom Alexander
3f49519bea
Initial structure for new implementation of walking functions using the heterogeneous tree.
2020-05-31 15:44:09 -04:00
Tom Alexander
456da98bed
Added an iter function which I think will let me automatically make iterators without having to explicitly take a reference to the tree.
2020-05-31 14:29:59 -04:00
Tom Alexander
bebedf56e4
Implement IntoIterator for references to a BreadcrumbTreeNode.
2020-05-31 14:27:31 -04:00
Tom Alexander
1be60511ed
Implement an iterator over the tree.
2020-05-31 14:17:21 -04:00
Tom Alexander
645b251f13
Initial setup for a heterogenous tree of IntoContextElement.
2020-05-31 13:52:20 -04:00
Tom Alexander
a578b57f12
Switch the call for IntoContextElement back to a static integer so it compiles again.
2020-05-31 13:21:47 -04:00
Tom Alexander
21b9e9282b
Ran into issue: Can't returned owned data when its expecting a trait object.
2020-05-30 18:28:33 -04:00
Tom Alexander
737c98d8b7
Add the renderer to calls to convert to a context element.
2020-05-30 18:16:58 -04:00
Tom Alexander
917da5a073
Put IntoContextElement everywhere. It compiles again.
2020-05-30 17:50:27 -04:00
Tom Alexander
975ab278ef
Starting an IntoContextElement trait to allow for delayed evaluation.
2020-05-30 16:34:32 -04:00
Tom Alexander
581f9f7e97
Update parser to treat all string rvalues as templates.
2020-05-30 15:49:13 -04:00
Tom Alexander
3352b777ae
Factor out the parsing of partial template names into its own parser for reuse as an rvalue.
2020-05-30 15:45:44 -04:00
Tom Alexander
4932a4bb6f
Add tests for reference parameters.
2020-05-30 15:20:54 -04:00
Tom Alexander
0236f882b7
Delete the old new_breadcrumbs function that is no longer used.
2020-05-30 14:45:48 -04:00
Tom Alexander
d07ac3dcc9
Merge branch 'explicit_context_priority' into render
2020-05-30 14:43:23 -04:00
Tom Alexander
e7c05f597f
Add a test proving exists does not support parameters.
2020-05-30 14:42:34 -04:00
Tom Alexander
add77cf6a5
Get rid of the concept of NamedBlock and replace it with a ParameterizedBlock special case that does not support an else block.
2020-05-30 14:39:31 -04:00
Tom Alexander
eb0eb8d4ca
Add priority tests for the other block types except helpers since I do not yet have a helper implemented that sets a value.
2020-05-30 13:47:13 -04:00
Tom Alexander
9bdc398a6d
Merge branch 'pseudo_context' into explicit_context_priority
2020-05-30 12:26:11 -04:00
Tom Alexander
a0e2ba2b82
Had to update the 1-behind insertion for partial parameters to account for pseudo elements.
2020-05-30 12:24:50 -04:00
Tom Alexander
3c9a369908
Skipping over pseudo contexts has fixed most of the tests.
2020-05-30 11:50:55 -04:00
Tom Alexander
f04e84dc31
Attempted to move section over to the section-specific new breadcrumbs function.
...
I think the problem is, the index context needs to be a higher priority than the new context element, but when referencing data with `{.}` the new context element needs to take priority. I could either combine entries in the context tree so that variables like $idx and $len live side-by-side with real context elements, or try to implement a way to skip over index context elements when walking up the tree.
2020-05-25 23:28:49 -04:00
Tom Alexander
79f52ecdee
Add test for priorities while looping and split the new_breadcrumbs function into two separate new_breadcrumbs functions because sections and partials have different orderings.
2020-05-25 22:50:10 -04:00
Tom Alexander
108cffb771
Fully replaced conditional's Container type with ParameterizedBlock.
2020-05-25 21:26:16 -04:00
Tom Alexander
dc92973313
Switch parameterized blocks to having a Path for a name and taking a parser for a name matcher in the goal of merging with the conditional blocks.
2020-05-25 21:17:58 -04:00
Tom Alexander
2527baeff4
Pull the calls for the DustTag constructor up out of parameterized_block.
2020-05-25 20:40:58 -04:00
Tom Alexander
0ca17e0885
Add tests that prove that the priority between explicit contexts and parameters varies across sections and partials.
2020-05-25 20:23:10 -04:00
Tom Alexander
92ad15ff85
Merge branch 'explicit_context_setting' into render
2020-05-25 19:34:48 -04:00
Tom Alexander
c78695d08e
Remove a TODO.
2020-05-25 19:34:36 -04:00
Tom Alexander
5b1e3c5fb0
Had to sort the input to the explicit_context_setting test because dustjs leaves the original order but serde_json sorts the keys.
2020-05-25 19:30:30 -04:00
