christoffer/cookbook-dsl
1
0
Fork 0
Code Issues 5 Pull Requests Packages Projects Releases Wiki Activity

reduced code duplication in recipes-by-ingredients and contains-ingredients?

Browse Source
This commit is contained in:
Christoffer Müller Madsen 2017-04-05 13:28:32 +02:00
parent ba43937232
commit ba8dc20964
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
parse.scm
View File

@ -43,8 +43,7 @@
(define contains-ingredient? (define contains-ingredient?
(lambda (recipe search-ingredient) (lambda (recipe search-ingredient)
(let ((ingredients (ingredients recipe))) (contains-ingredients? recipe (cons search-ingredient '()))))
(ingredient-by-name ingredients search-ingredient))))
(define contains-ingredients? (define contains-ingredients?
(lambda (recipe search-ingredients) (lambda (recipe search-ingredients)
@ -58,17 +57,20 @@
))) )))
(define recipes-by-ingredients (define recipes-by-ingredients
(lambda (recipes search-ingredients)
(recipes-by-ingredients-rec recipes search-ingredients '())))
(define recipes-by-ingredients-rec
(lambda (recipes search-ingredients list) (lambda (recipes search-ingredients list)
(if (null? recipes) (if (null? recipes)
list list
(let* ((recipe (car recipes)) (let* ((recipe (car recipes))
(ingredients (ingredients recipe)) (ingredients (ingredients recipe))
(contains? (contains-ingredients? recipe (contains? (contains-ingredients? recipe
search-ingredients))) search-ingredients))
(if contains? (new-list (if contains?
(recipes-by-ingredients (cdr recipes) (cons recipe list)
list)))
(recipes-by-ingredients-rec (cdr recipes)
search-ingredients search-ingredients
(cons recipe list)) new-list)))))
(recipes-by-ingredients (cdr recipes)
search-ingredients
list))))))