altos/lisp: Rename progn to begin

[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 d9b1c1f2ed3e250cb21fcb1dae899e53594917bb..f8a709799ff5b05b580246bc176910b4345545d2 100644 (file)
--- a/src/lisp/ao_lisp_const.lisp
+++ b/src/lisp/ao_lisp_const.lisp
@@ -25,7 +25,7 @@
 
 (set (quote define) (macro (name val rest)
                        (list
-                        'progn
+                        'begin
                         (list
                          'set
                          (list 'quote name)
@@ -60,10 +60,17 @@
 
 (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
@@ -152,9 +159,6 @@
 (odd? 3)
 (odd? -1)
 
-(define exact? number?)
-(defun inexact? (x) #f)
-
                                        ; (if <condition> <if-true>)
                                        ; (if <condition> <if-true> <if-false)
 
@@ -264,6 +268,7 @@
 
 (let ((x 1)) x)
 
+(define let* let)
                                        ; boolean operators
 
 (define or (lexpr (l)
@@ -463,11 +468,9 @@
 
 (define string (lexpr (chars) (list->string chars)))
 
-(patom "apply\n")
+(display "apply\n")
 (apply cons '(a b))
 
-(define save ())
-
 (define map (lexpr (proc lists)
                   (let ((args (lambda (lists)
                                 (if (null? lists) ()
@@ -488,33 +491,55 @@
                        (apply map proc lists)
                        #t))
 
-(for-each patom '("hello" " " "world" "\n"))
+(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)
-                         (let ((make-lists (lambda (strings)
-                                             (if (null? strings) ()
-                                               (cons (string->list (car strings)) (make-lists (cdr strings))))))
-                               )
-                           (list->string (apply map proc (make-lists strings))))))
+                         (list->string (apply map proc (-string-ml strings))))))
 
 (string-map 1+ "HAL")
 
 (define string-for-each (lexpr (proc strings)
-                              (apply string-map proc strings)
-                              #t))
+                              (apply for-each proc (-string-ml strings))))
+
+(string-for-each write-char "IBM\n")
 
-(string-for-each patom "IBM")
+(define newline (lambda () (write-char #\newline)))
 
+(newline)
 
 (call-with-current-continuation
  (lambda (exit)
    (for-each (lambda (x)
-              (print "test" x)
+              (write "test" x)
               (if (negative? x)
                   (exit x)))
             '(54 0 37 -3 245 19))
    #t))
 
+(define repeat (macro (count rest)
+                       (list
+                        let
+                        (list
+                         (list '__count__ count))
+                        (append
+                         (list
+                          while
+                          (list
+                           <=
+                           0
+                           (list
+                            set!
+                            '__count__
+                            (list
+                             -
+                             '__count__
+                             1))))
+                         rest))))
+
 ;(define number->string (lexpr (arg opt)
 ;                            (let ((base (if (null? opt) 10 (car opt)))
                                        ;