April 2006 - movitz-cvs@common-lisp.net - mailman3.common-lisp.net

[movitz-cvs] CVS movitz/losp/muerte
by ffjeld 30 Apr '06

30 Apr '06

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory clnet:/tmp/cvs-serv18377 Modified Files: cons.lisp Log Message: Lifted sublis and nsublis from cmucl. --- /project/movitz/cvsroot/movitz/losp/muerte/cons.lisp 2006/04/07 21:33:54 1.12 +++ /project/movitz/cvsroot/movitz/losp/muerte/cons.lisp 2006/04/30 21:38:40 1.13 @@ -9,7 +9,7 @@ ;;;; Created at: Fri Dec 8 15:25:45 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: cons.lisp,v 1.12 2006/04/07 21:33:54 ffjeld Exp $ +;;;; $Id: cons.lisp,v 1.13 2006/04/30 21:38:40 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -275,3 +275,42 @@ (defun acons (key datum alist) "=> new-alist" (cons (cons key datum) alist)) + +(defun sublis (alist tree &key key (test 'eql) test-not) + "Substitutes from alist into tree nondestructively." + (declare (inline assoc)) + (let ((key (or key 'identity)) + (test (if test-not (complement test-not) test))) + (labels ((s (subtree) + (let* ((key-val (funcall key subtree)) + (assoc (assoc key-val alist :test test))) + (cond (assoc (cdr assoc)) + ((atom subtree) subtree) + (t (let ((car (s (car subtree))) + (cdr (s (cdr subtree)))) + (if (and (eq car (car subtreE)) + (eq cdr (cdr subtree))) + subtree + (cons car cdr)))))))) + (s tree)))) + +(defun nsublis (alist tree &key key (test #'eql) (test-not nil notp)) + "Substitutes new for subtrees matching old." + (declare (inline assoc)) + (let ((key (or key 'identity)) + (test (if test-not (complement test-not) test)) + (temp)) + (labels ((s (subtree) + (cond ((Setq temp (nsublis-macro)) + (cdr temp)) + ((atom subtree) subtree) + (t (do* ((last nil subtree) + (subtree subtree (Cdr subtree))) + ((atom subtree) + (if (setq temp (assoc (funcall key subtree) alist :test test)) + (setf (cdr last) (cdr temp)))) + (if (setq temp (assoc (funcall key subtree) alist :test test)) + (return (setf (Cdr last) (Cdr temp))) + (setf (car subtree) (s (car subtree))))) + subtree)))) + (s tree))))

1 0

[movitz-cvs] CVS movitz/losp/muerte
by ffjeld 29 Apr '06

29 Apr '06

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory clnet:/tmp/cvs-serv27802 Modified Files: lists.lisp Log Message: Added (setf first) and (setf rest). --- /project/movitz/cvsroot/movitz/losp/muerte/lists.lisp 2006/04/29 11:30:35 1.13 +++ /project/movitz/cvsroot/movitz/losp/muerte/lists.lisp 2006/04/29 11:41:34 1.14 @@ -9,7 +9,7 @@ ;;;; Created at: Tue Dec 5 18:40:11 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: lists.lisp,v 1.13 2006/04/29 11:30:35 ffjeld Exp $ +;;;; $Id: lists.lisp,v 1.14 2006/04/29 11:41:34 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -25,10 +25,10 @@ (defun rest (x) (cdr x)) -(defun (setf first) (x y) +(defun (setf first) (y x) (setf (car x) y)) -(defun (setf rest) (x y) +(defun (setf rest) (y x) (setf (cdr x) y)) ;; Compiler-macros for first and rest in basic-macros.lisp. @@ -431,8 +431,6 @@ :test (if test-not (complement test-not) test))) - - (defun subsetp (list-1 list-2 &key (key 'identity) (test 'eql) test-not) "=> generalized-boolean"

1 0

[movitz-cvs] CVS movitz/losp/muerte
by ffjeld 29 Apr '06

29 Apr '06

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory clnet:/tmp/cvs-serv27486 Modified Files: lists.lisp Log Message: Added (setf first) and (setf rest). --- /project/movitz/cvsroot/movitz/losp/muerte/lists.lisp 2005/08/21 19:00:16 1.12 +++ /project/movitz/cvsroot/movitz/losp/muerte/lists.lisp 2006/04/29 11:30:35 1.13 @@ -9,7 +9,7 @@ ;;;; Created at: Tue Dec 5 18:40:11 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: lists.lisp,v 1.12 2005/08/21 19:00:16 ffjeld Exp $ +;;;; $Id: lists.lisp,v 1.13 2006/04/29 11:30:35 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -25,6 +25,12 @@ (defun rest (x) (cdr x)) +(defun (setf first) (x y) + (setf (car x) y)) + +(defun (setf rest) (x y) + (setf (cdr x) y)) + ;; Compiler-macros for first and rest in basic-macros.lisp. (defun second (x) (cadr x))

1 0

[movitz-cvs] CVS movitz/losp/muerte
by ffjeld 28 Apr '06

28 Apr '06

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory clnet:/tmp/cvs-serv29966 Modified Files: conditions.lisp Log Message: Add simple-condition-format-control and simple-condition-format-arguments readers. --- /project/movitz/cvsroot/movitz/losp/muerte/conditions.lisp 2006/04/07 21:51:53 1.18 +++ /project/movitz/cvsroot/movitz/losp/muerte/conditions.lisp 2006/04/28 23:21:59 1.19 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Wed Nov 20 15:47:04 2002 ;;;; -;;;; $Id: conditions.lisp,v 1.18 2006/04/07 21:51:53 ffjeld Exp $ +;;;; $Id: conditions.lisp,v 1.19 2006/04/28 23:21:59 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -59,7 +59,11 @@ (condition-format-control condition) (condition-format-arguments condition)))))) -(define-condition simple-condition (condition) ()) +(define-condition simple-condition (condition) + ((format-control + :reader simple-condition-format-control) + (format-arguments + :reader simple-condition-format-arguments))) (define-condition serious-condition () ()) (define-condition error (serious-condition) ()) (define-condition warning () ())

