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.66 by root, Sat May 26 15:44:03 2007 UTC vs.
Revision 1.71 by root, Mon May 28 03:47:44 2007 UTC

238 add (' '), add (v); 238 add (' '), add (v);
239 239
240 add ('\n'); 240 add ('\n');
241 } 241 }
242 242
243 //TODO//temporary, used only for saving body locations
244 void put (const char *k, int v)
245 {
246 add (k);
247 add (' ');
248 add (sint32 (v));
249 add ('\n');
250 }
251
252 template<typename T> 243 template<typename T>
253 void put_string (keyword k, const T &v) 244 void put_string (keyword k, const T &v)
254 { 245 {
255 int klen = keyword_len [k]; 246 int klen = keyword_len [k];
256 int vlen = v ? strlen (v) + 1 : 0; 247 int vlen = v ? strlen (v) + 1 : 0;
278 put_string (k, v); 269 put_string (k, v);
279 } 270 }
280 271
281 void put (keyword k, double v) 272 void put (keyword k, double v)
282 { 273 {
283 char buf [128]; 274 force (MAX_KEYWORD_LEN + 2 + 32);
284 275 fadd (keyword_str [k], keyword_len [k]);
285 snprintf (buf, 128, "%.7g", v); 276 fadd (' ');
286 277 falloc (sprintf (ptr, "%.7g", v));
287 put (k, (const char *)buf); 278 fadd ('\n');
288 } 279 }
289 280
290 void put_(keyword k, sint64 v) 281 void put_(keyword k, sint64 v)
291 { 282 {
283 force (MAX_KEYWORD_LEN + 2 + sint64_digits);
292 add (keyword_str [k], keyword_len [k]); 284 fadd (keyword_str [k], keyword_len [k]);
293 add (' '); 285 fadd (' ');
294 add (v); 286 add (v);
295 add ('\n'); 287 fadd ('\n');
296 } 288 }
297 289
298 void put_(keyword k, sint32 v) 290 void put_(keyword k, sint32 v)
299 { 291 {
292 force (MAX_KEYWORD_LEN + 2 + sint32_digits);
300 add (keyword_str [k], keyword_len [k]); 293 fadd (keyword_str [k], keyword_len [k]);
301 add (' '); 294 fadd (' ');
302 add (v); 295 add (v);
303 add ('\n'); 296 fadd ('\n');
304 } 297 }
305 298
306 void put (keyword kbeg, keyword kend, const shstr &v) 299 void put (keyword kbeg, keyword kend, const shstr &v)
307 { 300 {
301 force (MAX_KEYWORD_LEN + 1);
308 add (keyword_str [kbeg], keyword_len [kbeg]); add ('\n'); 302 fadd (keyword_str [kbeg], keyword_len [kbeg]); fadd ('\n');
309 303
310 if (expect_true (v)) 304 if (expect_true (v))
311 { 305 {
312 add (v); 306 add (v);
313 add ('\n'); 307 add ('\n');
314 } 308 }
315 309
310 force (MAX_KEYWORD_LEN + 1);
316 add (keyword_str [kend], keyword_len [kend]); add ('\n'); 311 fadd (keyword_str [kend], keyword_len [kend]); fadd ('\n');
317 } 312 }
318 313
319 void put (keyword k, float v) { put (k, (double)v); } 314 void put (keyword k, float v) { put (k, (double)v); }
320 void put (keyword k, signed char v) { put_(k, (sint32)v); } 315 void put (keyword k, signed char v) { put_(k, (sint32)v); }
321 void put (keyword k, unsigned char v) { put_(k, (sint32)v); } 316 void put (keyword k, unsigned char v) { put_(k, (sint32)v); }
347 char *as_string (); // like strdup 342 char *as_string (); // like strdup
348 343
349 operator bool () { return !!av; } 344 operator bool () { return !!av; }
350}; 345};
351 346
352// compatibility support, should be removed when no longer needed
353void fprintf (object_freezer &freezer, const char *format, ...);
354void fputs (const char *s, object_freezer &freezer);
355
356struct object_thawer 347struct object_thawer
357{ 348{
358 char *line; // current beginning of line 349 char *line; // current beginning of line
359 SV *text; // text part 350 SV *text; // text part
360 AV *av; // perl part 351 AV *av; // perl part
392 void get_ornull (shstr &sh) const { sh = value; } 383 void get_ornull (shstr &sh) const { sh = value; }
393 void get (shstr &sh) const { sh = value; } // might want to check for non-null here 384 void get (shstr &sh) const { sh = value; } // might want to check for non-null here
394 385
395 bool get_bool () const { return *value_nn == '1'; } 386 bool get_bool () const { return *value_nn == '1'; }
396 sint32 get_sint32 () const; 387 sint32 get_sint32 () const;
397 sint64 get_sint64 () const { return atoll (value_nn); } 388 sint64 get_sint64 () const { return strtoll (value_nn, 0, 10); }
398 double get_double () const { return atof (value_nn); } 389 double get_double () const { return strtod (value_nn, 0); }
399 390
400 void get (float &v) { v = get_double (); } 391 void get (float &v) { v = get_double (); }
401 void get (double &v) { v = get_double (); } 392 void get (double &v) { v = get_double (); }
402 393
403 void get (bool &i) { i = get_bool (); } 394 void get (bool &i) { i = get_bool (); }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines