Add a game state log dumping facility that produces a (load)able sexpr-log.

[eow] / xdump.lisp

diff --git a/xdump.lisp b/xdump.lisp
index dd878eed30efac5c50b1a01efe229171a026afd9..a1cf5964ca6c5f775c6cae4a7b22fe58fa1c6f74 100644 (file)
--- a/xdump.lisp
+++ b/xdump.lisp
@@ -42,7 +42,8 @@
    (index-by-name :accessor index-by-name
                  :initform (make-hash-table :size 128 :test 'equal))
    (meta-index :accessor meta-index :initform (make-array 5))
    (index-by-name :accessor index-by-name
                  :initform (make-hash-table :size 128 :test 'equal))
    (meta-index :accessor meta-index :initform (make-array 5))

-   (meta-meta :accessor meta-meta :initform (make-array 5))))
+   (meta-meta :accessor meta-meta :initform (make-array 5))
+   (user-log :accessor user-log :initarg :user-log)))

 
 (defgeneric get-table (xdump-parser table-name))
 (defgeneric get-table-entry (xdump-parser table-name index))
 
 (defgeneric get-table (xdump-parser table-name))
 (defgeneric get-table-entry (xdump-parser table-name index))


@@ -55,6 +56,7 @@
 (defgeneric header-parser (xdump-parser line))
 (defgeneric parse-line (xdump-parser line))
 (defgeneric reset-table-parser (xdump-parser))
 (defgeneric header-parser (xdump-parser line))
 (defgeneric parse-line (xdump-parser line))
 (defgeneric reset-table-parser (xdump-parser))

+(defgeneric flush-log (xdump-parser))

 (defgeneric entry-from-vector (xdump-parser class meta-table entry-vector
                                            &key array-support-p))
 
 (defgeneric entry-from-vector (xdump-parser class meta-table entry-vector
                                            &key array-support-p))
 


@@ -71,8 +73,11 @@
 (defun table (table-name &optional (parser *current-parser*))
   (get-table parser table-name))
 
 (defun table (table-name &optional (parser *current-parser*))
   (get-table parser table-name))
 

+(defun checkpoint (&optional (parser *current-parser*))
+  (flush-log parser))
+

 (defmethod get-table-entry ((parser xdump-parser) table-name index)
 (defmethod get-table-entry ((parser xdump-parser) table-name index)

-    (aref (table-entries (get-table table-name)) index))
+    (aref (table-entries (get-table parser table-name)) index))

 
 (defmethod sym-by-value ((parser xdump-parser) table-name value)
   (with-slots (table-classes-package) parser
 
 (defmethod sym-by-value ((parser xdump-parser) table-name value)
   (with-slots (table-classes-package) parser


@@ -93,8 +98,9 @@
          name nil
          timestamp nil)))
 
          name nil
          timestamp nil)))
 

