--- deliantra/server/include/cfperl.h	2006/08/31 18:59:24	1.20
+++ deliantra/server/include/cfperl.h	2006/09/04 11:07:59	1.22
@@ -29,7 +29,6 @@
 #undef crypt
 
 void cfperl_init ();
-void cfperl_boot ();
 void cfperl_main ();
 
 enum event_klass
@@ -84,18 +83,28 @@
 {
   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
   void instantiate (data_type type, void *obj);
 
-  void attachable_init ()
+  void attachable_clear ()
   {
     self   = 0;
     cb     = 0;
     attach = 0;
   }
+
+  attachable_base ()
+  {
+    attachable_clear ();
+  }
+
+  attachable_base (const attachable_base &src)
+  : self (0), cb (0), attach (src.attach)
+  {
+  }
 };
 
 // objects attachable from perl (or any other extension) should include or
@@ -131,10 +140,8 @@
   {
     add (k);
 
-    //if (v)
-    add (' '); //TODO//cf compatibility always add space
     if (v)
-      add (v);
+      add (' '), add (v);
 
     add ('\n');
   }
@@ -148,18 +155,45 @@
     add ('\n');
   }
 
+#if 1
   void put (keyword k, const char *v)
   {
     int klen = keyword_len [k];
-    int vlen = v ? strlen (v) : 0;
+    int vlen = v ? strlen (v) + 1 : 0;
 
-    char *p = (char *)alloc (klen + 1 + vlen + 1);
+    char *p = (char *)alloc (klen + vlen + 1);
 
     memcpy (p, keyword_str [k], klen); p += klen;
-    *p++ = ' ';  //TODO//cf compatibility always add space
-    memcpy (p, v, vlen); p += vlen;
+
+    if (v)
+      {
+        *p++ = ' ';  vlen--; //TODO//cf compatibility always add space
+        memcpy (p, v, vlen); p += vlen;
+      }
+
     *p = '\n';
   }
+#endif
+
+#if 0
+  void put (keyword k, const shstr &v)
+  {
+    int klen = keyword_len [k];
+    int vlen = v ? v.length () + 1 : 0;
+
+    char *p = (char *)alloc (klen + vlen + 1);
+
+    memcpy (p, keyword_str [k], klen); p += klen;
+
+    if (v)
+      {
+        *p++ = ' ';  vlen--; //TODO//cf compatibility always add space
+        memcpy (p, v, vlen); p += vlen;
+      }
+
+    *p = '\n';
+  }
+#endif
 
   void put (keyword k, double v)
   {
@@ -226,19 +260,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 ();
@@ -252,10 +281,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
+
+  void get (shstr &sh) const;
+  void get_ornull (shstr &sh) const { sh = last_value; }
+  void get_ml (keyword kend, shstr &sh);
 
-  operator FILE *() { return fp; }
+  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