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.26 by root, Sat Sep 16 22:24:12 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,
… …
53#define ARG_INT(v) DT_INT , static_cast<int> (v) 52#define ARG_INT(v) DT_INT , static_cast<int> (v)
54#define ARG_INT64(v) DT_INT64 , static_cast<sint64> (v) 53#define ARG_INT64(v) DT_INT64 , static_cast<sint64> (v)
55#define ARG_DOUBLE(v) DT_DOUBLE, static_cast<double> (v) 54#define ARG_DOUBLE(v) DT_DOUBLE, static_cast<double> (v)
56#define ARG_STRING(v) DT_STRING, static_cast<const char *> (v) 55#define ARG_STRING(v) DT_STRING, static_cast<const char *> (v)
57#define ARG_DATA(s,l) DT_DATA , static_cast<const void *> (s), (l) 56#define ARG_DATA(s,l) DT_DATA , static_cast<const void *> (s), (l)
58#define ARG_OBJECT(o) DT_OBJECT, (void *)static_cast<struct object *> (o) 57#define ARG_OBJECT(o) DT_OBJECT, (void *)static_cast<object *> (o)
59#define ARG_MAP(o) DT_MAP , (void *)static_cast<struct mapstruct *> (o) 58#define ARG_MAP(o) DT_MAP , (void *)static_cast<maptile *> (o)
60#define ARG_PLAYER(o) DT_PLAYER, (void *)static_cast<struct pl *> (o) 59#define ARG_PLAYER(o) DT_PLAYER, (void *)static_cast<player *> (o)
61#define ARG_ARCH(o) DT_ARCH , (void *)static_cast<struct archetype *> (o) 60#define ARG_ARCH(o) DT_ARCH , (void *)static_cast<archetype *> (o)
62#define ARG_PARTY(o) DT_PARTY , (void *)static_cast<struct party *> (o) 61#define ARG_PARTY(o) DT_PARTY , (void *)static_cast<party *> (o)
63#define ARG_REGION(o) DT_REGION, (void *)static_cast<struct region *> (o) 62#define ARG_REGION(o) DT_REGION, (void *)static_cast<region *> (o)
64 63
65// the ", ## __VA_ARGS" is, unfortunately, a gnu-cpp extension 64// the ", ## __VA_ARGS" is, unfortunately, a gnu-cpp extension
66 65
67// all these return true when the normal event processing should be skipped (if any) 66// all these return true when the normal event processing should be skipped (if any)
68#define INVOKE_(event, ...) cfperl_invoke (event, ## __VA_ARGS__, DT_END) 67#define INVOKE_(event, ...) cfperl_invoke (event, ## __VA_ARGS__, DT_END)
… …
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 ()
105 {
106 clear ();
107 }
108
109 attachable_base (const attachable_base &src)
110 : self (0), cb (0), attach (src.attach)
111 {
112 }
113
114 attachable_base &operator = (const attachable_base &src)
115 {
116 clear ();
117 attach = src.attach;
118 return *this;
98 } 119 }
99}; 120};
100 121
101// objects attachable from perl (or any other extension) should include or 122// objects attachable from perl (or any other extension) should include or
102// derive using the curiously recurring template pattern, to avoid 123// derive using the curiously recurring template pattern, to avoid
… …
129 //TODO//temporary 150 //TODO//temporary
130 void put (const char *k, const char *v) 151 void put (const char *k, const char *v)
131 { 152 {
132 add (k); 153 add (k);
133 154
134 //if (v) 155 if (v)
135 add (' '); //TODO//cf compatibility always add space 156 add (' '), add (v);
136 if (v)
137 add (v);
138 157
139 add ('\n'); 158 add ('\n');
140 } 159 }
141 160
142 //TODO//temporary 161 //TODO//temporary
… …
146 add (' '); 165 add (' ');
147 add (sint32 (v)); 166 add (sint32 (v));
148 add ('\n'); 167 add ('\n');
149 } 168 }
150 169
170#if 1
151 void put (keyword k, const char *v) 171 void put (keyword k, const char *v)
152 { 172 {
153 int klen = keyword_len [k]; 173 int klen = keyword_len [k];
154 int vlen = v ? strlen (v) : 0; 174 int vlen = v ? strlen (v) + 1 : 0;
155 175
156 char *p = (char *)alloc (klen + 1 + vlen + 1); 176 char *p = (char *)alloc (klen + vlen + 1);
157 177
158 memcpy (p, keyword_str [k], klen); p += klen; 178 memcpy (p, keyword_str [k], klen); p += klen;
179
180 if (v)
181 {
159 *p++ = ' '; //TODO//cf compatibility always add space 182 *p++ = ' '; vlen--; //TODO//cf compatibility always add space
160 memcpy (p, v, vlen); p += vlen; 183 memcpy (p, v, vlen); p += vlen;
184 }
185
161 *p = '\n'; 186 *p = '\n';
162 } 187 }
188#endif
189
190#if 0
191 void put (keyword k, const shstr &v)
192 {
193 int klen = keyword_len [k];
194 int vlen = v ? v.length () + 1 : 0;
195
196 char *p = (char *)alloc (klen + vlen + 1);
197
198 memcpy (p, keyword_str [k], klen); p += klen;
199
200 if (v)
201 {
202 *p++ = ' '; vlen--; //TODO//cf compatibility always add space
203 memcpy (p, v, vlen); p += vlen;
204 }
205
206 *p = '\n';
207 }
208#endif
163 209
164 void put (keyword k, double v) 210 void put (keyword k, double v)
165 { 211 {
166 char buf [128]; 212 char buf [128];
167 213
… …
184 add (' '); 230 add (' ');
185 add (v); 231 add (v);
186 add ('\n'); 232 add ('\n');
187 } 233 }
188 234
189 void put (keyword kbeg, keyword kend, const char *v) 235 void put (keyword kbeg, keyword kend, const shstr &v)
190 { 236 {
191 add (keyword_str [kbeg], keyword_len [kbeg]); add ('\n'); 237 add (keyword_str [kbeg], keyword_len [kbeg]); add ('\n');
192 238
193 if (v) 239 if (v)
194 { 240 {
… …
212 void put (keyword k, unsigned long long v) { put_(k, (sint64)v); } 258 void put (keyword k, unsigned long long v) { put_(k, (sint64)v); }
213 259
214 template<typename T> 260 template<typename T>
215 void put (keyword k, T *v) 261 void put (keyword k, T *v)
216 { 262 {
263 if (v)
264 put (k, v->name);
265 else
217 put (k, v ? (const char *)v->name : 0); 266 put (k, (const char *)0);
218 } 267 }
219 268
220 bool save (const char *filename); 269 bool save (const char *filename);
221 270
222 operator bool () { return !!av; } 271 operator bool () { return !!av; }
… …
224 273
225// compatibility support, should be removed when no longer needed 274// compatibility support, should be removed when no longer needed
226int fprintf (object_freezer &freezer, const char *format, ...); 275int fprintf (object_freezer &freezer, const char *format, ...);
227int fputs (const char *s, object_freezer &freezer); 276int fputs (const char *s, object_freezer &freezer);
228 277
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 278struct object_thawer
238{ 279{
239 AV *av; 280 SV *text; // text part
240 FILE *fp; 281 AV *av; // perl part
241 char line[1024]; 282 char *line; // current beginning of line
283 char *last_value;
284
285 operator bool () { return !!text; }
242 286
243 object_thawer (const char *filename = 0); 287 object_thawer (const char *filename = 0);
244 ~object_thawer (); 288 ~object_thawer ();
245 289
246 void get (data_type type, void *obj, attachable_base *ext, int oid); 290 void get (data_type type, void *obj, attachable_base *ext, int oid);
… …
250 { 294 {
251 if (av) 295 if (av)
252 get ((data_type) cftype<subclass>::dt, (subclass *)obj, obj, oid); 296 get ((data_type) cftype<subclass>::dt, (subclass *)obj, obj, oid);
253 } 297 }
254 298
255 token get_token (); 299 keyword get_kv (); // also parse value for later use
256 300
257 operator FILE *() { return fp; } 301 const char *get_str () { return last_value; } // may be 0
302
303 void get (shstr &sh) const;
304 void get_ornull (shstr &sh) const { sh = last_value; }
305 void get_ml (keyword kend, shstr &sh);
306
307 sint32 get_sint32 () const;
308 sint64 get_sint64 () const;
309 double get_double () const;
310
311 void get (float &v) { v = get_double (); }
312 void get (double &v) { v = get_double (); }
313
314 void get (sint8 &i) { i = get_sint32 (); }
315 void get (uint8 &i) { i = get_sint32 (); }
316 void get (sint16 &i) { i = get_sint32 (); }
317 void get (uint16 &i) { i = get_sint32 (); }
318 void get (sint32 &i) { i = get_sint32 (); }
319
320 void get (uint32 &i) { i = get_sint64 (); }
321 void get (sint64 &i) { i = get_sint64 (); }
258}; 322};
323
324char *fgets (char *s, int n, object_thawer &thawer);
259 325
260#endif 326#endif
261 327

Diff Legend

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