ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/include/freezethaw.h
(Generate patch)

Comparing deliantra/server/include/freezethaw.h (file contents):
Revision 1.1 by root, Thu Apr 15 04:02:38 2010 UTC vs.
Revision 1.7 by root, Thu Apr 29 12:24:04 2010 UTC

… …
163 utf8_string as_string (); // like strdup 163 utf8_string as_string (); // like strdup
164 164
165 operator bool () { return !!av; } 165 operator bool () { return !!av; }
166}; 166};
167 167
168// used as dir argument to object_thawer constructor
169#define RESOURCE_DIR const_utf8_string (0)
170
168INTERFACE_CLASS(object_thawer) 171INTERFACE_CLASS(object_thawer)
169struct object_thawer 172struct object_thawer
170{ 173{
174 static bool errors_are_fatal; // true during server startup only
175
171 char *line; // current beginning of line 176 char *line; // current beginning of line
172 SV *text; // text part 177 SV *text; // text part
173 AV *av; // perl part 178 AV *av; // perl part
174 int linenum; 179 int linenum;
175 keyword kw; 180 keyword kw;
… …
179 const char *name; 184 const char *name;
180 185
181 operator bool () const { return !!text; } 186 operator bool () const { return !!text; }
182 187
183 object_thawer (const_utf8_string path = 0); 188 object_thawer (const_utf8_string path = 0);
189 object_thawer (const_utf8_string dir, const_utf8_string file);
184 object_thawer (const_utf8_string data, AV *perlav); 190 object_thawer (const_utf8_string data, AV *perlav);
185 ~object_thawer (); 191 ~object_thawer ();
186 192
187 void get (attachable *obj, int oid); 193 void get (attachable *obj, int oid);
188 194
189 // parse next line as keyword-value pair 195 // parse next line as keyword-value pair
190 MTH void next (); 196 MTH void next ();
191 197
192 // parse next line, as a single value - skips initial whitespace and comments 198 // parse next line, as a single value
199 // skips initial whitespace and comments
200 // and sets kw to KW_value on success.
193 MTH void next_line (); 201 MTH bool next_line ();
194 202
195 // skip the current key-value (usually fetch next line, for 203 // skip the current key-value (usually fetch next line, for
196 // multiline-fields, skips till the corresponding end-kw 204 // multiline-fields, skips till the corresponding end-kw
197 MTH void skip (); 205 MTH void skip ();
198 MTH void skip_block (); // skips till and over KW_end 206 MTH void skip_block (); // skips till and over KW_end
199 207
200 bool has_value () { return value; } 208 bool has_value () const { return value; }
201 const_utf8_string get_str () { return value_nn; } // empty string when missing 209 const_utf8_string get_str () const { return value_nn; } // empty string when missing
202 void get_ml (keyword kend, shstr &sh); 210 void get_ml (keyword kend, shstr &sh);
203 211
204 void get_ornull (shstr &sh) const { sh = value; } 212 void get_ornull (shstr &sh) const { sh = value; }
205 void get (shstr &sh) const { sh = value; } // might want to check for non-null here 213 void get (shstr &sh) const { sh = value; } // might want to check for non-null here
206 214
207 bool get_bool () const { return *value_nn == '1'; } 215 bool get_bool () const { return *value_nn == '1'; }
208 sint32 get_sint32 () const; 216 sint32 get_sint32 () const;
209 sint64 get_sint64 () const { return strtoll (value_nn, 0, 10); } 217 sint64 get_sint64 () const { return strtoll (value_nn, 0, 10); }
210 double get_double () const { return strtod (value_nn, 0); } 218 double get_double () const { return strtod (value_nn, 0); }
211 219
212 void get (float &v) { v = get_double (); } 220 void get (float &v) const { v = get_double (); }
213 void get (double &v) { v = get_double (); } 221 void get (double &v) const { v = get_double (); }
214 222
215 void get (bool &i) { i = get_bool (); } 223 void get (bool &i) const { i = get_bool (); }
216 void get (sint8 &i) { i = get_sint32 (); } 224 void get (sint8 &i) const { i = get_sint32 (); }
217 void get (uint8 &i) { i = get_sint32 (); } 225 void get (uint8 &i) const { i = get_sint32 (); }
218 void get (sint16 &i) { i = get_sint32 (); } 226 void get (sint16 &i) const { i = get_sint32 (); }
219 void get (uint16 &i) { i = get_sint32 (); } 227 void get (uint16 &i) const { i = get_sint32 (); }
220 void get (sint32 &i) { i = get_sint32 (); } 228 void get (sint32 &i) const { i = get_sint32 (); }
221 229
222 void get (uint32 &i) { i = get_sint64 (); } 230 void get (uint32 &i) const { i = get_sint64 (); }
223 void get (sint64 &i) { i = get_sint64 (); } 231 void get (sint64 &i) const { i = get_sint64 (); }
224 232
233 void get (region_ptr &r) const;
234 void get (materialtype_t *&m) const;
235
225 MTH void parse_warn (const_utf8_string msg); 236 MTH void parse_warn (const_utf8_string msg) const;
226 MTH bool parse_error (const_utf8_string type = 0, const_utf8_string name = 0, bool skip = true); 237 MTH bool parse_error (const_utf8_string type = 0, const_utf8_string name = 0, bool skip = true) const;
227 238
228 struct delayed_ref { 239 struct delayed_ref {
229 attachable *op; 240 attachable *op;
230 object_ptr *ptr; 241 object_ptr *ptr;
231 const_utf8_string ref; 242 const_utf8_string ref;
232 }; 243 };
233 std::vector<delayed_ref> delrefs; 244 std::vector<delayed_ref> delrefs;
234 245
235 void delayed_deref (attachable *op, object_ptr &ptr, const_utf8_string ref); 246 void delayed_deref (attachable *op, object_ptr &ptr, const_utf8_string ref);
236 MTH void resolve_delayed_derefs (bool deref = true); 247 MTH void resolve_delayed_derefs (bool deref = true);
248private:
249 void new_from_path (const_utf8_string path);
237}; 250};
238 251
239//TODO: remove
240char *fgets (char *s, int n, object_thawer &thawer);
241
242#endif 252#endif
243 253

Diff Legend

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