Changeset f88521 in git

Timestamp:

Aug 30, 2012, 4:13:11 PM (11 years ago)

Author:

Alexander Dreyer <alexander.dreyer@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

a5e907a16ec70a7bfd4c506efb3f1a7b48693387

Parents:

2fbb4e014a0f3dda591b3df6f317ef27d9856de7

git-author:

Alexander Dreyer <alexander.dreyer@itwm.fraunhofer.de>2012-08-30 16:13:11+02:00

git-committer:

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

Message:

fix: allow shared(newstr.sh)=value; assignment for non-shared rhs

File:

• Singular/countedref.cc (modified) (13 diffs)

Singular/countedref.cc

@@ -94 +94 @@
 
   //{ @name Reference count interface
-  count_type count() const { return (*this? m_ptr->ref: 1); }
+  count_type count() const { return (*this? m_ptr->ref: 0); }
   void reclaim() { if (*this) ++m_ptr->ref; }
   void release() { 
@@ -284 +284 @@
     return *this;
   }
-
+  int Typ() const {return m_data->Typ(); }
    leftv access() { return m_data; }
 };
@@ -381 +381 @@
 
   CountedRefPtr<ring, true> Ring() { return m_ring; }
-
+  int Typ() const {return m_data->Typ(); }
 private:
+
   /// Raise error message and return @c TRUE
   BOOLEAN complain(const char* text) const  {
@@ -415 +416 @@
 
 
+
 inline void CountedRefPtr_kill(CountedRefData* data) { delete data; }
 
@@ -430 +432 @@
   static BOOLEAN is_ref(leftv arg) {
     int typ = arg->Typ();
-    return ((typ > MAX_TOK) &&
-           (getBlackboxStuff(typ)->blackbox_Init == countedref_Init));
+    return ((typ==CountedRefEnv::ref_id())  ||(typ==CountedRefEnv::sh_id()) ||
+            (typ==CountedRefEnv::idx_id()) );
+    //    return ((typ > MAX_TOK) &&
+    //            (getBlackboxStuff(typ)->blackbox_Init == countedref_Init));
   }
 
@@ -465 +469 @@
 
   /// Construct reference data object from
-  BOOLEAN outcast(leftv result) {
-    if (result->rtyp == IDHDL)
-      IDDATA((idhdl)result->data) = (char *)outcast();
+  BOOLEAN outcast(leftv res) {
+    if (res->rtyp == IDHDL)
+      IDDATA((idhdl)res->data) = (char *)outcast();
     else
-      result->data = (void *)outcast();
+      res->data = (void *)outcast();
     return FALSE;
   }
@@ -518 +522 @@
   BOOLEAN name(leftv res) { return construct(res, operator*()->Name()); }
 
+  /// Check whther argument is not defined yet
+  BOOLEAN undefined(leftv res) { return construct(res, operator*()->Typ() == NONE); }
+
   /// Recover the actual object from raw Singular data
   static self cast(void* data) {
@@ -536 +543 @@
     return (arg->next != NULL) && resolve(arg->next);
   }
-
+  int Typ() const {return m_data->Typ(); }
 protected:
   /// Construct integer value
@@ -612 +619 @@
     return blackboxDefaultOp1(op, res, head);
 
+
   if (countedref_CheckInit(res, head)) return TRUE;
-
-  if(op == head->Typ()) {
-    res->rtyp = op;
+ 
+  if ((op == DEF_CMD) || (op == head->Typ())) {
+    res->rtyp = head->Typ();
     return iiAssign(res, head);
   }
 
-  if(op == DEF_CMD) {
-    res->rtyp = DEF_CMD;
+  if(op == LINK_CMD) {
+    res->rtyp =  DEF_CMD;
     return CountedRef::cast(head).dereference(head) || iiAssign(res, head);
   }
@@ -748 +756 @@
 };
 
-
+void* countedref_InitShared(blackbox*)
+{
+  LeftvDeep empty;
+  return CountedRefShared(LeftvShallow(empty).operator->()).outcast();
+}
 
 /// blackbox support - binary operations
@@ -793 +805 @@
       if (strcmp(name, "name") == 0) return obj.name(res);
       if (strncmp(name, "type", 4) == 0) return obj.type(res);
+      if (strncmp(name, "undef", 5) == 0) return obj.undefined(res);
     }
     return TRUE;
   }
+  if (op == LIST_CMD){
+    res->rtyp=op;
+    return jjLIST_PL(res, args);
+  }
+
   return CountedRef::cast(args).dereference(args) || iiExprArithM(res, args, op);
 }
+
 /// blackbox support - assign element
 BOOLEAN countedref_AssignShared(leftv result, leftv arg)
 {
   /// Case: replace assignment behind reference
-  if ((result->Data()) != NULL) {
+  if ((result->Data() != NULL)  && (CountedRefShared::cast(result).Typ() !=0 )) {
     if (CountedRefShared::resolve(arg)) return TRUE;
     CountedRefShared::cast(result) = arg;
@@ -809 +828 @@
   
   /// Case: new reference to already shared data
-  if (result->Typ() == arg->Typ()) 
+  if (result->Typ() == arg->Typ()) {
+    if (result->Data() != NULL) 
+      CountedRefShared::cast(result).destruct();
     return CountedRefShared::cast(arg).outcast(result);
-
+  }  
+  if(CountedRefShared::cast(result).Typ() == 0) {
+    CountedRefShared::cast(result) = arg;
+    return FALSE;
+  }
+    
   /// Case: new shared data
   return CountedRefShared(arg).outcast(result);
@@ -845 +871 @@
   bbxshared->blackbox_destroy = countedref_destroyShared;
   bbxshared->blackbox_Op2     = countedref_Op2Shared;
+  bbxshared->blackbox_Init    = countedref_InitShared;
   bbxshared->data             = omAlloc0(newstruct_desc_size());
   CountedRefEnv::sh_id()=setBlackboxStuff(bbxshared, "shared");
+
 
   blackbox *bbxindexed =