Changeset 88180d in git

Timestamp:

Sep 4, 2012, 11:35:14 PM (12 years ago)

Author:

Alexander Dreyer <alexander.dreyer@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

d94836e0b38201eda7edf1d2094a7376a0090806

Parents:

cda275f5c6745c233d1ee5261720c388c5286ec9

git-author:

Alexander Dreyer <alexander.dreyer@itwm.fraunhofer.de>2012-09-04 23:35:14+02:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-09-05 15:52:17+02:00

Message:

fix: ensure we always have RefCounted object alive

Files:

• Singular/countedref.cc (modified) (19 diffs)
• doc/countedref.doc (added)

Singular/countedref.cc

@@ -48 +48 @@
 /** @class CountedRefData
  * This class stores a reference counter as well as a Singular interpreter object.
- * It also take care of the context, e.g. the current ring, indexed object, etc.
+ * It also take care of the context, e.g. the current ring, wrap object, etc.
  **/
 class CountedRefData:
@@ -59 +59 @@
 
   /// Generate object linked to other reference (e.g. for subscripts)
-  CountedRefData(leftv wrapped, back_ptr back):
-    base(), m_data(wrapped), m_ring(back->m_ring), m_back(back) {
+  CountedRefData(leftv wrapid, back_ptr back):
+    base(), m_data(wrapid), m_ring(back->m_ring), m_back(back) {
   }
 
@@ -101 +101 @@
 
   /// Generate object for indexing
-  ptr_type subscripted() { return new self(m_data.idify(root()), weakref()); }
+  ptr_type wrapid() { return new self(m_data.idify(root()), weakref()); }
 
   /// Gerenate  weak (but managed) reference to @c *this
@@ -151 +151 @@
 
   /// Reassign actual object
-  BOOLEAN assign(leftv result, leftv arg) {
+  BOOLEAN assign(leftv result, leftv arg) { 
+
     if (!m_data.isid()) {
       (*this) = arg;
@@ -183 +184 @@
   ring_ptr m_ring;
 
-  /// Reference to actual object for indexed structures  
+  /// Reference to actual object for wrap structures  
   back_ptr m_back;
 };
@@ -192 +193 @@
 
 /// blackbox support - initialization
-/// @note deals as marker for compatible references, too.
 void* countedref_Init(blackbox*)
 {
@@ -237 +237 @@
   }
 
-  BOOLEAN assign(leftv result, leftv arg) { 
+  BOOLEAN assign(leftv result, leftv arg) {
     return m_data->assign(result,arg);
   }
@@ -317 +317 @@
   /// Recover the actual object from Singular interpreter object
   static self cast(leftv arg) {
-    assume((arg != NULL) && is_ref(arg));
+    assume(arg != NULL); assume(is_ref(arg));
     return self::cast(arg->Data());
   }
@@ -348 +348 @@
   }
 
-
 protected:
   /// Store pointer to actual data
@@ -380 +379 @@
   // Case: replace assignment behind reference
   if (result->Data() != NULL) {
-    return CountedRef::resolve(arg) || 
-      CountedRef::cast(result).assign(result, arg);     
+    CountedRef ref = CountedRef::cast(result);
+    return CountedRef::resolve(arg) || ref.assign(result, arg); 
   }
   
@@ -409 +408 @@
   if(op == TYPEOF_CMD)
     return blackboxDefaultOp1(op, res, head);
-
 
   if (countedref_CheckInit(res, head)) return TRUE;
@@ -418 +416 @@
   }
 
-  if(op == LINK_CMD) {
-    res->rtyp =  DEF_CMD;
-    return CountedRef::cast(head).dereference(head) || iiAssign(res, head);
-  }
-
-  return CountedRef::cast(head).dereference(head) || iiExprArith1(res, head, op);
-}
-
-/// blackbox support - binary operations
+  CountedRef ref = CountedRef::cast(head);
+  return ref.dereference(head) ||
+    iiExprArith1(res, head, op == LINK_CMD? head->Typ(): op);
+}
+
+
+
+/// blackbox support - binary operations (resolve seocnd argument)
+static BOOLEAN countedref_Op2_(int op, leftv res, leftv head, leftv arg)
+{
+  if (CountedRef::is_ref(arg)) {
+    CountedRef ref = CountedRef::cast(arg);
+    return ref.dereference(arg) || iiExprArith2(res, head, op, arg);
+  }
+  return  iiExprArith2(res, head, op, arg);
+}
+
 BOOLEAN countedref_Op2(int op, leftv res, leftv head, leftv arg)
 {
-   return countedref_CheckInit(res, head) ||
-    CountedRef::cast(head).dereference(head) ||
-    CountedRef::resolve(arg) ||
-    iiExprArith2(res, head, op, arg);
+  if (countedref_CheckInit(res, head)) return TRUE;
+  if (CountedRef::is_ref(head)) {
+    CountedRef ref = CountedRef::cast(head);
+    return ref.dereference(head) || countedref_Op2_(op, res, head, arg);
+  }
+  return countedref_Op2_(op, res, head, arg);
+}
+
+static BOOLEAN countedref_Op3__(int op, leftv res, leftv head, leftv arg1, leftv arg2)
+{
+
+  if (CountedRef::is_ref(arg2)) {
+    CountedRef ref = CountedRef::cast(arg2);
+    return ref.dereference(arg2) || iiExprArith3(res, op, head, arg1, arg2);
+  }
+  return iiExprArith3(res, op, head, arg1, arg2);
+}
+
+static BOOLEAN countedref_Op3_(int op, leftv res, leftv head, leftv arg1, leftv arg2)
+{
+  if (CountedRef::is_ref(arg1)) {
+    CountedRef ref = CountedRef::cast(arg1);
+    return ref.dereference(arg1) || countedref_Op3__(op, res, head, arg1, arg2);
+  }
+  return countedref_Op3__(op, res, head, arg1, arg2);
 }
 
