Changeset 247

Timestamp:

Nov 25, 2002, 10:47:30 AM (18 years ago)

Author:

luba

Message:

* empty log message *

File:

• to-imperative/trunk/runtime/rf_int.hh (modified) (1 diff)

to-imperative/trunk/runtime/rf_int.hh

@@ -27 +27 @@
 
 inline rf_int::rf_int(const Expr& expr, bool is_positive, int i) {
+  if (expr.get_len() - i > 10) 
+    goto Error;
   Term* p = expr.get_last();
   Term* q = expr.get_first() + i;
   k = 1; n = 0;
-  for (; p >= q; p--) {
-    if (n + (((rf_char*)p)->to_byte().n - ord('0'))*k) > INTPTR_MAX)
-      error ( Word2Expr(RF-INT) + "Size limit exceeded"); //обдумать позже, стоит ли так делать
-    else {
+
+  if (expr.get_len() - i < 10){
+    for (; p >= q; p--) {
       n += (((rf_char*)p)->to_byte().n - ord('0'))*k;
-      k *= 10;      
+      k *= 10;
+       
     };
   };
+  if (expr.get_len() - i == 10) {
+    for (; p > p - 9 ; p--) {
+      n += (((rf_char*)p)->to_byte().n - ord('0'))*k;
+      k *= 10;
+       
+    };
+    p++;
+    if (n += (((rf_char*)p)->to_byte().n - ord('0'))*k > INTPTR_MAX)
+      goto Error;
+    else 
+      n += (((rf_char*)p)->to_byte().n - ord('0'))*k;
+
+  };
+
   if (!is_positive) 
      n = -n;
+
+Error: error ( Word2Expr(RF-INT) + "Size limit exceeded"); 
 
 };