Changeset 763 for to-imperative/trunk/runtime/rf_short_int.cc

Timestamp:

May 26, 2003, 7:34:42 PM (18 years ago)

Author:

luba

Message:

• creating number from terms of type Word is corrected

File:

• to-imperative/trunk/runtime/rf_short_int.cc (modified) (2 diffs)

to-imperative/trunk/runtime/rf_short_int.cc

@@ -68 +68 @@
 
       n = n * k + ((ShortInt*)p)->to_int();
+      
     }
     if (p->get_type() == type_char) {
@@ -74 +75 @@
     }
     if (p->get_type() == type_word) {
-      size_t len = ((Word*)p)->get_len();
-      size_t n_word = 0;
-      int k_word = 1;
-      int deg = 0;
-      if (_flag ) deg = len - 2;
-      else deg = len - 1;
-      
-      for (int i = 0; i < deg; i++)  
-        k_word *= 10;            
+      float n_word = 0;
+      float k_word = 0.1;
 
       Word::NumIterator i = *((Word*)p);
 
-      for (; i.in_bounds(); i++){       
-        n_word += (*i) * k_word;
+      while (i.in_bounds()) {
+        k_word *= 10;
+        i++;
+      }
+
+      Word::NumIterator j = *((Word*)p);
+
+      for (; j.in_bounds(); j++){       
+        n_word += (*j) * k_word;
         k_word /= 10;
       } 
-      n += n_word;                 
+      n += size_t (n_word);                 
     }
   }