Changeset c4dab4 in git

Timestamp:

Mar 15, 2011, 1:31:39 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

dd5534a607684bd18fa828b336e69ddaf1ce55d1

Parents:

aa2a4e7bda99071f7c4636b115e0c2f765522836

Message:

copy/deleting attributes of all types

git-svn-id: file:///usr/local/Singular/svn/trunk@13972 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

Singular

Files:

• attrib.cc (modified) (4 diffs)
• attrib.h (modified) (1 diff)
• ipid.cc (modified) (2 diffs)
• subexpr.cc (modified) (6 diffs)
• subexpr.h (modified) (1 diff)

Singular/attrib.cc

@@ -58 +58 @@
 static void attr_free(attr h, const ring r=currRing)
 {
-  switch (h->atyp)
-  {
-  case INTVEC_CMD:
-  case INTMAT_CMD:
-    delete (intvec *)(h->data);
-    break;
-  case IDEAL_CMD:
-  case MODUL_CMD:
-  case MATRIX_CMD:
-    id_Delete((ideal *)&(h->data),r);
-    break;
-  case POLY_CMD:
-  case VECTOR_CMD:
-    p_Delete((poly *)&(h->data),r);
-    break;
-  case INT_CMD:
-    break;
-  case STRING_CMD:
-    omFree((ADDRESS)(h->data));
-    break;
-#ifdef TEST
-  default:
-    ::Print("atKill: unknown type(%s [%d]) of attribute >>%s<<\n", Tok2Cmdname(h->atyp), h->atyp, h->name);  /* DEBUG */
-#endif
-  } /* end switch: (atyp) */
+  s_internalDelete(h->atyp,h->data,r);
   h->data=NULL;
 }
@@ -180 +156 @@
   if (root!=NULL)
   {
-    root->attribute=root->attribute->set(name,data,typ);
+    if ((IDTYP(root)!=RING_CMD)
+    && (IDTYP(root)!=QRING_CMD)
+    && (!RingDependend(IDTYP(root)))&&(RingDependend(typ)))
+      WerrorS("cannot set ring-dependend objects at this type");
+    else  
+      root->attribute=root->attribute->set(name,data,typ);
   }
 }
