--- capa/capa51/pProj/capaUnit.c 2000/09/20 17:20:33 1.10 +++ capa/capa51/pProj/capaUnit.c 2004/03/26 20:02:03 1.12 @@ -781,17 +781,17 @@ int check_correct_unit(char *u_symb,Uni (Pstack[Ptopidx]->u_count == t->u_count) ) { /* has unit */ *scale = units_ratio(Pstack[Ptopidx], t); if( *scale == 0.0 ) { - result = UNIT_FAIL; + result = UNIT_IRRECONCIBLE; } free_utree(ap); } else { - result = UNIT_FAIL; + result = UNIT_INVALID_STUDENT3; } } else { /* invalid unit representation */ - result = UNIT_FAIL; + result = UNIT_INVALID_STUDENT2; } } else { - result = UNIT_FAIL; + result = UNIT_INVALID_STUDENT1; } #ifdef UNIT_DBUG fclose(ufp); @@ -912,7 +912,6 @@ u_copy_unit(Unit_t *a_p, Unit_t *b_p, do 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++;*/ scale = pow(b_p->u_scale, exp_scale); a_p->u_scale = a_p->u_scale * scale;