X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?a=blobdiff_plain;f=scheme-library.scm;h=484f500efaa87092da9fa0f3e8097fe64a975a50;hb=069f0a8c965a6b7277f5ba8a3f939c69d787838e;hp=ffe02ea14b441741b8b4b90a98dc6f01a40e4e30;hpb=1d07170e70db6f42a900ea918ac22cce65345f2f;p=scheme.forth.jl.git

diff --git a/scheme-library.scm b/scheme-library.scm
index ffe02ea..484f500 100644
--- a/scheme-library.scm
+++ b/scheme-library.scm
@@ -13,6 +13,14 @@
 (define (cddr l) (cdr (cdr l)))
 (define (cadar l) (car (cdr (car l))))
 
+; Return number of items in list
+(define (length l)
+  (define (iter a count)
+    (if (null? a)
+      count
+      (iter (cdr a) (+ count 1))))
+  (iter l 0))
+
 ; Join two lists together
 (define (join l1 l2)
   (if (null? l1)
@@ -87,6 +95,39 @@
                 (error "cond requires at least one clause.")
                 (expand-clauses clauses)))
 
+; and
+
+(define (expand-and-expressions expressions)
+  (let ((first (car expressions))
+        (rest (cdr expressions)))
+    (if (null? rest)
+      first
+      `(if ,first
+         ,(expand-and-expressions rest)
+         #f))))
+
+(define-macro (and . expressions)
+              (if (null? expressions)
+                #t
+                (expand-and-expressions expressions)))
+
+; or
+
+(define (expand-or-expressions expressions)
+  (if (null? expressions)
+    #f
+    (let ((first (car expressions))
+          (rest (cdr expressions))
+          (val (gensym)))
+      `(let ((,val ,first))
+         (if ,val
+            ,val
+            ,(expand-or-expressions rest))))))
+
+(define-macro (or . expressions)
+              (expand-or-expressions expressions))
+
+
 ;; TESTING
 
 (define-macro (backwards . body)