--- deliantra/server/include/cfperl.h 2006/08/31 17:54:14 1.19 +++ deliantra/server/include/cfperl.h 2006/09/21 00:05:25 1.29 @@ -10,6 +10,7 @@ #include #include +#include // optimisations/workaround for functions requiring my_perl in scope (anti-bloat) #undef localtime @@ -28,7 +29,6 @@ #undef crypt void cfperl_init (); -void cfperl_boot (); void cfperl_main (); enum event_klass @@ -53,13 +53,13 @@ #define ARG_INT64(v) DT_INT64 , static_cast (v) #define ARG_DOUBLE(v) DT_DOUBLE, static_cast (v) #define ARG_STRING(v) DT_STRING, static_cast (v) -#define ARG_DATA(s,l) DT_DATA , static_cast (s), (l) -#define ARG_OBJECT(o) DT_OBJECT, (void *)static_cast (o) -#define ARG_MAP(o) DT_MAP , (void *)static_cast (o) -#define ARG_PLAYER(o) DT_PLAYER, (void *)static_cast (o) -#define ARG_ARCH(o) DT_ARCH , (void *)static_cast (o) -#define ARG_PARTY(o) DT_PARTY , (void *)static_cast (o) -#define ARG_REGION(o) DT_REGION, (void *)static_cast (o) +#define ARG_DATA(s,l) DT_DATA , static_cast (s), int (l) +#define ARG_OBJECT(o) DT_OBJECT, (void *)static_cast (o) +#define ARG_MAP(o) DT_MAP , (void *)static_cast (o) +#define ARG_PLAYER(o) DT_PLAYER, (void *)static_cast (o) +#define ARG_ARCH(o) DT_ARCH , (void *)static_cast (o) +#define ARG_PARTY(o) DT_PARTY , (void *)static_cast (o) +#define ARG_REGION(o) DT_REGION, (void *)static_cast (o) // the ", ## __VA_ARGS" is, unfortunately, a gnu-cpp extension @@ -75,26 +75,50 @@ //TODO should index into @result #define RESULT(idx,type) cfperl_result_ ## type (idx) #define RESULT_INT(idx) RESULT(idx, INT) +#define RESULT_MAP(idx) RESULT(idx, MAP) bool cfperl_invoke (event_type event, ...); int cfperl_result_INT (int idx); +int cfperl_result_MAP (int idx); struct attachable_base { 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 () + { + clear (); + } + + attachable_base (const attachable_base &src) + : self (0), cb (0), attach (src.attach) + { + } + + attachable_base &operator = (const attachable_base &src) + { + clear (); + attach = src.attach; + return *this; + } }; // objects attachable from perl (or any other extension) should include or @@ -125,16 +149,94 @@ put ((attachable_base *)obj); } - void put (const char *k, const char *v); //TODO//temporary - void put (const char *k, int v); //TODO//temporary + // used only for user-defined key-value pairs + void put (const shstr &k, const shstr &v) + { + add (k); + + if (v) + add (' '), add (v); + + add ('\n'); + } + + //TODO//temporary, used only for saving body locations + void put (const char *k, int v) + { + add (k); + add (' '); + add (sint32 (v)); + add ('\n'); + } + + template + void put_string (keyword k, const T &v) + { + int klen = keyword_len [k]; + int vlen = v ? strlen (v) + 1 : 0; + + char *p = (char *)alloc (klen + vlen + 1); - void put (keyword k, const char *v); - void put (keyword k, double v); - void put (keyword k, float v) { put (k, (double)v); } + memcpy (p, keyword_str [k], klen); p += klen; - void put_ (keyword k, sint32 v); - void put_ (keyword k, sint64 v); + if (v) + { + *p++ = ' '; vlen--; + memcpy (p, v, vlen); p += vlen; + } + *p = '\n'; + } + + void put (keyword k, const char *v) + { + put_string (k, v); + } + + void put (keyword k, const shstr &v) + { + put_string (k, v); + } + + 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'); + } + + void put_(keyword k, sint32 v) + { + add (keyword_str [k], keyword_len [k]); + add (' '); + add (v); + add ('\n'); + } + + void put (keyword kbeg, keyword kend, const shstr &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); } @@ -146,12 +248,13 @@ void put (keyword k, signed long long v) { put_(k, (sint64)v); } void put (keyword k, unsigned long long v) { put_(k, (sint64)v); } - void put (keyword kbeg, keyword kend, const char *v); // multiline - template void put (keyword k, T *v) { - put (k, v ? (const char *)v->name : 0); + if (v) + put (k, v->name); + else + put (k, (const char *)0); } bool save (const char *filename); @@ -163,19 +266,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 (); @@ -189,10 +287,32 @@ get ((data_type) cftype::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); + + sint32 get_sint32 () const; + sint64 get_sint64 () const; + double get_double () const; - operator FILE *() { return fp; } + 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