--- deliantra/server/include/cfperl.h	2006/08/27 16:15:12	1.8
+++ deliantra/server/include/cfperl.h	2006/08/31 09:19:34	1.18
@@ -4,36 +4,38 @@
 #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_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,
-  DT_AV,      // av that needs to be flattened out
+#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
 {
+  KLASS_NONE,
   KLASS_GLOBAL,
   KLASS_PLAYER,
   KLASS_OBJECT,
@@ -48,6 +50,7 @@
   NUM_EVENT_TYPES
 };
 
+#define ARG_AV(o)     DT_AV    , static_cast<AV *>   (o)
 #define ARG_INT(v)    DT_INT   , static_cast<int>    (v)
 #define ARG_INT64(v)  DT_INT64 , static_cast<sint64> (v)
 #define ARG_DOUBLE(v) DT_DOUBLE, static_cast<double> (v)
@@ -63,12 +66,13 @@
 // the ", ## __VA_ARGS" is, unfortunately, a gnu-cpp extension
 
 // all these return true when the normal event processing should be skipped (if any)
-#define INVOKE(klass, event, ...) cfperl_invoke (EVENT_ ## klass ## _ ## event, ## __VA_ARGS__, DT_END)
+#define INVOKE_(event, ...) cfperl_invoke (event, ## __VA_ARGS__, DT_END)
 
-#define INVOKE_GLOBAL(event, ...)     INVOKE (GLOBAL, event,                  ## __VA_ARGS__)
-#define INVOKE_OBJECT(event, op, ...) INVOKE (OBJECT, event, ARG_OBJECT (op), ## __VA_ARGS__)
-#define INVOKE_PLAYER(event, pl, ...) INVOKE (PLAYER, event, ARG_PLAYER (pl), ## __VA_ARGS__)
-#define INVOKE_MAP(event, map, ...)   INVOKE (MAP   , event, ARG_MAP (map)  , ## __VA_ARGS__)
+#define INVOKE(klass, event, ...)     INVOKE_(EVENT_ ## klass  ## _ ## event,                  ## __VA_ARGS__)
+#define INVOKE_GLOBAL(event, ...)     INVOKE_(EVENT_ ## GLOBAL ## _ ## event,                  ## __VA_ARGS__)
+#define INVOKE_OBJECT(event, op, ...) INVOKE_(EVENT_ ## OBJECT ## _ ## event, ARG_OBJECT (op), ## __VA_ARGS__)
+#define INVOKE_PLAYER(event, pl, ...) INVOKE_(EVENT_ ## PLAYER ## _ ## event, ARG_PLAYER (pl), ## __VA_ARGS__)
+#define INVOKE_MAP(event, map, ...)   INVOKE_(EVENT_ ## MAP    ## _ ## event, ARG_MAP (map)  , ## __VA_ARGS__)
 
 //TODO should index into @result
 #define RESULT(idx,type) cfperl_result_ ## type (idx)
@@ -77,71 +81,102 @@
 bool cfperl_invoke (event_type event, ...);
 int cfperl_result_INT (int idx);
 
-struct extendable_base
+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 extendable_init ()
+  void attachable_init ()
   {
-    self = cb = 0;
+    self   = 0;
+    cb     = 0;
     attach = 0;
   }
 };
 
-// objects extendable from perl (or any other extension) should include or
+// objects attachable from perl (or any other extension) should include or
 // derive using the curiously recurring template pattern, to avoid
 // virtual method calls etc.
 template<class subclass>
-struct extendable : extendable_base
+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;
-  int idx;
+  AV *av;
+  SV *text;
 
-  object_freezer (const char *filename);
+  object_freezer ();
   ~object_freezer ();
 
-  void put (extendable_base *ext);
+  void put (attachable_base *ext);
 
   template<class subclass>
-  void put (extendable<subclass> *obj)
+  void put (attachable<subclass> *obj)
   {
-    put ((extendable_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;
-  int idx;
+  AV *av;
+  FILE *fp;
+  char line[1024];
 
   object_thawer (const char *filename = 0);
   ~object_thawer ();
 
-  void get (data_type type, void *obj, extendable_base *ext);
+  void get (data_type type, void *obj, attachable_base *ext, int oid);
 
   template<class subclass>
-  void get (extendable<subclass> *obj)
+  void get (attachable<subclass> *obj, int oid)
   {
     if (av)
-      get (subclass::get_dt (), (subclass *)obj, obj);
+      get ((data_type) cftype<subclass>::dt, (subclass *)obj, obj, oid);
   }
 
-  void finish ();
+  token get_token ();
+
+  operator FILE *() { return fp; }
 };
 
 #endif