--- deliantra/server/include/cfperl.h	2006/08/28 16:52:51	1.13
+++ deliantra/server/include/cfperl.h	2006/08/31 17:54:14	1.19
@@ -4,33 +4,32 @@
 #ifndef CFPERL_H__
 #define CFPERL_H__
 
-struct pl;
-struct object;
-struct mapstruct;
+#include <cstdio>
 
-void cfperl_init ();
-void cfperl_main ();
+using namespace std;
 
-// 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,
+#include <EXTERN.h>
+#include <perl.h>
 
-  NUM_DATA_TYPES
-};
+// optimisations/workaround for functions requiring my_perl in scope (anti-bloat)
+#undef localtime
+#undef srand48
+#undef drand48
+#undef srandom
+#undef readdir
+#undef getprotobyname
+#undef gethostbyname
+#undef ctime
+#undef strerror
+
+// perl bug #40256: perl does overwrite those with reentrant versions
+// but does not initialise their state structures.
+#undef random
+#undef crypt
+
+void cfperl_init ();
+void cfperl_boot ();
+void cfperl_main ();
 
 enum event_klass
 {
@@ -82,7 +81,8 @@
 
 struct attachable_base
 {
-  void *self, *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
@@ -91,7 +91,8 @@
 
   void attachable_init ()
   {
-    self = cb = 0;
+    self   = 0;
+    cb     = 0;
     attach = 0;
   }
 };
@@ -102,31 +103,18 @@
 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
-{
-  void *av;
-  FILE *fp;
-
-  operator FILE *() { return fp; }
-};
-
-struct object_freezer : object_freezethaw
+struct object_freezer : dynbuf
 {
-  void *filename;
+  AV *av;
 
-  object_freezer (const char *filename);
+  object_freezer ();
   ~object_freezer ();
 
   void put (attachable_base *ext);
@@ -136,11 +124,60 @@
   {
     put ((attachable_base *)obj);
   }
+
+  void put (const char *k, const char *v); //TODO//temporary
+  void put (const char *k, int v); //TODO//temporary
+
+  void put (keyword k, const char *v);
+  void put (keyword k, double v);
+  void put (keyword k, float v) { put (k, (double)v); }
+
+  void put_ (keyword k, sint32 v);
+  void put_ (keyword k, sint64 v);
+
+  void put (keyword k,   signed char      v) { put_(k, (sint32)v); }
+  void put (keyword k, unsigned char      v) { put_(k, (sint32)v); }
+  void put (keyword k,   signed short     v) { put_(k, (sint32)v); }
+  void put (keyword k, unsigned short     v) { put_(k, (sint32)v); }
+  void put (keyword k,   signed int       v) { put_(k, (sint32)v); }
+  void put (keyword k, unsigned int       v) { put_(k, (sint64)v); }
+  void put (keyword k,   signed long      v) { put_(k, (sint64)v); }
+  void put (keyword k, unsigned long      v) { put_(k, (sint64)v); }
+  void put (keyword k,   signed long long v) { put_(k, (sint64)v); }
+  void put (keyword k, unsigned long long v) { put_(k, (sint64)v); }
+
+  void put (keyword kbeg, keyword kend, const char *v); // multiline
+
+  template<typename T>
+  void put (keyword k, T *v)
+  {
+    put (k, v ? (const char *)v->name : 0);
+  }
+
+  bool save (const char *filename);
+
+  operator bool () { return !!av; }
+};
+
+// 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 : object_freezethaw
+struct object_thawer
 {
-  object_thawer (FILE *fp, const char *filename = 0);
+  AV *av;
+  FILE *fp;
+  char line[1024];
+
+  object_thawer (const char *filename = 0);
   ~object_thawer ();
 
   void get (data_type type, void *obj, attachable_base *ext, int oid);
@@ -149,8 +186,12 @@
   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; }
 };
 
 #endif