@@ -194 +175 @@
     else
     {
+      int rt=root->Typ();
+      if ((rt!=RING_CMD)
+      && (rt!=QRING_CMD)
+      && (!RingDependend(rt))&&(RingDependend(typ)))
+        WerrorS("cannot set ring-dependend objects at this type");
+      else  
       if (root->rtyp==IDHDL)
       {
         idhdl h=(idhdl)root->data;
         h->attribute=h->attribute->set(name,data,typ);
-        //??// root->attribute=h->attribute;
       }
       else
@@ -223 +209 @@
   {
     temp1 = temp->next;
+    omCheckAddr(temp);
     temp->kill(r);
     temp = temp1;

Singular/attrib.h

@@ -16 +16 @@
 {
   public:
-    void Init() { memset(this,0,sizeof(*this)); }
+    inline void Init() { memset(this,0,sizeof(*this)); }
     const char *  name;
     void *  data;

Singular/ipid.cc

@@ -372 +372 @@
   if (h->attribute!=NULL)
   {
-    //at_KillAll(h,r);
     h->attribute=NULL;
   }
-  // ring / qring  --------------------------------------------------------
-  if ((IDTYP(h) == RING_CMD) || (IDTYP(h) == QRING_CMD))
-  {
-    // any objects defined for this ring ? -> done by rKill
-    rKill(h);
-  }
-  // package -------------------------------------------------------------
-  else if (IDTYP(h) == PACKAGE_CMD)
+  if (IDTYP(h) == PACKAGE_CMD)
   {
     if (strcmp(IDID(h),"Top")==0)
@@ -413 +405 @@
     iiCheckPack(currPack);
   }
-  // poly / vector -------------------------------------------------------
-  else if ((IDTYP(h) == POLY_CMD) || (IDTYP(h) == VECTOR_CMD))
-  {
-    assume(r!=NULL);
-    p_Delete(&IDPOLY(h),r);
-  }
-  // ideal / module/ matrix / map ----------------------------------------
-  else if ((IDTYP(h) == IDEAL_CMD)
-           || (IDTYP(h) == MODUL_CMD)
-           || (IDTYP(h) == MATRIX_CMD)
-           || (IDTYP(h) == MAP_CMD))
-  {
-    assume(r!=NULL);
-    ideal iid = IDIDEAL(h);
-    if (IDTYP(h) == MAP_CMD)
-    {
-      map im = IDMAP(h);
-      omFree((ADDRESS)im->preimage);
-    }
-    id_Delete(&iid,r);
-  }
-  // string -------------------------------------------------------------
-  else if (IDTYP(h) == STRING_CMD)
-  {
-    omFree((ADDRESS)IDSTRING(h));
-    //IDSTRING(h)=NULL;
-  }
-  // proc ---------------------------------------------------------------
-  else if (IDTYP(h) == PROC_CMD)
-  {
-    if (piKill(IDPROC(h))) return;
-  }
-  // number -------------------------------------------------------------
-  else if (IDTYP(h) == NUMBER_CMD)
-  {
-    assume(r!=NULL);
-    n_Delete(&IDNUMBER(h),r);
-  }
-  // bigint -------------------------------------------------------------
-  else if (IDTYP(h) == BIGINT_CMD)
-  {
-    nlDelete(&IDNUMBER(h),NULL);
-  }
-  // intvec / intmat  ---------------------------------------------------
-  else if ((IDTYP(h) == INTVEC_CMD)||(IDTYP(h) == INTMAT_CMD))
-  {
-    delete IDINTVEC(h);
-  }
-  // list  -------------------------------------------------------------
-  else if (IDTYP(h)==LIST_CMD)
-  {
-    IDLIST(h)->Clean(r);
-    //IDLIST(h)=NULL;
-  }
-  // link  -------------------------------------------------------------
-  else if (IDTYP(h)==LINK_CMD)
-  {
-    slKill(IDLINK(h));
-  }
-  else if(IDTYP(h)==RESOLUTION_CMD)
-  {
-    assume(r!=NULL);
-    if (IDDATA(h)!=NULL)
-      syKillComputation((syStrategy)IDDATA(h),r);
-  }
-  // blackbox -------------------------------------------------------------
-  else if (IDTYP(h)>MAX_TOK)
-  {
-    blackbox *bb=getBlackboxStuff(IDTYP(h));
-    if (bb!=NULL) bb->blackbox_destroy(bb,IDDATA(h));
-    IDDATA(h)=NULL;
-  }
-#ifdef TEST
-  else if ((IDTYP(h)!= INT_CMD)
-  &&(IDTYP(h)!=DEF_CMD)
-  &&(IDTYP(h)!=ALIAS_CMD)
-  &&(IDTYP(h)!=NONE))
-    Warn("unknown type to kill: %s(%d)",Tok2Cmdname(IDTYP(h)),IDTYP(h));
-#endif
-
+  else if ((IDTYP(h)==RING_CMD)||(IDTYP(h)==QRING_CMD))
+    rKill(h);
+  else
+    s_internalDelete(IDTYP(h),IDDATA(h),r);
   //  general  -------------------------------------------------------------
   // now dechain it and delete idrec

Singular/subexpr.cc

@@ -234 +234 @@
 
         default:
-          if (t>MAX_TOK)
-          {
-            blackbox * bb=getBlackboxStuff(t);
+          if (t>MAX_TOK)
+          {
+            blackbox * bb=getBlackboxStuff(t);
             PrintNSpaces(spaces);
-            if (bb!=NULL) { bb->blackbox_Print(bb,d); }
-            else          { ::Print("Print: blackbox %d(bb=NULL)",t); }
-          }
-          else
+            if (bb!=NULL) { bb->blackbox_Print(bb,d); }
+            else          { ::Print("Print: blackbox %d(bb=NULL)",t); }
+          }
+          else
           ::Print("Print:unknown type %s(%d)", Tok2Cmdname(t),t);
       } /* end switch: (Typ()) */
@@ -292 +292 @@
   if (data!=NULL)
   {
-    switch (rtyp)
-    {
-      case INTVEC_CMD:
-      case INTMAT_CMD:
-        delete (intvec *)data;
-        break;
-      case MAP_CMD:
-        omFree((ADDRESS)((map)data)->preimage);
-        ((map)data)->preimage=NULL;
-        // no break: kill the image as an ideal
-      case MATRIX_CMD:
-      case MODUL_CMD:
-      case IDEAL_CMD:
-        if ((((long)data) & 3)==0)
-        {
-          if(r!=NULL) id_Delete((ideal *)(&data),r);
-        }
-        break;
-      case STRING_CMD:
-        omFree((ADDRESS)data);
-        break;
-      case POLY_CMD:
-      case VECTOR_CMD:
-        if (r!=NULL) p_Delete((poly *)(&data),r);
-        break;
-      case NUMBER_CMD:
-        if (r!=NULL) n_Delete((number *)(&data),r);
-        break;
-      case BIGINT_CMD:
-        nlDelete((number *)(&data),r);
-        break;
-      case LIST_CMD:
-        ((lists)data)->Clean(r); // may contain ring-dep data
-        break;
-      case QRING_CMD:
-      case RING_CMD:
-        rKill((ring)data);
-        break;
-      case PROC_CMD:
-        piKill((procinfov)data);
-        break;
-      case LINK_CMD:
-        slKill((si_link)data);
-        break;
-      case COMMAND:
-      {
-        command cmd=(command)data;
-        if (cmd->arg1.rtyp!=0) cmd->arg1.CleanUp();
-        if (cmd->arg2.rtyp!=0) cmd->arg2.CleanUp();
-        if (cmd->arg3.rtyp!=0) cmd->arg3.CleanUp();
-        omFreeBin((ADDRESS)data, sip_command_bin);
-        break;
-      }
-      case RESOLUTION_CMD:
-        if (r!=NULL) syKillComputation((syStrategy)data,r);
-        break;
-      case IDHDL:
-        attribute=NULL; // is only a pointer to attribute of id
-        break;
-      // the following types do not take memory
-      // or are not copied
-      case PACKAGE_CMD:
-      case ANY_TYPE:
-      case VECHO:
-      case VPRINTLEVEL:
-      case VCOLMAX:
-      case VTIMER:
-      case VRTIMER:
-      case VOICE:
-      case VMAXDEG:
-      case VMAXMULT:
-      case TRACE:
-      case VSHORTOUT:
-      case VNOETHER:
-      case VMINPOLY:
-      case 0:
-      case INT_CMD:
-        break;
-      default:
-      {
-        if (rtyp<=MAX_TOK)
-        ::Print("CleanUp: unknown type %d\n",rtyp);  /* DEBUG */
-        else if (data!=NULL)
-        {
-           blackbox *b=getBlackboxStuff(rtyp);
-           if (b!=NULL) b->blackbox_destroy(b,data);
-           data=NULL;
-        }
-      }
-    } /* end switch: (rtyp) */
+     if (rtyp==IDHDL) attribute=NULL; // is only a pointer to attribute of id
+     else s_internalDelete(rtyp,data,r);
     //data=NULL; // will be done by Init() at the end
   }
@@ -410 +322 @@
       default:
       {
-        attr t;
-        while (attribute!=NULL)
-        {
-          t=attribute->next;
-          attribute->kill(currRing);
-          attribute=t;
-        }
+        if (attribute!=NULL) attribute->killAll(r);
       }
     }
@@ -508 +414 @@
       {
         blackbox *b=getBlackboxStuff(t);
-        if (b!=NULL) return b->blackbox_Copy(b,d);
+        if (b!=NULL) return b->blackbox_Copy(b,d);
         return NULL;
       }
@@ -519 +425 @@
 }
 
