| … | |
… | |
| 111 | static const char eof[] = "\n\n\n\0\0\0"; |
111 | static const char eof[] = "\n\n\n\0\0\0"; |
| 112 | |
112 | |
| 113 | av = 0; |
113 | av = 0; |
| 114 | text = 0; |
114 | text = 0; |
| 115 | line = 0; |
115 | line = 0; |
|
|
116 | linenum = 0; |
| 116 | |
117 | |
| 117 | if (path) |
118 | if (path) |
| 118 | { |
119 | { |
| 119 | CALL_BEGIN (1); |
120 | CALL_BEGIN (1); |
| 120 | CALL_ARG_SV (newSVpv (path, 0)); |
121 | CALL_ARG_SV (newSVpv (path, 0)); |
| … | |
… | |
| 202 | |
203 | |
| 203 | obj->self = hv; |
204 | obj->self = hv; |
| 204 | SvRV_set (*svp, &PL_sv_undef); |
205 | SvRV_set (*svp, &PL_sv_undef); |
| 205 | |
206 | |
| 206 | sv_magicext ((SV *)obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char *)obj, 0); |
207 | sv_magicext ((SV *)obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char *)obj, 0); |
| 207 | |
|
|
| 208 | // borrow a refcount for the perl object |
|
|
| 209 | obj->flags |= attachable::F_BORROWED; |
|
|
| 210 | obj->refcnt_dec (); |
|
|
| 211 | } |
208 | } |
| 212 | |
209 | |
| 213 | obj->reattach (); |
210 | obj->reattach (); |
| 214 | } |
211 | } |
| 215 | |
212 | |
| … | |
… | |
| 219 | if (av) SvREFCNT_dec (av); |
216 | if (av) SvREFCNT_dec (av); |
| 220 | |
217 | |
| 221 | free ((void *)name); |
218 | free ((void *)name); |
| 222 | } |
219 | } |
| 223 | |
220 | |
|
|
221 | //TODO: remove |
| 224 | char * |
222 | char * |
| 225 | fgets (char *s, int n, object_thawer &thawer) |
223 | fgets (char *s, int n, object_thawer &thawer) |
| 226 | { |
224 | { |
| 227 | char *p = thawer.line; |
225 | char *p = thawer.line; |
| 228 | char *q = s; |
226 | char *q = s; |
| … | |
… | |
| 236 | break; |
234 | break; |
| 237 | |
235 | |
| 238 | *q++ = *p; |
236 | *q++ = *p; |
| 239 | |
237 | |
| 240 | if (*p++ == '\n') |
238 | if (*p++ == '\n') |
|
|
239 | { |
|
|
240 | ++thawer.linenum; |
| 241 | break; |
241 | break; |
|
|
242 | } |
| 242 | } |
243 | } |
| 243 | |
244 | |
| 244 | *q = 0; |
245 | *q = 0; |
| 245 | thawer.line = p; |
246 | thawer.line = p; |
| 246 | |
247 | |
| 247 | return s == q ? 0 : s; |
248 | return s == q ? 0 : s; |
|
|
249 | } |
|
|
250 | |
|
|
251 | bool |
|
|
252 | object_thawer::parse_error (keyword kw, const char *type, const char *name, bool skip) |
|
|
253 | { |
|
|
254 | if (!type) type = "file section"; |
|
|
255 | if (!name) name = "generic"; |
|
|
256 | |
|
|
257 | switch (kw) |
|
|
258 | { |
|
|
259 | case KW_EOF: |
|
|
260 | LOG (llevError, "%s:%d end of file while reading %s '%s', aborting load.\n", |
|
|
261 | this->name, linenum, type, name); |
|
|
262 | return false; |
|
|
263 | |
|
|
264 | case KW_ERROR: |
|
|
265 | LOG (llevError, "%s:%d errornous line (%s) while reading %s '%s', aborting load.\n", |
|
|
266 | this->name, linenum, |
|
|
267 | last_keyword ? last_keyword : "<null>", |
|
|
268 | type, name); |
|
|
269 | return false; |
|
|
270 | |
|
|
271 | default: |
|
|
272 | LOG (llevError, "%s:%d unexpected line (%s) while reading %s '%s', %s.\n", |
|
|
273 | this->name, linenum, |
|
|
274 | last_keyword ? last_keyword : "<null>", |
|
|
275 | last_value ? last_value : "<null>", |
|
|
276 | type, name, |
|
|
277 | skip ? "skipping line" : "aborting load"); |
|
|
278 | return skip; |
|
|
279 | } |
| 248 | } |
280 | } |
| 249 | |
281 | |
| 250 | keyword |
282 | keyword |
| 251 | object_thawer::get_kv () |
283 | object_thawer::get_kv () |
| 252 | { |
284 | { |
| … | |
… | |
| 280 | *p++ = 0; |
312 | *p++ = 0; |
| 281 | } |
313 | } |
| 282 | else |
314 | else |
| 283 | last_value = 0; |
315 | last_value = 0; |
| 284 | |
316 | |
|
|
317 | ++linenum; |
| 285 | line [klen] = 0; |
318 | line [klen] = 0; |
| 286 | keyword_idx *kw = kw_lex::match (line, klen); |
319 | keyword_idx *kw = kw_lex::match (line, klen); |
| 287 | |
320 | |
| 288 | //printf ("KV %d<%s,%s>\n", kw ? kw->index : 0, line, last_value);//D |
321 | //printf ("KV %d<%s,%s>\n", kw ? kw->index : 0, line, last_value);//D |
| 289 | |
322 | |
| … | |
… | |
| 334 | kw [0] = '\n'; |
367 | kw [0] = '\n'; |
| 335 | memcpy (kw + 1, keyword_str [kend], klen); |
368 | memcpy (kw + 1, keyword_str [kend], klen); |
| 336 | kw [klen + 1] = '\n'; |
369 | kw [klen + 1] = '\n'; |
| 337 | kw [klen + 2] = 0; |
370 | kw [klen + 2] = 0; |
| 338 | |
371 | |
|
|
372 | ++linenum; |
|
|
373 | |
| 339 | // first test for completely empty msg... "endXXX\n" |
374 | // first test for completely empty msg... "endXXX\n" |
| 340 | if (!strncmp (line, kw + 1, klen + 1)) |
375 | if (!strncmp (line, kw + 1, klen + 1)) |
| 341 | { |
376 | { |
| 342 | sh = 0; |
377 | sh = 0; |
| 343 | |
378 | |
| … | |
… | |
| 358 | } |
393 | } |
| 359 | |
394 | |
| 360 | *end = 0; |
395 | *end = 0; |
| 361 | sh = line; |
396 | sh = line; |
| 362 | |
397 | |
|
|
398 | // count line numbers |
|
|
399 | while (line < end) |
|
|
400 | linenum += *line++ == '\n'; |
|
|
401 | |
| 363 | line = end + keyword_len [kend] + 1; |
402 | line += keyword_len [kend]; |
| 364 | |
403 | |
| 365 | while (*line++ != '\n') |
404 | while (*line++ != '\n') |
| 366 | ; |
405 | ; |
|
|
406 | |
|
|
407 | ++linenum; |
| 367 | } |
408 | } |
| 368 | } |
409 | } |
| 369 | |
410 | |
| 370 | sint32 |
411 | sint32 |
| 371 | object_thawer::get_sint32 () const |
412 | object_thawer::get_sint32 () const |
