--- capa/capa51/pProj/capaUnit.c 1999/09/28 21:26:21 1.1.1.1 +++ capa/capa51/pProj/capaUnit.c 2000/03/22 21:08:03 1.4 @@ -632,6 +632,7 @@ postorder_utree(node_p) Unit_t *node_p; return (result); } +/* returns 1 on okay, 2 on error*/ int postwalk_utree(Unit_t *n_p) { @@ -640,25 +641,32 @@ postwalk_utree(Unit_t *n_p) if( n_p == NULL ) return (1); result = postwalk_utree(U_LEFT(n_p)); - if( result ) result = postwalk_utree(U_RIGHT(n_p)); - if( result ) { - switch(U_TYPE(n_p)) { - case U_DERIVED: Ptopidx++; Pstack[Ptopidx] = n_p; /* push into stack */ - break; - case U_CONSTANT: Ptopidx++; Pstack[Ptopidx] = n_p; /* push into stack */ - break; - case U_OP_POWER: printf("^"); - break; - case U_OP_TIMES: process_op(U_OP_TIMES); /* process operator */ - break; - case U_OP_PLUS: printf("+"); - break; - case U_OP_MINUS: printf("-"); - break; - case U_OP_DIVIDE: process_op(U_OP_DIVIDE); /* process operator */ - break; - default: printf("()"); - break; + if (result !=2) { + if( result ) result = postwalk_utree(U_RIGHT(n_p)); + if (result !=2) { + if( result ) { + switch(U_TYPE(n_p)) { + case U_DERIVED: Ptopidx++; Pstack[Ptopidx] = n_p; /* push into stack */ + break; + case U_CONSTANT: Ptopidx++; Pstack[Ptopidx] = n_p; /* push into stack */ + break; + case U_UNKNOWN: result=2; + /*push into stack anyway, try to parse rest of tree */ + break; + case U_OP_POWER: printf("^"); result=2; + break; + case U_OP_TIMES: process_op(U_OP_TIMES); /* process operator */ + break; + case U_OP_PLUS: printf("+"); result=2; + break; + case U_OP_MINUS: printf("-"); result=2; + break; + case U_OP_DIVIDE: process_op(U_OP_DIVIDE); /* process operator */ + break; + default: printf("()"); result=2; + break; + } + } } } return (result); @@ -727,30 +735,38 @@ int check_correct_unit(char *u_symb,Uni int result=UNIT_OK; #ifdef UNIT_DBUG - if ((ufp=fopen("unit.DBUG","a"))==NULL) { fprintf(stderr,"Error: can't open login debug\n"); return; } + if ((ufp=fopen("unit.DBUG","a"))==NULL) { fprintf(stderr,"Error: can't open login debug\n"); return UNIT_FAIL; } #endif - while( isspace(*u_symb) ) u_symb++; + while( isspace(*u_symb) ) u_symb++; + /* <= change this to search from the end of string */ + /* or to get rid of all the white spaces */ + + ap = parse_unit_expr(u_symb); Ptopidx=0; - postwalk_utree(ap); + + if (postwalk_utree(ap)==1) { #ifdef UNIT_DBUG - fprintf(ufp,"Ptopidx %d\n",Ptopidx); + fprintf(ufp,"Ptopidx %d\n",Ptopidx); #endif - if( Ptopidx == 1 ) { - simplify_unit(Pstack[Ptopidx]); - - if( (Pstack[Ptopidx]->u_count != 0) || - (Pstack[Ptopidx]->u_count == t->u_count) ) { /* has unit */ - *scale = units_ratio(Pstack[Ptopidx], t); - if( *scale == 0.0 ) { - result = UNIT_FAIL; + if( Ptopidx == 1 ) { + simplify_unit(Pstack[Ptopidx]); + + if( (Pstack[Ptopidx]->u_count != 0) || + (Pstack[Ptopidx]->u_count == t->u_count) ) { /* has unit */ + *scale = units_ratio(Pstack[Ptopidx], t); + if( *scale == 0.0 ) { + result = UNIT_FAIL; + } + free_utree(ap); + } else { + result = UNIT_FAIL; } - free_utree(ap); - } else { + } else { /* invalid unit representation */ result = UNIT_FAIL; } - } else { /* invalid unit representation */ + } else { result = UNIT_FAIL; } #ifdef UNIT_DBUG @@ -856,7 +872,7 @@ u_copy_unit(Unit_t *a_p, Unit_t *b_p, do a_p->u_scale = a_p->u_scale * scale; /* printf("Found scale=%g=%g\n",a_p->u_scale,b_p->u_scale); */ } else { - if( b_p->u_type == U_BASE || b_p->u_type == U_DERIVED) { + if( b_p->u_type == U_BASE ) { /* *b_p is a base unit, so create a one element unit */ ne_p = (Unit_E *) capa_malloc(1, sizeof(Unit_E)); /* *** */ ne_p->ue_scale = b_p->u_scale; @@ -870,6 +886,10 @@ u_copy_unit(Unit_t *a_p, Unit_t *b_p, do } last_p = ne_p; a_p->u_count++; + } else if( b_p->u_type == U_DERIVED) { + /* derived units but without any units elements (scalar) */ + /* do nothing, ignore this units WE REALLY MEAN THIS DON'T DO THE NEXT LINE!*/ + /*a_p->u_count++;*/ } else if( b_p->u_type == U_CONSTANT ) { scale = pow(b_p->u_scale, exp_scale); a_p->u_scale = a_p->u_scale * scale; @@ -1363,9 +1383,10 @@ u_insert_derived(n_p,s_p,c_p,u_p)char * strcpy(new_p->u_comment,c_p); simplify_unit(new_p); - - /* print_unit_t(new_p); */ - + /* + printf("Derived Unit:%s\n",new_p->u_name); + print_unit_t(new_p); + */ if (c_result < 0 ) { new_p->u_left = t->u_left; new_p->u_right = t; t->u_left = NULL; @@ -1411,6 +1432,10 @@ simplify_unit(u_p) Unit_t *u_p; CScale[ii] = 0.0; CExp[ii] = 0.0; } + /* + printf("Before Simplify:: \n"); + print_unit_t(u_p); + */ if( u_p->u_count > 0 ) { for(eu_p=u_p->u_list; eu_p; eu_p = eu_p->ue_nextp) { @@ -1422,11 +1447,14 @@ simplify_unit(u_p) Unit_t *u_p; CScale[idx] = CScale[idx] * eu_p->ue_scale; CExp[idx] = CExp[idx] + eu_p->ue_exp; } - /* + /* debugging for(ii=0;iiu_list); @@ -1448,10 +1476,11 @@ simplify_unit(u_p) Unit_t *u_p; u_p->u_count++; } } - - } - + /* + printf("After Simplify:: \n"); + print_unit_t(u_p); + */ } /* before comparing two units, make sure they are of basic form */ @@ -1688,14 +1717,17 @@ p_new_unit(Unit_t *left_p, Unit_t *right } else { /* unit *tmp_str not found */ /* printf(" not found\n"); */ err_code = 3; + cu_p->u_type = U_UNKNOWN; } } else { /* printf("<<%s>>", symb_str); */ err_code = 2; + cu_p->u_type = U_UNKNOWN; } } else {/* len == 1 */ /* printf(" not found\n"); */ err_code = 1; + cu_p->u_type = U_UNKNOWN; } } } else {