altos/lisp: Fix some scheme compat issues

[fw/altos] / src / lisp / ao_lisp_const.lisp

diff --git a/src/lisp/ao_lisp_const.lisp b/src/lisp/ao_lisp_const.lisp
index 3ba6aaf50fa6990c4534577eb15d554fb7f276ce..861a4fc80eed91314a76453f63528fef4d21340e 100644 (file)
--- a/src/lisp/ao_lisp_const.lisp
+++ b/src/lisp/ao_lisp_const.lisp
@@ -54,14 +54,23 @@
                                        ; basic list accessors
 
 
+(defun caar (l) (car (car l)))
+
 (defun cadr (l) (car (cdr l)))
 
 (defun caddr (l) (car (cdr (cdr l))))
 
-(defun nth (list n)
-  (cond ((= n 0) (car list))
-       ((nth (cdr list) (1- n)))
-       )
+(define list-tail (lambda (x k)
+                   (if (zero? k)
+                       x
+                     (list-tail (cdr x (- k 1)))
+                     )
+                   )
+  )
+
+(define list-ref (lambda (x k)
+                  (car (list-tail x k))
+                  )
   )
 
                                        ; simple math operators
@@ -217,16 +226,18 @@
                                        ; expressions to evaluate
 
                   (set! make-exprs (lambda (vars exprs)
-                                     (cond ((not (null? vars)) (cons
-                                                  (list set
-                                                        (list quote
-                                                              (car (car vars))
-                                                              )
-                                                        (cadr (car vars))
-                                                        )
-                                                  (make-exprs (cdr vars) exprs)
-                                                  )
-                                                 )
+                                     (cond ((not (null? vars))
+                                            (cons
+                                             (list set
+                                                   (list quote
+                                                         (car (car vars))
+                                                         )
+                                                   (cond ((null? (cdr (car vars))) ())
+                                                         (else (cadr (car vars))))
+                                                   )
+                                             (make-exprs (cdr vars) exprs)
+                                             )
+                                            )
                                            (exprs)
                                            )
                                      )
@@ -260,6 +271,7 @@
 
 (let ((x 1)) x)
 
+(define let* let)
                                        ; boolean operators
 
 (define or (lexpr (l)
@@ -336,6 +348,12 @@
       (list-tail (cdr x) (- k 1)))))
 
 (list-tail '(1 2 3) 2)
+
+(defun list-ref (x k) (car (list-tail x k)))
+
+(list-ref '(1 2 3) 2)
+
+    
                                        ; recursive equality
 
 (defun equal? (a b)
@@ -351,6 +369,160 @@
 (equal? '(a b c) '(a b c))
 (equal? '(a b c) '(a b b))
 
+(defun _member (obj list test?)
+  (if (null? list)
+      #f
+    (if (test? obj (car list))
+       list
+      (memq obj (cdr list)))))
+
+(defun memq (obj list) (_member obj list eq?))
+
+(memq 2 '(1 2 3))
+
+(memq 4 '(1 2 3))
+
+(defun memv (obj list) (_member obj list eqv?))
+
+(memv 2 '(1 2 3))
+
+(memv 4 '(1 2 3))
+
+(defun member (obj list) (_member obj list equal?))
+
+(member '(2) '((1) (2) (3)))
+
+(member '(4) '((1) (2) (3)))
+
+(defun _assoc (obj list test?)
+  (if (null? list)
+      #f
+    (if (test? obj (caar list))
+       (car list)
+      (_assoc obj (cdr list) test?)
+      )
+    )
+  )
+
+(defun assq (obj list) (_assoc obj list eq?))
+(defun assv (obj list) (_assoc obj list eqv?))
+(defun assoc (obj list) (_assoc obj list equal?))
+
+(assq 'a '((a 1) (b 2) (c 3)))
+(assv 'b '((a 1) (b 2) (c 3)))
+(assoc '(c) '((a 1) (b 2) ((c) 3)))
+
+(define char? integer?)
+
+(char? #\q)
+(char? "h")
+
+(defun char-upper-case? (c) (<= #\A c #\Z))
+
+(char-upper-case? #\a)
+(char-upper-case? #\B)
+(char-upper-case? #\0)
+(char-upper-case? #\space)
+
+(defun char-lower-case? (c) (<= #\a c #\a))
+
+(char-lower-case? #\a)
+(char-lower-case? #\B)
+(char-lower-case? #\0)
+(char-lower-case? #\space)
+
+(defun char-alphabetic? (c) (or (char-upper-case? c) (char-lower-case? c)))
+
+(char-alphabetic? #\a)
+(char-alphabetic? #\B)
+(char-alphabetic? #\0)
+(char-alphabetic? #\space)
+
+(defun char-numeric? (c) (<= #\0 c #\9))
+
+(char-numeric? #\a)
+(char-numeric? #\B)
+(char-numeric? #\0)
+(char-numeric? #\space)
+
+(defun char-whitespace? (c) (or (<= #\tab c #\return) (= #\space c)))
+
+(char-whitespace? #\a)
+(char-whitespace? #\B)
+(char-whitespace? #\0)
+(char-whitespace? #\space)
+
+(defun char->integer (c) c)
+(defun integer->char (c) char-integer)
+
+(defun char-upcase (c) (if (char-lower-case? c) (+ c (- #\A #\a)) c))
+
+(char-upcase #\a)
+(char-upcase #\B)
+(char-upcase #\0)
+(char-upcase #\space)
+
+(defun char-downcase (c) (if (char-upper-case? c) (+ c (- #\a #\A)) c))
+
+(char-downcase #\a)
+(char-downcase #\B)
+(char-downcase #\0)
+(char-downcase #\space)
+
+(define string (lexpr (chars) (list->string chars)))
+
+(display "apply\n")
+(apply cons '(a b))
+
+(define map (lexpr (proc lists)
+                  (let ((args (lambda (lists)
+                                (if (null? lists) ()
+                                  (cons (caar lists) (args (cdr lists))))))
+                        (next (lambda (lists)
+                                (if (null? lists) ()
+                                  (cons (cdr (car lists)) (next (cdr lists))))))
+                        (domap (lambda (lists)
+                                 (if (null? (car lists)) ()
+                                   (cons (apply proc (args lists)) (domap (next lists)))
+                                       )))
+                        )
+                    (domap lists))))
+
+(map cadr '((a b) (d e) (g h)))
+
+(define for-each (lexpr (proc lists)
+                       (apply map proc lists)
+                       #t))
+
+(for-each display '("hello" " " "world" "\n"))
+
+(define -string-ml (lambda (strings)
+                            (if (null? strings) ()
+                              (cons (string->list (car strings)) (-string-ml (cdr strings))))))
+
+(define string-map (lexpr (proc strings)
+                         (list->string (apply map proc (-string-ml strings))))))
+
+(string-map 1+ "HAL")
+
+(define string-for-each (lexpr (proc strings)
+                              (apply for-each proc (-string-ml strings))))
+
+(string-for-each write-char "IBM\n")
+
+(define newline (lambda () (write-char #\newline)))
+
+(newline)
+
+(call-with-current-continuation
+ (lambda (exit)
+   (for-each (lambda (x)
+              (write "test" x)
+              (if (negative? x)
+                  (exit x)))
+            '(54 0 37 -3 245 19))
+   #t))
+
 ;(define number->string (lexpr (arg opt)
 ;                            (let ((base (if (null? opt) 10 (car opt)))
                                        ;