movitz-cvs April 2006

movitz-cvs@common-lisp.net

1 participants
40 discussions

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

10 Apr '06

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory clnet:/tmp/cvs-serv5221 Modified Files: variables.lisp Log Message: Added some variables. --- /project/movitz/cvsroot/movitz/losp/muerte/variables.lisp 2005/06/10 23:05:50 1.9 +++ /project/movitz/cvsroot/movitz/losp/muerte/variables.lisp 2006/04/10 11:58:27 1.10 @@ -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.9 2005/06/10 23:05:50 ffjeld Exp $ +;;;; $Id: variables.lisp,v 1.10 2006/04/10 11:58:27 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -45,4 +45,28 @@ (defvar *gc-hooks* nil) +(defvar *load-pathname* nil) + + +(defvar most-positive-short-float 1000000) +(defvar most-positive-single-float 1000000) +(defvar most-positive-double-float 1000000) +(defvar most-positive-long-float 1000000) + +(defvar short-float-epsilon 1/1000) +(defvar single-float-epsilon 1/1000) +(defvar double-float-epsilon 1/1000) +(defvar long-float-epsilon 1/1000) + +(defvar short-float-negative-epsilon -1/1000) +(defvar single-float-negative-epsilon -1/1000) +(defvar double-float-negative-epsilon -1/1000) +(defvar long-float-negative-epsilon -1/1000) + + +(defconstant call-arguments-limit #xffff0) +(defconstant lambda-parameters-limit #x1000) ; ? + +(defvar *print-pprint-dispatch* nil) + (declaim (special *build-number*))

1 0

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

10 Apr '06

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory clnet:/tmp/cvs-serv5192 Modified Files: typep.lisp Log Message: Improved coerce. --- /project/movitz/cvsroot/movitz/losp/muerte/typep.lisp 2005/10/25 19:27:46 1.52 +++ /project/movitz/cvsroot/movitz/losp/muerte/typep.lisp 2006/04/10 11:58:15 1.53 @@ -9,7 +9,7 @@ ;;;; Created at: Fri Dec 8 11:07:53 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: typep.lisp,v 1.52 2005/10/25 19:27:46 ffjeld Exp $ +;;;; $Id: typep.lisp,v 1.53 2006/04/10 11:58:15 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -704,7 +704,7 @@ (cond ((typep object result-type) object) - ((member result-type '(list array vector)) + ((member result-type '(list array vector simple-vector string simple-string)) (map result-type #'identity object)) ((and (consp result-type) (eq (car result-type) 'vector))

1 0

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

10 Apr '06

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory clnet:/tmp/cvs-serv5157 Modified Files: streams.lisp Log Message: Have finish-output accept a function as stream designator. --- /project/movitz/cvsroot/movitz/losp/muerte/streams.lisp 2004/11/24 16:19:36 1.4 +++ /project/movitz/cvsroot/movitz/losp/muerte/streams.lisp 2006/04/10 11:57:24 1.5 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Mon Jun 30 14:33:15 2003 ;;;; -;;;; $Id: streams.lisp,v 1.4 2004/11/24 16:19:36 ffjeld Exp $ +;;;; $Id: streams.lisp,v 1.5 2006/04/10 11:57:24 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -125,6 +125,7 @@ destination, and then returns." (let ((stream (output-stream-designator stream))) (etypecase stream + (function) ; NOP (simple-stream (%finish-output stream)))))

1 0

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

10 Apr '06

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory clnet:/tmp/cvs-serv5113 Modified Files: sequences.lisp Log Message: Improved map and remove-if. --- /project/movitz/cvsroot/movitz/losp/muerte/sequences.lisp 2006/04/02 20:48:34 1.32 +++ /project/movitz/cvsroot/movitz/losp/muerte/sequences.lisp 2006/04/10 11:56:28 1.33 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Tue Sep 11 14:19:23 2001 ;;;; -;;;; $Id: sequences.lisp,v 1.32 2006/04/02 20:48:34 ffjeld Exp $ +;;;; $Id: sequences.lisp,v 1.33 2006/04/10 11:56:28 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -716,22 +716,21 @@ (ignore function first-sequence more-sequences)) (error "MAP not implemented.")))) -(defun map-for-string (function first-sequence &rest more-sequences) +(defun map-for-vector (result function first-sequence &rest more-sequences) (numargs-case - (2 (function first-sequence) + (3 (result function first-sequence) (with-funcallable (mapf function) - (let ((result (make-string (length first-sequence)))) - (sequence-dispatch first-sequence - (vector - (do ((i 0 (1+ i))) - ((>= i (length result)) result) - (declare (index i)) - (setf (char result i) (mapf (aref first-sequence i))))) - (list - (do ((i 0 (1+ i))) - ((>= i (length result)) result) - (declare (index i)) - (setf (char result i) (mapf (pop first-sequence))))))))) + (sequence-dispatch first-sequence + (vector + (do ((i 0 (1+ i))) + ((>= i (length result)) result) + (declare (index i)) + (setf (aref result i) (mapf (aref first-sequence i))))) + (list + (do ((i 0 (1+ i))) + ((>= i (length result)) result) + (declare (index i)) + (setf (aref result i) (mapf (pop first-sequence)))))))) (t (function first-sequence &rest more-sequences) (declare (ignore function first-sequence more-sequences)) (error "MAP not implemented.")))) @@ -746,7 +745,13 @@ ((eq 'list result-type) (apply 'map-for-list function first-sequence more-sequences)) ((member result-type '(string simple-string)) - (apply 'map-for-string function first-sequence more-sequences)) + (apply 'map-for-vector + (make-string (length first-sequence)) + function first-sequence more-sequences)) + ((member result-type '(vector simple-vector)) + (apply 'map-for-vector + (make-array (length first-sequence)) + function first-sequence more-sequences)) (t (error "MAP not implemented.")))) (defun fill (sequence item &key (start 0) end) @@ -1253,30 +1258,33 @@ list) (t (with-funcallable (test) (with-funcallable (key) - (if (test (key (car list))) - (list-remove-if test (cdr list) key - (when end (1- end)) - (when count (1- count))) - (do ((i 1 (1+ i)) - (p0 list (cdr p0)) - (p1 (cdr list) (cdr p1))) - ((or (endp p1) (and end (>= i end))) list) - (declare (index i)) - (when (test (key (car p1))) - (return - ;; reiterate from <list> to <p1>, consing up a copy, with - ;; the copy's tail being the recursive call to list-remove. - (do* ((new-list (cons (car list) nil)) - (x (cdr list) (cdr x)) - (new-x new-list)) - ((eq x p1) - (setf (cdr new-x) (list-remove-if test (cdr p1) key - (when end (- end i 1)) - (when count (1- count)))) - new-list) - (setf new-x - (setf (cdr new-x) - (cons (car x) nil))))))))))))) + (and (do () ((or (endp list) + (and end (<= end 0)) + (not (test (key (car list)))) + (and count (<= (decf count) 0))) + list) + (when end (decf end)) + (setf list (cdr list))) + (do ((i 1 (1+ i)) + (p0 list (cdr p0)) + (p1 (cdr list) (cdr p1))) + ((or (endp p1) (and end (>= i end))) list) + (declare (index i)) + (when (test (key (car p1))) + (return + ;; reiterate from <list> to <p1>, consing up a copy, with + ;; the copy's tail being the recursive call to list-remove. + (do* ((new-list (cons (car list) nil)) + (x (cdr list) (cdr x)) + (new-x new-list)) + ((eq x p1) + (setf (cdr new-x) (list-remove-if test (cdr p1) key + (when end (- end i 1)) + (when count (1- count)))) + new-list) + (setf new-x + (setf (cdr new-x) + (cons (car x) nil))))))))))))) (defun remove-if (test sequence &key from-end (start 0) end count (key 'identity)) (sequence-dispatch sequence

1 0

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

10 Apr '06

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory clnet:/tmp/cvs-serv4992 Modified Files: more-macros.lisp Log Message: Added trivial locally macro. Also a mock-up load compiler-macro. --- /project/movitz/cvsroot/movitz/losp/muerte/more-macros.lisp 2005/08/26 19:39:26 1.29 +++ /project/movitz/cvsroot/movitz/losp/muerte/more-macros.lisp 2006/04/10 11:54:52 1.30 @@ -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.29 2005/08/26 19:39:26 ffjeld Exp $ +;;;; $Id: more-macros.lisp,v 1.30 2006/04/10 11:54:52 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -431,3 +431,12 @@ (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) + "hm..." + (assert (movitz:movitz-constantp filespec) (filespec) + "Can't load a non-constant filename: ~S" filespec) + (warn "load-compile: ~S" filespec) + `(funcall ',(movitz:movitz-compile-file (format nil "losp/ansi-tests/~A" filespec)))) + +(defmacro locally (&body body) + `(let () ,@body))

1 0

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

10 Apr '06

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory clnet:/tmp/cvs-serv4947 Modified Files: los-closette.lisp Log Message: Have find-class compiler-macro accept optional environment arg. Take note that character class contains base-char and extended-char. --- /project/movitz/cvsroot/movitz/losp/muerte/los-closette.lisp 2005/08/21 17:55:54 1.35 +++ /project/movitz/cvsroot/movitz/losp/muerte/los-closette.lisp 2006/04/10 11:52:21 1.36 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Tue Jul 23 14:29:10 2002 ;;;; -;;;; $Id: los-closette.lisp,v 1.35 2005/08/21 17:55:54 ffjeld Exp $ +;;;; $Id: los-closette.lisp,v 1.36 2006/04/10 11:52:21 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -99,6 +99,10 @@ (defmacro push-on-end (value location) `(setf ,location (nconc ,location (list ,value)))) + +(defmacro define-method-combination (name &rest options) + (declare (ignore options)) + (warn "Method-combinations not implemented: ~S" name)) ;;; @@ -210,7 +214,8 @@ ;;; -(defun find-class (symbol &optional (errorp t)) +(defun find-class (symbol &optional (errorp t) environment) + (declare (ignore environment)) (let ((class (gethash symbol *class-table*))) (if (and (null class) errorp) (error "No class named ~S." symbol) @@ -951,7 +956,9 @@ (defclass symbol (t) () (:metaclass built-in-class)) (defclass sequence (t) () (:metaclass built-in-class)) (defclass array (t) () (:metaclass built-in-class)) -(defclass character (t) () (:metaclass built-in-class)) +(defclass character (t) () + (:metaclass built-in-class) + (:plist (:subtypes (base-char extended-char)))) (defclass list (sequence) () (:metaclass built-in-class)) (defclass null (symbol list) () (:metaclass built-in-class)) (defclass cons (list) () (:metaclass built-in-class))

1 0

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

10 Apr '06

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory clnet:/tmp/cvs-serv4911 Modified Files: basic-macros.lisp Log Message: Have find-class compiler-macro accept optional environment arg. --- /project/movitz/cvsroot/movitz/losp/muerte/basic-macros.lisp 2005/08/28 20:53:13 1.65 +++ /project/movitz/cvsroot/movitz/losp/muerte/basic-macros.lisp 2006/04/10 11:51:03 1.66 @@ -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.65 2005/08/28 20:53:13 ffjeld Exp $ +;;;; $Id: basic-macros.lisp,v 1.66 2006/04/10 11:51:03 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -914,9 +914,9 @@ (error "Array backquote not implemented.")) (t (list 'quote form)))) -(define-compiler-macro find-class (&whole form &environment env symbol &optional (errorp t)) - (declare (ignore errorp)) - (if (not (movitz:movitz-constantp symbol env)) +(define-compiler-macro find-class (&whole form &environment env symbol &optional (errorp t) (environment nil envp)) + (declare (ignore errorp environment)) + (if (or envp (not (movitz:movitz-constantp symbol env))) form (let* ((type (movitz:movitz-eval symbol env)) (movitz-type (movitz-program type))

1 0

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

10 Apr '06

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory clnet:/tmp/cvs-serv4874 Modified Files: arithmetic-macros.lisp Log Message: No need to give cl package prefix inside #.(..) anymore. --- /project/movitz/cvsroot/movitz/losp/muerte/arithmetic-macros.lisp 2005/09/18 16:20:04 1.15 +++ /project/movitz/cvsroot/movitz/losp/muerte/arithmetic-macros.lisp 2006/04/10 11:50:34 1.16 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Sat Jul 17 13:42:46 2004 ;;;; -;;;; $Id: arithmetic-macros.lisp,v 1.15 2005/09/18 16:20:04 ffjeld Exp $ +;;;; $Id: arithmetic-macros.lisp,v 1.16 2006/04/10 11:50:34 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -216,7 +216,7 @@ ,@(loop repeat count append `((:addl (:result-register) (:result-register)) (:into))))) - ((< 0 count #.(cl:1- movitz::+movitz-fixnum-bits+)) + ((< 0 count #.(1- movitz::+movitz-fixnum-bits+)) `(with-inline-assembly (:returns :register :side-effects nil :type integer) ,@load-integer (:cmpl ,(ash 1 (- (- 31 0) count))

1 0

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

10 Apr '06

Update of /project/movitz/cvsroot/movitz In directory clnet:/tmp/cvs-serv4760 Modified Files: compiler.lisp Log Message: minor tweaks. --- /project/movitz/cvsroot/movitz/compiler.lisp 2005/10/31 09:22:54 1.166 +++ /project/movitz/cvsroot/movitz/compiler.lisp 2006/04/10 11:49:41 1.167 @@ -8,7 +8,7 @@ ;;;; Created at: Wed Oct 25 12:30:49 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: compiler.lisp,v 1.166 2005/10/31 09:22:54 ffjeld Exp $ +;;;; $Id: compiler.lisp,v 1.167 2006/04/10 11:49:41 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -1400,8 +1400,7 @@ (pathname-directory path)) (path) "Refusing to delete file not in /tmp.") - (delete-file path)))) - (values)) + (delete-file path))))) (defun movitz-compile-file-internal (path &optional (*default-load-priority* @@ -1440,9 +1439,9 @@ (when *compiler-verbose-p* (format *query-io* "~&Movitz Compiling ~S..~%" (cond - ((symbolp form) form) - ((symbolp (car form)) - (xsubseq form 0 2))))) + ((symbolp form) form) + ((symbolp (car form)) + (xsubseq form 0 2))))) (compiler-call #'compile-form :form form :funobj funobj @@ -1452,13 +1451,16 @@ (cond ((null file-code) (setf (image-load-time-funobjs *image*) - (delete funobj (image-load-time-funobjs *image*) :key #'first))) + (delete funobj (image-load-time-funobjs *image*) :key #'first)) + 'muerte::constantly-true) (t (setf (extended-code function-env) file-code (need-normalized-ecx-p function-env) nil (function-envs funobj) (list (cons 'muerte.cl::t function-env)) (funobj-env funobj) funobj-env) - (make-compiled-funobj-pass2 funobj))) - t)))) + (make-compiled-funobj-pass2 funobj) + (let ((name (funobj-name funobj))) + (setf (movitz-env-named-function name) funobj) + name))))))) ;;;;

1 0

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

10 Apr '06

Update of /project/movitz/cvsroot/movitz In directory clnet:/tmp/cvs-serv4724 Modified Files: image.lisp Log Message: Read floats by rationalizing. --- /project/movitz/cvsroot/movitz/image.lisp 2005/08/21 13:47:16 1.104 +++ /project/movitz/cvsroot/movitz/image.lisp 2006/04/10 11:48:20 1.105 @@ -9,7 +9,7 @@ ;;;; Created at: Sun Oct 22 00:22:43 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: image.lisp,v 1.104 2005/08/21 13:47:16 ffjeld Exp $ +;;;; $Id: image.lisp,v 1.105 2006/04/10 11:48:20 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -1495,7 +1495,9 @@ (mapcar #'(lambda (slot) (movitz-read (slot-value expr (if (consp slot) (car slot) slot)))) slot-descriptions)) - movitz-object)))))))) + movitz-object))) + (float ; XXX + (movitz-read (rationalize expr)))))))) ;;;

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

movitz-cvs April 2006