--- deliantra/server/include/cfperl.h	2006/08/28 07:07:41	1.11
+++ deliantra/server/include/cfperl.h	2006/08/31 09:19:34	1.18
@@ -4,33 +4,34 @@
 #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
-};
+#include "keyword.h"
+
+// 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,15 +83,18 @@
 
 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
-  void optimise ();                              // possibly save some memory by destroying unneeded data
+  void clear ();     // called when free'ing objects
+  void optimise ();  // possibly save some memory by destroying unneeded data
+  void instantiate (data_type type, void *obj);
 
   void attachable_init ()
   {
-    self = cb = 0;
+    self   = 0;
+    cb     = 0;
     attach = 0;
   }
 };
@@ -101,34 +105,62 @@
 template<class subclass>
 struct attachable : attachable_base
 {
-  static data_type get_dt ()
+  void instantiate ()
   {
-    subclass::get_dt ();
+    if (attach)
+      attachable_base::instantiate ((data_type) cftype<subclass>::dt, static_cast<subclass *>(this));
   }
 };
 
 struct object_freezer
 {
-  const char *filename;
-  void *av;
+  AV *av;
+  SV *text;
 
-  object_freezer (const char *filename);
+  object_freezer ();
   ~object_freezer ();
 
-  void put (FILE *fp, attachable_base *ext);
+  void put (attachable_base *ext);
 
   template<class subclass>
-  void put (FILE *fp, attachable<subclass> *obj)
+  void put (attachable<subclass> *obj)
   {
-    put (fp, (attachable_base *)obj);
+    put ((attachable_base *)obj);
   }
 
-  void finish ();
+  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; }
+};
+
+// 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
 {
-  void *av;
+  AV *av;
+  FILE *fp;
+  char line[1024];
 
   object_thawer (const char *filename = 0);
   ~object_thawer ();
@@ -139,10 +171,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);
   }
 
-  void finish ();
+  token get_token ();
+
+  operator FILE *() { return fp; }
 };
 
 #endif