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.20 by root, Thu Aug 31 18:59:24 2006 UTC vs.
Revision 1.22 by root, Mon Sep 4 11:07:59 2006 UTC

… …
27// but does not initialise their state structures. 27// but does not initialise their state structures.
28#undef random 28#undef random
29#undef crypt 29#undef crypt
30 30
31void cfperl_init (); 31void cfperl_init ();
32void cfperl_boot ();
33void cfperl_main (); 32void cfperl_main ();
34 33
35enum event_klass 34enum event_klass
36{ 35{
37 KLASS_NONE, 36 KLASS_NONE,
… …
82 81
83struct attachable_base 82struct attachable_base
84{ 83{
85 SV *self; 84 SV *self;
86 AV *cb; // CF+ perl self and callback 85 AV *cb; // CF+ perl self and callback
87 const char *attach; // generic extension attachment information 86 shstr attach; // generic extension attachment information
88 87
89 void clear (); // called when free'ing objects 88 void clear (); // called when free'ing objects
90 void optimise (); // possibly save some memory by destroying unneeded data 89 void optimise (); // possibly save some memory by destroying unneeded data
91 void instantiate (data_type type, void *obj); 90 void instantiate (data_type type, void *obj);
92 91
93 void attachable_init () 92 void attachable_clear ()
94 { 93 {
95 self = 0; 94 self = 0;
96 cb = 0; 95 cb = 0;
97 attach = 0; 96 attach = 0;
97 }
98
99 attachable_base ()
100 {
101 attachable_clear ();
102 }
103
104 attachable_base (const attachable_base &src)
105 : self (0), cb (0), attach (src.attach)
106 {
98 } 107 }
99}; 108};
100 109
101// objects attachable from perl (or any other extension) should include or 110// objects attachable from perl (or any other extension) should include or
102// derive using the curiously recurring template pattern, to avoid 111// derive using the curiously recurring template pattern, to avoid
… …
129 //TODO//temporary 138 //TODO//temporary
130 void put (const char *k, const char *v) 139 void put (const char *k, const char *v)
131 { 140 {
132 add (k); 141 add (k);
133 142
134 //if (v)
135 add (' '); //TODO//cf compatibility always add space
136 if (v) 143 if (v)
137 add (v); 144 add (' '), add (v);
138 145
139 add ('\n'); 146 add ('\n');
140 } 147 }
141 148
142 //TODO//temporary 149 //TODO//temporary
… …
146 add (' '); 153 add (' ');
147 add (sint32 (v)); 154 add (sint32 (v));
148 add ('\n'); 155 add ('\n');
149 } 156 }
150 157
158#if 1
151 void put (keyword k, const char *v) 159 void put (keyword k, const char *v)
152 { 160 {
153 int klen = keyword_len [k]; 161 int klen = keyword_len [k];
154 int vlen = v ? strlen (v) : 0; 162 int vlen = v ? strlen (v) + 1 : 0;
155 163
156 char *p = (char *)alloc (klen + 1 + vlen + 1); 164 char *p = (char *)alloc (klen + vlen + 1);
157 165
158 memcpy (p, keyword_str [k], klen); p += klen; 166 memcpy (p, keyword_str [k], klen); p += klen;
167
168 if (v)
169 {
159 *p++ = ' '; //TODO//cf compatibility always add space 170 *p++ = ' '; vlen--; //TODO//cf compatibility always add space
160 memcpy (p, v, vlen); p += vlen; 171 memcpy (p, v, vlen); p += vlen;
172 }
173
161 *p = '\n'; 174 *p = '\n';
162 } 175 }
176#endif
177
178#if 0
179 void put (keyword k, const shstr &v)
180 {
181 int klen = keyword_len [k];
182 int vlen = v ? v.length () + 1 : 0;
183
184 char *p = (char *)alloc (klen + vlen + 1);
185
186 memcpy (p, keyword_str [k], klen); p += klen;
187
188 if (v)
189 {
190 *p++ = ' '; vlen--; //TODO//cf compatibility always add space
191 memcpy (p, v, vlen); p += vlen;
192 }
193
194 *p = '\n';
195 }
196#endif
163 197
164 void put (keyword k, double v) 198 void put (keyword k, double v)
165 { 199 {
166 char buf [128]; 200 char buf [128];
167 201
… …
224 258
225// compatibility support, should be removed when no longer needed 259// compatibility support, should be removed when no longer needed
226int fprintf (object_freezer &freezer, const char *format, ...); 260int fprintf (object_freezer &freezer, const char *format, ...);
227int fputs (const char *s, object_freezer &freezer); 261int fputs (const char *s, object_freezer &freezer);
228 262
229// a single key-value line from a file
230struct token {
231 keyword k;
232 const char *v;
233
234 token (keyword k, const char *v = 0) : k(k), v(v) { }
235};
236
237struct object_thawer 263struct object_thawer
238{ 264{
239 AV *av; 265 SV *text; // text part
240 FILE *fp; 266 AV *av; // perl part
241 char line[1024]; 267 char *line; // current beginning of line
268 char *last_value;
269
270 operator bool () { return !!text; }
242 271
243 object_thawer (const char *filename = 0); 272 object_thawer (const char *filename = 0);
244 ~object_thawer (); 273 ~object_thawer ();
245 274
246 void get (data_type type, void *obj, attachable_base *ext, int oid); 275 void get (data_type type, void *obj, attachable_base *ext, int oid);
… …
250 { 279 {
251 if (av) 280 if (av)
252 get ((data_type) cftype<subclass>::dt, (subclass *)obj, obj, oid); 281 get ((data_type) cftype<subclass>::dt, (subclass *)obj, obj, oid);
253 } 282 }
254 283
255 token get_token (); 284 keyword get_kv (); // also parse value for later use
256 285
257 operator FILE *() { return fp; } 286 const char *get_str () { return last_value; } // may be 0
287
288 void get (shstr &sh) const;
289 void get_ornull (shstr &sh) const { sh = last_value; }
290 void get_ml (keyword kend, shstr &sh);
291
292 sint32 get_sint32 () const;
293 sint64 get_sint64 () const;
294 double get_double () const;
295
296 void get (float &v) { v = get_double (); }
297 void get (double &v) { v = get_double (); }
298
299 void get (sint8 &i) { i = get_sint32 (); }
300 void get (uint8 &i) { i = get_sint32 (); }
301 void get (sint16 &i) { i = get_sint32 (); }
302 void get (uint16 &i) { i = get_sint32 (); }
303 void get (sint32 &i) { i = get_sint32 (); }
304
305 void get (uint32 &i) { i = get_sint64 (); }
306 void get (sint64 &i) { i = get_sint64 (); }
258}; 307};
308
309char *fgets (char *s, int n, object_thawer &thawer);
259 310
260#endif 311#endif
261 312

Diff Legend

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