@@ -439 +466 @@
 BOOLEAN countedref_Op3(int op, leftv res, leftv head, leftv arg1, leftv arg2)
 {
-  return countedref_CheckInit(res, head) ||
-    CountedRef::cast(head).dereference(head) || 
-    CountedRef::resolve(arg1) || CountedRef::resolve(arg2) ||
-    iiExprArith3(res, op, head, arg1, arg2);
+  if (countedref_CheckInit(res, head)) return TRUE;
+  if (CountedRef::is_ref(head)) {
+    CountedRef ref = CountedRef::cast(head);
+    return ref.dereference(head) || countedref_Op3_(op, res, head, arg1, arg2);
+  }
+  return countedref_Op3_(op, res, head, arg1, arg2);
 }
 
@@ -489 +518 @@
 
   /// Temporarily wrap with identifier for '[' and '.' operation
-  self subscripted() { return self(m_data->subscripted()); }
-
-  ///
+  self wrapid() { return self(m_data->wrapid()); }
+
+  /// Generate weak reference (may get invalid)
   data_type::back_ptr weakref() { return m_data->weakref(); }
 
+  /// Recover more information (e.g. subexpression data) from computed result
   BOOLEAN retrieve(leftv res, int typ) { 
     return (m_data->retrieve(res) && outcast(res, typ));
@@ -505 +535 @@
 }
 
+/// Blackbox support - unary operation for shared data
+BOOLEAN countedref_Op1Shared(int op, leftv res, leftv head)
+{
+  if(op == TYPEOF_CMD)
+    return blackboxDefaultOp1(op, res, head);
+
+  if (countedref_CheckInit(res, head)) return TRUE;
+
+  if ((op == DEF_CMD) || (op == head->Typ())) {
+    res->rtyp = head->Typ();
+    return iiAssign(res, head);
+  }
+
+  CountedRefShared ref = CountedRefShared::cast(head);
+  CountedRefShared wrap = ref.wrapid();
+  int typ = head->Typ();
+  return wrap.dereference(head) || 
+    iiExprArith1(res, head, op == LINK_CMD? head->Typ(): op) ||
+    wrap.retrieve(res, typ);
+}
+
+
 /// blackbox support - binary operations
 BOOLEAN countedref_Op2Shared(int op, leftv res, leftv head, leftv arg)
 {
-  if  ((op == '[') || (op == '.')) {
-    if (countedref_CheckInit(res, head))  return TRUE;
-    CountedRefShared indexed = CountedRefShared::cast(head).subscripted();
-
+  if (countedref_CheckInit(res, head))  return TRUE;
+
+  if (CountedRefShared::is_ref(head)) {
+    CountedRefShared wrap = CountedRefShared::cast(head).wrapid();
     int typ = head->Typ();
-    return indexed.dereference(head) || CountedRefShared::resolve(arg) || 
-      iiExprArith2(res, head, op, arg) || indexed.retrieve(res, typ);
-  }
-
-  return countedref_Op2(op, res, head, arg);
+    return wrap.dereference(head) || countedref_Op2_(op, res, head, arg) ||
+      wrap.retrieve(res, typ);
+  }
+
+  return countedref_Op2_(op, res, head, arg);
 }
 
@@ -566 +618 @@
     return jjLIST_PL(res, args);
   }
-
-  return CountedRef::cast(args).dereference(args) || iiExprArithM(res, args, op);
+  CountedRef ref = CountedRef::cast(args);
+  return ref.dereference(args) || iiExprArithM(res, args, op);
 }
 
@@ -575 +627 @@
   /// Case: replace assignment behind reference
   if ((result->Data() != NULL)  && !CountedRefShared::cast(result).unassigned()) {
-    if (CountedRefShared::resolve(arg)) return TRUE;
-    return CountedRefShared::cast(result).assign(result, arg);
-    return FALSE;
+    CountedRef ref = CountedRef::cast(result);
+    return CountedRef::resolve(arg) || ref.assign(result, arg); 
   }
   
@@ -587 +638 @@
   }  
   if(CountedRefShared::cast(result).unassigned()) {
-   // CountedRefShared::cast(result) = arg;
    return CountedRefShared::cast(result).assign(result, arg);
 
@@ -649 +699 @@
   bbxshared->blackbox_Assign  = countedref_AssignShared;
   bbxshared->blackbox_destroy = countedref_destroyShared;
+  bbxshared->blackbox_Op1     = countedref_Op1Shared;
   bbxshared->blackbox_Op2     = countedref_Op2Shared;
   bbxshared->blackbox_Init    = countedref_InitShared;