From f1927a3b57f5fe4001297f44045e2b06f8cd3942 Mon Sep 17 00:00:00 2001 From: JeffBezanson Date: Thu, 19 Feb 2009 22:29:47 +0000 Subject: [PATCH] moving delete-duplicates and new f-body so they can be macroexpanded in advance deprecating setf, labels, and try (weren't used anywhere) adding string.tail changing match to use delete-duplicates --- femtolisp/ast/match.scm | 9 +- femtolisp/attic/scrap.lsp | 100 +++++++++++++++++++++ femtolisp/system.lsp | 182 +++++++++----------------------------- 3 files changed, 144 insertions(+), 147 deletions(-) create mode 100644 femtolisp/attic/scrap.lsp diff --git a/femtolisp/ast/match.scm b/femtolisp/ast/match.scm index d99a917..ff7257c 100644 --- a/femtolisp/ast/match.scm +++ b/femtolisp/ast/match.scm @@ -1,13 +1,6 @@ ; tree regular expression pattern matching ; by Jeff Bezanson -(define (unique lst) - (if (null? lst) - () - (cons (car lst) - (filter (lambda (x) (not (eq? x (car lst)))) - (unique (cdr lst)))))) - ; list of special pattern symbols that cannot be variable names (define metasymbols '(_ ...)) @@ -141,7 +134,7 @@ ((pair? p) (if (eq? (car p) '-/) () - (unique (apply append (map patargs- (cdr p)))))) + (delete-duplicates (apply append (map patargs- (cdr p)))))) (else ()))) (cons '__ (patargs- p))) diff --git a/femtolisp/attic/scrap.lsp b/femtolisp/attic/scrap.lsp new file mode 100644 index 0000000..a16674a --- /dev/null +++ b/femtolisp/attic/scrap.lsp @@ -0,0 +1,100 @@ +; -*- scheme -*- +; (try expr +; (catch (type-error e) . exprs) +; (catch (io-error e) . exprs) +; (catch (e) . exprs) +; (finally . exprs)) +(define-macro (try expr . forms) + (let* ((e (gensym)) + (reraised (gensym)) + (final (f-body (cdr (or (assq 'finally forms) '(()))))) + (catches (filter (lambda (f) (eq (car f) 'catch)) forms)) + (catchblock `(cond + ,.(map (lambda (catc) + (let* ((specific (cdr (cadr catc))) + (extype (caadr catc)) + (var (if specific (car specific) + extype)) + (todo (cddr catc))) + `(,(if specific + ; exception matching logic + `(or (eq ,e ',extype) + (and (pair? ,e) + (eq (car ,e) + ',extype))) + #t); (catch (e) ...), match anything + (let ((,var ,e)) (begin ,@todo))))) + catches) + (#t (raise ,e))))) ; no matches, reraise + (if final + (if catches + ; form with both catch and finally + `(prog1 (trycatch ,expr + (lambda (,e) + (trycatch ,catchblock + (lambda (,reraised) + (begin ,final + (raise ,reraised)))))) + ,final) + ; finally only; same as unwind-protect + `(prog1 (trycatch ,expr (lambda (,e) + (begin ,final (raise ,e)))) + ,final)) + ; catch, no finally + `(trycatch ,expr (lambda (,e) ,catchblock))))) + +; setf +; expands (setf (place x ...) v) to (mutator (f x ...) v) +; (mutator (identity x ...) v) is interpreted as (mutator x ... v) +(set! *setf-place-list* + ; place mutator f + '((car rplaca identity) + (cdr rplacd identity) + (caar rplaca car) + (cadr rplaca cdr) + (cdar rplacd car) + (cddr rplacd cdr) + (caaar rplaca caar) + (caadr rplaca cadr) + (cadar rplaca cdar) + (caddr rplaca cddr) + (cdaar rplacd caar) + (cdadr rplacd cadr) + (cddar rplacd cdar) + (cdddr rplacd cddr) + (list-ref rplaca nthcdr) + (get put! identity) + (aref aset! identity) + (symbol-syntax set-syntax! identity))) + +(define (setf-place-mutator place val) + (if (symbol? place) + (list 'set! place val) + (let ((mutator (assq (car place) *setf-place-list*))) + (if (null? mutator) + (error "setf: unknown place " (car place)) + (if (eq (caddr mutator) 'identity) + (cons (cadr mutator) (append (cdr place) (list val))) + (list (cadr mutator) + (cons (caddr mutator) (cdr place)) + val)))))) + +(define-macro (setf . args) + (f-body + ((label setf- + (lambda (args) + (if (null? args) + () + (cons (setf-place-mutator (car args) (cadr args)) + (setf- (cddr args)))))) + args))) + +(define-macro (labels binds . body) + (cons (list 'lambda (map car binds) + (f-body + (nconc (map (lambda (b) + (list 'set! (car b) (cons 'lambda (cdr b)))) + binds) + body))) + (map (lambda (x) #f) binds))) + diff --git a/femtolisp/system.lsp b/femtolisp/system.lsp index 4e39da4..0cfb2a5 100644 --- a/femtolisp/system.lsp +++ b/femtolisp/system.lsp @@ -101,43 +101,6 @@ ((eqv (caar lst) item) (car lst)) (#t (assv item (cdr lst))))) -(define (delete-duplicates lst) - (if (atom? lst) - lst - (let ((elt (car lst)) - (tail (cdr lst))) - (if (member elt tail) - (delete-duplicates tail) - (cons elt - (delete-duplicates tail)))))) - -(define (get-defined-vars- expr) - (cond ((atom? expr) ()) - ((and (eq? (car expr) 'define) - (pair? (cdr expr))) - (or (and (symbol? (cadr expr)) - (list (cadr expr))) - (and (pair? (cadr expr)) - (symbol? (caadr expr)) - (list (caadr expr))) - ())) - ((eq? (car expr) 'begin) - (apply append (map get-defined-vars- (cdr expr)))) - (else ()))) -(define (get-defined-vars expr) - (delete-duplicates (get-defined-vars- expr))) - -; redefine f-body to support internal defines -(define f-body- f-body) -(define (f-body e) - ((lambda (B) - ((lambda (V) - (if (null? V) - B - (cons (list 'lambda V B) (map (lambda (x) #f) V)))) - (get-defined-vars B))) - (f-body- e))) - (define (macrocall? e) (and (symbol? (car e)) (symbol-syntax (car e)))) @@ -196,6 +159,43 @@ (macroexpand (list 'lambda (cdr form) (f-body body))))) (define macroexpand (macroexpand macroexpand)) +(define (delete-duplicates lst) + (if (atom? lst) + lst + (let ((elt (car lst)) + (tail (cdr lst))) + (if (member elt tail) + (delete-duplicates tail) + (cons elt + (delete-duplicates tail)))))) + +(define (get-defined-vars- expr) + (cond ((atom? expr) ()) + ((and (eq? (car expr) 'define) + (pair? (cdr expr))) + (or (and (symbol? (cadr expr)) + (list (cadr expr))) + (and (pair? (cadr expr)) + (symbol? (caadr expr)) + (list (caadr expr))) + ())) + ((eq? (car expr) 'begin) + (apply append (map get-defined-vars- (cdr expr)))) + (else ()))) +(define (get-defined-vars expr) + (delete-duplicates (get-defined-vars- expr))) + +; redefine f-body to support internal defines +(define f-body- f-body) +(define (f-body e) + ((lambda (B) + ((lambda (V) + (if (null? V) + B + (cons (list 'lambda V B) (map (lambda (x) #f) V)))) + (get-defined-vars B))) + (f-body- e))) + (define = eqv) (define eql eqv) (define (/= a b) (not (equal a b))) @@ -334,15 +334,6 @@ (map (lambda (x) #f) binds))) (set-syntax! 'letrec (symbol-syntax 'let*)) -(define-macro (labels binds . body) - (cons (list 'lambda (map car binds) - (f-body - (nconc (map (lambda (b) - (list 'set! (car b) (cons 'lambda (cdr b)))) - binds) - body))) - (map (lambda (x) #f) binds))) - (define-macro (when c . body) (list 'if c (f-body body) #f)) (define-macro (unless c . body) (list 'if c #f (f-body body))) @@ -385,96 +376,6 @@ (lambda (,e) (begin ,finally (raise ,e)))) ,finally))) -; (try expr -; (catch (type-error e) . exprs) -; (catch (io-error e) . exprs) -; (catch (e) . exprs) -; (finally . exprs)) -(define-macro (try expr . forms) - (let* ((e (gensym)) - (reraised (gensym)) - (final (f-body (cdr (or (assq 'finally forms) '(()))))) - (catches (filter (lambda (f) (eq (car f) 'catch)) forms)) - (catchblock `(cond - ,.(map (lambda (catc) - (let* ((specific (cdr (cadr catc))) - (extype (caadr catc)) - (var (if specific (car specific) - extype)) - (todo (cddr catc))) - `(,(if specific - ; exception matching logic - `(or (eq ,e ',extype) - (and (pair? ,e) - (eq (car ,e) - ',extype))) - #t); (catch (e) ...), match anything - (let ((,var ,e)) (begin ,@todo))))) - catches) - (#t (raise ,e))))) ; no matches, reraise - (if final - (if catches - ; form with both catch and finally - `(prog1 (trycatch ,expr - (lambda (,e) - (trycatch ,catchblock - (lambda (,reraised) - (begin ,final - (raise ,reraised)))))) - ,final) - ; finally only; same as unwind-protect - `(prog1 (trycatch ,expr (lambda (,e) - (begin ,final (raise ,e)))) - ,final)) - ; catch, no finally - `(trycatch ,expr (lambda (,e) ,catchblock))))) - -; setf -; expands (setf (place x ...) v) to (mutator (f x ...) v) -; (mutator (identity x ...) v) is interpreted as (mutator x ... v) -(set! *setf-place-list* - ; place mutator f - '((car rplaca identity) - (cdr rplacd identity) - (caar rplaca car) - (cadr rplaca cdr) - (cdar rplacd car) - (cddr rplacd cdr) - (caaar rplaca caar) - (caadr rplaca cadr) - (cadar rplaca cdar) - (caddr rplaca cddr) - (cdaar rplacd caar) - (cdadr rplacd cadr) - (cddar rplacd cdar) - (cdddr rplacd cddr) - (list-ref rplaca nthcdr) - (get put! identity) - (aref aset! identity) - (symbol-syntax set-syntax! identity))) - -(define (setf-place-mutator place val) - (if (symbol? place) - (list 'set! place val) - (let ((mutator (assq (car place) *setf-place-list*))) - (if (null? mutator) - (error "setf: unknown place " (car place)) - (if (eq (caddr mutator) 'identity) - (cons (cadr mutator) (append (cdr place) (list val))) - (list (cadr mutator) - (cons (caddr mutator) (cdr place)) - val)))))) - -(define-macro (setf . args) - (f-body - ((label setf- - (lambda (args) - (if (null? args) - () - (cons (setf-place-mutator (car args) (cadr args)) - (setf- (cddr args)))))) - args))) - (define (revappend l1 l2) (nconc (reverse l1) l2)) (define (nreconc l1 l2) (nconc (nreverse l1) l2)) @@ -600,13 +501,16 @@ (io.close F) (raise `(load-error ,filename ,e))))))) -(define *banner* -"; _ +(define (string.tail s n) + (string.sub s (string.inc s 0 n) (sizeof s))) + +(define *banner* (string.tail " +; _ ; |_ _ _ |_ _ | . _ _ ; | (-||||_(_)|__|_)|_) ;-------------------|---------------------------------------------------------- -") +" 1)) (define (repl) (define (prompt)