Changeset 730 for to-imperative/trunk/library/Convert/to_int.cc

Timestamp:

May 16, 2003, 11:37:44 AM (18 years ago)

Author:

luba

Message:

• term type word processing is added to the function

File:

• to-imperative/trunk/library/Convert/to_int.cc (modified) (4 diffs)

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

@@ -5 +5 @@
 
 #include <rf_core.hh>
-#include <rf_short_int.hh>
 
 namespace refal
@@ -23 +22 @@
 
   if (t->get_type() == type_char) {
-    if (((Char*)t)->to_wchar_t() == '-')
-      flag = -1;
-
-    if (((Char*)t)->to_wchar_t() == '+')
-      flag = 1;
+    if (((Char*)t)->to_wchar_t() == '-') {
+      flag = -1; t++;
+    }
+    else
+      if (((Char*)t)->to_wchar_t() == '+') {
+        flag = 1; t++;
+      }
   };
 
-  //добавить для Word проверку первого символа
+  if ((t->get_type() == type_word) )
+    if (((Word*)t)->is_number() == -1)
+       flag = -1;
+    else
+    if(((Word*)t)->is_number() == 1)
+      flag = 1;
+    else
+    retfail;
 
-  if (flag || t->get_type() == type_short_int)
+
+  if (t->get_type() == type_short_int)
     t++;
 
@@ -53 +62 @@
         }
       }
-#if 0
     else
-    if (t->get_type() == type_word && ((Word*)t)->is_number())
-      if (len > UINTPTR_MAX - длина слова ))
-        RF_LIB_ERROR("Argument too large for conversion");
-      else
-        len += ((Word*)t)->get_len();
-#endif
+      if (t->get_type() == type_word){
+        size_t word_len = ((Word*)t)->get_len();
+        if (len > UINTPTR_MAX - word_len)
+          RF_LIB_ERROR("Argument too large for conversion");
+        else
+          len += word_len;
+      }
     else
       retfail;
@@ -69 +78 @@
 
   s_Int = ShortInt::create_expr(e_Exp, flag);
-
+ 
 RF_END
 }