projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/lisp: More schemisms
[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 3c8fd21b73165a6c3d2bd95c40b5c73ddec010bb..37307a6877758938bb1f9258a701940770560c30 100644
(file)
--- a/
src/lisp/ao_lisp_const.lisp
+++ b/
src/lisp/ao_lisp_const.lisp
@@
-23,17
+23,17
@@
; having lots of output generated
;
; having lots of output generated
;
-(set
q def
(macro (name val rest)
- (list
- 'progn
- (list
- 'set
- (list 'quote name)
- val)
- (list 'quote name)
- )
- )
-
)
+(set
(quote define)
(macro (name val rest)
+
(list
+
'progn
+
(list
+
'set
+
(list 'quote name)
+
val)
+
(list 'quote name)
+
)
+
)
+ )
;
; A slightly more convenient form
;
; A slightly more convenient form
@@
-42,9
+42,9
@@
; (defun <name> (<params>) s-exprs)
;
; (defun <name> (<params>) s-exprs)
;
-(def defun (macro (name args exprs)
+(def
ine
defun (macro (name args exprs)
(list
(list
- def
+ def
ine
name
(cons 'lambda (cons args exprs))
)
name
(cons 'lambda (cons args exprs))
)
@@
-69,6
+69,28
@@
(defun 1+ (x) (+ x 1))
(defun 1- (x) (- x 1))
(defun 1+ (x) (+ x 1))
(defun 1- (x) (- x 1))
+(define if (macro (test args)
+ (cond ((null? (cdr args))
+ (list
+ cond
+ (list test (car args)))
+ )
+ (else
+ (list
+ cond
+ (list test (car args))
+ (list 'else (cadr args))
+ )
+ )
+ )
+ )
+ )
+
+(if (> 3 2) 'yes)
+(if (> 3 2) 'yes 'no)
+(if (> 2 3) 'no 'yes)
+(if (> 2 3) 'no)
+
; define a set of local
; variables and then evaluate
; a list of sexprs
; define a set of local
; variables and then evaluate
; a list of sexprs
@@
-85,17
+107,17
@@
;
; e.g.
;
;
; e.g.
;
- ; (let ((x 1) (y)) (set
q
y (+ x 1)) y)
+ ; (let ((x 1) (y)) (set
!
y (+ x 1)) y)
-(def let (macro (vars exprs)
+(def
ine
let (macro (vars exprs)
((lambda (make-names make-exprs make-nils)
;
; make the list of names in the let
;
((lambda (make-names make-exprs make-nils)
;
; make the list of names in the let
;
- (set
q
make-names (lambda (vars)
- (cond (
vars
+ (set
!
make-names (lambda (vars)
+ (cond (
(not (null? vars))
(cons (car (car vars))
(make-names (cdr vars))))
)
(cons (car (car vars))
(make-names (cdr vars))))
)
@@
-107,8
+129,8
@@
; pre-pended to the
; expressions to evaluate
; pre-pended to the
; expressions to evaluate
- (set
q
make-exprs (lambda (vars exprs)
- (cond (
vars
(cons
+ (set
!
make-exprs (lambda (vars exprs)
+ (cond (
(not (null? vars))
(cons
(list set
(list quote
(car (car vars))
(list set
(list quote
(car (car vars))
@@
-126,15
+148,15
@@
; the parameters to the lambda is a list
; of nils of the right length
; the parameters to the lambda is a list
; of nils of the right length
- (set
q
make-nils (lambda (vars)
- (cond (
vars (cons nil
(make-nils (cdr vars))))
+ (set
!
make-nils (lambda (vars)
+ (cond (
(not (null? vars)) (cons ()
(make-nils (cdr vars))))
)
)
)
; prepend the set operations
; to the expressions
)
)
)
; prepend the set operations
; to the expressions
- (set
q
exprs (make-exprs vars exprs))
+ (set
!
exprs (make-exprs vars exprs))
; build the lambda.
; build the lambda.
@@
-149,14
+171,15
@@
)
)
)
)
+(let ((x 1)) x)
+
; boolean operators
; boolean operators
-(def or (lexpr (l)
- (let ((ret nil))
- (while l
- (cond ((setq ret (car l))
- (setq l nil))
- ((setq l (cdr l)))))
+(define or (lexpr (l)
+ (let ((ret #f))
+ (while (not (null? l))
+ (cond ((car l) (set! ret #t) (set! l ()))
+ ((set! l (cdr l)))))
ret
)
)
ret
)
)
@@
-164,14
+187,16
@@
; execute to resolve macros
; execute to resolve macros
-(or
nil
t)
+(or
#f #
t)
-(def and (lexpr (l)
- (let ((ret t))
- (while l
- (cond ((setq ret (car l))
- (setq l (cdr l)))
- ((setq ret (setq l nil)))
+(define and (lexpr (l)
+ (let ((ret #t))
+ (while (not (null? l))
+ (cond ((car l)
+ (set! l (cdr l)))
+ (#t
+ (set! ret #f)
+ (set! l ()))
)
)
ret
)
)
ret
@@
-181,4
+206,17
@@
; execute to resolve macros
; execute to resolve macros
-(and t nil)
+(and #t #f)
+
+(defun equal? (a b)
+ (cond ((eq? a b) #t)
+ ((and (pair? a) (pair? b))
+ (and (equal? (car a) (car b))
+ (equal? (cdr a) (cdr b)))
+ )
+ (else #f)
+ )
+ )
+
+(equal? '(a b c) '(a b c))
+(equal? '(a b c) '(a b b))