/[public]/psiconv/trunk/lib/psiconv/parse_formula.c
ViewVC logotype

Diff of /psiconv/trunk/lib/psiconv/parse_formula.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 105 Revision 110
… …
46 {psiconv_formula_op_mul,2,"*"}, 46 {psiconv_formula_op_mul,2,"*"},
47 {psiconv_formula_op_div,2,"/"}, 47 {psiconv_formula_op_div,2,"/"},
48 {psiconv_formula_op_pow,2,"^"}, 48 {psiconv_formula_op_pow,2,"^"},
49 {psiconv_formula_op_pos,1,"+"}, 49 {psiconv_formula_op_pos,1,"+"},
50 {psiconv_formula_op_neg,1,"-"}, 50 {psiconv_formula_op_neg,1,"-"},
51 {psiconv_formula_unknown,0,"*UNKNOWN*"}, 51 {psiconv_formula_op_not,1,"NOT"},
52 {psiconv_formula_unknown,0,"*UNKNOWN*"}, 52 {psiconv_formula_op_and,2,"AND"},
53 {psiconv_formula_unknown,0,"*UNKNOWN*"}, /* 10 */ 53 {psiconv_formula_op_or,2,"OR"}, /* 10 */
54 {psiconv_formula_op_con,2,"&"}, 54 {psiconv_formula_op_con,2,"&"},
55 {psiconv_formula_op_bra,1,"{}"}, 55 {psiconv_formula_op_bra,1,"()"},
56 {psiconv_formula_unknown,0,"*UNKNOWN*"}, 56 {psiconv_formula_unknown,0,"*UNKNOWN*"},
57 {psiconv_formula_unknown,0,"*UNKNOWN*"}, 57 {psiconv_formula_unknown,0,"*UNKNOWN*"},
58 {psiconv_formula_mark_eof,0,"End of formula"}, 58 {psiconv_formula_mark_eof,0,"End of formula"},
59 {psiconv_formula_unknown,0,"*UNKNOWN*"}, 59 {psiconv_formula_unknown,0,"*UNKNOWN*"},
60 {psiconv_formula_unknown,0,"*UNKNOWN*"}, 60 {psiconv_formula_unknown,0,"*UNKNOWN*"},
… …
284 {psiconv_formula_unknown,0,"*UNKNOWN*"}, 284 {psiconv_formula_unknown,0,"*UNKNOWN*"},
285 {psiconv_formula_unknown,0,"*UNKNOWN*"}, 285 {psiconv_formula_unknown,0,"*UNKNOWN*"},
286 {psiconv_formula_unknown,0,"*UNKNOWN*"}, 286 {psiconv_formula_unknown,0,"*UNKNOWN*"},
287 {psiconv_formula_unknown,0,"*UNKNOWN*"}, 287 {psiconv_formula_unknown,0,"*UNKNOWN*"},
288 {psiconv_formula_unknown,0,"*UNKNOWN*"}, 288 {psiconv_formula_unknown,0,"*UNKNOWN*"},
289 {psiconv_formula_unknown,0,"*UNKNOWN*"},
290 {psiconv_formula_unknown,0,"*UNKNOWN*"},
291 {psiconv_formula_unknown,0,"*UNKNOWN*"},
292 {psiconv_formula_unknown,0,"*UNKNOWN*"}}; 289 {psiconv_formula_unknown,0,"*UNKNOWN*"}};
293
294static psiconv_string_t psiconv_read_sheet_string(const psiconv_buffer buf,
295 int lev,
296 psiconv_u32 off,int *length, int *status)
297{
298 int stringlen,i,len,localstatus;
299 psiconv_string_t result;
300 char *res_copy;
301
302 psiconv_progress(lev+1,off,"Going to read a sheet string");
303
304 stringlen = psiconv_read_u8(buf,lev+2,off,&localstatus);
305 if (localstatus)
306 goto ERROR1;
307 psiconv_debug(lev+2,off,"Length: %i",stringlen);
308 len = 1;
309
310 result = malloc(stringlen + 1);
311 if (!result)
312 goto ERROR1;
313 for (i = 0; (i < stringlen) && !localstatus; i++)
314 result[i] = psiconv_read_u8(buf,lev,off+i+len,&localstatus);
315 if (localstatus)
316 goto ERROR2;
317 result[stringlen] = 0;
318 len += stringlen;
319
320 res_copy = psiconv_make_printable(result);
321 if (!res_copy)
322 goto ERROR2;
323 psiconv_debug(lev+2,off,"Contents: `%s'",res_copy);
324 free(res_copy);
325
326 if (length)
327 *length = len;
328
329 if (status)
330 *status = 0;
331
332 psiconv_progress(lev+1,off+len-1,"End of sheet string (total length: %08x)",
333 len);
334
335 return result;
336
337
338ERROR2:
339 free(result);
340ERROR1:
341 psiconv_warn(lev+1,off,"Reading of sheet string failed");
342 if (status)
343 *status = localstatus;
344 if (length)
345 *length = 0;
346 return NULL;
347}
348
349 290
350static int psiconv_parse_sheet_ref(const psiconv_buffer buf,int lev, 291static int psiconv_parse_sheet_ref(const psiconv_buffer buf,int lev,
351 psiconv_u32 off, int *length, 292 psiconv_u32 off, int *length,
352 psiconv_sheet_ref_t *result) 293 psiconv_sheet_ref_t *result)
353{ 294{
… …
447{ 388{
448 int res=0; 389 int res=0;
449 int len=0; 390 int len=0;
450 int leng; 391 int leng;
451 int eof = 0; 392 int eof = 0;
452 psiconv_u8 marker; 393 psiconv_u8 marker,submarker;
453 psiconv_formula_list formula_stack; 394 psiconv_formula_list formula_stack;
454 psiconv_formula formula,subformula1,subformula2,subformula3,subformula4; 395 psiconv_formula formula,subformula,subformula1,subformula2,
396 subformula3,subformula4;
397 psiconv_u16 temp,nr_of_subs;
455 398
456 psiconv_progress(lev+1,off,"Going to read a formula element list"); 399 psiconv_progress(lev+1,off,"Going to read a formula element list");
457 if (!(*result = malloc(sizeof(**result)))) 400 if (!(*result = malloc(sizeof(**result))))
458 goto ERROR1; 401 goto ERROR1;
459 if (!(formula_stack = psiconv_list_new(sizeof(struct psiconv_formula_s)))) 402 if (!(formula_stack = psiconv_list_new(sizeof(struct psiconv_formula_s))))
… …
530 formula->type = formula_elements[marker].formula_type; 473 formula->type = formula_elements[marker].formula_type;
531 len += leng; 474 len += leng;
532 if ((res = psiconv_list_add(formula_stack,formula))) 475 if ((res = psiconv_list_add(formula_stack,formula)))
533 goto ERROR8; 476 goto ERROR8;
534 formula->type = psiconv_formula_unknown; 477 formula->type = psiconv_formula_unknown;
535 } else if (formula_elements[marker].formula_type == 478 } else if ((formula_elements[marker].formula_type ==
479 psiconv_formula_dat_cellblock) ||
480 (formula_elements[marker].formula_type ==
536 psiconv_formula_dat_cellblock) { 481 psiconv_formula_dat_vcellblock)) {
537 psiconv_progress(lev+3,off+len,"Next item: a cell block"); 482 psiconv_progress(lev+3,off+len,"Next item: a cell block");
538 if ((res = psiconv_parse_sheet_cell_block(buf,lev+2,off+len,&leng, 483 if ((res = psiconv_parse_sheet_cell_block(buf,lev+2,off+len,&leng,
539 &formula->data.dat_cellblock))) 484 &formula->data.dat_cellblock)))
540 goto ERROR8; 485 goto ERROR8;
541 formula->type = formula_elements[marker].formula_type; 486 formula->type = formula_elements[marker].formula_type;
… …
545 formula->type = psiconv_formula_unknown; 490 formula->type = psiconv_formula_unknown;
546 } else if (formula_elements[marker].formula_type == 491 } else if (formula_elements[marker].formula_type ==
547 psiconv_formula_dat_string) { 492 psiconv_formula_dat_string) {
548 psiconv_progress(lev+3,off+len,"Next item: a string"); 493 psiconv_progress(lev+3,off+len,"Next item: a string");
549 formula->data.dat_string = 494 formula->data.dat_string =
550 psiconv_read_sheet_string(buf,lev+2,off+len,&leng,&res); 495 psiconv_read_short_string(buf,lev+2,off+len,&leng,&res);
551 if (res) 496 if (res)
552 goto ERROR8; 497 goto ERROR8;
553 formula->type = formula_elements[marker].formula_type; 498 formula->type = formula_elements[marker].formula_type;
554 len += leng; 499 len += leng;
555 if ((res = psiconv_list_add(formula_stack,formula))) 500 if ((res = psiconv_list_add(formula_stack,formula)))
… …
560 (formula_elements[marker].formula_type == 505 (formula_elements[marker].formula_type ==
561 psiconv_formula_dat_vcellblock)) { 506 psiconv_formula_dat_vcellblock)) {
562 psiconv_warn(lev+3,off+len,"Not yet supported formula mark!"); 507 psiconv_warn(lev+3,off+len,"Not yet supported formula mark!");
563 goto ERROR8; 508 goto ERROR8;
564 } else if (formula_elements[marker].number_of_args == -1) { 509 } else if (formula_elements[marker].number_of_args == -1) {
565 psiconv_warn(lev+3,off+len,"Vararg functions not yet supported!"); 510 psiconv_progress(lev+3,off+len,"Going to parse a vararg function");
511 if (!(formula->data.fun_operands =
512 psiconv_list_new(sizeof(*formula))))
513 goto ERROR8;
514 formula->type = formula_elements[marker].formula_type;
515 nr_of_subs = 0;
516 do {
517 nr_of_subs ++;
518 psiconv_progress(lev+4,off+len,"Going to read vararg argument %d",
519 nr_of_subs);
520 if ((res = psiconv_parse_formula_element_list(buf,lev+4,off+len,&leng,
521 &subformula,maxlen)))
522 goto ERROR8;
523 len += leng;
524 if ((res = psiconv_list_add(formula->data.fun_operands,subformula))) {
525 psiconv_free_formula(subformula);
526 goto ERROR8;
527 }
528 free(subformula);
529 psiconv_progress(lev+4,off+len,"Going to read the next marker");
530 submarker = psiconv_read_u8(buf,lev+4,off+len,&res);
531 len ++;
532 if (res)
533 goto ERROR8;
534 } while (formula_elements[submarker].formula_type
535 == psiconv_formula_mark_opsep);
536 if (formula_elements[submarker].formula_type
537 != psiconv_formula_mark_opend) {
538 psiconv_warn(lev+3,off+len,"Formula corrupted!");
539 psiconv_debug(lev+3,off+len,"Found unexpected marker %02x",submarker);
566 goto ERROR8; 540 goto ERROR8;
541 }
542 psiconv_progress(lev+3,off+len,"Going to read the repeated marker %02x",
543 marker);
544 submarker = psiconv_read_u8(buf,lev+3,off+len,&res);
545 if (res)
546 goto ERROR8;
547 if (submarker != marker) {
548 psiconv_warn(lev+3,off+len,"Formula corrupted!");
549 psiconv_debug(lev+3,off+len,"Expected marker %02x, found %02x",
550 marker,submarker);
551 goto ERROR8;
552 }
553 len++;
554 psiconv_progress(lev+3,off+len,
555 "Going to read the number of arguments (%d expected)",
556 nr_of_subs);
557 temp = psiconv_read_u16(buf,lev+3,off+len,&res);
558 if (res)
559 goto ERROR8;
560 if (temp != nr_of_subs) {
561 psiconv_warn(lev+3,off+len,"Formula corrupted!");
562 psiconv_debug(lev+3,off+len,
563 "Read %d arguments, but formula says there are %d",
564 nr_of_subs,temp);
565 goto ERROR8;
566 }
567 len += 2;
568 if ((res = psiconv_list_add(formula_stack,formula)))
569 goto ERROR8;
570 formula->type = psiconv_formula_unknown;
567 } else { 571 } else {
568 if (formula_elements[marker].number_of_args > 0) 572 if (formula_elements[marker].number_of_args > 0)
569 if ((res = psiconv_list_pop(formula_stack,subformula1))) 573 if ((res = psiconv_list_pop(formula_stack,subformula1)))
570 goto ERROR8; 574 goto ERROR8;
571 if (formula_elements[marker].number_of_args > 1) 575 if (formula_elements[marker].number_of_args > 1)
Legend:
Removed from v.105  
changed lines
  Added in v.110
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26