--- capa/capa51/pProj/capaUnit.c	2000/02/22 18:19:02	1.3
+++ 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,7 +735,7 @@ 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++; 
@@ -737,24 +745,28 @@ int  check_correct_unit(char *u_symb,Uni
 
   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
@@ -876,7 +888,8 @@ 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  */
+      /* 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;
@@ -1704,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 {