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.21 by root, Sun Sep 3 22:45:56 2006 UTC vs.
Revision 1.23 by root, Mon Sep 4 13:55:54 2006 UTC

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
92 void attachable_init () 92 void attachable_clear ()
93 { 93 {
94 self = 0; 94 self = 0;
95 cb = 0; 95 cb = 0;
96 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 {
97 } 107 }
98}; 108};
99 109
100// objects attachable from perl (or any other extension) should include or 110// objects attachable from perl (or any other extension) should include or
101// derive using the curiously recurring template pattern, to avoid 111// derive using the curiously recurring template pattern, to avoid
128 //TODO//temporary 138 //TODO//temporary
129 void put (const char *k, const char *v) 139 void put (const char *k, const char *v)
130 { 140 {
131 add (k); 141 add (k);
132 142
133 //if (v) 143 if (v)
134 add (' '); //TODO//cf compatibility always add space 144 add (' '), add (v);
135 if (v)
136 add (v);
137 145
138 add ('\n'); 146 add ('\n');
139 } 147 }
140 148
141 //TODO//temporary 149 //TODO//temporary
145 add (' '); 153 add (' ');
146 add (sint32 (v)); 154 add (sint32 (v));
147 add ('\n'); 155 add ('\n');
148 } 156 }
149 157
158#if 1
150 void put (keyword k, const char *v) 159 void put (keyword k, const char *v)
151 { 160 {
152 int klen = keyword_len [k]; 161 int klen = keyword_len [k];
153 int vlen = v ? strlen (v) : 0; 162 int vlen = v ? strlen (v) + 1 : 0;
154 163
155 char *p = (char *)alloc (klen + 1 + vlen + 1); 164 char *p = (char *)alloc (klen + vlen + 1);
156 165
157 memcpy (p, keyword_str [k], klen); p += klen; 166 memcpy (p, keyword_str [k], klen); p += klen;
167
168 if (v)
169 {
158 *p++ = ' '; //TODO//cf compatibility always add space 170 *p++ = ' '; vlen--; //TODO//cf compatibility always add space
159 memcpy (p, v, vlen); p += vlen; 171 memcpy (p, v, vlen); p += vlen;
172 }
173
160 *p = '\n'; 174 *p = '\n';
161 } 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
162 197
163 void put (keyword k, double v) 198 void put (keyword k, double v)
164 { 199 {
165 char buf [128]; 200 char buf [128];
166 201
183 add (' '); 218 add (' ');
184 add (v); 219 add (v);
185 add ('\n'); 220 add ('\n');
186 } 221 }
187 222
188 void put (keyword kbeg, keyword kend, const char *v) 223 void put (keyword kbeg, keyword kend, const shstr &v)
189 { 224 {
190 add (keyword_str [kbeg], keyword_len [kbeg]); add ('\n'); 225 add (keyword_str [kbeg], keyword_len [kbeg]); add ('\n');
191 226
192 if (v) 227 if (v)
193 { 228 {
211 void put (keyword k, unsigned long long v) { put_(k, (sint64)v); } 246 void put (keyword k, unsigned long long v) { put_(k, (sint64)v); }
212 247
213 template<typename T> 248 template<typename T>
214 void put (keyword k, T *v) 249 void put (keyword k, T *v)
215 { 250 {
251 if (v)
252 put (k, v->name);
253 else
216 put (k, v ? (const char *)v->name : 0); 254 put (k, (const char *)0);
217 } 255 }
218 256
219 bool save (const char *filename); 257 bool save (const char *filename);
220 258
221 operator bool () { return !!av; } 259 operator bool () { return !!av; }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines