--- deliantra/server/include/cfperl.h	2006/08/25 17:11:53	1.5
+++ deliantra/server/include/cfperl.h	2006/08/30 06:06:27	1.14
@@ -4,10 +4,19 @@
 #ifndef CFPERL_H__
 #define CFPERL_H__
 
+struct pl;
+struct object;
+struct mapstruct;
+
+void cfperl_init ();
+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 {
+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,
@@ -20,53 +29,129 @@
   DT_PARTY,
   DT_REGION,
 
-  // following are only for cfapi-compatibility
-  DT_INT_PTR,
-  DT_INT64_PTR,
-  DT_DOUBLE_PTR,
+  NUM_DATA_TYPES
 };
 
-enum event_klass {
+enum event_klass
+{
+  KLASS_NONE,
   KLASS_GLOBAL,
   KLASS_PLAYER,
   KLASS_OBJECT,
   KLASS_MAP,
 };
 
-enum event_type {
-# define def(klass,name) EV_ ## klass ## _ ## name,
+enum event_type
+{
+# define def(klass,name) EVENT_ ## klass ## _ ## name,
 #  include "eventinc.h"
 # undef def
   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)
 #define ARG_STRING(v) DT_STRING, static_cast<const char *> (v)
 #define ARG_DATA(s,l) DT_DATA  , static_cast<const void *> (s), (l)
-#define ARG_OBJECT(o) DT_OBJECT, static_cast<struct object *>    (o)
-#define ARG_MAP(o)    DT_MAP   , static_cast<struct mapstruct *> (o)
-#define ARG_PLAYER(o) DT_PLAYER, static_cast<struct pl *>        (o)
-#define ARG_ARCH(o)   DT_ARCH  , static_cast<struct archetype *> (o)
-#define ARG_PARTY(o)  DT_PARTY , static_cast<struct party *>     (o)
-#define ARG_REGION(o) DT_REGION, static_cast<struct region *>    (o)
+#define ARG_OBJECT(o) DT_OBJECT, (void *)static_cast<struct object *>    (o)
+#define ARG_MAP(o)    DT_MAP   , (void *)static_cast<struct mapstruct *> (o)
+#define ARG_PLAYER(o) DT_PLAYER, (void *)static_cast<struct pl *>        (o)
+#define ARG_ARCH(o)   DT_ARCH  , (void *)static_cast<struct archetype *> (o)
+#define ARG_PARTY(o)  DT_PARTY , (void *)static_cast<struct party *>     (o)
+#define ARG_REGION(o) DT_REGION, (void *)static_cast<struct region *>    (o)
 
 // 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 (EV_ ## 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)
+#define RESULT_INT(idx) RESULT(idx, INT)
 
 bool cfperl_invoke (event_type event, ...);
-void cfperl_free_ob (object *op);
+int cfperl_result_INT (int idx);
 
-void cfperl_init ();
-void cfperl_main ();
+struct attachable_base
+{
+  void *self, *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 instantiate (data_type type, void *obj);
+
+  void attachable_init ()
+  {
+    self = cb = 0;
+    attach = 0;
+  }
+};
+
+// 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 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));
+  }
+};
+
+struct object_freezethaw
+{
+  void *av;
+  FILE *fp;
+
+  operator FILE *() { return fp; }
+};
+
+struct object_freezer : object_freezethaw
+{
+  void *filename;
+
+  object_freezer (const char *filename);
+  ~object_freezer ();
+
+  void put (attachable_base *ext);
+
+  template<class subclass>
+  void put (attachable<subclass> *obj)
+  {
+    put ((attachable_base *)obj);
+  }
+};
+
+struct object_thawer : object_freezethaw
+{
+  object_thawer (const char *filename = 0);
+  ~object_thawer ();
+
+  void get (data_type type, void *obj, attachable_base *ext, int oid);
+
+  template<class subclass>
+  void get (attachable<subclass> *obj, int oid)
+  {
+    if (av)
+      get (subclass::get_dt (), (subclass *)obj, obj, oid);
+  }
+};
 
 #endif