-(defun meta-meta-finalizer (parser)
-  (with-slots (entry-buffer meta-index meta-meta) parser
+(defun define-meta-table (entry-buffer)
+  (with-slots (meta-index meta-meta user-log) *current-parser*
+    (print `(define-meta-table ,entry-buffer) user-log)

                                        ; build meta-index from integer index to
                                        ; slot symbol
     (loop
                                        ; build meta-index from integer index to
                                        ; slot symbol
     (loop


@@ -112,6 +118,10 @@
               do (setf (slot-value meta-meta-column slot) field))
            (setf (aref meta-meta i) meta-meta-column)))))
 
               do (setf (slot-value meta-meta-column slot) field))
            (setf (aref meta-meta i) meta-meta-column)))))
 

+(defun meta-meta-finalizer (parser)
+  (with-parser parser
+    (define-meta-table (entry-buffer parser))))
+

 (defun table-entry-defclass-form (name class-name package slot-list)
   `(defclass ,(find-symbol class-name package) ()
      ,(mapcar #'(lambda (raw-slot-name)
 (defun table-entry-defclass-form (name class-name package slot-list)
   `(defclass ,(find-symbol class-name package) ()
      ,(mapcar #'(lambda (raw-slot-name)


@@ -123,18 +133,17 @@
                          :accessor (intern accessor-name package))))
              slot-list)))
 
                          :accessor (intern accessor-name package))))
              slot-list)))
 

-(defun meta-finalizer (parser)
+(defun define-table (name entry-buffer)

   (let ((meta-table (make-array 1 :fill-pointer 0 :adjustable t)))
   (let ((meta-table (make-array 1 :fill-pointer 0 :adjustable t)))

-    (with-slots (entry-buffer name meta-index meta-by-index index-by-name
-                             table-by-index)
-       parser
+    (with-slots (meta-index meta-by-index index-by-name table-by-index user-log)
+       *current-parser*
+      (print `(define-table ,name ,entry-buffer) user-log)

       (loop for entry across entry-buffer
         do (let ((meta (make-instance 'table-column-meta)))
              (loop for slot across meta-index
                 for field in entry
                 do (setf (slot-value meta slot) field))
              (vector-push-extend meta meta-table)))
       (loop for entry across entry-buffer
         do (let ((meta (make-instance 'table-column-meta)))
              (loop for slot across meta-index
                 for field in entry
                 do (setf (slot-value meta slot) field))
              (vector-push-extend meta meta-table)))

-      (format t "~a~%~a~%~a~%" name meta-table entry-buffer)

       (let ((table-index (if (string= "table" name)
                             ; voodoo: the first column of the table of tables
                             ; is the uid
       (let ((table-index (if (string= "table" name)
                             ; voodoo: the first column of the table of tables
                             ; is the uid


@@ -150,7 +159,7 @@
 
        ;; create xdump-table instance and entry class
        (let* ((class-name (string-upcase (format nil "~a-table-entry" name)))
 
        ;; create xdump-table instance and entry class
        (let* ((class-name (string-upcase (format nil "~a-table-entry" name)))

-              (package (table-classes-package parser))
+              (package (table-classes-package *current-parser*))

               (table-instance (make-instance 'xdump-table
                                              :name name
                                              :index table-index
               (table-instance (make-instance 'xdump-table
                                              :name name
                                              :index table-index


@@ -160,10 +169,14 @@
               (slot-list (loop for entry across entry-buffer
                             collect (car entry))))
          (setf (aref table-by-index table-index) table-instance)
               (slot-list (loop for entry across entry-buffer
                             collect (car entry))))
          (setf (aref table-by-index table-index) table-instance)

-         (format t "slot-list: ~a~%" slot-list)

          (eval (table-entry-defclass-form name class-name package
                                           slot-list)))))))
 
          (eval (table-entry-defclass-form name class-name package
                                           slot-list)))))))
 

+(defun meta-finalizer (parser)
+  (with-parser parser
+    (with-slots (name entry-buffer) parser
+      (define-table name entry-buffer))))
+

 (defmethod array-p ((parser xdump-parser) column)
   (let ((column-len (meta-len column))
        (column-type (sym-by-value parser "meta-type" (meta-type column))))
 (defmethod array-p ((parser xdump-parser) column)
   (let ((column-len (meta-len column))
        (column-type (sym-by-value parser "meta-type" (meta-type column))))


@@ -199,13 +212,14 @@
                    :initial-element nil))
     (setf (aref entries index) entry)))
 
                    :initial-element nil))
     (setf (aref entries index) entry)))
 

-(defun table-finalizer (parser)
-  (with-slots (entry-buffer name timestamp index-by-name meta-by-index
-                           table-by-index table-classes-package) parser
+(defun load-table (name timestamp entry-buffer)
+  (with-slots (index-by-name meta-by-index table-by-index table-classes-package
+                            user-log)
+      *current-parser*
+    (print `(load-table ,name ,timestamp ,entry-buffer) user-log)

     (if (string= name "table") ; special magic: prefill index-by-name
        (loop for entry across entry-buffer do
             (setf (gethash (second entry) index-by-name) (first entry))))
     (if (string= name "table") ; special magic: prefill index-by-name
        (loop for entry across entry-buffer do
             (setf (gethash (second entry) index-by-name) (first entry))))

-    (format t "table-finalizer: ~a~%" name)

     (let* ((table-index (gethash name index-by-name))
           (meta-table (aref meta-by-index table-index))
           (table (aref table-by-index table-index))
     (let* ((table-index (gethash name index-by-name))
           (meta-table (aref meta-by-index table-index))
           (table (aref table-by-index table-index))


@@ -213,7 +227,7 @@
           (array-support-p (not (or (string= name "table")
                                     (string= name "meta-type")))))
       (loop for entry across entry-buffer do
           (array-support-p (not (or (string= name "table")
                                     (string= name "meta-type")))))
       (loop for entry across entry-buffer do

-          (let ((entry-instance (entry-from-vector parser
+          (let ((entry-instance (entry-from-vector *current-parser*

                                                    (table-entry-class table)
                                                    meta-table
                                                    entry
                                                    (table-entry-class table)
                                                    meta-table
                                                    entry


@@ -225,6 +239,11 @@
                 (vector-push-extend entry-instance (table-entries table)))))
       (setf (table-last-update table) timestamp))))
 
                 (vector-push-extend entry-instance (table-entries table)))))
       (setf (table-last-update table) timestamp))))
 

+(defun table-finalizer (parser)
+  (with-parser parser
+    (with-slots (name timestamp entry-buffer) parser
+      (load-table name timestamp entry-buffer))))
+

 (defmethod finish-table ((parser xdump-parser) number-of-records)
   (if (not (equal number-of-records (length (entry-buffer parser))))
       (error "Table row count mismatch"))
 (defmethod finish-table ((parser xdump-parser) number-of-records)
   (if (not (equal number-of-records (length (entry-buffer parser))))
       (error "Table row count mismatch"))


@@ -280,8 +299,8 @@
            (parse-table parser name timestamp)))))
   nil)
 
            (parse-table parser name timestamp)))))
   nil)
 

-(defun make-parser ()
-  (let ((parser (make-instance 'xdump-parser)))
+(defun make-parser (&key user-log)
+  (let ((parser (make-instance 'xdump-parser :user-log user-log)))

     (setf (line-parser parser) #'header-parser)
     parser))
 
     (setf (line-parser parser) #'header-parser)
     parser))
 


@@ -297,6 +316,9 @@
   (with-open-file (s filename)
     (parse-stream parser s)))
 
   (with-open-file (s filename)
     (parse-stream parser s)))
 

+(defmethod flush-log ((parser xdump-parser))
+  (finish-output (user-log parser)))
+

 (defun t1 ()
   (let ((parser (make-parser)))
     (setf *current-parser* parser)
 (defun t1 ()
   (let ((parser (make-parser)))
     (setf *current-parser* parser)