capa/capa51/pProj/capaUnit.c - diff

Return to capaUnit.c CVS log

Up to [LON-CAPA] / capa / capa51 / pProj

version 1.9, 2000/09/14 20:25:12	version 1.11, 2000/09/20 19:03:09
Line 912 u_copy_unit(Unit_t a_p, Unit_t b_p, do	Line 912 u_copy_unit(Unit_t a_p, Unit_t b_p, do
a_p->u_count++;	a_p->u_count++;
} else if( b_p->u_type == U_DERIVED) {	} else if( b_p->u_type == U_DERIVED) {
/* derived units but without any units elements (scalar) */	/* 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++;/	/a_p->u_count++;/
	scale = pow(b_p->u_scale, exp_scale);
	a_p->u_scale = a_p->u_scale * scale;
} else if( b_p->u_type == U_CONSTANT ) {	} else if( b_p->u_type == U_CONSTANT ) {
scale = pow(b_p->u_scale, exp_scale);	scale = pow(b_p->u_scale, exp_scale);
a_p->u_scale = a_p->u_scale * scale;	a_p->u_scale = a_p->u_scale * scale;
Line 1407 u_insert_derived(n_p,s_p,c_p,u_p)char *	Line 1408 u_insert_derived(n_p,s_p,c_p,u_p)char *
strcpy(new_p->u_comment,c_p);	strcpy(new_p->u_comment,c_p);

simplify_unit(new_p);	simplify_unit(new_p);
/*	#ifdef UNIT_DBUG
printf("Derived Unit:%s\n",new_p->u_name);	printf("Derived Unit:%s\n",new_p->u_name);
print_unit_t(new_p);	print_unit_t(new_p);
*/	#endif
if (c_result < 0 ) {	if (c_result < 0 ) {
new_p->u_left = t->u_left; new_p->u_right = t;	new_p->u_left = t->u_left; new_p->u_right = t;
t->u_left = NULL;	t->u_left = NULL;