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

Timestamp:

May 21, 2003, 12:42:22 PM (18 years ago)

Author:

luba

Message:

• create_expr(Expr&, int) method is modified to process terms of type word

File:

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

to-imperative/trunk/runtime/rf_short_int.cc

@@ -8 +8 @@
 #include "rf_expr.ih"
 #include "rf_char.ih"
+#include "rf_word.ih"
 
 namespace rftype
@@ -32 +33 @@
 Expr ShortInt::create_expr (Expr& _expr, int _flag)
 {
-  // _flag == 1, if the number in _expr has "+" 
-  //_flag == -1, if the number in _expr has "-"
-  //othewise _flag == 0
-
   Term* p = _expr.get_first();
   Term* q = _expr.get_last();
-
+  int d = 0;
   intptr_t n = 0;
 
@@ -45 +42 @@
     if (n < 0) {
       n = -n;
+      d = -1;
       _flag = -1;
     }
-    else
+    else {
       _flag = 1;
+      d = 1;
+    }
+  }
+  if (p->get_type() == type_word) {
+    d = 0;
+  }
+  if (p->get_type() == type_char) {
+    d = _flag;
   }
 
-  for (p += _flag * _flag; p < q; p++) {
+  for (p += _flag * d; p < q; p++) {
     if (p->get_type() == type_short_int) {
       intptr_t n_temp = ((ShortInt*)p)->to_int() / 10;
@@ -63 +69 @@
       n = n * k + ((ShortInt*)p)->to_int();
     }
-    else
     if (p->get_type() == type_char) {
       n = n * 10 + (((Char*)p)->to_wchar_t() - 48);
     }
+    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;            
+
+      Word::NumIterator i = *((Word*)p);
+
+      for (; i.in_bounds(); i++){       
+        //        n_word += ((*i)-48) * k_word;
+        n_word += (*i) * k_word;
+        k_word /= 10;
+      } 
+      n += n_word;                 
+    }
   }
-
   if (-1 == _flag) n = -n;
 
   Expr e = Term::create_expr(1);
-
   new(e.get_first()) ShortInt(n);
   return e;