-
+void s_internalDelete(const int t,  void *d, const ring r)
+{
+  switch (t)
+  {
+    case INTVEC_CMD:
+    case INTMAT_CMD:
+    {
+      intvec *v=(intvec*)d;
+      delete v;
+      break;
+    }
+    case MAP_CMD:
+    {
+      map m=(map)d;
+      omFree((ADDRESS)m->preimage);
+      m->preimage=NULL;
+      /* no break: continue as IDEAL*/
+    }
+    case MATRIX_CMD:
+    case IDEAL_CMD:
+    case MODUL_CMD:
+    {
+      ideal i=(ideal)d;
+      id_Delete(&i,r);
+      break;
+    }
+    case STRING_CMD:
+      omFree(d);
+      break;
+    //case POINTER_CMD:
+    //  return d;
+    //case PACKAGE_CMD:
+    //  return  (void *)paCopy((package) d);
+    case PROC_CMD:
+      piKill((procinfo*)d);
+      break;
+    case POLY_CMD:
+    case VECTOR_CMD:
+    {
+      poly p=(poly)d;
+      p_Delete(&p,r);
+      break;
+    }
+    case NUMBER_CMD:
+    {
+      number n=(number)d;
+      n_Delete(&n,r);
+      break;
+    }
+    case BIGINT_CMD:
+    {
+      number n=(number)d;
+      nlDelete(&n,NULL);
+      break;
+    }
+    case LIST_CMD:
+    {
+      lists l=(lists)d;
+      l->Clean(r);
+      break;
+    }
+    case LINK_CMD:
+    {
+      si_link l=(si_link)d;
+      slKill(l);
+      break;
+    }
+    case RING_CMD:
+    case QRING_CMD:
+    {
+      ring R=(ring)d;
+      #ifdef TEST
+      if (R==currRing)
+        PrintS("currRing?\n");
+      else
+      #endif
+      rKill(R);
+      break;
+    }
+    case RESOLUTION_CMD:
+    {
+      syStrategy s=(syStrategy)d;
+      if (s!=NULL) syKillComputation(s,r);
+      break;
+    }
+    case COMMAND:
+    {
+     command cmd=(command)d;
+     if (cmd->arg1.rtyp!=0) cmd->arg1.CleanUp(r);
+     if (cmd->arg2.rtyp!=0) cmd->arg2.CleanUp(r);
+     if (cmd->arg3.rtyp!=0) cmd->arg3.CleanUp(r);
+     omFreeBin((ADDRESS)d, sip_command_bin);
+     break;
+    }
+    case INT_CMD:
+    case DEF_CMD:
+    case ALIAS_CMD:
+    case POINTER_CMD:
+    case PACKAGE_CMD:
+    case IDHDL:
+    case NONE:
+    case ANY_TYPE:
+    case VECHO:
+    case VPRINTLEVEL:
+    case VCOLMAX:
+    case VTIMER:
+    case VRTIMER:
+    case VOICE:
+    case VMAXDEG:
+    case VMAXMULT:
+    case TRACE:
+    case VSHORTOUT:
+    case VNOETHER:
+    case VMINPOLY:
+    case LIB_CMD:
+    case 0: /* type in error case */
+      break; /* error recovery: do nothing */
+    //case COMMAND:
+    //case COMMAND:
+    default:
+    {
+      if (t>MAX_TOK)
+      {
+        blackbox *b=getBlackboxStuff(t);
+        if (b!=NULL) b->blackbox_destroy(b,d);
+        break;
+      }
+      else
+      Warn("s_internalDelete: cannot delete type %s(%d)",
+            Tok2Cmdname(t),t);
+    }
+  }
+}
 
 void * slInternalCopy(leftv source, const int t, void *d, Subexpr e)
@@ -823 +861 @@
 
         default:
-          if(t> MAX_TOK)
-          {
-            blackbox *bb=getBlackboxStuff(t);
-            if (bb!=NULL) return bb->blackbox_String(bb,d);
-          }
+          if(t> MAX_TOK)
+          {
+            blackbox *bb=getBlackboxStuff(t);
+            if (bb!=NULL) return bb->blackbox_String(bb,d);
+          }
     } /* end switch: (Typ()) */
   }

Singular/subexpr.h

@@ -120 +120 @@
 extern omBin libstack_bin;
 
+void s_internalDelete(const int t,  void *d, const ring r);
+
 #endif