map: support two lists.

2016-07-09 22:05:07 +02:00 · 2016-07-09 22:05:07 +02:00 · de2e9502cf
parent 717ae9cdc1
commit de2e9502cf
2 changed files with 7 additions and 1 deletions
--- a/scm.mes
+++ b/scm.mes
@ -95,4 +95,6 @@ EOF

 (define (map f l . r)
  (cond ((null l) '())
-        ((null r) (cons (f (car l)) (map f (cdr l))))))
+        ((null r) (cons (f (car l)) (map f (cdr l))))
+        ((null (cdr r))
+         (cons (f (car l) (caar r)) (map f (cdr l) (cdar r))))))
--- a/test.mes
+++ b/test.mes
@ -102,4 +102,8 @@
 (newline)
 (map '(lambda (x) (display x) (newline)) '(5 6 7 8))
 (newline)
+
+(map '(lambda (i a) (display i) (display ':) (display a) (newline)) '(1 2 3 4) '(a b c d))
+(newline)
+
 '()