ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/include/cfperl.h
(Generate patch)

Comparing deliantra/server/include/cfperl.h (file contents):
Revision 1.109 by root, Tue Nov 3 23:44:20 2009 UTC vs.
Revision 1.114 by root, Sat Jan 16 13:41:37 2010 UTC

… …
99void cfperl_main (); 99void cfperl_main ();
100void cfperl_tick (); 100void cfperl_tick ();
101void cfperl_emergency_save (); 101void cfperl_emergency_save ();
102void cfperl_cleanup (int make_core); 102void cfperl_cleanup (int make_core);
103void cfperl_make_book (object *book, int level); 103void cfperl_make_book (object *book, int level);
104void cfperl_send_msg (client *ns, int color, const char *type, const char *msg); 104void cfperl_send_msg (client *ns, int color, const_utf8_string type, const_utf8_string msg);
105int cfperl_can_merge (object *ob1, object *ob2); 105int cfperl_can_merge (object *ob1, object *ob2);
106void cfperl_mapscript_activate (object *ob, int state, object *activator, object *originator = 0); 106void cfperl_mapscript_activate (object *ob, int state, object *activator, object *originator = 0);
107 107
108bool is_match_expr (const char *expr); 108bool is_match_expr (const_utf8_string expr);
109/* applies the match expression and returns true if it matches */ 109// applies the match expression and returns true if it matches
110bool match (const char *expr, object *ob, object *self = 0, object *source = 0, object *originator = 0); 110bool match (const_utf8_string expr, object *ob, object *self = 0, object *source = 0, object *originator = 0);
111// same as above, but returns the first object found, or 0
112object *match_one (const_utf8_string expr, object *ob, object *self = 0, object *source = 0, object *originator = 0);
111 113
112////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 114//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
113 115
114#if IVSIZE >= 8 116#if IVSIZE >= 8
115 typedef IV val64; 117 typedef IV val64;
… …
194 196
195 enum { 197 enum {
196 F_DESTROYED = 0x01, 198 F_DESTROYED = 0x01,
197 F_DEBUG_TRACE = 0x02, 199 F_DEBUG_TRACE = 0x02,
198 }; 200 };
199 uint8 ACC (RW, flags); 201 uint8 ACC (RW, attachable_flags);
200 202
201 static unordered_vector<attachable *> mortals; 203 static unordered_vector<attachable *> mortals;
202 MTH static void check_mortals (); 204 MTH static void check_mortals ();
203 205
204 // object is delete'd after the refcount reaches 0 206 // object is delete'd after the refcount reaches 0
… …
210 // this politely asks everybody interested the reduce 212 // this politely asks everybody interested the reduce
211 // the refcount to 0 as soon as possible. 213 // the refcount to 0 as soon as possible.
212 MTH void destroy (); 214 MTH void destroy ();
213 215
214 // return wether an object was destroyed already 216 // return wether an object was destroyed already
215 MTH bool destroyed () const { return flags & F_DESTROYED; } 217 MTH bool destroyed () const { return attachable_flags & F_DESTROYED; }
216 218
217 virtual void gather_callbacks (AV *&callbacks, event_type event) const; 219 virtual void gather_callbacks (AV *&callbacks, event_type event) const;
218 220
219#if 0 221#if 0
220private: 222private:
… …
228 230
229 void sever_self (); // sever this object from its self, if it has one. 231 void sever_self (); // sever this object from its self, if it has one.
230 void optimise (); // possibly save some memory by destroying unneeded data 232 void optimise (); // possibly save some memory by destroying unneeded data
231 233
232 attachable () 234 attachable ()
233 : flags (0), self (0), cb (0), attach (0) 235 : attachable_flags (0), self (0), cb (0), attach (0)
234 { 236 {
235 } 237 }
236 238
237 attachable (const attachable &src) 239 attachable (const attachable &src)
238 : flags (0), self (0), cb (0), attach (src.attach) 240 : attachable_flags (0), self (0), cb (0), attach (src.attach)
239 { 241 {
240 } 242 }
241 243
242 // set a custom key to the given value, or delete it if value = 0 244 // set a custom key to the given value, or delete it if value = 0
243 void set_key (const char *key, const char *value = 0, bool is_utf8 = 0); 245 void set_key (const_utf8_string key, const_utf8_string value = 0, bool is_utf8 = 0);
244 246
245 void set_key_text (const char *key, const char *value = 0) 247 void set_key_text (const_utf8_string key, const_utf8_string value = 0)
246 { 248 {
247 set_key (key, value, 1); 249 set_key (key, value, 1);
248 } 250 }
249 251
250 void set_key_data (const char *key, const char *value = 0) 252 void set_key_data (const_utf8_string key, const_utf8_string value = 0)
251 { 253 {
252 set_key (key, value, 0); 254 set_key (key, value, 0);
253 } 255 }
254 256
255 attachable &operator =(const attachable &src); 257 attachable &operator =(const attachable &src);
… …
284 286
285extern struct global gbl_ev; 287extern struct global gbl_ev;
286 288
287////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 289//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
288 290
291// a little dirty hack, maybe unify with something else at a later time
292struct keyword_string
293{
294 const char *s;
295 const int l;
296
297 keyword_string (const char *s, int l)
298 : s(s), l(l)
299 { }
300
301 keyword_string (keyword kw)
302 : s(keyword_str [kw]), l(keyword_len [kw])
303 {
304 }
305
306 keyword_string (shstr_tmp sh)
307 : s(&sh), l(sh.length ())
308 {
309 }
310};
311
312#define CS(keyword) keyword_string (# keyword, sizeof (# keyword) - 1)
313#define KW(keyword) CS(keyword)
314
289INTERFACE_CLASS(object_freezer) 315INTERFACE_CLASS(object_freezer)
290struct object_freezer : dynbuf_text 316struct object_freezer : dynbuf_text
291{ 317{
292 AV *av; 318 AV *av;
293 319
294 object_freezer (); 320 object_freezer ();
295 ~object_freezer (); 321 ~object_freezer ();
296 322
323 // serialise perl part
297 void put (attachable *ext); 324 void put_ (attachable *ext);
298 325 void put (attachable *ext)
299 // used only for user-defined key-value pairs
300 void put (shstr_tmp k, shstr_tmp v)
301 { 326 {
302 add (k); 327 if (expect_false (ext->self))
328 put_ (ext);
329 }
303 330
331 // null value (== no space after keyword)
332 void put (const keyword_string k)
333 {
334 char *p = force (k.l + 1);
335 memcpy (p, k.s, k.l); p += k.l; *p++ = '\n';
336 alloc (p);
337 }
338
339 void put (const keyword_string k, const keyword_string v)
340 {
341 char *p = force (k.l + 1 + v.l + 1);
342 memcpy (p, k.s, k.l); p += k.l; *p++ = ' ';
343 memcpy (p, v.s, v.l); p += v.l; *p++ = '\n';
344 alloc (p);
345 }
346
347 void put (const keyword_string k, const_utf8_string v)
348 {
304 if (expect_true (v)) 349 if (expect_true (v))
305 add (' '), add (v); 350 put (k, keyword_string (v, strlen (v)));
306 351 else
307 add ('\n'); 352 put (k);
308 } 353 }
309 354
310 template<typename T>
311 void put_kw_string (keyword k, const T &v)
312 {
313 int klen = keyword_len [k];
314 int vlen = v ? strlen (v) + 1 : 0;
315
316 char *p = (char *)alloc (klen + vlen + 1);
317
318 memcpy (p, keyword_str [k], klen); p += klen;
319
320 if (expect_true (v))
321 {
322 *p++ = ' '; vlen--;
323 memcpy (p, v, vlen); p += vlen;
324 }
325
326 *p = '\n';
327 }
328
329 void put (keyword k, const char *v = 0)
330 {
331 put_kw_string (k, v);
332 }
333
334 void put (keyword k, shstr_tmp v) 355 void put (const keyword_string k, shstr_tmp v)
335 { 356 {
336 put_kw_string (k, v); 357 put (k, keyword_string (v));
337 } 358 }
338 359
339 void put (keyword k, double v) 360 void put (const keyword_string k, double v)
340 { 361 {
341 force (MAX_KEYWORD_LEN + 2 + 32); 362 char *p = force (MAX_KEYWORD_LEN + 2 + 32);
342 fadd (keyword_str [k], keyword_len [k]); 363 memcpy (p, k.s, k.l); p += k.l; *p++ = ' ';
343 fadd (' '); 364 p += sprintf (p, "%.7g", v); *p++ = '\n';
344 falloc (sprintf (ptr, "%.7g", v)); 365 alloc (p);
345 fadd ('\n');
346 } 366 }
347 367
348 void put_(keyword k, sint64 v) 368 void put_(const keyword_string k, sint64 v)
349 { 369 {
350 force (MAX_KEYWORD_LEN + 2 + sint64_digits); 370 force (MAX_KEYWORD_LEN + 2 + sint64_digits);
351 fadd (keyword_str [k], keyword_len [k]); 371 fadd (k.s, k.l);
352 fadd (' '); 372 fadd (' ');
353 add (v); 373 add (v);
354 fadd ('\n'); 374 fadd ('\n');
355 } 375 }
356 376
357 void put_(keyword k, sint32 v) 377 void put_(const keyword_string k, sint32 v)
358 { 378 {
359 force (MAX_KEYWORD_LEN + 2 + sint32_digits); 379 force (MAX_KEYWORD_LEN + 2 + sint32_digits);
360 fadd (keyword_str [k], keyword_len [k]); 380 fadd (k.s, k.l);
361 fadd (' '); 381 fadd (' ');
362 add (v); 382 add (v);
363 fadd ('\n'); 383 fadd ('\n');
364 } 384 }
365 385
366 void put (keyword k, float v) { put (k, (double)v); } 386 void put (const keyword_string k, float v) { put (k, (double)v); }
367 void put (keyword k, signed char v) { put_(k, (sint32)v); } 387 void put (const keyword_string k, signed char v) { put_(k, (sint32)v); }
368 void put (keyword k, unsigned char v) { put_(k, (sint32)v); } 388 void put (const keyword_string k, unsigned char v) { put_(k, (sint32)v); }
369 void put (keyword k, signed short v) { put_(k, (sint32)v); } 389 void put (const keyword_string k, signed short v) { put_(k, (sint32)v); }
370 void put (keyword k, unsigned short v) { put_(k, (sint32)v); } 390 void put (const keyword_string k, unsigned short v) { put_(k, (sint32)v); }
371 void put (keyword k, signed int v) { put_(k, (sint32)v); } 391 void put (const keyword_string k, signed int v) { put_(k, (sint32)v); }
372 void put (keyword k, unsigned int v) { put_(k, (sint64)v); } 392 void put (const keyword_string k, unsigned int v) { put_(k, (sint64)v); }
373 void put (keyword k, signed long v) { put_(k, (sint64)v); } 393 void put (const keyword_string k, signed long v) { put_(k, (sint64)v); }
374 void put (keyword k, unsigned long v) { put_(k, (sint64)v); } 394 void put (const keyword_string k, unsigned long v) { put_(k, (sint64)v); }
375 void put (keyword k, signed long long v) { put_(k, (sint64)v); } 395 void put (const keyword_string k, signed long long v) { put_(k, (sint64)v); }
376 void put (keyword k, unsigned long long v) { put_(k, (sint64)v); } 396 void put (const keyword_string k, unsigned long long v) { put_(k, (sint64)v); }
377 397
378 void put (keyword kbeg, keyword kend, shstr_tmp v) 398 void put (const keyword_string kbeg, const keyword_string kend, shstr_tmp v)
379 { 399 {
380 force (MAX_KEYWORD_LEN + 1); 400 force (MAX_KEYWORD_LEN + 1);
381 fadd (keyword_str [kbeg], keyword_len [kbeg]); fadd ('\n'); 401 fadd (kbeg.s, kbeg.l); fadd ('\n');
382 402
383 if (expect_true (v)) 403 if (expect_true (v))
384 { 404 {
385 add (v); 405 add (v);
386 add ('\n'); 406 add ('\n');
387 } 407 }
388 408
389 force (MAX_KEYWORD_LEN + 1); 409 force (MAX_KEYWORD_LEN + 1);
390 fadd (keyword_str [kend], keyword_len [kend]); fadd ('\n'); 410 fadd (kend.s, kend.l); fadd ('\n');
391 } 411 }
392 412
393 void put (keyword k, archetype *v); 413 void put (const keyword_string k, archetype *v);
394 void put (keyword k, treasurelist *v); 414 void put (const keyword_string k, treasurelist *v);
395 void put (keyword k, faceinfo *v); 415 void put (const keyword_string k, faceinfo *v);
396 416
397 template<typename T> 417 template<typename T>
398 void put (keyword k, const refptr<T> &v) 418 void put (const keyword_string k, const refptr<T> &v)
399 { 419 {
400 put (k, (T *)v); 420 put (k, (T *)v);
401 } 421 }
402 422
403 MTH bool save (const_octet_string path); 423 MTH bool save (const_utf8_string path);
404 char *as_string (); // like strdup 424 utf8_string as_string (); // like strdup
405 425
406 operator bool () { return !!av; } 426 operator bool () { return !!av; }
407}; 427};
408 428
409INTERFACE_CLASS(object_thawer) 429INTERFACE_CLASS(object_thawer)
… …
419 const char *value_nn; // the value, or the empty string if no value 439 const char *value_nn; // the value, or the empty string if no value
420 const char *name; 440 const char *name;
421 441
422 operator bool () const { return !!text; } 442 operator bool () const { return !!text; }
423 443
424 object_thawer (const char *path = 0); 444 object_thawer (const_utf8_string path = 0);
425 object_thawer (const char *data, AV *perlav); 445 object_thawer (const_utf8_string data, AV *perlav);
426 ~object_thawer (); 446 ~object_thawer ();
427 447
428 void get (attachable *obj, int oid); 448 void get (attachable *obj, int oid);
429 449
430 // parse next line 450 // parse next line
… …
432 // skip the current key-value (usually fetch next line, for 452 // skip the current key-value (usually fetch next line, for
433 // multiline-fields, skips till the corresponding end-kw 453 // multiline-fields, skips till the corresponding end-kw
434 MTH void skip (); 454 MTH void skip ();
435 MTH void skip_block (); // skips till and over KW_end 455 MTH void skip_block (); // skips till and over KW_end
436 456
437 char *get_str () { return value; } // may be 0 457 bool has_value () { return value; }
458 const_utf8_string get_str () { return value_nn; } // empty string when missing
438 void get_ml (keyword kend, shstr &sh); 459 void get_ml (keyword kend, shstr &sh);
439 460
440 void get_ornull (shstr &sh) const { sh = value; } 461 void get_ornull (shstr &sh) const { sh = value; }
441 void get (shstr &sh) const { sh = value; } // might want to check for non-null here 462 void get (shstr &sh) const { sh = value; } // might want to check for non-null here
442 463
… …
456 void get (sint32 &i) { i = get_sint32 (); } 477 void get (sint32 &i) { i = get_sint32 (); }
457 478
458 void get (uint32 &i) { i = get_sint64 (); } 479 void get (uint32 &i) { i = get_sint64 (); }
459 void get (sint64 &i) { i = get_sint64 (); } 480 void get (sint64 &i) { i = get_sint64 (); }
460 481
461 MTH void parse_warn (const char *msg); 482 MTH void parse_warn (const_utf8_string msg);
462 MTH bool parse_error (const char *type = 0, const char *name = 0, bool skip = true); 483 MTH bool parse_error (const_utf8_string type = 0, const_utf8_string name = 0, bool skip = true);
463 484
464 struct delayed_ref { 485 struct delayed_ref {
465 attachable *op; 486 attachable *op;
466 object_ptr *ptr; 487 object_ptr *ptr;
467 const char *ref; 488 const_utf8_string ref;
468 }; 489 };
469 std::vector<delayed_ref> delrefs; 490 std::vector<delayed_ref> delrefs;
470 491
471 void delayed_deref (attachable *op, object_ptr &ptr, const char *ref); 492 void delayed_deref (attachable *op, object_ptr &ptr, const_utf8_string ref);
472 MTH void resolve_delayed_derefs (bool deref = true); 493 MTH void resolve_delayed_derefs (bool deref = true);
473}; 494};
474 495
475//TODO: remove 496//TODO: remove
476char *fgets (char *s, int n, object_thawer &thawer); 497char *fgets (char *s, int n, object_thawer &thawer);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines