--- deliantra/server/include/cfperl.h	2006/08/31 09:19:34	1.18
+++ deliantra/server/include/cfperl.h	2006/09/03 22:45:56	1.21
@@ -10,8 +10,7 @@
 
 #include <EXTERN.h>
 #include <perl.h>
-
-#include "keyword.h"
+#include <XSUB.h>
 
 // optimisations/workaround for functions requiring my_perl in scope (anti-bloat)
 #undef localtime
@@ -30,7 +29,6 @@
 #undef crypt
 
 void cfperl_init ();
-void cfperl_boot ();
 void cfperl_main ();
 
 enum event_klass
@@ -85,7 +83,7 @@
 {
   SV *self;
   AV *cb;    // CF+ perl self and callback
-  const char *attach; // generic extension attachment information
+  shstr attach; // generic extension attachment information
 
   void clear ();     // called when free'ing objects
   void optimise ();  // possibly save some memory by destroying unneeded data
@@ -112,10 +110,9 @@
   }
 };
 
-struct object_freezer
+struct object_freezer : dynbuf
 {
   AV *av;
-  SV *text;
 
   object_freezer ();
   ~object_freezer ();
@@ -128,15 +125,95 @@
     put ((attachable_base *)obj);
   }
 
-  void put (keyword k);
-  void put (const char *v);
-  void put (int v);
+  //TODO//temporary
+  void put (const char *k, const char *v)
+  {
+    add (k);
+
+    //if (v)
+    add (' '); //TODO//cf compatibility always add space
+    if (v)
+      add (v);
+
+    add ('\n');
+  }
+
+  //TODO//temporary
+  void put (const char *k, int v)
+  {
+    add (k);
+    add (' ');
+    add (sint32 (v));
+    add ('\n');
+  }
+
+  void put (keyword k, const char *v)
+  {
+    int klen = keyword_len [k];
+    int vlen = v ? strlen (v) : 0;
+
+    char *p = (char *)alloc (klen + 1 + vlen + 1);
+
+    memcpy (p, keyword_str [k], klen); p += klen;
+    *p++ = ' ';  //TODO//cf compatibility always add space
+    memcpy (p, v, vlen); p += vlen;
+    *p = '\n';
+  }
+
+  void put (keyword k, double v)
+  {
+    char buf [128];
+
+    snprintf (buf, 128, "%.7g", v);
+
+    put (k, (const char *)buf);
+  }
+
+  void put_(keyword k, sint64 v)
+  {
+    add (keyword_str [k], keyword_len [k]);
+    add (' ');
+    add (v);
+    add ('\n');
+  }
 
-  template<typename value>
-  void put (keyword k, value v)
+  void put_(keyword k, sint32 v)
   {
-    put (k);
-    put (v);
+    add (keyword_str [k], keyword_len [k]);
+    add (' ');
+    add (v);
+    add ('\n');
+  }
+
+  void put (keyword kbeg, keyword kend, const char *v)
+  {
+    add (keyword_str [kbeg], keyword_len [kbeg]); add ('\n');
+
+    if (v)
+      {
+        add (v);
+        add ('\n');
+      }
+
+    add (keyword_str [kend], keyword_len [kend]); add ('\n');
+  }
+
+  void put (keyword k,          float     v) { put (k, (double)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); }
+
+  template<typename T>
+  void put (keyword k, T *v)
+  {
+    put (k, v ? (const char *)v->name : 0);
   }
 
   bool save (const char *filename);
@@ -148,19 +225,14 @@
 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];
+  SV *text; // text part
+  AV *av;   // perl part
+  char *line; // current beginning of line
+  char *last_value;
+
+  operator bool () { return !!text; }
 
   object_thawer (const char *filename = 0);
   ~object_thawer ();
@@ -174,10 +246,32 @@
       get ((data_type) cftype<subclass>::dt, (subclass *)obj, obj, oid);
   }
 
-  token get_token ();
+  keyword get_kv (); // also parse value for later use
+
+  const char *get_str () { return last_value; } // may be 0
 
-  operator FILE *() { return fp; }
+  void get (shstr &sh) const;
+  void get_ornull (shstr &sh) const { sh = last_value; }
+  void get_ml (keyword kend, shstr &sh);
+
+  sint32 get_sint32 () const;
+  sint64 get_sint64 () const;
+  double get_double () const;
+
+  void get (float &v)  { v = get_double (); }
+  void get (double &v) { v = get_double (); }
+
+  void get (sint8  &i) { i = get_sint32 (); }
+  void get (uint8  &i) { i = get_sint32 (); }
+  void get (sint16 &i) { i = get_sint32 (); }
+  void get (uint16 &i) { i = get_sint32 (); }
+  void get (sint32 &i) { i = get_sint32 (); }
+
+  void get (uint32 &i) { i = get_sint64 (); }
+  void get (sint64 &i) { i = get_sint64 (); }
 };
 
+char *fgets (char *s, int n, object_thawer &thawer);
+
 #endif