1 0

[movitz-cvs] CVS movitz/losp/muerte
by ffjeld 28 Apr '06

28 Apr '06

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory clnet:/tmp/cvs-serv29923 Modified Files: more-macros.lisp Log Message: Have the silly load implementation be a macro rather than compiler-macro, since there's no function to back it up. --- /project/movitz/cvsroot/movitz/losp/muerte/more-macros.lisp 2006/04/28 21:18:48 1.31 +++ /project/movitz/cvsroot/movitz/losp/muerte/more-macros.lisp 2006/04/28 23:21:32 1.32 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Fri Jun 7 15:05:57 2002 ;;;; -;;;; $Id: more-macros.lisp,v 1.31 2006/04/28 21:18:48 ffjeld Exp $ +;;;; $Id: more-macros.lisp,v 1.32 2006/04/28 23:21:32 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -431,7 +431,7 @@ (define-unimplemented-macro with-open-file) (define-unimplemented-macro restart-case) -(define-compiler-macro load (filespec &key verbose print if-does-not-exist external-format) +(defmacro load (filespec &key verbose print if-does-not-exist external-format) "hm..." (assert (movitz:movitz-constantp filespec) (filespec) "Can't load a non-constant filename: ~S" filespec)

1 0

[movitz-cvs] CVS movitz
by ffjeld 28 Apr '06

28 Apr '06

