fset-cvs May 2007

fset-cvs@common-lisp.net

1 participants
11 discussions

[fset-cvs] r12 - tags/fset_1.0.0 trunk
by sburson＠common-lisp.net 28 May '07

28 May '07

Author: sburson Date: Sun May 27 23:10:45 2007 New Revision: 12 Modified: tags/fset_1.0.0/fset.asd trunk/fset.asd Log: Changed ASDF system definition to use `:serial t' to work around a bug in the version of ASDF-Install distributed with SBCL. Modified: tags/fset_1.0.0/fset.asd ============================================================================== --- tags/fset_1.0.0/fset.asd (original) +++ tags/fset_1.0.0/fset.asd Sun May 27 23:10:45 2007 @@ -11,23 +11,17 @@ (asdf:defsystem FSet :depends-on (:misc-extensions) + :serial t :components ((:system :misc-extensions) (:module "Code" + :serial t :components - ((:file "defs" :in-order-to ((compile-op (load-op :misc-extensions)) - (load-op (load-op :misc-extensions)))) - (:file "port" :in-order-to ((compile-op (load-op "defs")) - (load-op (load-op "defs")))) - (:file "order" :in-order-to ((compile-op (load-op "port")) - (load-op (load-op "port")))) - (:file "wb-trees" :in-order-to ((compile-op (load-op "port")) - (load-op (load-op "port")))) - (:file "fset" :in-order-to ((compile-op (load-op "order" "wb-trees")) - (load-op (load-op "order" "wb-trees")))) - ;; Uses macros from "fset". - (:file "tuples" :in-order-to ((compile-op (load-op "fset")) - (load-op (load-op "fset")))) - (:file "reader" :depends-on ("tuples")) - (:file "testing" :depends-on ("reader")))))) - + ((:file "defs") + (:file "port") + (:file "order") + (:file "wb-trees") + (:file "fset") + (:file "tuples") + (:file "reader") + (:file "testing"))))) Modified: trunk/fset.asd ============================================================================== --- trunk/fset.asd (original) +++ trunk/fset.asd Sun May 27 23:10:45 2007 @@ -11,23 +11,17 @@ (asdf:defsystem FSet :depends-on (:misc-extensions) + :serial t :components ((:system :misc-extensions) (:module "Code" + :serial t :components - ((:file "defs" :in-order-to ((compile-op (load-op :misc-extensions)) - (load-op (load-op :misc-extensions)))) - (:file "port" :in-order-to ((compile-op (load-op "defs")) - (load-op (load-op "defs")))) - (:file "order" :in-order-to ((compile-op (load-op "port")) - (load-op (load-op "port")))) - (:file "wb-trees" :in-order-to ((compile-op (load-op "port")) - (load-op (load-op "port")))) - (:file "fset" :in-order-to ((compile-op (load-op "order" "wb-trees")) - (load-op (load-op "order" "wb-trees")))) - ;; Uses macros from "fset". - (:file "tuples" :in-order-to ((compile-op (load-op "fset")) - (load-op (load-op "fset")))) - (:file "reader" :depends-on ("tuples")) - (:file "testing" :depends-on ("reader")))))) - + ((:file "defs") + (:file "port") + (:file "order") + (:file "wb-trees") + (:file "fset") + (:file "tuples") + (:file "reader") + (:file "testing")))))

1 0

[fset-cvs] r11 - tags/fset_1.0.0 trunk
by sburson＠common-lisp.net 27 May '07

27 May '07

Author: sburson Date: Sat May 26 21:06:50 2007 New Revision: 11 Modified: tags/fset_1.0.0/fset.asd trunk/fset.asd Log: Gaah, third try on `fset.asd'. Modified: tags/fset_1.0.0/fset.asd ============================================================================== --- tags/fset_1.0.0/fset.asd (original) +++ tags/fset_1.0.0/fset.asd Sat May 26 21:06:50 2007 @@ -10,13 +10,13 @@ (asdf:defsystem FSet - :depends-on (:gmap) + :depends-on (:misc-extensions) :components ((:system :misc-extensions) (:module "Code" :components - ((:file "defs" :in-order-to ((compile-op (load-op :gmap)) - (load-op (load-op :gmap)))) + ((:file "defs" :in-order-to ((compile-op (load-op :misc-extensions)) + (load-op (load-op :misc-extensions)))) (:file "port" :in-order-to ((compile-op (load-op "defs")) (load-op (load-op "defs")))) (:file "order" :in-order-to ((compile-op (load-op "port")) Modified: trunk/fset.asd ============================================================================== --- trunk/fset.asd (original) +++ trunk/fset.asd Sat May 26 21:06:50 2007 @@ -10,13 +10,13 @@ (asdf:defsystem FSet - :depends-on (:gmap) + :depends-on (:misc-extensions) :components ((:system :misc-extensions) (:module "Code" :components - ((:file "defs" :in-order-to ((compile-op (load-op :gmap)) - (load-op (load-op :gmap)))) + ((:file "defs" :in-order-to ((compile-op (load-op :misc-extensions)) + (load-op (load-op :misc-extensions)))) (:file "port" :in-order-to ((compile-op (load-op "defs")) (load-op (load-op "defs")))) (:file "order" :in-order-to ((compile-op (load-op "port"))

