Changeset 1376

Timestamp:

Mar 18, 2004, 10:04:11 PM (17 years ago)

Author:

orlov

Message:

---

• Fixed printing of objects.

Location:

to-imperative/branches/parenth_term/runtime

Files:

• rf_box.hh (modified) (1 diff)
• rf_box.ih (modified) (1 diff)
• rf_channel.hh (modified) (1 diff)
• rf_channel.ih (modified) (1 diff)
• rf_common.hh (modified) (1 diff)
• rf_expr.ih (modified) (2 diffs)
• rf_object.ih (modified) (1 diff)
• rf_table.hh (modified) (1 diff)
• rf_table.ih (modified) (1 diff)
• rf_term.hh (modified) (1 diff)
• rf_term.ih (modified) (1 diff)
• rf_vector.hh (modified) (2 diffs)
• rf_vector.ih (modified) (1 diff)

to-imperative/branches/parenth_term/runtime/rf_box.hh

@@ -34 +34 @@
 
   inline void put (Expr const& _expr) ;
-  inline Expr get () ;
+  inline Expr get () const ;
 
+  inline pxx::WString to_string () const ;
 
 };

to-imperative/branches/parenth_term/runtime/rf_box.ih

@@ -65 +65 @@
 }
 
-inline Expr Box::get ()
+inline Expr Box::get () const
 {
   return content;
+}
+
+inline pxx::WString Box::to_string () const
+{ 
+  size_t max_len = hex_ptr_len + 10;
+  wchar_t str[max_len];
+  int len = swprintf(str, max_len, L"<Box|%p|", this);
+  if (-1 == len)
+    FATAL("<Box|%p| is more then %u wide characters", this, max_len);
+  return pxx::WString(str, len) + pxx::WString(content) + pxx::WString(L">");
 }
 

to-imperative/branches/parenth_term/runtime/rf_channel.hh

@@ -34 +34 @@
   inline bool operator == (Object const& _obj) const ;
 
+  inline pxx::WString to_string () const ;
+
   inline bool open (char const* _fname, char const* _mode) ;
   inline void close () ;

to-imperative/branches/parenth_term/runtime/rf_channel.ih

@@ -82 +82 @@
 }
 
+inline pxx::WString Channel::to_string () const
+{ 
+  size_t max_len = hex_ptr_len + max_int_len + 15;
+  wchar_t str[max_len];
+  int len =
+      swprintf(str, max_len, L"<Channel|%p|%d>", this, fp ? fileno(fp) : -1);
+  if (-1 == len) {
+    FATAL("<Channel|%p|%d> is more then %u wide characters",
+          this, fp ? fileno(fp) : -1, max_len);
+  }
+  return pxx::WString(str, len);
+}
+
 }
 

to-imperative/branches/parenth_term/runtime/rf_common.hh

@@ -32 +32 @@
 extern uintptr_t stack_size ;
 
+#if UINTPTR_MAX == UINT32_MAX
+static const uint8_t hex_ptr_len = 8;
+#elif UINTPTR_MAX == UINT64_MAX
+static const uint8_t hex_ptr_len = 16;
+#else
+#error "Unsupported pointer size"
+#endif
+
+static const uint8_t max_int_len = 10;
+// FIXME: Is int 32 bits everywhere?
+
 #if DEBUG
 extern uintptr_t empty_copy ;

to-imperative/branches/parenth_term/runtime/rf_expr.ih

@@ -862 +862 @@
         if (fprintf(_fp, "%" PRIdPTR, ((Int32 const&)(*p)).to_int()) == -1)
           return false;
-      } else if (p->get_type() == type_int) {
+      } else { // if (p->get_type() == type_int) {
 //        mpz_t* z = static_cast<Integer*>(p)->get_mpz_ptr();
 //        if (!mpz_out_str(_fp, 10, *z)) return false;
         if (!write_wstr(_fp, (WString)(*p))) return false;
-      } else {
-        fprintf(_fp, " <%u|%p> ", p->get_type(), p->ptr_data2);
+//      } else {
+//        fprintf(_fp, " <%u|%p> ", p->get_type(), p->ptr_data2);
 //        FATAL("Not supported yet");
       }
