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

[eow] / xdump.lisp

diff --git a/xdump.lisp b/xdump.lisp
index eaa8ce125e9c03a0d4945835ebfb0b947a67733f..dd878eed30efac5c50b1a01efe229171a026afd9 100644 (file)
--- a/xdump.lisp
+++ b/xdump.lisp
@@ -21,14 +21,6 @@
                                  :initial-element nil))
    (has-uid-p :accessor has-uid-p :initarg :has-uid-p)))
 
-(defun get-table (table-name)
-  (let* ((table-index (gethash table-name *index-by-name*))
-        (table (aref *table-by-index* table-index)))
-    table))
-
-(defun get-table-entry (table-name index)
-    (aref (table-entries (get-table table-name)) index))
-
 (defclass xdump-parser ()
   ((line-parser :accessor line-parser :initform nil)
    (entry-buffer :accessor entry-buffer
@@ -52,6 +44,10 @@
    (meta-index :accessor meta-index :initform (make-array 5))
    (meta-meta :accessor meta-meta :initform (make-array 5))))
 
+(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))
@@ -59,6 +55,33 @@
 (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
+    (let* ((table-index (gethash table-name index-by-name))
+          (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 sym-by-value ((parser xdump-parser) table-name value)
+  (with-slots (table-classes-package) parser
+    (let ((value-slot (find-symbol "VALUE" table-classes-package))
+         (name-slot (find-symbol "NAME" table-classes-package))
+         (meta-type-table (get-table parser table-name)))
+      (loop for entry across (table-entries meta-type-table)
+          if (= (slot-value entry value-slot) value)
+          return (slot-value entry name-slot)))))
 
 (defmethod reset-table-parser ((parser xdump-parser))
   (with-slots (line-parser entry-buffer entry-index finalizer name timestamp)
@@ -141,15 +164,31 @@
          (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)))
-    (loop
-       for item in entry-vector
-       for column across meta-table do
-        (let ((slot (find-symbol (string-upcase (meta-name column))
-                                 table-classes-package)))
-          (setf (slot-value new-entry slot) item)))
-    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
@@ -170,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))
-          (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
-          (let ((entry-instance (entry-from-vector (table-entry-class table)
+          (let ((entry-instance (entry-from-vector parser
+                                                   (table-entry-class table)
                                                    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))