1 0

[fset-cvs] r10 - tags/fset_1.0.0
by sburson＠common-lisp.net 27 May '07

27 May '07

Author: sburson Date: Sat May 26 20:59:00 2007 New Revision: 10 Modified: tags/fset_1.0.0/fset.asd Log: Fix reference to "gmap" in `fset.asd'. Modified: tags/fset_1.0.0/fset.asd ============================================================================== --- tags/fset_1.0.0/fset.asd (original) +++ tags/fset_1.0.0/fset.asd Sat May 26 20:59:00 2007 @@ -12,7 +12,7 @@ (asdf:defsystem FSet :depends-on (:gmap) :components - ((:system :gmap) + ((:system :misc-extensions) (:module "Code" :components ((:file "defs" :in-order-to ((compile-op (load-op :gmap))

1 0

[fset-cvs] r9 - trunk
by sburson＠common-lisp.net 27 May '07

27 May '07

Author: sburson Date: Sat May 26 20:56:40 2007 New Revision: 9 Modified: trunk/fset.asd Log: Fix reference to "gmap" in `fset.asd'. Modified: trunk/fset.asd ============================================================================== --- trunk/fset.asd (original) +++ trunk/fset.asd Sat May 26 20:56:40 2007 @@ -12,7 +12,7 @@ (asdf:defsystem FSet :depends-on (:gmap) :components - ((:system :gmap) + ((:system :misc-extensions) (:module "Code" :components ((:file "defs" :in-order-to ((compile-op (load-op :gmap))

1 0

[fset-cvs] r8 - tags/fset_1.0.0
by sburson＠common-lisp.net 26 May '07

26 May '07

Author: sburson Date: Sat May 26 19:06:36 2007 New Revision: 8 Added: tags/fset_1.0.0/ - copied from r7, trunk/ Log: Tagging release 1.0.0.

1 0

[fset-cvs] r7 - trunk/Code
by sburson＠common-lisp.net 26 May '07

26 May '07

Author: sburson Date: Sat May 26 19:01:08 2007 New Revision: 7 Removed: trunk/Code/ops.text Log: Removing file of notes I didn't intend to publish.

1 0

[fset-cvs] r6 - trunk
by sburson＠common-lisp.net 26 May '07

26 May '07