@@ -882 +882 @@
   for (Term* p = first; p < last; p++) {
     if (p->is_sym()) {
-      if (!(p->is_dynamic())) {
-        WString s = (WString)(*p);
-        size_t len = s.get_length();
-        char buf[MB_CUR_MAX + 1];
-        for (size_t i = 0; i < len; i++) {
-          size_t n = wctomb(buf, s[i]);
-          if (n != (size_t)(-1)) {
-            buf[n] = 0;
-            if (fputs(buf, _fp) == EOF) return false;
-          } else {
-            if (fputc('?', _fp) == EOF) return false;
-          }
-        } 
-      } else {  
-        if (fprintf(_fp,"<%u|%p>", p->get_type(), p->ptr_data2) < 0)
-          return false;   
-     }  
+      WString s = (WString)(*p);
+      size_t len = s.get_length();
+      char buf[MB_CUR_MAX + 1];
+      for (size_t i = 0; i < len; i++) {
+        size_t n = wctomb(buf, s[i]);
+        if (n != (size_t)(-1)) {
+          buf[n] = 0;
+          if (fputs(buf, _fp) == EOF) return false;
+        } else {
+          if (fputc('?', _fp) == EOF) return false;
+        }
+      }
     } else if (p->is_ref()) {
       if (fputc('(', _fp) == EOF) return false;

to-imperative/branches/parenth_term/runtime/rf_object.ih

@@ -111 +111 @@
 inline pxx::WString Object::to_string () const
 { 
-  return (pxx::WString(L""));
+  size_t max_len = hex_ptr_len + 15;
+  wchar_t str[max_len];
+  int len = swprintf(str, max_len, L"<Object|%p>", this);
+  if (-1 == len)
+    FATAL("<Object|%p> is more then %u wide characters", this, max_len);
+  return pxx::WString(str, len);
 }
 

to-imperative/branches/parenth_term/runtime/rf_table.hh

@@ -44 +44 @@
   inline uint32_t hash () const;
   inline bool operator == (Object const&) const; 
+  inline pxx::WString to_string () const;
 };
   

to-imperative/branches/parenth_term/runtime/rf_table.ih

@@ -151 +151 @@
 }
 
+inline pxx::WString Table::to_string () const
+{ 
+  size_t max_len = hex_ptr_len + 15;
+  wchar_t str[max_len];
+  int len = swprintf(str, max_len, L"<Table|%p>", this, root);
+  if (-1 == len) 
+    FATAL("<Table|%p> is more then %u wide characters", this, max_len);
+  return pxx::WString(str, len);
+}
  
 }

to-imperative/branches/parenth_term/runtime/rf_term.hh

@@ -133 +133 @@
   inline bool is_ref () const ;
   ///
-  /// Check whether a term is a dynamic symbol
-  inline bool is_dynamic() const;
-  ///
   /// Check whether a term is a border symbol
   inline bool is_border () const ;

to-imperative/branches/parenth_term/runtime/rf_term.ih

@@ -77 +77 @@
   return get_short_type() > type_parenth;
 }
-
-inline bool Term::is_dynamic() const
-{ 
-  unsigned obj = get_type();
-  return (obj==type_box) || (obj==type_vector) || (obj==type_table) || (obj==type_channel);
-}
-
 
 inline bool Term::is_ref () const

to-imperative/branches/parenth_term/runtime/rf_vector.hh

@@ -24 +24 @@
   inline Vector (size_t _length, Expr const& _fill) ;
   inline Vector (Expr const& _expr, size_t _length) ;
-  inline Vector (Vector const& _vector, size_t _index, size_t _length);
+  inline Vector (Vector const& _vector, size_t _index, size_t _length) ;
 
   inline unsigned get_type () const ;
@@ -30 +30 @@
 
   inline bool operator == (Object const& _obj) const ;
-  inline const Vector& operator = (Vector const&);
+  inline const Vector& operator = (Vector const&) ;
+
+  inline pxx::WString to_string () const ;
 };
 

to-imperative/branches/parenth_term/runtime/rf_vector.ih

@@ -97 +97 @@
 }
 
+inline pxx::WString Vector::to_string () const
+{ 
+  size_t max_len = hex_ptr_len * 2 + 15;
+  wchar_t str[max_len];
+  int len = swprintf(str, max_len, L"<Vector|%p|%p>", this, get_data());
+  if (-1 == len) {
+    FATAL("<Vector|%p|%p> is more then %u wide characters",
+          this, get_data(), max_len);
+  }
+  return pxx::WString(str, len);
+}
 
 }