Update of /project/movitz/cvsroot/movitz In directory clnet:/tmp/cvs-serv29871 Modified Files: eval.lisp Log Message: If a compiler-macro signals error, print a warning and pretend the compiler-macro declined. --- /project/movitz/cvsroot/movitz/eval.lisp 2005/09/16 22:49:34 1.10 +++ /project/movitz/cvsroot/movitz/eval.lisp 2006/04/28 23:20:47 1.11 @@ -9,7 +9,7 @@ ;;;; Created at: Thu Nov 2 17:45:05 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: eval.lisp,v 1.10 2005/09/16 22:49:34 ffjeld Exp $ +;;;; $Id: eval.lisp,v 1.11 2006/04/28 23:20:47 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -66,9 +66,11 @@ (cons (let* ((compiler-macro-function (movitz-compiler-macro-function (car form) env)) (compiler-macro-expansion (and compiler-macro-function - (funcall *movitz-macroexpand-hook* - compiler-macro-function - form env)))) + (handler-case + (funcall *movitz-macroexpand-hook* + compiler-macro-function + form env) + (error () form))))) (or (let ((form (translate-program form :cl :muerte.cl))) (case (car form) ((muerte.cl:quote) t)

1 0

[movitz-cvs] CVS movitz
by ffjeld 28 Apr '06

28 Apr '06

Update of /project/movitz/cvsroot/movitz In directory clnet:/tmp/cvs-serv29847 Modified Files: compiler.lisp Log Message: If a compiler-macro signals error, print a warning and pretend the compiler-macro declined. --- /project/movitz/cvsroot/movitz/compiler.lisp 2006/04/10 11:49:41 1.167 +++ /project/movitz/cvsroot/movitz/compiler.lisp 2006/04/28 23:20:45 1.168 @@ -8,7 +8,7 @@ ;;;; Created at: Wed Oct 25 12:30:49 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: compiler.lisp,v 1.167 2006/04/10 11:49:41 ffjeld Exp $ +;;;; $Id: compiler.lisp,v 1.168 2006/04/28 23:20:45 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -5550,9 +5550,13 @@ (compiler-call (movitz-special-operator-compiler operator) :forward all) (let* ((compiler-macro-function (movitz-compiler-macro-function operator env)) (compiler-macro-expansion (and compiler-macro-function - (funcall *movitz-macroexpand-hook* - compiler-macro-function - form env)))) + (handler-case + (funcall *movitz-macroexpand-hook* + compiler-macro-function + form env) + (error (c) + (warn "Compiler-macro for ~S failed: ~A" operator c) + form))))) (cond ((and compiler-macro-function (not (movitz-env-get operator 'notinline nil env)) @@ -6671,7 +6675,6 @@ (define-extended-code-expander :cons-get (instruction funobj frame-map) (destructuring-bind (op cell dst) (cdr instruction) - (check-type cell lexical-binding) (check-type dst (member :eax :ebx :ecx :edx)) (multiple-value-bind (op-offset fast-op fast-op-ebx) (ecase op @@ -6684,8 +6687,7 @@ (let* ((binding (binding-target (ensure-local-binding (binding-target cell) funobj))) (location (new-binding-location (binding-target binding) frame-map)) (binding-is-list-p (binding-store-subtypep binding 'list))) - #+ignore (warn "car of loc ~A bind ~A" - location binding) + #+ignore (warn "~A of loc ~A bind ~A" op location binding) (cond ((and binding-is-list-p (member location '(:eax :ebx :ecx :edx)))

1 0

[movitz-cvs] CVS movitz/losp/muerte
by ffjeld 28 Apr '06

28 Apr '06

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory clnet:/tmp/cvs-serv15466 Modified Files: packages.lisp Log Message: Implement package-nicknames. --- /project/movitz/cvsroot/movitz/losp/muerte/packages.lisp 2005/08/31 22:32:08 1.12 +++ /project/movitz/cvsroot/movitz/losp/muerte/packages.lisp 2006/04/28 21:19:08 1.13 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Thu Aug 30 15:19:43 2001 ;;;; -;;;; $Id: packages.lisp,v 1.12 2005/08/31 22:32:08 ffjeld Exp $ +;;;; $Id: packages.lisp,v 1.13 2006/04/28 21:19:08 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -28,13 +28,17 @@ external-symbols internal-symbols shadowing-symbols-list - use-list) + use-list + nicknames) (defvar *packages*) ; Set by dump-image. (defun package-name (object) (package-object-name (find-package object))) +(defun package-nicknames (package-designator) + (package-object-nicknames (find-package package-designator))) + (defun package-use-list (package-name) (package-object-use-list (find-package package-name)))

1 0

[movitz-cvs] CVS movitz
by ffjeld 28 Apr '06

28 Apr '06

Update of /project/movitz/cvsroot/movitz In directory clnet:/tmp/cvs-serv15447 Modified Files: image.lisp Log Message: Implement package-nicknames. --- /project/movitz/cvsroot/movitz/image.lisp 2006/04/10 11:48:20 1.105 +++ /project/movitz/cvsroot/movitz/image.lisp 2006/04/28 21:19:06 1.106 @@ -9,7 +9,7 @@ ;;;; Created at: Sun Oct 22 00:22:43 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: image.lisp,v 1.105 2006/04/10 11:48:20 ffjeld Exp $ +;;;; $Id: image.lisp,v 1.106 2006/04/28 21:19:06 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -1117,7 +1117,7 @@ (pushnew :constant-variable (movitz-symbol-flags symbol)) (setf (movitz-symbol-value symbol) (movitz-read (translate-program (symbol-value (translate-program name :muerte.cl :cl)) - :cl :muerte.cl)))) + :cl :muerte.cl)))) symbol))) (defun make-packages-hash (&optional (*image* *image*)) @@ -1143,16 +1143,20 @@ lisp-package context) (setf (gethash lisp-package lisp-to-movitz-package) (or (gethash package-name packages-hash nil) - (let ((p (funcall 'muerte::make-package-object - :name package-name - :shadowing-symbols-list (package-shadowing-symbols lisp-package) - :external-symbols (make-hash-table :test #'equal) - :internal-symbols (make-hash-table :test #'equal) - :use-list (mapcar #'(lambda (up) - (ensure-package (movitz-package-name (package-name up)) - up context)) - (package-use-list lisp-package))))) + (let* ((nicks (mapcar #'movitz-package-name (package-nicknames lisp-package))) + (p (funcall 'muerte::make-package-object + :name package-name + :shadowing-symbols-list (package-shadowing-symbols lisp-package) + :external-symbols (make-hash-table :test #'equal) + :internal-symbols (make-hash-table :test #'equal) + :nicknames nicks + :use-list (mapcar #'(lambda (up) + (ensure-package (movitz-package-name (package-name up)) + up context)) + (package-use-list lisp-package))))) (setf (gethash package-name packages-hash) p) + (dolist (nick nicks) + (setf (gethash nick packages-hash) p)) p))))) (let ((movitz-cl-package (ensure-package (symbol-name :common-lisp) (find-package :muerte.common-lisp))))

1 0

[movitz-cvs] CVS movitz/losp/muerte
by ffjeld 28 Apr '06

28 Apr '06

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory clnet:/tmp/cvs-serv15406 Modified Files: more-macros.lisp Log Message: Added trivial with-standard-io-syntax macro. --- /project/movitz/cvsroot/movitz/losp/muerte/more-macros.lisp 2006/04/10 11:54:52 1.30 +++ /project/movitz/cvsroot/movitz/losp/muerte/more-macros.lisp 2006/04/28 21:18:48 1.31 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Fri Jun 7 15:05:57 2002 ;;;; -;;;; $Id: more-macros.lisp,v 1.30 2006/04/10 11:54:52 ffjeld Exp $ +;;;; $Id: more-macros.lisp,v 1.31 2006/04/28 21:18:48 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -440,3 +440,27 @@ (defmacro locally (&body body) `(let () ,@body)) + +(defmacro with-standard-io-syntax (&body body) + `(let ((*package* (find-package :init)) + (*print-array* t) + (*print-base* 10) + (*print-case* :upcase) + (*print-circle* nil) + (*print-escape* t) + (*print-gensym* t) + (*print-length* nil) + (*print-level* nil) + (*print-lines* nil) + #+ignore (*print-miser-width* nil) + #+ignore (*print-pprint-dispatch* nil) + (*print-pretty* nil) + (*print-radix* nil) + (*print-readably* t) + #+ignore (*print-right-margin* nil) + (*read-base* 10) + (*read-default-float-format* 'ratio) + (*read-eval* t) + (*read-suppress* nil) + #+ignore (*readtable* nil)) + ,@body))

1 0