Start integration of xdump with protocol

[eow] / empire.lisp

diff --git a/empire.lisp b/empire.lisp
index 2f3452e3af8113b120fd87fd0a6873c70231ae7e..c8993e8bb8cb53899befdecc38bc9ef120681ab2 100644 (file)
--- a/empire.lisp
+++ b/empire.lisp
@@ -303,20 +303,22 @@
        (char= +special-command-char+ (aref line 0))))
 
 (defclass xdump-mode (play-mode)
-  ((table-buffer
-    :initform nil
-    :accessor table-buffer
-    :documentation "Intermediate storage for incomplete table dump.")))
+  ((parser :initform (xdump:make-parser))
+   (phase :initform :meta-meta)))
 
 (defmethod handle-data ((m xdump-mode) message)
-  (with-slots (connection table-buffer) m
-    (if (char= #\/ (aref message 0))
-       (progn
-         (format t "table: ~a~%" table-buffer)
-         (set-new-mode m 'play-mode)))
-                                       ;XXX check table size
-    (with-input-from-string (s (format nil "(~a)" message))
-      (setf table-buffer (cons (read s) table-buffer)))))
+  (with-slots (connection parser phase) m
+    (if (xdump:parse-line parser message)
+       ;;XXX consider something like a 'pop-mode function
+       (case phase
+         (:meta-meta 
+          (setf phase :meta-table)
+          (send-message connection "xdump meta table" :next-mode 'xdump-mode))
+         (:meta-table
+          (setf phase :table)
+          (send-message connection "xdump table *" :next-mode 'xdump-mode))
+         (:table
+          (set-new-mode (connection-mode connection) 'play-mode))))))
 
 (defmethod special-xup ((c connection))
   (send-message c "xdump meta meta" :next-mode 'xdump-mode))