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

[movitz-cvs] CVS update: movitz/losp/muerte/interrupt.lisp
by Frode Vatvedt Fjeld 13 Apr '04

13 Apr '04

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv12837 Modified Files: interrupt.lisp Log Message: For exception 98, used to signal an undefined function, use EDX rather than ECX to carry the offending function name, since ECX isn't a GC root. Date: Tue Apr 13 12:55:17 2004 Author: ffjeld Index: movitz/losp/muerte/interrupt.lisp diff -u movitz/losp/muerte/interrupt.lisp:1.2 movitz/losp/muerte/interrupt.lisp:1.3 --- movitz/losp/muerte/interrupt.lisp:1.2 Tue Apr 6 20:34:47 2004 +++ movitz/losp/muerte/interrupt.lisp Tue Apr 13 12:55:17 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Wed Apr 7 01:50:03 2004 ;;;; -;;;; $Id: interrupt.lisp,v 1.2 2004/04/07 00:34:47 ffjeld Exp $ +;;;; $Id: interrupt.lisp,v 1.3 2004/04/13 16:55:17 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -215,7 +215,7 @@ (70 (error "[EIP=~@Z] Index ~@Z out of bounds ~@Z for ~S." $eip $ecx $ebx (@ $eax))) (98 - (let ((name (@ $ecx))) + (let ((name (@ $edx))) (when (symbolp name) (error 'undefined-function :name name)))) (99

1 0

[movitz-cvs] CVS update: movitz/special-operators-cl.lisp
by Frode Vatvedt Fjeld 13 Apr '04

13 Apr '04

Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv11619 Modified Files: special-operators-cl.lisp Log Message: For exception 98, used to signal an undefined function, use EDX rather than ECX to carry the offending function name, since ECX isn't a GC root. Date: Tue Apr 13 12:55:09 2004 Author: ffjeld Index: movitz/special-operators-cl.lisp diff -u movitz/special-operators-cl.lisp:1.16 movitz/special-operators-cl.lisp:1.17 --- movitz/special-operators-cl.lisp:1.16 Tue Apr 13 09:28:26 2004 +++ movitz/special-operators-cl.lisp Tue Apr 13 12:55:08 2004 @@ -9,7 +9,7 @@ ;;;; Created at: Fri Nov 24 16:31:11 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: special-operators-cl.lisp,v 1.16 2004/04/13 13:28:26 ffjeld Exp $ +;;;; $Id: special-operators-cl.lisp,v 1.17 2004/04/13 16:55:08 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -895,7 +895,7 @@ (:globally (:cmpl (:edi (:edi-offset unbound-function)) ,register)) (:je '(:sub-program () - (:load-constant ,movitz-name :ecx) + (:load-constant ,movitz-name :edx) (:int 98)))) :modifies nil :functional-p t

1 0

[movitz-cvs] CVS update: movitz/losp/muerte/basic-macros.lisp
by Frode Vatvedt Fjeld 13 Apr '04