Author: sburson Date: Sat May 26 02:37:22 2007 New Revision: 6 Modified: trunk/fset.asd Log: Fix `.asd' file (having moved it). Modified: trunk/fset.asd ============================================================================== --- trunk/fset.asd (original) +++ trunk/fset.asd Sat May 26 02:37:22 2007 @@ -13,19 +13,21 @@ :depends-on (:gmap) :components ((:system :gmap) - (:file "defs" :in-order-to ((compile-op (load-op :gmap)) - (load-op (load-op :gmap)))) - (:file "port" :in-order-to ((compile-op (load-op "defs")) - (load-op (load-op "defs")))) - (:file "order" :in-order-to ((compile-op (load-op "port")) - (load-op (load-op "port")))) - (:file "wb-trees" :in-order-to ((compile-op (load-op "port")) - (load-op (load-op "port")))) - (:file "fset" :in-order-to ((compile-op (load-op "order" "wb-trees")) - (load-op (load-op "order" "wb-trees")))) - ;; Uses macros from "fset". - (:file "tuples" :in-order-to ((compile-op (load-op "fset")) - (load-op (load-op "fset")))) - (:file "reader" :depends-on ("tuples")) - (:file "testing" :depends-on ("reader")))) + (:module "Code" + :components + ((:file "defs" :in-order-to ((compile-op (load-op :gmap)) + (load-op (load-op :gmap)))) + (:file "port" :in-order-to ((compile-op (load-op "defs")) + (load-op (load-op "defs")))) + (:file "order" :in-order-to ((compile-op (load-op "port")) + (load-op (load-op "port")))) + (:file "wb-trees" :in-order-to ((compile-op (load-op "port")) + (load-op (load-op "port")))) + (:file "fset" :in-order-to ((compile-op (load-op "order" "wb-trees")) + (load-op (load-op "order" "wb-trees")))) + ;; Uses macros from "fset". + (:file "tuples" :in-order-to ((compile-op (load-op "fset")) + (load-op (load-op "fset")))) + (:file "reader" :depends-on ("tuples")) + (:file "testing" :depends-on ("reader"))))))

1 0

[fset-cvs] r5 - trunk/Code
by sburson＠common-lisp.net 26 May '07

26 May '07

Author: sburson Date: Sat May 26 02:34:37 2007 New Revision: 5 Modified: trunk/Code/defs.lisp trunk/Code/port.lisp trunk/Code/testing.lisp trunk/Code/tuples.lisp Log: Minor fixes for CMUCL, LispWorks, case-sensitive-lower mode. Modified: trunk/Code/defs.lisp ============================================================================== --- trunk/Code/defs.lisp (original) +++ trunk/Code/defs.lisp Sat May 26 02:34:37 2007 @@ -29,7 +29,7 @@ #:substitute #:substitute-if #:substitute-if-not #:some #:every #:notany #:notevery ;; This one is internal. - #+(or cmucl scl sbcl) #:length) + #+(or cmu scl sbcl) #:length) (:export #:set #:bag #:map #:seq #:tuple #:compare #:empty? #:size #:arb #:member? #:multiplicity Modified: trunk/Code/port.lisp ============================================================================== --- trunk/Code/port.lisp (original) +++ trunk/Code/port.lisp Sat May 26 02:34:37 2007 @@ -11,17 +11,6 @@ ;;; This license provides NO WARRANTY. -#-lispworks -(defun base-char-p (x) - (typep x 'base-char)) - -;;; I think this may be faster than `(typep x 'base-char)'. Maybe not. -#+lispworks -(defun base-char-p (x) (lw:base-char-p x)) - -(declaim (inline base-char-p)) - - ;;; On non-kernel-threads implementations, we use something like ;;; `without-interrupts'. On kernel-threads implementations, we have to do ;;; real locking. @@ -51,11 +40,11 @@ (declare (ignore lock wait?)) `(mp:without-interrupts . ,body)) -#+cmucl +#+cmu (defun make-lock (&optional name) (declare (ignore name)) nil) -#+cmucl +#+cmu (defmacro with-lock ((lock &key (wait? t)) &body body) (declare (ignore lock wait?)) `(sys:without-interrupts . ,body)) @@ -122,6 +111,8 @@ `(progn . ,body)) +;;; ---------------- + ;;; Constants used by the tuple implementation. We choose the widths of ;;; two bitfields to fit in a fixnum less the sign bit. @@ -146,6 +137,9 @@ (23 9)) "This limits the number of key/value pairs in any tuple.") + +;;; ---------------- + ;;; Unfortunately, CL doesn't specify that `make-random-state' should be able ;;; to accept an integer seed. We want to be able to supply it one, so that ;;; (for testing) we can have multiple reproducible sequences of pseudorandom @@ -153,7 +147,7 @@ (defun make-seeded-random-state (seed) (if (null seed) (make-random-state) - #+(or cmucl scl) + #+(or cmu scl) (progn (assert (plusp seed)) (kernel::make-random-object :state @@ -168,20 +162,40 @@ (logand seed #xFFFF)) #+genera (fcli::make-random-state-internal 71 35 seed) - #-(or cmucl scl sbcl openmcl genera) + #-(or cmu scl sbcl openmcl genera) (error "Implementation-specific code needed in `make-seeded-random-state'"))) + +;;; ---------------- + +#-lispworks +(defun base-char-p (x) + (typep x 'base-char)) + +;;; I think this may be faster than `(typep x 'base-char)'. Maybe not. +#+lispworks +(defun base-char-p (x) (lw:base-char-p x)) + +#-lispworks +(declaim (inline base-char-p)) + + ;;; SBCL has a distinct `extended-char' type but no `make-char'. #+sbcl (defun make-char (code bits) ;; Kinda weird, but this is only used by the test suite to generate random chars. (code-char (+ code (ash bits 8)))) +#+lispworks +(defun make-char (code bits) + (code-char code bits)) + + ;;; This little oddity exists because of a limitation in Python (that's the ;;; CMUCL compiler). Given a call to `length' on type `(or null simple-vector)', ;;; Python isn't quite smart enough to optimize the call unless we do the case ;;; breakdown for it like this. -#+(or cmucl scl) +#+(or cmu scl) (defmacro length (x) (ext:once-only ((x x)) `(if (null ,x) 0 (cl:length ,x)))) Modified: trunk/Code/testing.lisp ============================================================================== --- trunk/Code/testing.lisp (original) +++ trunk/Code/testing.lisp Sat May 26 02:34:37 2007 @@ -16,7 +16,7 @@ Value) -(defun Run-Test-Suite (n-iterations &optional random-seed) +(defun run-test-suite (n-iterations &optional random-seed) (let ((*random-state* (make-seeded-random-state random-seed))) ; for repeatability. (dotimes (i n-iterations) (Test-Map-Operations i (Test-Set-Operations i)) Modified: trunk/Code/tuples.lisp ============================================================================== --- trunk/Code/tuples.lisp (original) +++ trunk/Code/tuples.lisp Sat May 26 02:34:37 2007 @@ -218,7 +218,7 @@ (unless desc (setq desc (Make-Tuple-Desc (empty-set) (vector))) (setf (lookup *Tuple-Descriptor-Map* (empty-map)) desc)) - (make-tuple-internal desc (vector)))) + (Make-Tuple-Internal desc (vector)))) (defvar *Tuple-Random-Value* 0 "State for an extremely fast, low-quality generator of small numbers of

1 0

[fset-cvs] r4 - Code trunk trunk/Code
by sburson＠common-lisp.net 22 May '07

22 May '07

Author: sburson Date: Tue May 22 01:32:57 2007 New Revision: 4 Added: trunk/Code/ - copied from r3, Code/ trunk/fset.asd - copied unchanged from r3, fset.asd Removed: Code/ fset.asd Log: Oops, fixing structure of initial import.

1 0

[fset-cvs] r3 - trunk
by sburson＠common-lisp.net 22 May '07

22 May '07

Author: sburson Date: Tue May 22 01:29:23 2007 New Revision: 3 Added: trunk/ Log:

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

fset-cvs May 2007