Changeset 678

Timestamp:

Apr 27, 2003, 1:32:08 AM (18 years ago)

Author:

orlov

Message:

• More elegant version of ShortInt::create_expr (Expr& _expr, int _flag) method.

File:

• to-imperative/trunk/runtime/rf_short_int.cc (modified) (1 diff)

to-imperative/trunk/runtime/rf_short_int.cc

@@ -26 +26 @@
   //othewise _flag == 0
 
-  Expr e = Term::create_expr(1);
+  Term* p = _expr.get_first();
+  Term* q = _expr.get_last();
 
-  Term* t = _expr.get_last() - 1;
-  Term* p = _expr.get_first();
- 
   intptr_t n = 0;
 
-  //the following two variables are for computing the position 
-  //of digit in number
-
-  intptr_t n_temp = 0;
-  uintptr_t k = 1;
-
-  for (; t > _expr.get_first(); t--){
-    if (t->get_type() == type_short_int) {
-      n_temp = (((ShortInt*)t)->to_int());
-      n = n + n_temp * k;
-
-      while (n_temp!=0) {
-        n_temp = n_temp/10;
-        k = k*10;
-      }
+  if (p->get_type() == type_short_int) {
+    n = ((ShortInt*)p)->to_int();
+    if (n < 0) {
+      n = -n;
+      _flag = -1;
     }
     else
-    if (t->get_type() == type_char) {
-      n += (((Char*)t)->to_wchar_t() - 48)*k;
-      k = k*10;
-    }
-  }            
-  if (t->get_type() == type_char && ((Char*)t)->is_digit()) {
-      n += (((Char*)t)->to_wchar_t() - 48)*k;
-      k = k*10;
-    }
-  intptr_t temp = 0;
-
-  if (p->get_type() == type_short_int){
-    temp = ( (ShortInt*)_expr.get_first() )->to_int();
-    if (temp < 0)
-      n = -n + temp * k;
-    else 
-      n = n + temp * k;
+      _flag = 1;
   }
 
-  if (_flag == -1) n = -n;
+  for (p += _flag * _flag; p < q; p++) {
+    if (p->get_type() == type_short_int) {
+      intptr_t n_temp = ((ShortInt*)p)->to_int() / 10;
+      intptr_t k      = 10;
+      
+      while (n_temp) {
+        n_temp /= 10;
+        k *= 10;
+      }
 
+      n = n * k + ((ShortInt*)p)->to_int();
+    }
+    else
+    if (p->get_type() == type_char) {
+      n = n * 10 + (((Char*)p)->to_wchar_t() - 48);
+    }
+  }
+
+  if (-1 == _flag) n = -n;
+
+  Expr e = Term::create_expr(1);
 
   new(e.get_first()) ShortInt(n);