13 Apr '04

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv11686 Modified Files: basic-macros.lisp Log Message: Added a compiler-macro for defparameter. This should reduce the number of file-toplevels that needs to be executed at boot-time just to initialize some variables to constant values. Date: Tue Apr 13 12:40:53 2004 Author: ffjeld Index: movitz/losp/muerte/basic-macros.lisp diff -u movitz/losp/muerte/basic-macros.lisp:1.6 movitz/losp/muerte/basic-macros.lisp:1.7 --- movitz/losp/muerte/basic-macros.lisp:1.6 Tue Apr 6 09:39:47 2004 +++ movitz/losp/muerte/basic-macros.lisp Tue Apr 13 12:40:53 2004 @@ -9,7 +9,7 @@ ;;;; Created at: Wed Nov 8 18:44:57 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: basic-macros.lisp,v 1.6 2004/04/06 13:39:47 ffjeld Exp $ +;;;; $Id: basic-macros.lisp,v 1.7 2004/04/13 16:40:53 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -119,8 +119,20 @@ ;; (muerte::compile-time-setq ,name ,initial-value) (setq ,name ,initial-value))) -(defmacro defvar (name &optional value documentation) - `(defparameter ,name ,value ,documentation)) +(define-compiler-macro defparameter (&whole form name initial-value + &optional docstring &environment env) + (declare (ignore docstring)) + (if (not (movitz:movitz-constantp initial-value env)) + form + (let ((mname (translate-program name :cl :muerte.cl))) + (setf (movitz::movitz-symbol-value (movitz:movitz-read mname)) + (movitz:movitz-eval initial-value env)) + `(declaim (special ,name))))) + +(defmacro defvar (name &optional (value nil valuep) documentation) + (if (not valuep) + `(declaim (special ,name)) + `(defparameter ,name ,value ,documentation))) (defmacro define-compile-time-variable (name value) `(progn

1 0

[movitz-cvs] CVS update: movitz/eval.lisp
by Frode Vatvedt Fjeld 13 Apr '04

13 Apr '04

Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv20526 Modified Files: eval.lisp Log Message: movitz-constantp should know that a string is indeed constant (self-evaluating, that is) Date: Tue Apr 13 12:30:36 2004 Author: ffjeld Index: movitz/eval.lisp diff -u movitz/eval.lisp:1.4 movitz/eval.lisp:1.5 --- movitz/eval.lisp:1.4 Wed Mar 31 11:31:44 2004 +++ movitz/eval.lisp Tue Apr 13 12:30:36 2004 @@ -9,7 +9,7 @@ ;;;; Created at: Thu Nov 2 17:45:05 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: eval.lisp,v 1.4 2004/03/31 16:31:44 ffjeld Exp $ +;;;; $Id: eval.lisp,v 1.5 2004/04/13 16:30:36 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -63,6 +63,7 @@ (number t) (keyword t) (character t) + (string t) (symbol (or (movitz-env-get form 'constantp nil environment) (typep (movitz-binding form environment) 'constant-object-binding))) (cons (case (car form)

1 0

[movitz-cvs] CVS update: movitz/losp/muerte/print.lisp
by Frode Vatvedt Fjeld 13 Apr '04

13 Apr '04

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv26853 Modified Files: print.lisp Log Message: Extracted internal-write from write. *print-safely* should work again. Date: Tue Apr 13 11:15:55 2004 Author: ffjeld Index: movitz/losp/muerte/print.lisp diff -u movitz/losp/muerte/print.lisp:1.6 movitz/losp/muerte/print.lisp:1.7 --- movitz/losp/muerte/print.lisp:1.6 Tue Apr 13 10:22:02 2004 +++ movitz/losp/muerte/print.lisp Tue Apr 13 11:15:55 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Mon Sep 3 11:48:19 2001 ;;;; -;;;; $Id: print.lisp,v 1.6 2004/04/13 14:22:02 ffjeld Exp $ +;;;; $Id: print.lisp,v 1.7 2004/04/13 15:15:55 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -161,9 +161,8 @@ ((:readably *print-readably*) *print-readably*) right-margin) (numargs-case - (t (object &key safe-recursive-call + (t (object &key stream ;; lines miser-width pprint-dispatch right-margin case circle - ((:stream *standard-output*) *standard-output*) ((:array *print-array*) *print-array*) ((:base *print-base*) *print-base*) ((:escape *print-escape*) *print-escape*) @@ -173,158 +172,161 @@ ((:pretty *print-pretty*) *print-pretty*) ((:radix *print-radix*) *print-radix*) ((:readably *print-readably*) *print-readably*)) - (cond - ((and *print-safely* (not safe-recursive-call)) - (handler-case (write object :safe-recursive-call t) - (t (condition) - (write-string "#<printer error>")))) - (t (write object)))) + (let ((*standard-output* (output-stream-designator stream))) + (write object))) (1 (object) - (let ((stream (output-stream-designator *standard-output*))) - (cond - ((and (not *print-pretty*) - (not *never-use-print-object*)) - (print-object object stream)) - (t (let ((do-escape-p (or *print-escape* *print-readably*)) - (*print-level* (minus-if *print-level* 1))) - (typecase object - (character - (if (not do-escape-p) - (write-char object stream) - (progn - (write-string "#\\" stream) - (let ((name (char-name object))) - (if name - (write-string name stream) - (write-char object stream)))))) - (null - (write-string (symbol-name nil) stream)) - ((or cons tag5) - (let ((level *print-level*) - (length *print-length*)) - (cond - ((and level (minusp level)) - (write-char #\# stream)) - ((and (eq 'quote (car object)) - (not (cddr object))) - (write-char #\' stream) - (write (cadr object))) - (t (labels ((write-cons (c stream length) - (cond - ((and length (= 0 length)) - (write-string "...)")) - (t (write (car c)) - (typecase (cdr c) - (null - (write-char #\) stream)) - (cons - (write-char #\space stream) - (write-cons (cdr c) stream (minus-if length 1))) - (t - (write-string " . " stream) - (write (cdr c)) - (write-char #\) stream))))))) - (write-char #\( stream) - (write-cons object stream length)))))) - (integer - (write-integer object stream *print-base* *print-radix*)) - (string - (if do-escape-p - (stream-write-escaped-string stream object #\") - (write-string object stream))) - (symbol ; 22.1.3.3 Printing Symbols - (flet ((write-symbol-name (symbol stream) - (let ((name (symbol-name symbol))) - (if (and (plusp (length name)) - (every (lambda (c) - (or (upper-case-p c) - (member c '(#\- #\% #\$ #\* #\@ #\. #\& #\< #\> #\=)) - (digit-char-p c))) - name) - (not (every (lambda (c) - (or (digit-char-p c *read-base*) - (member c '(#\.)))) - name))) - (write-string name stream) - (stream-write-escaped-string stream name #\|))))) - (cond - ((not do-escape-p) - (write-symbol-name object stream)) - ((eq (symbol-package object) (find-package "KEYWORD")) - (write-string ":" stream) - (write-symbol-name object stream)) - ((or (eq (symbol-package object) *package*) - (eq (find-symbol (string object)) - object)) - (write-symbol-name object stream)) - ((symbol-package object) - (let ((package (symbol-package object))) - (write-string (package-name package) stream) - (write-string (if (gethash (symbol-name object) - (package-object-external-symbols package)) - ":" "::") - stream) - (write-symbol-name object stream))) - ((not (symbol-package object)) - (when *print-gensym* - (write-string "#:" stream)) - (write-symbol-name object stream)) - (t (error "Huh?"))))) - (vector - (let ((level *print-level*) - (length *print-length*)) - (cond - ((and level (minusp level)) - (write-char #\# stream)) - ((or *print-array* *print-readably*) - (write-string "#(" stream) - (cond - ((and length (< length (length object))) - (dotimes (i length) - (unless (= 0 i) - (write-char #\space stream)) - (write (aref object i))) - (write-string " ...)" stream)) - (t (dotimes (i (length object)) - (unless (= 0 i) - (write-char #\space stream)) - (write (aref object i))) - (write-char #\) stream)))) - (t (print-unreadable-object (object stream :identity t) - (princ (type-of object) stream)))))) - (standard-gf-instance - (print-unreadable-object (object stream) - (format stream "gf ~S" (funobj-name object)))) - (compiled-function - (print-unreadable-object (object stream) - (format stream "function ~S" (funobj-name object)))) - (hash-table + (if (not *print-safely*) + (internal-write object) + (handler-case (internal-write object) + (serious-condition (c) + (format t "#<printer error for ~Z: [~A]>" object c))))))) + +(defun internal-write (object) + (let ((stream *standard-output*)) + (cond + ((and (not *print-pretty*) + (not *never-use-print-object*)) + (print-object object stream)) + (t (let ((do-escape-p (or *print-escape* *print-readably*)) + (*print-level* (minus-if *print-level* 1))) + (typecase object + (character + (if (not do-escape-p) + (write-char object stream) + (progn + (write-string "#\\" stream) + (let ((name (char-name object))) + (if name + (write-string name stream) + (write-char object stream)))))) + (null + (write-string (symbol-name nil) stream)) + ((or cons tag5) + (let ((level *print-level*) + (length *print-length*)) + (cond + ((and level (minusp level)) + (write-char #\# stream)) + ((and (eq 'quote (car object)) + (not (cddr object))) + (write-char #\' stream) + (write (cadr object))) + (t (labels ((write-cons (c stream length) + (cond + ((and length (= 0 length)) + (write-string "...)")) + (t (write (car c)) + (typecase (cdr c) + (null + (write-char #\) stream)) + (cons + (write-char #\space stream) + (write-cons (cdr c) stream (minus-if length 1))) + (t + (write-string " . " stream) + (write (cdr c)) + (write-char #\) stream))))))) + (write-char #\( stream) + (write-cons object stream length)))))) + (integer + (write-integer object stream *print-base* *print-radix*)) + (string + (if do-escape-p + (stream-write-escaped-string stream object #\") + (write-string object stream))) + (symbol ; 22.1.3.3 Printing Symbols + (flet ((write-symbol-name (symbol stream) + (let ((name (symbol-name symbol))) + (if (and (plusp (length name)) + (every (lambda (c) + (or (upper-case-p c) + (member c '(#\- #\% #\$ #\* #\@ #\. #\& #\< #\> #\=)) + (digit-char-p c))) + name) + (not (every (lambda (c) + (or (digit-char-p c *read-base*) + (member c '(#\.)))) + name))) + (write-string name stream) + (stream-write-escaped-string stream name #\|))))) + (cond + ((not do-escape-p) + (write-symbol-name object stream)) + ((eq (symbol-package object) (find-package "KEYWORD")) + (write-string ":" stream) + (write-symbol-name object stream)) + ((or (eq (symbol-package object) *package*) + (eq (find-symbol (string object)) + object)) + (write-symbol-name object stream)) + ((symbol-package object) + (let ((package (symbol-package object))) + (write-string (package-name package) stream) + (write-string (if (gethash (symbol-name object) + (package-object-external-symbols package)) + ":" "::") + stream) + (write-symbol-name object stream))) + ((not (symbol-package object)) + (when *print-gensym* + (write-string "#:" stream)) + (write-symbol-name object stream)) + (t (error "Huh?"))))) + (vector + (let ((level *print-level*) + (length *print-length*)) + (cond + ((and level (minusp level)) + (write-char #\# stream)) + ((or *print-array* *print-readably*) + (write-string "#(" stream) + (cond + ((and length (< length (length object))) + (dotimes (i length) + (unless (= 0 i) + (write-char #\space stream)) + (write (aref object i))) + (write-string " ...)" stream)) + (t (dotimes (i (length object)) + (unless (= 0 i) + (write-char #\space stream)) + (write (aref object i))) + (write-char #\) stream)))) + (t (print-unreadable-object (object stream :identity t) + (princ (type-of object) stream)))))) + (standard-gf-instance + (print-unreadable-object (object stream) + (format stream "gf ~S" (funobj-name object)))) + (compiled-function + (print-unreadable-object (object stream) + (format stream "function ~S" (funobj-name object)))) + (hash-table + (print-unreadable-object (object stream :identity nil :type nil) + (format stream "~S hash-table with ~D entries" + (let ((test (hash-table-test object))) + (if (typep test 'compiled-function) + (funobj-name test) + test)) + (hash-table-count object)))) + (package + (if (package-name object) (print-unreadable-object (object stream :identity nil :type nil) - (format stream "~S hash-table with ~D entries" - (let ((test (hash-table-test object))) - (if (typep test 'compiled-function) - (funobj-name test) - test)) - (hash-table-count object)))) - (package - (if (package-name object) - (print-unreadable-object (object stream :identity nil :type nil) - (format stream "Package ~A with ~D+~D symbols" - (package-name object) - (hash-table-count (package-object-external-symbols object)) - (hash-table-count (package-object-internal-symbols object)))) - (print-unreadable-object (object stream :identity t :type t)))) - (t (if (not *never-use-print-object*) - (print-object object stream) - (print-unreadable-object (object stream :identity t) - (cond - ((typep object 'std-instance) - (write-string "[std-instance]" stream) - (write (standard-instance-access (std-instance-class object) 0))) - ((typep object 'standard-gf-instance) - (write-string "[std-gf-instance]" stream)) - (t (princ (type-of object) stream))))))))))) - object))) + (format stream "Package ~A with ~D+~D symbols" + (package-name object) + (hash-table-count (package-object-external-symbols object)) + (hash-table-count (package-object-internal-symbols object)))) + (print-unreadable-object (object stream :identity t :type t)))) + (t (if (not *never-use-print-object*) + (print-object object stream) + (print-unreadable-object (object stream :identity t) + (cond + ((typep object 'std-instance) + (write-string "[std-instance]" stream) + (write (standard-instance-access (std-instance-class object) 0))) + ((typep object 'standard-gf-instance) + (write-string "[std-gf-instance]" stream)) + (t (princ (type-of object) stream))))))))))) + object) (defun prin1 (object &optional stream) (let ((*standard-output* (output-stream-designator stream))

1 0

[movitz-cvs] CVS update: movitz/losp/muerte/print.lisp
by Frode Vatvedt Fjeld 13 Apr '04

13 Apr '04

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv18310 Modified Files: print.lisp Log Message: Tried to be somewhat more clever about avoiding keyword-parsing in calls to write. Date: Tue Apr 13 10:22:02 2004 Author: ffjeld Index: movitz/losp/muerte/print.lisp diff -u movitz/losp/muerte/print.lisp:1.5 movitz/losp/muerte/print.lisp:1.6 --- movitz/losp/muerte/print.lisp:1.5 Tue Apr 6 10:29:33 2004 +++ movitz/losp/muerte/print.lisp Tue Apr 13 10:22:02 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Mon Sep 3 11:48:19 2001 ;;;; -;;;; $Id: print.lisp,v 1.5 2004/04/06 14:29:33 ffjeld Exp $ +;;;; $Id: print.lisp,v 1.6 2004/04/13 14:22:02 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -100,9 +100,9 @@ (write-char comma-char stream)) nil) -(defun write-integer (x stream &key (base *print-base*) (radix *print-radix*) - mincol (padchar #\space) - (sign-always nil) (comma-char #\,) (comma-interval nil)) +(defun write-integer (x stream base radix + &optional mincol (padchar #\space) + (sign-always nil) (comma-char #\,) (comma-interval nil)) (when radix (case base (10) ; put a #\. at the end. @@ -124,7 +124,7 @@ (8 #.(cl:format cl:nil "~O" movitz::+movitz-most-negative-fixnum+)) (10 #.(cl:format cl:nil "~D" movitz::+movitz-most-negative-fixnum+)) (16 #.(cl:format cl:nil "~X" movitz::+movitz-most-negative-fixnum+)) - (t "minus-hack")) + (t (break "minus-hack!?"))) stream)))) (sign-always (values #\+ x)) @@ -160,170 +160,197 @@ (pretty *print-pretty*) (radix *print-radix*) ((:readably *print-readably*) *print-readably*) right-margin) - (declare (dynamic-extent key-args) - (special *read-base* *package*) - (ignore case circle pprint-dispatch miser-width right-margin lines)) - (cond - ((and *print-safely* (not safe-recursive-call)) - (handler-case (apply #'write object :safe-recursive-call t key-args) - (t (condition) - (write-string "#<printer error>" stream)))) - ((and (not pretty) - (not *never-use-print-object*)) - (print-object object stream)) - (t (let ((do-escape-p (or *print-escape* *print-readably*)) - (stream (output-stream-designator stream)) - (*print-level* (minus-if level 1))) - (typecase object - (character - (if (not do-escape-p) - (write-char object stream) - (progn - (write-string "#\\" stream) - (let ((name (char-name object))) - (if name - (write-string name stream) - (write-char object stream)))))) - (null - (write-string (symbol-name nil) stream)) - ((or cons tag5) - (cond - ((and *print-level* (minusp *print-level*)) - (write-char #\# stream)) - ((and (eq 'quote (car object)) - (not (cddr object))) - (write-char #\' stream) - (write (cadr object) :stream stream)) - (t (labels ((write-cons (c stream length) - (cond - ((and length (= 0 length)) - (write-string "...)")) - (t (write (car c) :stream stream) - (typecase (cdr c) - (null - (write-char #\) stream)) - (cons - (write-char #\space stream) - (write-cons (cdr c) stream (minus-if length 1))) - (t - (write-string " . " stream) - (write (cdr c) :stream stream) - (write-char #\) stream))))))) - (write-char #\( stream) - (write-cons object stream length))))) - (integer - (write-integer object stream :base base :radix radix)) - (string - (if do-escape-p - (stream-write-escaped-string stream object #\") - (write-string object stream))) - (symbol ; 22.1.3.3 Printing Symbols - (flet ((write-symbol-name (symbol stream) - (let ((name (symbol-name symbol))) - (if (and (plusp (length name)) - (every (lambda (c) - (or (upper-case-p c) - (member c '(#\- #\% #\$ #\* #\@ #\. #\& #\< #\> #\=)) - (digit-char-p c))) - name) - (not (every (lambda (c) - (or (digit-char-p c *read-base*) - (member c '(#\.)))) - name))) - (write-string name stream) - (stream-write-escaped-string stream name #\|))))) - (cond - ((not do-escape-p) - (write-symbol-name object stream)) - ((eq (symbol-package object) (find-package "KEYWORD")) - (write-string ":" stream) - (write-symbol-name object stream)) - ((or (eq (symbol-package object) *package*) - (eq (find-symbol (string object)) - object)) - (write-symbol-name object stream)) - ((symbol-package object) - (let ((package (symbol-package object))) - (write-string (package-name package) stream) - (write-string (if (gethash (symbol-name object) - (package-object-external-symbols package)) - ":" "::") - stream) - (write-symbol-name object stream))) - ((not (symbol-package object)) - (when *print-gensym* - (write-string "#:" stream)) - (write-symbol-name object stream)) - (t (error "Huh?"))))) - (vector - (cond - ((and *print-level* (minusp *print-level*)) - (write-char #\# stream)) - ((or array *print-readably*) - (write-string "#(" stream) - (cond - ((and length (< length (length object))) - (dotimes (i length) - (unless (= 0 i) - (write-char #\space stream)) - (write (aref object i))) - (write-string " ...)" stream)) - (t (dotimes (i (length object)) - (unless (= 0 i) - (write-char #\space stream)) - (write (aref object i) :stream stream)) - (write-char #\) stream)))) - (t (print-unreadable-object (object stream :identity t) - (princ (type-of object) stream))))) - (standard-gf-instance - (print-unreadable-object (object stream) - (format stream "gf ~S" (funobj-name object)))) - (compiled-function - (print-unreadable-object (object stream) - (format stream "function ~S" (funobj-name object)))) - (hash-table - (print-unreadable-object (object stream :identity nil :type nil) - (format stream "~S hash-table with ~D entries" - (let ((test (hash-table-test object))) - (if (typep test 'compiled-function) - (funobj-name test) - test)) - (hash-table-count object)))) - (package - (if (package-name object) - (print-unreadable-object (object stream :identity nil :type nil) - (format stream "Package ~A with ~D+~D symbols" - (package-name object) - (hash-table-count (package-object-external-symbols object)) - (hash-table-count (package-object-internal-symbols object)))) - (print-unreadable-object (object stream :identity t :type t)))) - (t (if (not *never-use-print-object*) - (print-object object stream) - (print-unreadable-object (object stream :identity t) - (cond - ((typep object 'std-instance) - (write-string "[std-instance]" stream) - (write (standard-instance-access (std-instance-class object) 0) :stream stream)) - ((typep object 'standard-gf-instance) - (write-string "[std-gf-instance]" stream)) - (t (princ (type-of object) stream)))))))))) - object) + (numargs-case + (t (object &key safe-recursive-call + ;; lines miser-width pprint-dispatch right-margin case circle + ((:stream *standard-output*) *standard-output*) + ((:array *print-array*) *print-array*) + ((:base *print-base*) *print-base*) + ((:escape *print-escape*) *print-escape*) + ((:gensym *print-gensym*) *print-gensym*) + ((:length *print-length*) *print-length*) + ((:level *print-level*) *print-level*) + ((:pretty *print-pretty*) *print-pretty*) + ((:radix *print-radix*) *print-radix*) + ((:readably *print-readably*) *print-readably*)) + (cond + ((and *print-safely* (not safe-recursive-call)) + (handler-case (write object :safe-recursive-call t) + (t (condition) + (write-string "#<printer error>")))) + (t (write object)))) + (1 (object) + (let ((stream (output-stream-designator *standard-output*))) + (cond + ((and (not *print-pretty*) + (not *never-use-print-object*)) + (print-object object stream)) + (t (let ((do-escape-p (or *print-escape* *print-readably*)) + (*print-level* (minus-if *print-level* 1))) + (typecase object + (character + (if (not do-escape-p) + (write-char object stream) + (progn + (write-string "#\\" stream) + (let ((name (char-name object))) + (if name + (write-string name stream) + (write-char object stream)))))) + (null + (write-string (symbol-name nil) stream)) + ((or cons tag5) + (let ((level *print-level*) + (length *print-length*)) + (cond + ((and level (minusp level)) + (write-char #\# stream)) + ((and (eq 'quote (car object)) + (not (cddr object))) + (write-char #\' stream) + (write (cadr object))) + (t (labels ((write-cons (c stream length) + (cond + ((and length (= 0 length)) + (write-string "...)")) + (t (write (car c)) + (typecase (cdr c) + (null + (write-char #\) stream)) + (cons + (write-char #\space stream) + (write-cons (cdr c) stream (minus-if length 1))) + (t + (write-string " . " stream) + (write (cdr c)) + (write-char #\) stream))))))) + (write-char #\( stream) + (write-cons object stream length)))))) + (integer + (write-integer object stream *print-base* *print-radix*)) + (string + (if do-escape-p + (stream-write-escaped-string stream object #\") + (write-string object stream))) + (symbol ; 22.1.3.3 Printing Symbols + (flet ((write-symbol-name (symbol stream) + (let ((name (symbol-name symbol))) + (if (and (plusp (length name)) + (every (lambda (c) + (or (upper-case-p c) + (member c '(#\- #\% #\$ #\* #\@ #\. #\& #\< #\> #\=)) + (digit-char-p c))) + name) + (not (every (lambda (c) + (or (digit-char-p c *read-base*) + (member c '(#\.)))) + name))) + (write-string name stream) + (stream-write-escaped-string stream name #\|))))) + (cond + ((not do-escape-p) + (write-symbol-name object stream)) + ((eq (symbol-package object) (find-package "KEYWORD")) + (write-string ":" stream) + (write-symbol-name object stream)) + ((or (eq (symbol-package object) *package*) + (eq (find-symbol (string object)) + object)) + (write-symbol-name object stream)) + ((symbol-package object) + (let ((package (symbol-package object))) + (write-string (package-name package) stream) + (write-string (if (gethash (symbol-name object) + (package-object-external-symbols package)) + ":" "::") + stream) + (write-symbol-name object stream))) + ((not (symbol-package object)) + (when *print-gensym* + (write-string "#:" stream)) + (write-symbol-name object stream)) + (t (error "Huh?"))))) + (vector + (let ((level *print-level*) + (length *print-length*)) + (cond + ((and level (minusp level)) + (write-char #\# stream)) + ((or *print-array* *print-readably*) + (write-string "#(" stream) + (cond + ((and length (< length (length object))) + (dotimes (i length) + (unless (= 0 i) + (write-char #\space stream)) + (write (aref object i))) + (write-string " ...)" stream)) + (t (dotimes (i (length object)) + (unless (= 0 i) + (write-char #\space stream)) + (write (aref object i))) + (write-char #\) stream)))) + (t (print-unreadable-object (object stream :identity t) + (princ (type-of object) stream)))))) + (standard-gf-instance + (print-unreadable-object (object stream) + (format stream "gf ~S" (funobj-name object)))) + (compiled-function + (print-unreadable-object (object stream) + (format stream "function ~S" (funobj-name object)))) + (hash-table + (print-unreadable-object (object stream :identity nil :type nil) + (format stream "~S hash-table with ~D entries" + (let ((test (hash-table-test object))) + (if (typep test 'compiled-function) + (funobj-name test) + test)) + (hash-table-count object)))) + (package + (if (package-name object) + (print-unreadable-object (object stream :identity nil :type nil) + (format stream "Package ~A with ~D+~D symbols" + (package-name object) + (hash-table-count (package-object-external-symbols object)) + (hash-table-count (package-object-internal-symbols object)))) + (print-unreadable-object (object stream :identity t :type t)))) + (t (if (not *never-use-print-object*) + (print-object object stream) + (print-unreadable-object (object stream :identity t) + (cond + ((typep object 'std-instance) + (write-string "[std-instance]" stream) + (write (standard-instance-access (std-instance-class object) 0))) + ((typep object 'standard-gf-instance) + (write-string "[std-gf-instance]" stream)) + (t (princ (type-of object) stream))))))))))) + object))) (defun prin1 (object &optional stream) - (write object :stream stream :escape t)) + (let ((*standard-output* (output-stream-designator stream)) + (*print-escape* t)) + (write object))) (defun princ (object &optional stream) - (write object :stream stream :escape nil :readably nil)) + (let ((*standard-output* (output-stream-designator stream)) + (*print-escape* nil) + (*print-readably* nil)) + (write object))) (defun print (object &optional stream) - (terpri stream) - (write object :stream stream :escape t) - (write-char #\Space stream) - object) + (let ((*standard-output* (output-stream-designator stream)) + (*print-escape* t)) + (write-char #\newline) + (write object) + (write-char #\Space) + object)) (defun pprint (object &optional stream) - (write object :stream stream :escape t :pretty t) - (values)) + (let ((*standard-output* (output-stream-designator stream)) + (*print-escape* t) + (*print-pretty* t)) + (write object) + (values))) (defun terpri (&optional stream) (write-char #\newline stream)

1 0

[movitz-cvs] CVS update: movitz/losp/muerte/format.lisp
by Frode Vatvedt Fjeld 13 Apr '04

13 Apr '04

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv18083 Modified Files: format.lisp Log Message: Tried to be somewhat more clever about avoiding keyword-parsing in calls to write. Date: Tue Apr 13 10:21:57 2004 Author: ffjeld Index: movitz/losp/muerte/format.lisp diff -u movitz/losp/muerte/format.lisp:1.3 movitz/losp/muerte/format.lisp:1.4 --- movitz/losp/muerte/format.lisp:1.3 Wed Mar 24 14:30:15 2004 +++ movitz/losp/muerte/format.lisp Tue Apr 13 10:21:57 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Sat Mar 23 01:18:36 2002 ;;;; -;;;; $Id: format.lisp,v 1.3 2004/03/24 19:30:15 ffjeld Exp $ +;;;; $Id: format.lisp,v 1.4 2004/04/13 14:21:57 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -51,12 +51,13 @@ (padchar (or (second prefix-parameters) #\space)) (commachar (or (third prefix-parameters) #\,)) (comma-interval (or (fourth prefix-parameters) 3))) - (write-integer x *standard-output* :radix nil :base base - :mincol mincol :padchar padchar - :comma-interval (and colon-p comma-interval) - :comma-char commachar - :sign-always at-sign-p)) - (write x :escape nil :radix nil :base base :readably nil))) + (write-integer x *standard-output* base nil + mincol padchar at-sign-p commachar (and colon-p comma-interval))) + (let ((*print-escape* nil) + (*print-radix* nil) + (*print-base* base) + (*print-readably* nil)) + (write x)))) (defun find-directive (string i directive &optional recursive-skip-start (recursive-skip-end directive))

1 0

[movitz-cvs] CVS update: movitz/losp/muerte/variables.lisp
by Frode Vatvedt Fjeld 13 Apr '04

13 Apr '04

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv16607 Modified Files: variables.lisp Log Message: Moved *read-base* and *package* declarations to variables.lisp. Date: Tue Apr 13 10:21:19 2004 Author: ffjeld Index: movitz/losp/muerte/variables.lisp diff -u movitz/losp/muerte/variables.lisp:1.4 movitz/losp/muerte/variables.lisp:1.5 --- movitz/losp/muerte/variables.lisp:1.4 Tue Apr 6 10:31:09 2004 +++ movitz/losp/muerte/variables.lisp Tue Apr 13 10:21:19 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Wed Nov 5 21:53:34 2003 ;;;; -;;;; $Id: variables.lisp,v 1.4 2004/04/06 14:31:09 ffjeld Exp $ +;;;; $Id: variables.lisp,v 1.5 2004/04/13 14:21:19 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -33,6 +33,9 @@ (defvar + nil) (defvar ++ nil) (defvar +++ nil) + +(defvar *read-base* 10) +(defvar *package*) (defparameter *debugger-hook* nil) (defvar *active-condition-handlers* nil)

1 0

[movitz-cvs] CVS update: movitz/losp/muerte/read.lisp
by Frode Vatvedt Fjeld 13 Apr '04

13 Apr '04

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv16565 Modified Files: read.lisp Log Message: Moved *read-base* and *package* declarations to variables.lisp. Date: Tue Apr 13 10:21:14 2004 Author: ffjeld Index: movitz/losp/muerte/read.lisp diff -u movitz/losp/muerte/read.lisp:1.2 movitz/losp/muerte/read.lisp:1.3 --- movitz/losp/muerte/read.lisp:1.2 Mon Jan 19 06:23:47 2004 +++ movitz/losp/muerte/read.lisp Tue Apr 13 10:21:14 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Wed Oct 17 21:50:42 2001 ;;;; -;;;; $Id: read.lisp,v 1.2 2004/01/19 11:23:47 ffjeld Exp $ +;;;; $Id: read.lisp,v 1.3 2004/04/13 14:21:14 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -18,8 +18,6 @@ (provide :muerte/read) (in-package muerte) - -(defvar *read-base* 10) (defun substring (string start end) (if (and (zerop start) (= end (length string)))

1 0

[movitz-cvs] CVS update: movitz/losp/muerte/packages.lisp
by Frode Vatvedt Fjeld 13 Apr '04

13 Apr '04

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv16435 Modified Files: packages.lisp Log Message: Moved *read-base* and *package* declarations to variables.lisp. Date: Tue Apr 13 10:21:09 2004 Author: ffjeld Index: movitz/losp/muerte/packages.lisp diff -u movitz/losp/muerte/packages.lisp:1.2 movitz/losp/muerte/packages.lisp:1.3 --- movitz/losp/muerte/packages.lisp:1.2 Mon Jan 19 06:23:47 2004 +++ movitz/losp/muerte/packages.lisp Tue Apr 13 10:21:09 2004 @@ -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.2 2004/01/19 11:23:47 ffjeld Exp $ +;;;; $Id: packages.lisp,v 1.3 2004/04/13 14:21:09 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -19,8 +19,6 @@ (provide :muerte/packages) (in-package muerte) - -(defvar *package*) (defstruct (package (:predicate packagep)

1 0