Finish meta meta parsing, start with table of tables

diff --git a/xdump-test.lisp b/xdump-test.lisp
index 3a7846f8fd16109457d8178bbeac6dc5d5f456b5..4419a1276ded3c9634d518b2128d4ab9dadc05cf 100644 (file)
--- a/xdump-test.lisp
+++ b/xdump-test.lisp
@@ -4,22 +4,28 @@
 
 (defvar *current-parser* nil)
 
-(defclass meta-table ()
+(defclass table-column-meta ()
   ((name :accessor meta-name)
    (type :accessor meta-type)
    (flags :accessor meta-flags)
    (len :accessor meta-len)
    (table :accessor meta-table)))
 
-(defvar *meta-by-index* (make-array 30 :fill-pointer 0 :adjustable t))
-(defvar *meta-index* (make-array 5))
+(defclass empire-table ()
+  (()))
+
+(defvar *meta-by-index* (make-array 50 :adjustable t :initial-element nil))
+(defvar *index-by-name* (make-hash-table :size 50))
+(defvar *meta-index* (make-array 5) "meta slot symbol by meta table column index")
 (defvar *meta-meta* (make-array 5))
 
 (defclass xdump-parser ()
   ((line-parser :accessor line-parser :initform nil)
    (entry-buffer :accessor entry-buffer :initform (make-array 1 :fill-pointer 0 :adjustable t))
    (entry-index :accessor entry-index :initform 0)
-   (finalizer :accessor finalizer :initform nil)))
+   (finalizer :accessor finalizer :initform nil)
+   (name :accessor table-name :initform nil)
+   (timestamp :accessor timestamp :initform nil)))
 
 (defgeneric finish-table (xdump-parser number-of-records))
 (defgeneric parse-entry (xdump-parser line))
@@ -28,30 +34,47 @@
 (defgeneric header-parser (xdump-parser line))
 (defgeneric parse-line (xdump-parser line))
 
-(defun meta-meta-finalizer (entry-buffer index)
-  (declare (ignorable index))
-  (loop
-     for i = 0 then (+ i 1)
-     for e across entry-buffer
-     do (let* ((slot-name (string-upcase (car e)))
-              (slot (find-symbol slot-name :xdump)))
-         (setf (aref *meta-index* i) slot)))
-  (loop for entry across entry-buffer
-     for i = 0 then (+ i 1)
-     do   (let ((meta-meta (make-instance 'meta-table)))
+(defun meta-meta-finalizer (parser)
+  (with-slots (entry-buffer) parser
+                                       ; build meta-index from integer index to slot symbol
+    (loop
+       for i = 0 then (+ i 1)
+       for e across entry-buffer
+       do (let* ((slot-name (string-upcase (car e)))
+                (slot (find-symbol slot-name :xdump)))
+           (setf (aref *meta-index* i) slot)))
+                                       ; build meta-meta table
+    (loop for entry across entry-buffer
+       for i = 0 then (+ i 1)
+       do (let ((meta-meta (make-instance 'table-column-meta)))
            (loop for slot across *meta-index*
               for field in entry
               do (setf (slot-value meta-meta slot) field))
-           (setf (aref *meta-meta* i) meta-meta))))
-
-(defun meta-finalizer (entry-buffer index)
+           (setf (aref *meta-meta* i) meta-meta)))))
+
+(defun meta-finalizer (parser)
+  (let ((meta-table (make-array 1 :fill-pointer 0 :adjustable t)))
+    (with-slots (entry-buffer name) parser
+      (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
+                            (elt (aref entry-buffer 0) 4)
+                            (gethash name *index-by-name*))))
+       (setf (aref *meta-by-index* table-index) meta-table)))))
+
+(defun table-finalizer (parser)
   t)
 
 (defmethod finish-table ((parser xdump-parser) number-of-records)
   (if (not (equal number-of-records (length (entry-buffer parser))))
       (error "Table row count mismatch"))
-  (with-slots (finalizer entry-buffer entry-index) parser
-    (funcall finalizer entry-buffer entry-index)))
+  (funcall (finalizer parser) parser))
 
 (defmethod parse-entry ((parser xdump-parser) line)
   (if (char= #\/ (aref line 0))
@@ -61,15 +84,19 @@
          (vector-push-extend fields entry-buffer)
          (incf entry-index)))))
 
-(defmethod parse-meta ((parser xdump-parser) name timestamp)
-  (with-slots (line-parser finalizer) parser
+(defmethod parse-meta ((parser xdump-parser) input-name input-timestamp)
+  (with-slots (line-parser finalizer name timestamp) parser
     (setf line-parser #'parse-entry
-         finalizer (if (string= "meta" name)
+         finalizer (if (string= "meta" input-name)
                        #'meta-meta-finalizer
-                       #'meta-finalizer))))
+                       #'meta-finalizer)
+         name input-name
+         timestamp input-timestamp)))
 
 (defmethod parse-table ((parser xdump-parser) name timestamp)
-  (setf (line-parser parser) #'parse-entry))
+  (with-slots (line-parser finalizer) parser
+    (setf line-parser #'parse-entry
+         finalizer #'table-finalizer)))
 
 (defmethod header-parser ((parser xdump-parser) line)
   (multiple-value-bind (fullmatch groups)
@@ -112,3 +139,8 @@
 
 (defun t1 ()
   (test-parse "xdump-meta-meta.txt"))
+
+(defun t2 ()
+  (test-parse "xdump-meta-meta.txt")
+  (test-parse "xdump-meta-table.txt")
+  (test-parse "xdump-table.txt"))