Changeset 2594

Timestamp:

02/22/08 13:39:15 (9 months ago)

Author:

hans

Message:

Indices tutorial and documentation updates.

Files:

• trunk/bknr/datastore/doc/Makefile (modified) (1 diff)
• trunk/bknr/datastore/doc/indices.tex (modified) (2 diffs)
• trunk/bknr/datastore/src/indices/tutorial.lisp (modified) (5 diffs)

trunk/bknr/datastore/doc/Makefile

@@ +1 @@
+PBOOK=../../tools/pbook.py
+
-all: manual.pdf
-
-manual.pdf: manual.tex introduction.tex guidedtour.tex indices2.tex datastore2.tex impex2.tex 
-        pdflatex manual && pdflatex manual
-/home/manuel/public_html
+../../../projects/bknr-website/pdf
-
-indices2.tex: ../src/indices/tutorial.lisp
-/usr/local/bin/pbook.py
+$(PBOOK)
-
-datastore2.tex: ../src/data/tutorial.lisp
-/usr/local/bin/pbook.py
+$(PBOOK)
-
-impex2.tex: ../src/xml-impex/tutorial.lisp
-/usr/local/bin/pbook.py
+$(PBOOK)
-
-clean:

trunk/bknr/datastore/doc/indices.tex

@@ -449 +449 @@
-\begin{Verbatim}[fontsize=\small,frame=leftline,framerule=0.9mm,rulecolor=\color{gray},framesep=5.1mm,xleftmargin=5mm,fontfamily=cmtt]
-(defvar *class-index*
-
+
+
-
-(defclass base-object ()
-
+(id :initform (incf *object-id*))
-  (:metaclass indexed-class)
-  (:class-indices (class :index *class-index*
-          :slots nil
-          :index-reader objects-of-class
-          :index-values all-objects
@@ -462 +462 @@
-        (classes :index-type class-index
-            :index-initargs (:index-superclasses t)
-nil
+(id)
-            :index-subclasses t
-            :index-reader objects-with-class)))

trunk/bknr/datastore/src/indices/tutorial.lisp

@@ -118 +118 @@
-;;;
-;;; Using the `INDEXED-CLASS', we can redefine our gorilla example.
+
+;;; Before we are able to refine GORILLA with a new metaclass, we need
+;;; to delete the old class definition:
+
+(setf (find-class 'gorilla) nil)
-
-(defclass gorilla ()
@@ -130 +135 @@
-                :index-reader gorillas-with-description))
-  (:metaclass indexed-class))
+
+(defmethod print-object ((gorilla gorilla) stream)
+  (print-unreadable-object (gorilla stream :type t)
+    (format stream "~S" (gorilla-name gorilla))))
-
-;;; We have to recreate the gorillas though, as the old instances
@@ -419 +428 @@
-; => #<TEST-CLASS2 5,5,0>
-
+#|
+
+;;; XXX the class index tutorial needs updating, please skip to next section!
+
-;;; Another example of a class index is the `CLASS-INDEX' index.
-
@@ -475 +488 @@
-; => NIL
-; NIL
+|#
-
-;;;## Destroying objects
@@ -485 +499 @@
-
-(let ((obj (test-with-coords '(5 5 0))))
-                (destroy-object obj)
+  (destroy-object obj
-
-;;; This will throw an error.
-;;;
-
-(test-class-x obj
+  (test-class-x obj)
-
-;;;## Class and object reinitialization