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.19 by root, Thu Aug 31 17:54:14 2006 UTC vs.
Revision 1.21 by root, Sun Sep 3 22:45:56 2006 UTC

… …
8 8
9using namespace std; 9using namespace std;
10 10
11#include <EXTERN.h> 11#include <EXTERN.h>
12#include <perl.h> 12#include <perl.h>
13#include <XSUB.h>
13 14
14// optimisations/workaround for functions requiring my_perl in scope (anti-bloat) 15// optimisations/workaround for functions requiring my_perl in scope (anti-bloat)
15#undef localtime 16#undef localtime
16#undef srand48 17#undef srand48
17#undef drand48 18#undef drand48
… …
26// but does not initialise their state structures. 27// but does not initialise their state structures.
27#undef random 28#undef random
28#undef crypt 29#undef crypt
29 30
30void cfperl_init (); 31void cfperl_init ();
31void cfperl_boot ();
32void cfperl_main (); 32void cfperl_main ();
33 33
34enum event_klass 34enum event_klass
35{ 35{
36 KLASS_NONE, 36 KLASS_NONE,
… …
81 81
82struct attachable_base 82struct attachable_base
83{ 83{
84 SV *self; 84 SV *self;
85 AV *cb; // CF+ perl self and callback 85 AV *cb; // CF+ perl self and callback
86 const char *attach; // generic extension attachment information 86 shstr attach; // generic extension attachment information
87 87
88 void clear (); // called when free'ing objects 88 void clear (); // called when free'ing objects
89 void optimise (); // possibly save some memory by destroying unneeded data 89 void optimise (); // possibly save some memory by destroying unneeded data
90 void instantiate (data_type type, void *obj); 90 void instantiate (data_type type, void *obj);
91 91
… …
123 void put (attachable<subclass> *obj) 123 void put (attachable<subclass> *obj)
124 { 124 {
125 put ((attachable_base *)obj); 125 put ((attachable_base *)obj);
126 } 126 }
127 127
128 //TODO//temporary
128 void put (const char *k, const char *v); //TODO//temporary 129 void put (const char *k, const char *v)
130 {
131 add (k);
132
133 //if (v)
134 add (' '); //TODO//cf compatibility always add space
135 if (v)
136 add (v);
137
138 add ('\n');
139 }
140
141 //TODO//temporary
129 void put (const char *k, int v); //TODO//temporary 142 void put (const char *k, int v)
143 {
144 add (k);
145 add (' ');
146 add (sint32 (v));
147 add ('\n');
148 }
130 149
131 void put (keyword k, const char *v); 150 void put (keyword k, const char *v)
151 {
152 int klen = keyword_len [k];
153 int vlen = v ? strlen (v) : 0;
154
155 char *p = (char *)alloc (klen + 1 + vlen + 1);
156
157 memcpy (p, keyword_str [k], klen); p += klen;
158 *p++ = ' '; //TODO//cf compatibility always add space
159 memcpy (p, v, vlen); p += vlen;
160 *p = '\n';
161 }
162
132 void put (keyword k, double v); 163 void put (keyword k, double v)
133 void put (keyword k, float v) { put (k, (double)v); } 164 {
165 char buf [128];
134 166
135 void put_ (keyword k, sint32 v); 167 snprintf (buf, 128, "%.7g", v);
168
169 put (k, (const char *)buf);
170 }
171
136 void put_ (keyword k, sint64 v); 172 void put_(keyword k, sint64 v)
173 {
174 add (keyword_str [k], keyword_len [k]);
175 add (' ');
176 add (v);
177 add ('\n');
178 }
137 179
180 void put_(keyword k, sint32 v)
181 {
182 add (keyword_str [k], keyword_len [k]);
183 add (' ');
184 add (v);
185 add ('\n');
186 }
187
188 void put (keyword kbeg, keyword kend, const char *v)
189 {
190 add (keyword_str [kbeg], keyword_len [kbeg]); add ('\n');
191
192 if (v)
193 {
194 add (v);
195 add ('\n');
196 }
197
198 add (keyword_str [kend], keyword_len [kend]); add ('\n');
199 }
200
201 void put (keyword k, float v) { put (k, (double)v); }
138 void put (keyword k, signed char v) { put_(k, (sint32)v); } 202 void put (keyword k, signed char v) { put_(k, (sint32)v); }
139 void put (keyword k, unsigned char v) { put_(k, (sint32)v); } 203 void put (keyword k, unsigned char v) { put_(k, (sint32)v); }
140 void put (keyword k, signed short v) { put_(k, (sint32)v); } 204 void put (keyword k, signed short v) { put_(k, (sint32)v); }
141 void put (keyword k, unsigned short v) { put_(k, (sint32)v); } 205 void put (keyword k, unsigned short v) { put_(k, (sint32)v); }
142 void put (keyword k, signed int v) { put_(k, (sint32)v); } 206 void put (keyword k, signed int v) { put_(k, (sint32)v); }
… …
144 void put (keyword k, signed long v) { put_(k, (sint64)v); } 208 void put (keyword k, signed long v) { put_(k, (sint64)v); }
145 void put (keyword k, unsigned long v) { put_(k, (sint64)v); } 209 void put (keyword k, unsigned long v) { put_(k, (sint64)v); }
146 void put (keyword k, signed long long v) { put_(k, (sint64)v); } 210 void put (keyword k, signed long long v) { put_(k, (sint64)v); }
147 void put (keyword k, unsigned long long v) { put_(k, (sint64)v); } 211 void put (keyword k, unsigned long long v) { put_(k, (sint64)v); }
148 212
149 void put (keyword kbeg, keyword kend, const char *v); // multiline
150
151 template<typename T> 213 template<typename T>
152 void put (keyword k, T *v) 214 void put (keyword k, T *v)
153 { 215 {
154 put (k, v ? (const char *)v->name : 0); 216 put (k, v ? (const char *)v->name : 0);
155 } 217 }
… …
161 223
162// compatibility support, should be removed when no longer needed 224// compatibility support, should be removed when no longer needed
163int fprintf (object_freezer &freezer, const char *format, ...); 225int fprintf (object_freezer &freezer, const char *format, ...);
164int fputs (const char *s, object_freezer &freezer); 226int fputs (const char *s, object_freezer &freezer);
165 227
166// a single key-value line from a file
167struct token {
168 keyword k;
169 const char *v;
170
171 token (keyword k, const char *v = 0) : k(k), v(v) { }
172};
173
174struct object_thawer 228struct object_thawer
175{ 229{
176 AV *av; 230 SV *text; // text part
177 FILE *fp; 231 AV *av; // perl part
178 char line[1024]; 232 char *line; // current beginning of line
233 char *last_value;
234
235 operator bool () { return !!text; }
179 236
180 object_thawer (const char *filename = 0); 237 object_thawer (const char *filename = 0);
181 ~object_thawer (); 238 ~object_thawer ();
182 239
183 void get (data_type type, void *obj, attachable_base *ext, int oid); 240 void get (data_type type, void *obj, attachable_base *ext, int oid);
… …
187 { 244 {
188 if (av) 245 if (av)
189 get ((data_type) cftype<subclass>::dt, (subclass *)obj, obj, oid); 246 get ((data_type) cftype<subclass>::dt, (subclass *)obj, obj, oid);
190 } 247 }
191 248
192 token get_token (); 249 keyword get_kv (); // also parse value for later use
193 250
194 operator FILE *() { return fp; } 251 const char *get_str () { return last_value; } // may be 0
252
253 void get (shstr &sh) const;
254 void get_ornull (shstr &sh) const { sh = last_value; }
255 void get_ml (keyword kend, shstr &sh);
256
257 sint32 get_sint32 () const;
258 sint64 get_sint64 () const;
259 double get_double () const;
260
261 void get (float &v) { v = get_double (); }
262 void get (double &v) { v = get_double (); }
263
264 void get (sint8 &i) { i = get_sint32 (); }
265 void get (uint8 &i) { i = get_sint32 (); }
266 void get (sint16 &i) { i = get_sint32 (); }
267 void get (uint16 &i) { i = get_sint32 (); }
268 void get (sint32 &i) { i = get_sint32 (); }
269
270 void get (uint32 &i) { i = get_sint64 (); }
271 void get (sint64 &i) { i = get_sint64 (); }
195}; 272};
273
274char *fgets (char *s, int n, object_thawer &thawer);
196 275
197#endif 276#endif
198 277

Diff Legend

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