Author: hhubner
Date: 2006-02-18 06:58:11 -0600 (Sat, 18 Feb 2006)
New Revision: 1847
Modified:
branches/xml-class-rework/bknr/src/data/object.lisp
branches/xml-class-rework/bknr/src/xml-impex/xml-class.lisp
branches/xml-class-rework/modules/bknr-modules.asd
branches/xml-class-rework/modules/packages.lisp
branches/xml-class-rework/tools/make-core.lisp
Log:
Save intermediate stage. object.lisp was broken, revert thirdparty changes
due to infeasibility. Remove id3 stuff.
Modified: branches/xml-class-rework/bknr/src/data/object.lisp
===================================================================
--- branches/xml-class-rework/bknr/src/data/object.lisp 2006-02-18 10:02:10 UTC (rev 1846)
+++ branches/xml-class-rework/bknr/src/data/object.lisp 2006-02-18 12:58:11 UTC (rev 1847)
@@ -211,7 +211,7 @@
(find-class 'persistent-class))))
(error "Can not define a persistent class with metaclass ~A." metaclass))
`(define-bknr-class ,class ,superclasses ,slots
- ,@(unless metaclass '(:metaclass persistent-class))
+ ,@(unless metaclass '((:metaclass persistent-class)))
,@class-options)))
(defmacro defpersistent-class (class (&rest superclasses) slots &rest class-options)
Modified: branches/xml-class-rework/bknr/src/xml-impex/xml-class.lisp
===================================================================
--- branches/xml-class-rework/bknr/src/xml-impex/xml-class.lisp 2006-02-18 10:02:10 UTC (rev 1846)
+++ branches/xml-class-rework/bknr/src/xml-impex/xml-class.lisp 2006-02-18 12:58:11 UTC (rev 1847)
@@ -122,6 +122,16 @@
(setf (xml-class-element class) (or (first element) (string-downcase (class-name class))))
(xml-class-finalize class))
+(defmethod xml-class-finalize ((class xml-class))
+ (unless (class-finalized-p class)
+ (finalize-inheritance class))
+
+ (let ((slots (class-slots class))
+ (elmdef (xml-class-element class)))
+
+ slots))
+
+
(defmethod direct-slot-definition-class ((class xml-class) &key parent attribute element body &allow-other-keys)
(if (or attribute element body parent)
'xml-direct-slot-definition
Modified: branches/xml-class-rework/modules/bknr-modules.asd
===================================================================
--- branches/xml-class-rework/modules/bknr-modules.asd 2006-02-18 10:02:10 UTC (rev 1846)
+++ branches/xml-class-rework/modules/bknr-modules.asd 2006-02-18 12:58:11 UTC (rev 1847)
@@ -29,8 +29,7 @@
:bknr
:klammerscript
#+(not allegro)
- :acl-compat
- :bknr-id3)
+ :acl-compat)
:components ((:file "packages")
Modified: branches/xml-class-rework/modules/packages.lisp
===================================================================
--- branches/xml-class-rework/modules/packages.lisp 2006-02-18 10:02:10 UTC (rev 1846)
+++ branches/xml-class-rework/modules/packages.lisp 2006-02-18 12:58:11 UTC (rev 1847)
@@ -6,7 +6,6 @@
:cl-interpol
:net.aserve
:puri
- :bknr.id3
:bknr.rss
:bknr.utils
:bknr.web
Modified: branches/xml-class-rework/tools/make-core.lisp
===================================================================
--- branches/xml-class-rework/tools/make-core.lisp 2006-02-18 10:02:10 UTC (rev 1846)
+++ branches/xml-class-rework/tools/make-core.lisp 2006-02-18 12:58:11 UTC (rev 1847)
@@ -6,7 +6,6 @@
(defparameter *src-directory* (make-pathname :directory (pathname-directory *load-truename*)))
(defparameter *bknr-directory* (merge-pathnames #p"bknr-svn/" (user-homedir-pathname)))
-(defparameter *central-repository* (merge-pathnames #p"central-repository/" (user-homedir-pathname)))
#+cmu #-cmu19b
(load (merge-pathnames "bknr/patches/patch-around-mop-cmucl19a.lisp" *bknr-directory*))