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.88 by root, Thu Aug 30 07:28:25 2007 UTC vs.
Revision 1.89 by root, Tue Sep 4 05:43:21 2007 UTC

… …
258 258
259extern struct global gbl_ev; 259extern struct global gbl_ev;
260 260
261////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 261//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
262 262
263INTERFACE_CLASS(object_freezer)
263struct object_freezer : dynbuf_text 264struct object_freezer : dynbuf_text
264{ 265{
265 AV *av; 266 AV *av;
266 267
267 object_freezer (); 268 object_freezer ();
… …
371 void put (keyword k, const refptr<T> &v) 372 void put (keyword k, const refptr<T> &v)
372 { 373 {
373 put (k, (T *)v); 374 put (k, (T *)v);
374 } 375 }
375 376
376 bool save (const char *path); 377 MTH bool save (const_octet_string path);
377 char *as_string (); // like strdup 378 char *as_string (); // like strdup
378 379
379 operator bool () { return !!av; } 380 operator bool () { return !!av; }
380}; 381};
381 382
383INTERFACE_CLASS(object_thawer)
382struct object_thawer 384struct object_thawer
383{ 385{
384 char *line; // current beginning of line 386 char *line; // current beginning of line
385 SV *text; // text part 387 SV *text; // text part
386 AV *av; // perl part 388 AV *av; // perl part
… …
389 char *kw_str; // the keyword parsed, as string 391 char *kw_str; // the keyword parsed, as string
390 char *value; // the value, or 0 if no value 392 char *value; // the value, or 0 if no value
391 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
392 const char *name; 394 const char *name;
393 395
394 operator bool () { return !!text; } 396 operator bool () const { return !!text; }
395 397
396 object_thawer (const char *path = 0); 398 object_thawer (const char *path = 0);
397 object_thawer (const char *data, AV *perlav); 399 object_thawer (const char *data, AV *perlav);
398 ~object_thawer (); 400 ~object_thawer ();
399 401
400 void get (attachable *obj, int oid); 402 void get (attachable *obj, int oid);
401 403
402 // parse next line 404 // parse next line
403 void next (); 405 MTH void next ();
404 // skip the current key-value (usually fetch next line, for 406 // skip the current key-value (usually fetch next line, for
405 // multiline-fields, skips till the corresponding end-kw 407 // multiline-fields, skips till the corresponding end-kw
406 void skip (); 408 MTH void skip ();
409 MTH void skip_block (); // skips till and over KW_end
407 410
408 char *get_str () { return value; } // may be 0 411 char *get_str () { return value; } // may be 0
409 void get_ml (keyword kend, shstr &sh); 412 void get_ml (keyword kend, shstr &sh);
410 413
411 void get_ornull (shstr &sh) const { sh = value; } 414 void get_ornull (shstr &sh) const { sh = value; }
… …
427 void get (sint32 &i) { i = get_sint32 (); } 430 void get (sint32 &i) { i = get_sint32 (); }
428 431
429 void get (uint32 &i) { i = get_sint64 (); } 432 void get (uint32 &i) { i = get_sint64 (); }
430 void get (sint64 &i) { i = get_sint64 (); } 433 void get (sint64 &i) { i = get_sint64 (); }
431 434
432 void parse_warn (const char *msg); 435 MTH void parse_warn (const char *msg);
433 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);
434}; 447};
435 448
436//TODO: remove 449//TODO: remove
437char *fgets (char *s, int n, object_thawer &thawer); 450char *fgets (char *s, int n, object_thawer &thawer);
438 451

Diff Legend

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