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.86 by root, Mon Aug 6 10:54:12 2007 UTC vs.
Revision 1.89 by root, Tue Sep 4 05:43:21 2007 UTC

… …
55#undef readdir 55#undef readdir
56#undef getprotobyname 56#undef getprotobyname
57#undef gethostbyname 57#undef gethostbyname
58#undef ctime 58#undef ctime
59#undef strerror 59#undef strerror
60#undef _
60 61
61// same here, massive symbol spamming 62// same here, massive symbol spamming
62#undef do_open 63#undef do_open
63#undef do_close 64#undef do_close
64#undef ref 65#undef ref
… …
66 67
67// perl bug #40256: perl does overwrite those with reentrant versions 68// perl bug #40256: perl does overwrite those with reentrant versions
68// but does not initialise their state structures. 69// but does not initialise their state structures.
69#undef random 70#undef random
70#undef crypt 71#undef crypt
72
73//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
74
75#define _(msg) (msg)
76#define N_(msg) (msg)
71 77
72////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 78//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
73 79
74// some macros to simplify perl in-calls 80// some macros to simplify perl in-calls
75 81
… …
206 : flags (0), self (0), cb (0), attach (src.attach) 212 : flags (0), self (0), cb (0), attach (src.attach)
207 { 213 {
208 } 214 }
209 215
210 // set a custom key to the given value, or delete it if value = 0 216 // set a custom key to the given value, or delete it if value = 0
217 void set_key (const char *key, const char *value = 0, bool is_utf8 = 0);
218
211 void set_key (const char *key, const char *value = 0); 219 void set_key_text (const char *key, const char *value = 0)
220 {
221 set_key (key, value, 1);
222 }
223
224 void set_key_data (const char *key, const char *value = 0)
225 {
226 set_key (key, value, 0);
227 }
212 228
213 attachable &operator =(const attachable &src); 229 attachable &operator =(const attachable &src);
214 230
215 // used to _quickly_ device wether to shortcut the evaluation 231 // used to _quickly_ device wether to shortcut the evaluation
216 bool should_invoke (event_type event) 232 bool should_invoke (event_type event)
… …
242 258
243extern struct global gbl_ev; 259extern struct global gbl_ev;
244 260
245////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 261//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
246 262
263INTERFACE_CLASS(object_freezer)
247struct object_freezer : dynbuf_text 264struct object_freezer : dynbuf_text
248{ 265{
249 AV *av; 266 AV *av;
250 267
251 object_freezer (); 268 object_freezer ();
… …
355 void put (keyword k, const refptr<T> &v) 372 void put (keyword k, const refptr<T> &v)
356 { 373 {
357 put (k, (T *)v); 374 put (k, (T *)v);
358 } 375 }
359 376
360 bool save (const char *path); 377 MTH bool save (const_octet_string path);
361 char *as_string (); // like strdup 378 char *as_string (); // like strdup
362 379
363 operator bool () { return !!av; } 380 operator bool () { return !!av; }
364}; 381};
365 382
383INTERFACE_CLASS(object_thawer)
366struct object_thawer 384struct object_thawer
367{ 385{
368 char *line; // current beginning of line 386 char *line; // current beginning of line
369 SV *text; // text part 387 SV *text; // text part
370 AV *av; // perl part 388 AV *av; // perl part
… …
373 char *kw_str; // the keyword parsed, as string 391 char *kw_str; // the keyword parsed, as string
374 char *value; // the value, or 0 if no value 392 char *value; // the value, or 0 if no value
375 char *value_nn; // the value, or the empty string if no value 393 char *value_nn; // the value, or the empty string if no value
376 const char *name; 394 const char *name;
377 395
378 operator bool () { return !!text; } 396 operator bool () const { return !!text; }
379 397
380 object_thawer (const char *path = 0); 398 object_thawer (const char *path = 0);
381 object_thawer (const char *data, AV *perlav); 399 object_thawer (const char *data, AV *perlav);
382 ~object_thawer (); 400 ~object_thawer ();
383 401
384 void get (attachable *obj, int oid); 402 void get (attachable *obj, int oid);
385 403
386 // parse next line 404 // parse next line
387 void next (); 405 MTH void next ();
388 // skip the current key-value (usually fetch next line, for 406 // skip the current key-value (usually fetch next line, for
389 // multiline-fields, skips till the corresponding end-kw 407 // multiline-fields, skips till the corresponding end-kw
390 void skip (); 408 MTH void skip ();
409 MTH void skip_block (); // skips till and over KW_end
391 410
392 char *get_str () { return value; } // may be 0 411 char *get_str () { return value; } // may be 0
393 void get_ml (keyword kend, shstr &sh); 412 void get_ml (keyword kend, shstr &sh);
394 413
395 void get_ornull (shstr &sh) const { sh = value; } 414 void get_ornull (shstr &sh) const { sh = value; }
… …
411 void get (sint32 &i) { i = get_sint32 (); } 430 void get (sint32 &i) { i = get_sint32 (); }
412 431
413 void get (uint32 &i) { i = get_sint64 (); } 432 void get (uint32 &i) { i = get_sint64 (); }
414 void get (sint64 &i) { i = get_sint64 (); } 433 void get (sint64 &i) { i = get_sint64 (); }
415 434
416 void parse_warn (const char *msg); 435 MTH void parse_warn (const char *msg);
417 bool parse_error (const char *type = 0, const char *name = 0, bool skip = true); 436 MTH bool parse_error (const char *type = 0, const char *name = 0, bool skip = true);
437
438 struct delayed_ref {
439 attachable *op;
440 object_ptr *ptr;
441 const char *ref;
442 };
443 std::vector<delayed_ref> delrefs;
444
445 void delayed_deref (attachable *op, object_ptr &ptr, const char *ref);
446 MTH void resolve_delayed_derefs (bool deref = true);
418}; 447};
419 448
420//TODO: remove 449//TODO: remove
421char *fgets (char *s, int n, object_thawer &thawer); 450char *fgets (char *s, int n, object_thawer &thawer);
422 451

Diff Legend

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