--- deliantra/server/include/cfperl.h	2006/08/30 16:30:37	1.16
+++ deliantra/server/include/cfperl.h	2006/08/31 09:19:34	1.18
@@ -11,6 +11,8 @@
 #include <EXTERN.h>
 #include <perl.h>
 
+#include "keyword.h"
+
 // optimisations/workaround for functions requiring my_perl in scope (anti-bloat)
 #undef localtime
 #undef srand48
@@ -27,35 +29,10 @@
 #undef random
 #undef crypt
 
-struct pl;
-struct object;
-struct mapstruct;
-
 void cfperl_init ();
 void cfperl_boot ();
 void cfperl_main ();
 
-// could have used templates, but a more traditional C api
-// uses more explicit typing which is ok for this purpose.
-enum data_type
-{
-  DT_END,     // no further arguments
-  DT_AV,      // perl-only av that needs to be flattened out
-  DT_INT,
-  DT_INT64,
-  DT_DOUBLE,
-  DT_STRING,  // 0-terminated string
-  DT_DATA,    // string + length
-  DT_OBJECT,
-  DT_MAP,
-  DT_PLAYER,
-  DT_ARCH,
-  DT_PARTY,
-  DT_REGION,
-
-  NUM_DATA_TYPES
-};
-
 enum event_klass
 {
   KLASS_NONE,
@@ -106,8 +83,8 @@
 
 struct attachable_base
 {
-  struct sv *self;
-  struct av *cb;    // CF+ perl self and callback
+  SV *self;
+  AV *cb;    // CF+ perl self and callback
   const char *attach; // generic extension attachment information
 
   void clear ();     // called when free'ing objects
@@ -128,29 +105,19 @@
 template<class subclass>
 struct attachable : attachable_base
 {
-  static data_type get_dt ()
-  {
-    return subclass::get_dt ();
-  }
-
   void instantiate ()
   {
     if (attach)
-      attachable_base::instantiate (get_dt (), static_cast<subclass *>(this));
+      attachable_base::instantiate ((data_type) cftype<subclass>::dt, static_cast<subclass *>(this));
   }
 };
 
-struct object_freezethaw
-{
-  struct av *av;
-};
-
-struct object_freezer : object_freezethaw
+struct object_freezer
 {
-  struct sv *text;
-  void *filename;
+  AV *av;
+  SV *text;
 
-  object_freezer (const char *filename);
+  object_freezer ();
   ~object_freezer ();
 
   void put (attachable_base *ext);
@@ -161,12 +128,39 @@
     put ((attachable_base *)obj);
   }
 
+  void put (keyword k);
+  void put (const char *v);
+  void put (int v);
+
+  template<typename value>
+  void put (keyword k, value v)
+  {
+    put (k);
+    put (v);
+  }
+
+  bool save (const char *filename);
+
   operator bool () { return !!av; }
 };
 
-struct object_thawer : object_freezethaw
+// compatibility support, should be removed when no longer needed
+int fprintf (object_freezer &freezer, const char *format, ...);
+int fputs (const char *s, object_freezer &freezer);
+
+// a single key-value line from a file
+struct token {
+   keyword k;
+   const char *v;
+
+   token (keyword k, const char *v = 0) : k(k), v(v) { }
+};
+
+struct object_thawer
 {
+  AV *av;
   FILE *fp;
+  char line[1024];
 
   object_thawer (const char *filename = 0);
   ~object_thawer ();
@@ -177,15 +171,13 @@
   void get (attachable<subclass> *obj, int oid)
   {
     if (av)
-      get (subclass::get_dt (), (subclass *)obj, obj, oid);
+      get ((data_type) cftype<subclass>::dt, (subclass *)obj, obj, oid);
   }
 
+  token get_token ();
+
   operator FILE *() { return fp; }
 };
 
-// compatibility support, should be removed when no longer needed
-int fprintf (object_freezer &freezer, const char *format, ...);
-int fputs (const char *s, object_freezer &freezer);
-
 #endif