Array dump support. Create access function package xdump-data.

[eow] / xdump.lisp

diff --git a/xdump.lisp b/xdump.lisp
index 3114323a86bd0f40f29b532f89e0ec3ad9499575..dd878eed30efac5c50b1a01efe229171a026afd9 100644 (file)
--- a/xdump.lisp
+++ b/xdump.lisp
@@ -47,6 +47,7 @@
 (defgeneric get-table (xdump-parser table-name))
 (defgeneric get-table-entry (xdump-parser table-name index))
 (defgeneric sym-by-value (xdump-parser table-name value))
 (defgeneric get-table (xdump-parser table-name))
 (defgeneric get-table-entry (xdump-parser table-name index))
 (defgeneric sym-by-value (xdump-parser table-name value))

+(defgeneric array-p (xdump-parser column))

 (defgeneric finish-table (xdump-parser number-of-records))
 (defgeneric parse-entry (xdump-parser line))
 (defgeneric parse-meta (xdump-parser name timestamp))
 (defgeneric finish-table (xdump-parser number-of-records))
 (defgeneric parse-entry (xdump-parser line))
 (defgeneric parse-meta (xdump-parser name timestamp))


@@ -54,6 +55,8 @@
 (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 entry-from-vector (xdump-parser class meta-table entry-vector
+                                           &key array-support-p))

 
 (defmethod get-table ((parser xdump-parser) table-name)
   (with-slots (index-by-name table-by-index) parser
 
 (defmethod get-table ((parser xdump-parser) table-name)
   (with-slots (index-by-name table-by-index) parser


@@ -61,6 +64,13 @@
           (table (aref table-by-index table-index)))
       table)))
 
           (table (aref table-by-index table-index)))
       table)))
 

+(defmacro with-parser (parser &body body)
+  `(let ((*current-parser* ,parser))
+     ,@body))
+
+(defun table (table-name &optional (parser *current-parser*))
+  (get-table parser table-name))
+

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


@@ -154,16 +164,31 @@
          (eval (table-entry-defclass-form name class-name package
                                           slot-list)))))))
 
          (eval (table-entry-defclass-form name class-name package
                                           slot-list)))))))
 

-(defun entry-from-vector (class meta-table entry-vector table-classes-package)
-  (let ((new-entry (make-instance class))
-       (i 0))
-    (loop
-       for column across meta-table do
-        (let ((slot (find-symbol (string-upcase (meta-name column))
-                                 table-classes-package)))
-          (setf (slot-value new-entry slot) (nth i entry-vector))
-          (incf i)))
-    new-entry))
+(defmethod array-p ((parser xdump-parser) column)
+  (let ((column-len (meta-len column))
+       (column-type (sym-by-value parser "meta-type" (meta-type column))))
+    (and (> column-len 0)
+        (not (string= column-type "c")))))
+
+(defmethod entry-from-vector (parser class meta-table entry-vector
+                             &key (array-support-p t))
+  (with-slots (table-classes-package) parser
+    (let ((new-entry (make-instance class))
+         (entries entry-vector))
+      (loop
+        for column across meta-table do
+          (let ((slot (find-symbol (string-upcase (meta-name column))
+                                   table-classes-package)))
+            (if (and array-support-p (array-p parser column))
+                ;; then collect array
+                (let ((array nil))
+                  (dotimes (j (meta-len column))
+                    (push (pop entries) array))
+                  (setf (slot-value new-entry slot) array))
+                ;; else collect single entry
+                (progn
+                  (setf (slot-value new-entry slot) (pop entries))))))
+      new-entry)))

 
 (defmethod table-entry-insert-at ((table xdump-table) entry index)
                                        ; extend array if necessary
 
 (defmethod table-entry-insert-at ((table xdump-table) entry index)
                                        ; extend array if necessary


@@ -184,12 +209,16 @@
     (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))

-          (has-uid-p (has-uid-p table)))
+          (has-uid-p (has-uid-p table))
+          (array-support-p (not (or (string= name "table")
+                                    (string= name "meta-type")))))

       (loop for entry across entry-buffer do
       (loop for entry across entry-buffer do

-          (let ((entry-instance (entry-from-vector (table-entry-class table)
+          (let ((entry-instance (entry-from-vector parser
+                                                   (table-entry-class table)

                                                    meta-table
                                                    entry
                                                    meta-table
                                                    entry

-                                                   table-classes-package)))
+                                                   :array-support-p
+                                                   array-support-p)))

             (if has-uid-p
                 (let ((index (first entry)))
                   (table-entry-insert-at table entry-instance index))
             (if has-uid-p
                 (let ((index (first entry)))
                   (table-entry-insert-at table entry-instance index))