summaryrefslogtreecommitdiffstats
path: root/src/eval.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/eval.c')
-rw-r--r--src/eval.c15
1 files changed, 5 insertions, 10 deletions
diff --git a/src/eval.c b/src/eval.c
index a26cc21..8bc886a 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -5,17 +5,12 @@ recipe *
eval(recipe * r)
{
if (!r) return NULL;
- recipe * r1 = new_recipe();
- recipe * r2 = new_recipe();
- /* attempt to merge items (adding qtys) */
- merge_items(r1, r);
- distinct_sum_items(r2, r1);
- free_recipe(r1);
+ recipe * _r = new_recipe();
- copy_metadata(r2, r);
- /* /\* Resolve step type, variables, duration and step output (if any) *\/ */
- /* finalize_steps(eve, r); */
+ merge_items(_r, r);
+ merge_steps(_r, r);
+ copy_metadata(_r, r);
- return r2;
+ return _r;
}