Author: hhubner Date: 2007-10-04 17:08:36 -0400 (Thu, 04 Oct 2007) New Revision: 2210

Added: branches/trunk-reorg/thirdparty/cl-interpol/ Modified: branches/trunk-reorg/bknr/datastore/src/bknr-data-impex.asd branches/trunk-reorg/bknr/datastore/src/bknr-datastore.asd branches/trunk-reorg/bknr/datastore/src/bknr-utils.asd branches/trunk-reorg/bknr/datastore/src/data/package.lisp branches/trunk-reorg/bknr/datastore/src/data/txn.lisp branches/trunk-reorg/bknr/datastore/src/utils/acl-mp-compat.lisp branches/trunk-reorg/bknr/datastore/src/utils/package.lisp branches/trunk-reorg/bknr/datastore/src/utils/utils.lisp branches/trunk-reorg/xhtmlgen/xhtmlgen.asd branches/trunk-reorg/xhtmlgen/xhtmlgen.lisp Log: SBCL-1.0.10 loads :bknr-datastore and performs some basic operations. The rest of this is untested. I'll be moving this forward while working on the scrabble application that I'm going to commit later on.

Modified: branches/trunk-reorg/bknr/datastore/src/bknr-data-impex.asd =================================================================== --- branches/trunk-reorg/bknr/datastore/src/bknr-data-impex.asd 2007-10-04 20:57:29 UTC (rev 2209) +++ branches/trunk-reorg/bknr/datastore/src/bknr-data-impex.asd 2007-10-04 21:08:36 UTC (rev 2210) @@ -16,8 +16,6 @@ :description "baikonour - launchpad for lisp satellites"

:depends-on (:cl-interpol :unit-test :bknr-utils :bknr-indices - :bknr-datastore :bknr-impex - #+(not allegro) - :acl-compat) + :bknr-datastore :bknr-impex)

:components ((:module "data" :components ((:file "xml-object")))))

Modified: branches/trunk-reorg/bknr/datastore/src/bknr-datastore.asd =================================================================== --- branches/trunk-reorg/bknr/datastore/src/bknr-datastore.asd 2007-10-04 20:57:29 UTC (rev 2209) +++ branches/trunk-reorg/bknr/datastore/src/bknr-datastore.asd 2007-10-04 21:08:36 UTC (rev 2210) @@ -17,10 +17,10 @@ :description "baikonour - launchpad for lisp satellites"

