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.68 by root, Sun May 27 23:22:29 2007 UTC vs.
Revision 1.73 by root, Mon May 28 05:35:51 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 force (32); 274 force (MAX_KEYWORD_LEN + 2 + 32);
275 fadd (keyword_str [k], keyword_len [k]);
276 fadd (' ');
284 ptr += sprintf (ptr, "%.7g", v); 277 falloc (sprintf (ptr, "%.7g", v));
278 fadd ('\n');
285 } 279 }
286 280
287 void put_(keyword k, sint64 v) 281 void put_(keyword k, sint64 v)
288 { 282 {
283 force (MAX_KEYWORD_LEN + 2 + sint64_digits);
289 add (keyword_str [k], keyword_len [k]); 284 fadd (keyword_str [k], keyword_len [k]);
290 add (' '); 285 fadd (' ');
291 add (v); 286 add (v);
292 add ('\n'); 287 fadd ('\n');
293 } 288 }
294 289
295 void put_(keyword k, sint32 v) 290 void put_(keyword k, sint32 v)
296 { 291 {
292 force (MAX_KEYWORD_LEN + 2 + sint32_digits);
297 add (keyword_str [k], keyword_len [k]); 293 fadd (keyword_str [k], keyword_len [k]);
298 add (' '); 294 fadd (' ');
299 add (v); 295 add (v);
300 add ('\n'); 296 fadd ('\n');
301 }
302
303 void put (keyword kbeg, keyword kend, const shstr &v)
304 {
305 add (keyword_str [kbeg], keyword_len [kbeg]); add ('\n');
306
307 if (expect_true (v))
308 {
309 add (v);
310 add ('\n');
311 }
312
313 add (keyword_str [kend], keyword_len [kend]); add ('\n');
314 } 297 }
315 298
316 void put (keyword k, float v) { put (k, (double)v); } 299 void put (keyword k, float v) { put (k, (double)v); }
317 void put (keyword k, signed char v) { put_(k, (sint32)v); } 300 void put (keyword k, signed char v) { put_(k, (sint32)v); }
318 void put (keyword k, unsigned char v) { put_(k, (sint32)v); } 301 void put (keyword k, unsigned char v) { put_(k, (sint32)v); }
… …
323 void put (keyword k, signed long v) { put_(k, (sint64)v); } 306 void put (keyword k, signed long v) { put_(k, (sint64)v); }
324 void put (keyword k, unsigned long v) { put_(k, (sint64)v); } 307 void put (keyword k, unsigned long v) { put_(k, (sint64)v); }
325 void put (keyword k, signed long long v) { put_(k, (sint64)v); } 308 void put (keyword k, signed long long v) { put_(k, (sint64)v); }
326 void put (keyword k, unsigned long long v) { put_(k, (sint64)v); } 309 void put (keyword k, unsigned long long v) { put_(k, (sint64)v); }
327 310
311 void put (keyword kbeg, keyword kend, const shstr &v)
312 {
313 force (MAX_KEYWORD_LEN + 1);
314 fadd (keyword_str [kbeg], keyword_len [kbeg]); fadd ('\n');
315
316 if (expect_true (v))
317 {
318 add (v);
319 add ('\n');
320 }
321
322 force (MAX_KEYWORD_LEN + 1);
323 fadd (keyword_str [kend], keyword_len [kend]); fadd ('\n');
324 }
325
328 template<typename T> 326 template<typename T>
329 void put (keyword k, const T *v) 327 void put (keyword k, const T *v)
330 { 328 {
331 if (expect_true (v)) 329 if (v)
332 put (k, v->name); 330 put (k, v->name);
333 else 331 else
334 put (k, (const char *)0); 332 put (k, (const char *)0);
335 } 333 }
336 334
… …
367 void get (attachable *obj, int oid); 365 void get (attachable *obj, int oid);
368 366
369 // parse next line 367 // parse next line
370 void next (); 368 void next ();
371 // skip the current key-value (usually fetch next line, for 369 // skip the current key-value (usually fetch next line, for
372 // multiline-fields, skips untilt he corresponding end-kw 370 // multiline-fields, skips till the corresponding end-kw
373 void skip (); 371 void skip ();
374
375 //TODO: remove, deprecated
376 keyword get_kv ()
377 {
378 next ();
379 return kw;
380 }
381 372
382 char *get_str () { return value; } // may be 0 373 char *get_str () { return value; } // may be 0
383 void get_ml (keyword kend, shstr &sh); 374 void get_ml (keyword kend, shstr &sh);
384 375
385 void get_ornull (shstr &sh) const { sh = value; } 376 void get_ornull (shstr &sh) const { sh = value; }
386 void get (shstr &sh) const { sh = value; } // might want to check for non-null here 377 void get (shstr &sh) const { sh = value; } // might want to check for non-null here
387 378
388 bool get_bool () const { return *value_nn == '1'; } 379 bool get_bool () const { return *value_nn == '1'; }
389 sint32 get_sint32 () const; 380 sint32 get_sint32 () const;
390 sint64 get_sint64 () const { return atoll (value_nn); } 381 sint64 get_sint64 () const { return strtoll (value_nn, 0, 10); }
391 double get_double () const { return atof (value_nn); } 382 double get_double () const { return strtod (value_nn, 0); }
392 383
393 void get (float &v) { v = get_double (); } 384 void get (float &v) { v = get_double (); }
394 void get (double &v) { v = get_double (); } 385 void get (double &v) { v = get_double (); }
395 386
396 void get (bool &i) { i = get_bool (); } 387 void get (bool &i) { i = get_bool (); }

Diff Legend

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