/[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 106 Revision 142
… …
22 22
23#include <stdlib.h> 23#include <stdlib.h>
24 24
25#include "parse_routines.h" 25#include "parse_routines.h"
26#include "error.h" 26#include "error.h"
27
28#ifdef DMALLOC
29#include <dmalloc.h>
30#endif
31
27 32
28struct formula_element 33struct formula_element
29{ 34{
30 psiconv_formula_type_t formula_type; 35 psiconv_formula_type_t formula_type;
31 int number_of_args; 36 int number_of_args;
… …
46 {psiconv_formula_op_mul,2,"*"}, 51 {psiconv_formula_op_mul,2,"*"},
47 {psiconv_formula_op_div,2,"/"}, 52 {psiconv_formula_op_div,2,"/"},
48 {psiconv_formula_op_pow,2,"^"}, 53 {psiconv_formula_op_pow,2,"^"},
49 {psiconv_formula_op_pos,1,"+"}, 54 {psiconv_formula_op_pos,1,"+"},
50 {psiconv_formula_op_neg,1,"-"}, 55 {psiconv_formula_op_neg,1,"-"},
51 {psiconv_formula_unknown,0,"*UNKNOWN*"}, 56 {psiconv_formula_op_not,1,"NOT"},
52 {psiconv_formula_unknown,0,"*UNKNOWN*"}, 57 {psiconv_formula_op_and,2,"AND"},
53 {psiconv_formula_unknown,0,"*UNKNOWN*"}, /* 10 */ 58 {psiconv_formula_op_or,2,"OR"}, /* 10 */
54 {psiconv_formula_op_con,2,"&"}, 59 {psiconv_formula_op_con,2,"&"},
55 {psiconv_formula_op_bra,1,"{}"}, 60 {psiconv_formula_op_bra,1,"()"},
56 {psiconv_formula_unknown,0,"*UNKNOWN*"}, 61 {psiconv_formula_unknown,0,"*UNKNOWN*"},
57 {psiconv_formula_unknown,0,"*UNKNOWN*"}, 62 {psiconv_formula_unknown,0,"*UNKNOWN*"},
58 {psiconv_formula_mark_eof,0,"End of formula"}, 63 {psiconv_formula_mark_eof,0,"End of formula"},
59 {psiconv_formula_unknown,0,"*UNKNOWN*"}, 64 {psiconv_formula_unknown,0,"*UNKNOWN*"},
60 {psiconv_formula_unknown,0,"*UNKNOWN*"}, 65 {psiconv_formula_unknown,0,"*UNKNOWN*"},
… …
284 {psiconv_formula_unknown,0,"*UNKNOWN*"}, 289 {psiconv_formula_unknown,0,"*UNKNOWN*"},
285 {psiconv_formula_unknown,0,"*UNKNOWN*"}, 290 {psiconv_formula_unknown,0,"*UNKNOWN*"},
286 {psiconv_formula_unknown,0,"*UNKNOWN*"}, 291 {psiconv_formula_unknown,0,"*UNKNOWN*"},
287 {psiconv_formula_unknown,0,"*UNKNOWN*"}, 292 {psiconv_formula_unknown,0,"*UNKNOWN*"},
288 {psiconv_formula_unknown,0,"*UNKNOWN*"}, 293 {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*"}}; 294 {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 295
350static int psiconv_parse_sheet_ref(const psiconv_buffer buf,int lev, 296static int psiconv_parse_sheet_ref(const psiconv_buffer buf,int lev,
351 psiconv_u32 off, int *length, 297 psiconv_u32 off, int *length,
352 psiconv_sheet_ref_t *result) 298 psiconv_sheet_ref_t *result)
353{ 299{
… …
447{ 393{
448 int res=0; 394 int res=0;
449 int len=0; 395 int len=0;
450 int leng; 396 int leng;
451 int eof = 0; 397 int eof = 0;
452 psiconv_u8 marker,submarker; 398 psiconv_u8 marker,submarker,submarker2;
453 psiconv_formula_list formula_stack; 399 psiconv_formula_list formula_stack;
454 psiconv_formula formula,subformula,subformula1,subformula2, 400 psiconv_formula formula,subformula,subformula1,subformula2,
455 subformula3,subformula4; 401 subformula3,subformula4;
456 psiconv_u16 temp,nr_of_subs; 402 psiconv_u16 temp,nr_of_subs;
457 403
… …
549 formula->type = psiconv_formula_unknown; 495 formula->type = psiconv_formula_unknown;
550 } else if (formula_elements[marker].formula_type == 496 } else if (formula_elements[marker].formula_type ==
551 psiconv_formula_dat_string) { 497 psiconv_formula_dat_string) {
552 psiconv_progress(lev+3,off+len,"Next item: a string"); 498 psiconv_progress(lev+3,off+len,"Next item: a string");
553 formula->data.dat_string = 499 formula->data.dat_string =
554 psiconv_read_sheet_string(buf,lev+2,off+len,&leng,&res); 500 psiconv_read_short_string(buf,lev+2,off+len,&leng,&res);
555 if (res) 501 if (res)
556 goto ERROR8; 502 goto ERROR8;
557 formula->type = formula_elements[marker].formula_type; 503 formula->type = formula_elements[marker].formula_type;
558 len += leng; 504 len += leng;
559 if ((res = psiconv_list_add(formula_stack,formula))) 505 if ((res = psiconv_list_add(formula_stack,formula)))
560 goto ERROR8; 506 goto ERROR8;
561 formula->type = psiconv_formula_unknown; 507 formula->type = psiconv_formula_unknown;
562 } else if ((formula_elements[marker].formula_type == 508 } else if ((formula_elements[marker].formula_type ==
563 psiconv_formula_dat_var) || 509 psiconv_formula_dat_var)) {
564 (formula_elements[marker].formula_type == 510 psiconv_progress(lev+3,off+len,"Next item: a variable reference");
565 psiconv_formula_dat_vcellblock)) { 511 formula->data.dat_variable = psiconv_read_u32(buf,lev+2,off+len,&res);
566 psiconv_warn(lev+3,off+len,"Not yet supported formula mark!"); 512 if (res)
567 goto ERROR8; 513 goto ERROR8;
514 formula->type = formula_elements[marker].formula_type;
515 len += 4;
516 if ((res = psiconv_list_add(formula_stack,formula)))
517 goto ERROR8;
518 formula->type = psiconv_formula_unknown;
568 } else if (formula_elements[marker].number_of_args == -1) { 519 } else if (formula_elements[marker].number_of_args == -1) {
569 psiconv_progress(lev+3,off+len,"Going to parse a vararg function"); 520 psiconv_progress(lev+3,off+len,"Going to parse a vararg function");
570 if (!(formula->data.fun_operands = 521 if (!(formula->data.fun_operands =
571 psiconv_list_new(sizeof(*formula)))) 522 psiconv_list_new(sizeof(*formula))))
572 goto ERROR8; 523 goto ERROR8;
… …
588 psiconv_progress(lev+4,off+len,"Going to read the next marker"); 539 psiconv_progress(lev+4,off+len,"Going to read the next marker");
589 submarker = psiconv_read_u8(buf,lev+4,off+len,&res); 540 submarker = psiconv_read_u8(buf,lev+4,off+len,&res);
590 len ++; 541 len ++;
591 if (res) 542 if (res)
592 goto ERROR8; 543 goto ERROR8;
544 submarker2 = psiconv_read_u8(buf,lev+4,off+len,&res);
545 if (res)
546 goto ERROR8;
593 } while (formula_elements[submarker].formula_type 547 } while ((formula_elements[submarker].formula_type
594 == psiconv_formula_mark_opsep); 548 == psiconv_formula_mark_opsep) &&
549 (formula_elements[submarker2].formula_type
550 != psiconv_formula_mark_opend));
551 if ((formula_elements[submarker].formula_type ==
552 psiconv_formula_mark_opsep) &&
553 (formula_elements[submarker2].formula_type ==
554 psiconv_formula_mark_opend)) {
555 submarker=submarker2;
556 len++;
557 }
595 if (formula_elements[submarker].formula_type 558 if (formula_elements[submarker].formula_type
596 != psiconv_formula_mark_opend) { 559 != psiconv_formula_mark_opend) {
597 psiconv_warn(lev+3,off+len,"Formula corrupted!"); 560 psiconv_warn(lev+3,off+len,"Formula corrupted!");
598 psiconv_debug(lev+3,off+len,"Found unexpected marker %02x",submarker); 561 psiconv_debug(lev+3,off+len,"Found unexpected marker %02x",submarker);
599 goto ERROR8; 562 goto ERROR8;
Legend:
Removed from v.106  
changed lines
  Added in v.142
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26