:depends-on (:cl-interpol + :closer-mop :unit-test :bknr-utils - :bknr-indices - #+(not allegro) :acl-compat) + :bknr-indices)

:components ((:module "data" :components ((:file "package") (:file "encoding" :depends-on ("package"))

Modified: branches/trunk-reorg/bknr/datastore/src/bknr-utils.asd =================================================================== --- branches/trunk-reorg/bknr/datastore/src/bknr-utils.asd 2007-10-04 20:57:29 UTC (rev 2209) +++ branches/trunk-reorg/bknr/datastore/src/bknr-utils.asd 2007-10-04 21:08:36 UTC (rev 2210) @@ -18,8 +18,6 @@

:depends-on (:cl-interpol :cl-ppcre :md5 - #+(not allegro) - :acl-compat :iconv)

:components ((:module "statistics" :components ((:file "package")

Modified: branches/trunk-reorg/bknr/datastore/src/data/package.lisp =================================================================== --- branches/trunk-reorg/bknr/datastore/src/data/package.lisp 2007-10-04 20:57:29 UTC (rev 2209) +++ branches/trunk-reorg/bknr/datastore/src/data/package.lisp 2007-10-04 21:08:36 UTC (rev 2210) @@ -3,16 +3,7 @@ (defpackage :bknr.datastore (:use :cl :bknr.utils :cl-interpol :cl-ppcre :bknr.indices :bknr.statistics - #+allegro - :mp - #+(not allegro) - :acl-compat.mp - #+allegro :aclmop - #+cmu :pcl - #+openmcl :openmcl-mop - #+sbcl :sb-mop) - #+(not allegro) - (:shadowing-import-from :acl-compat.mp process-kill process-wait) + :closer-mop ) (:shadowing-import-from :cl-interpol quote-meta-chars) (:export #:*store-debug* #:*store*

Modified: branches/trunk-reorg/bknr/datastore/src/data/txn.lisp =================================================================== --- branches/trunk-reorg/bknr/datastore/src/data/txn.lisp 2007-10-04 20:57:29 UTC (rev 2209) +++ branches/trunk-reorg/bknr/datastore/src/data/txn.lisp 2007-10-04 21:08:36 UTC (rev 2210) @@ -37,15 +37,18 @@ (transaction-run-time :accessor store-transaction-run-time :initform 0 :documentation "The total run time of all application transaction code since last snapshot")) - (:default-initargs :guard #'funcall :log-guard #'funcall :subsystems (list (make-instance 'store-object-subsystem)))) + (:default-initargs + :guard #'funcall + :log-guard #'funcall + :subsystems (list (make-instance 'store-object-subsystem))))

(defclass mp-store (store) () - (:default-initargs :guard (let ((lock (make-process-lock))) + (:default-initargs :guard (let ((lock (mp-make-lock))) (lambda (thunk) (mp-with-recursive-lock-held (lock) (funcall thunk)))) - :log-guard (let ((lock (make-process-lock))) + :log-guard (let ((lock (mp-make-lock))) (lambda (thunk) (mp-with-recursive-lock-held (lock) (funcall thunk)))))

Modified: branches/trunk-reorg/bknr/datastore/src/utils/acl-mp-compat.lisp =================================================================== --- branches/trunk-reorg/bknr/datastore/src/utils/acl-mp-compat.lisp 2007-10-04 20:57:29 UTC (rev 2209) +++ branches/trunk-reorg/bknr/datastore/src/utils/acl-mp-compat.lisp 2007-10-04 21:08:36 UTC (rev 2210) @@ -1,24 +1,24 @@ -(in-package :bknr.utils) - -(defun mp-make-lock (&optional (name "Anonymous")) - #+allegro - (mp:make-process-lock :name name) - #+sbcl - (sb-thread:make-mutex :name name) - #+cmu - (mp:make-lock name)) - -(defmacro mp-with-lock-held ((lock) &rest body) - #+allegro - `(mp:with-process-lock (,lock) - ,@body) - #+sbcl - `(sb-thread:with-mutex (,lock) - ,@body) - #+cmu - `(mp:with-lock-held (,lock) - ,@body)) +(in-package :bknr.utils)

+(defun mp-make-lock (&optional (name "Anonymous")) + #+allegro + (mp:make-process-lock :name name) + #+sbcl + (sb-thread:make-mutex :name name) + #+cmu + (mp:make-lock name)) + +(defmacro mp-with-lock-held ((lock) &rest body) + #+allegro + `(mp:with-process-lock (,lock) + ,@body) + #+sbcl + `(sb-thread:with-mutex (,lock) + ,@body) + #+cmu + `(mp:with-lock-held (,lock) + ,@body)) + (defmacro mp-with-recursive-lock-held ((lock) &rest body) #+allegro `(mp:with-process-lock (,lock)

Modified: branches/trunk-reorg/bknr/datastore/src/utils/package.lisp =================================================================== --- branches/trunk-reorg/bknr/datastore/src/utils/package.lisp 2007-10-04 20:57:29 UTC (rev 2209) +++ branches/trunk-reorg/bknr/datastore/src/utils/package.lisp 2007-10-04 21:08:36 UTC (rev 2210) @@ -6,12 +6,8 @@ :cl-interpol :md5 #+cmu :extensions -; #+sbcl :sb-ext - #+(not allegro) :acl-compat.mp - #+allegro :mp) + #+sbcl :sb-ext) (:shadowing-import-from :cl-interpol quote-meta-chars) - #+(not allegro) - (:shadowing-import-from :acl-compat.mp process-kill process-wait) (:export #:define-bknr-class

;; byte size formatting

Modified: branches/trunk-reorg/bknr/datastore/src/utils/utils.lisp =================================================================== --- branches/trunk-reorg/bknr/datastore/src/utils/utils.lisp 2007-10-04 20:57:29 UTC (rev 2209) +++ branches/trunk-reorg/bknr/datastore/src/utils/utils.lisp 2007-10-04 21:08:36 UTC (rev 2210) @@ -546,14 +546,3 @@ (t (format nil "~A" byte-count))))

-;;; from norvig -(defun find-all (item sequence &rest keyword-args - &key (test #'eql) test-not &allow-other-keys) - "Find all those elements of sequence that match item, - according to the keywords. Doesn't alter sequence." - (if test-not - (apply #'remove item sequence - :test-not (complement test-not) keyword-args) - (apply #'remove item sequence - :test (complement test) keyword-args))) -

Modified: branches/trunk-reorg/xhtmlgen/xhtmlgen.asd =================================================================== --- branches/trunk-reorg/xhtmlgen/xhtmlgen.asd 2007-10-04 20:57:29 UTC (rev 2209) +++ branches/trunk-reorg/xhtmlgen/xhtmlgen.asd 2007-10-04 21:08:36 UTC (rev 2210) @@ -1,6 +1,7 @@ (in-package :cl-user)

-(defsystem :xhtmlgen - :serial t - :components ((:file "package") - (:file "xhtmlgen"))) \ No newline at end of file +(asdf:defsystem :xhtmlgen + :depends-on (:cxml) + :serial t + :components ((:file "package") + (:file "xhtmlgen"))) \ No newline at end of file

Modified: branches/trunk-reorg/xhtmlgen/xhtmlgen.lisp =================================================================== --- branches/trunk-reorg/xhtmlgen/xhtmlgen.lisp 2007-10-04 20:57:29 UTC (rev 2209) +++ branches/trunk-reorg/xhtmlgen/xhtmlgen.lisp 2007-10-04 21:08:36 UTC (rev 2210) @@ -49,12 +49,12 @@

#-rune-is-character (defun make-sink-for-utf8-strings (stream) - (cxml:make-recoder (cxml:make-character-stream-sink stream :canonical nil :indentation 3) + (cxml:make-recoder (cxml:make-character-stream-sink/utf8 stream :canonical nil :indentation 3) #'cxml::utf8-string-to-rod))

#-rune-is-character (defun make-sink-for-latin1-strings (stream) - (cxml:make-recoder (cxml:make-character-stream-sink stream :canonical nil :indentation 3) + (cxml:make-recoder (cxml:make-character-stream-sink/utf8 stream :canonical nil :indentation 3) #'cxml::string-rod))

#-rune-is-character @@ -75,9 +75,9 @@ `(let ((*html-sink* (if (boundp '*html-sink*) *html-sink* #+rune-is-character - (cxml:make-character-stream-sink net.html.generator:*html-stream* :canonical nil :indentation 3) + (cxml:make-character-stream-sink *standard-output* :canonical nil :indentation 3) #-rune-is-character - (make-sink-for-internal-strings net.html.generator:*html-stream*)))) + (make-sink-for-internal-strings *standard-output*)))) ,(process-html-forms forms env)))

(defmacro html-stream (stream &rest forms &environment env)