Changeset 1132 for to-imperative/trunk/library/Convert/bytes_to_chars.cc

Timestamp:

Aug 8, 2003, 6:04:12 PM (17 years ago)

Author:

luba

Message:

• processing of Interger args is added

File:

• to-imperative/trunk/library/Convert/bytes_to_chars.cc (modified) (1 diff)

to-imperative/trunk/library/Convert/bytes_to_chars.cc

@@ -18 +18 @@
 
 RF_FUNC (Bytes_m_To_m_Chars, (RF_ARG e_Int), (RF_RES e_Res))
-#if 0
-  e_Res = Expr(e_Int.get_len(), 0);
-  
-  Term *p = e_Int.get_first();
-  Term *r = e_Res.get_first();
-  
-  for (; p < e_Int.get_last(); p++, r++) {
-    if (p->get_type() == type_int) {
-      RF_LIB_ERROR("Invalid argument");
-    }
-    else
-    if (p->get_type() == type_short_int) {
-      intptr_t t = ((ShortInt*)p)->to_int();
-      if (t < 0 || t > WCHAR_MAX)
-        RF_LIB_ERROR("Invalid argument");
-      else
-      *r = Char::to_chars(t);
-    }
-    else                        
-       RF_LIB_ERROR("Invalid argument");
-  }
-#endif
 
   Term* p = e_Int.get_first();
   for (; p < e_Int.get_last(); p++) {
     if (p->get_type() == type_int32) {
-      intptr_t t = ((Int32*)p)->to_int();
+      intptr_t t = static_cast<Int32*>(p)->to_int();
       if (t < 0 || t > WCHAR_MAX)
         RF_LIB_ERROR("Invalid argument");
       }
+    else 
+    if (p->get_type() == type_int) {
+      Integer* P = static_cast<Integer*>(p);
+      intptr_t l = P->to_int();
+      if (P->cmp(0) < 0 || uintptr_t(l) > SIZE_MAX) 
+        RF_LIB_ERROR("Invalid argument");
+    }
     else
       RF_LIB_ERROR("Invalid argument");
   
   }
-
   e_Res = Char::bytes_to_chars(e_Int);