Changeset 786

Timestamp:

May 29, 2003, 1:24:02 AM (18 years ago)

Author:

pooh

Message:

• More fixes to make Word working.

Location:

to-imperative/trunk/runtime

Files:

• rf_expr.ih (modified) (3 diffs)
• rf_term.ih (modified) (1 diff)
• rf_word.cc (modified) (2 diffs)
• rf_word.ih (modified) (1 diff)

to-imperative/trunk/runtime/rf_expr.ih

@@ -558 +558 @@
     // In a case of not flat expression advance reference counters for child
     // memory blocks
-    if (!_expr.is_flat()) _expr.ref_childs();
+//    if (!_expr.is_flat()) _expr.ref_childs();
     //
     // Initialize expression by a copy of a first argument
     Expr e(*this);
-    memcpy(e.last, _expr.first, len2 * sizeof(Term));
+//    memcpy(e.last, _expr.first, len2 * sizeof(Term));
+    if (_expr.is_flat())
+      memcpy(e.last, _expr.first, len2 * sizeof(Term));
+    else {
+      Term* to = e.last;
+      Term const* from = _expr.first;
+      while (from != _expr.last) {
+        new(to) Term(*from);
+        from++; to++;
+      }
+    }
     //
     // Adjust flags
@@ -580 +590 @@
     lt_copy++;
     #endif
-    if (!is_flat()) ref_childs();
+//    if (!is_flat()) ref_childs();
     Expr e(_expr);
     e.first -= len1;
-    memcpy(e.first, first, len1 * sizeof(Term));
+//    memcpy(e.first, first, len1 * sizeof(Term));
+    if (is_flat()) memcpy(e.first, first, len1 * sizeof(Term));
+    else {
+      Term* to = e.first;
+      Term const* from = first;
+      while (from != last) {
+        new(to) Term(*from);
+        from++; to++;
+      }
+    }
     e.flags &= flags;
     return e;
@@ -600 +619 @@
     // then for the resulting expression. This advances our chances to avoid
     // some work in a case if at least one of two expressions is flat.
-    if (!is_flat()) ref_childs();
-    if (!_expr.is_flat()) _expr.ref_childs();
-    memcpy(e.first, first, len1 * sizeof(Term));
-    memcpy(e.first + len1, _expr.first, len2 * sizeof(Term));
+    if (is_flat()) memcpy(e.first, first, len1 * sizeof(Term));
+    else {
+      Term* to = e.first;
+      Term const* from = first;
+      while (from != last) {
+        new(to) Term(*from);
+        from++; to++;
+      }
+    }
+    if (_expr.is_flat())
+      memcpy(e.first + len1, _expr.first, len2 * sizeof(Term));
+    else {
+      Term* to = e.first + len1;
+      Term const* from = _expr.first;
+      while (from != _expr.last) {
+        new(to) Term(*from);
+        from++; to++;
+      }
+    }
     //
     // Adjust flags

to-imperative/trunk/runtime/rf_term.ih

@@ -70 +70 @@
 inline Term::Term (Term const& _t)
 {
-  (this->*ctor_funcs[get_class()])(_t);
+  (this->*ctor_funcs[_t.get_class()])(_t);
 }
 

to-imperative/trunk/runtime/rf_word.cc

@@ -33 +33 @@
   }
 }
-  
+
+pxx::WString Word::to_string (uintptr_t _data)
+{
+  Header* h = reinterpret_cast<Header*>(_data);
+  return pxx::WString(h->content, h->length);
+}
+
 Expr Word::create_expr (wchar_t const* _wstr)
  {
@@ -81 +87 @@
   Word::compare,
   Word::hash,
-  null // Word::to_string
+  Word::to_string
 };
 

to-imperative/trunk/runtime/rf_word.ih

@@ -232 +232 @@
 }
 #endif
+
 }