Changeset c232af in git for Singular/lists.cc

Timestamp:

Aug 14, 2000, 2:58:28 PM (24 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

d26c2e9dd38f1531c0e77c38e6177109182b5bca

Parents:

4697a8a1ccbf49d0048033ea29c651e3966ba729

Message:

* omalloc stuff


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

File:

• Singular/lists.cc (modified) (18 diffs)

Singular/lists.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: lists.cc,v 1.21 2000-05-18 14:04:01 Singular Exp $ */
+/* $Id: lists.cc,v 1.22 2000-08-14 12:56:34 obachman Exp $ */
 /*
 * ABSTRACT: handling of the list type
@@ -20 +20 @@
 #include "lists.h"
 
+omBin slists_bin = omGetSpecBin(sizeof(slists));
+
 lists lCopy(lists L)
 {
-  lists N=(lists)Alloc0SizeOf(slists);
+  lists N=(lists)omAlloc0Bin(slists_bin);
   int n=L->nr;
   if (L->nr>=0)
@@ -44 +46 @@
 BOOLEAN lAdd(leftv res, leftv u, leftv v)
 {
-  lists l=(lists) AllocSizeOf(slists);
+  lists l=(lists) omAllocBin(slists_bin);
   lists ul=(lists)u->CopyD();
   lists vl=(lists)v->CopyD();
@@ -62 +64 @@
     l->m[i+ul->nr+1].data=vl->m[i].data;
   }
-  Free((ADDRESS)ul->m,(ul->nr+1)*sizeof(sleftv));
-  FreeSizeOf((ADDRESS)ul,slists);
-  Free((ADDRESS)vl->m,(vl->nr+1)*sizeof(sleftv));
-  FreeSizeOf((ADDRESS)vl,slists);
+  if (ul->m != NULL) // OB: ???
+    omFreeSize((ADDRESS)ul->m,(ul->nr+1)*sizeof(sleftv));
+  omFreeBin((ADDRESS)ul, slists_bin);
+  if (vl->m != NULL) // OB: ????
+    omFreeSize((ADDRESS)vl->m,(vl->nr+1)*sizeof(sleftv));
+  omFreeBin((ADDRESS)vl, slists_bin);
   memset(u,0,sizeof(*u));
   memset(v,0,sizeof(*v));
@@ -80 +84 @@
   if ((pos<0)||(v->rtyp==NONE))
     return NULL;
-  lists l=(lists) AllocSizeOf(slists);
+  lists l=(lists) omAllocBin(slists_bin);
   l->Init(max(ul->nr+2,pos+1));
   int i,j;
@@ -96 +100 @@
   l->m[pos].flag=v->flag;
   l->m[pos].attribute=v->CopyA();
-  Free((ADDRESS)ul->m,(ul->nr+1)*sizeof(sleftv));
-  FreeSizeOf((ADDRESS)ul,slists);
+  if (ul->m != NULL) // OB: ?????
+    omFreeSize((ADDRESS)ul->m,(ul->nr+1)*sizeof(sleftv));
+  omFreeBin((ADDRESS)ul, slists_bin);
   return l;
 }
@@ -153 +158 @@
   {
     int i,j;
-    lists l=(lists) AllocSizeOf(slists);
+    lists l=(lists) omAllocBin(slists_bin);
     l->Init(ul->nr);
 
@@ -200 +205 @@
   int typ0, intvec ** weights)
 {
-  lists L=(lists)Alloc0SizeOf(slists);
+  lists L=(lists)omAlloc0Bin(slists_bin);
   if (length<=0)
   {
@@ -249 +254 @@
         if ((weights!=NULL) && (weights[i]!=NULL))
         {
-          atSet((idhdl)&L->m[i],mstrdup("isHomog"),weights[i],INTVEC_CMD);
+          atSet((idhdl)&L->m[i],omStrDup("isHomog"),weights[i],INTVEC_CMD);
           weights[i] = NULL;
         }
@@ -263 +268 @@
       i++;
     }
-    Free((ADDRESS)r,oldlength*sizeof(ideal));
+    omFreeSize((ADDRESS)r,oldlength*sizeof(ideal));
     if (i==0)
     {
@@ -303 +308 @@
     return NULL;
   }
-  r=(ideal *)Alloc0((*len)*sizeof(ideal));
-  w=(intvec**)Alloc0((*len)*sizeof(intvec*));
+  r=(ideal *)omAlloc0((*len)*sizeof(ideal));
+  w=(intvec**)omAlloc0((*len)*sizeof(intvec*));
   int i=0;
   *typ0=MODUL_CMD;
@@ -314 +319 @@
       {
         Werror("element %d is not of type module",i+1);
-        Free((ADDRESS)r,(*len)*sizeof(ideal));
+        omFreeSize((ADDRESS)r,(*len)*sizeof(ideal));
         return NULL;
       }
@@ -325 +330 @@
     }
     r[i]=(ideal)L->m[i].data;
-    tw=(intvec*)atGet((idhdl)&L->m[i],mstrdup("isHomog"));
+    tw=(intvec*)atGet((idhdl)&L->m[i],omStrDup("isHomog"));
     if (tw!=NULL)
     {
@@ -346 +351 @@
       if (w[j]!=NULL) delete w[j];
     }
-    Free((ADDRESS)w,(*len)*sizeof(intvec*));
+    omFreeSize((ADDRESS)w,(*len)*sizeof(intvec*));
   }
   else
@@ -360 +365 @@
   if (l->nr == -1)
   {
-    if (typed) return mstrdup("list()");
-    return mstrdup("");
-  }
-
-  char** slist = (char**) Alloc((l->nr+1) * sizeof(char*));
+    if (typed) return omStrDup("list()");
+    return omStrDup("");
+  }
+
+  char** slist = (char**) omAlloc((l->nr+1) * sizeof(char*));
   int i, j, k;
   char *s;
@@ -371 +376 @@
     slist[i] = l->m[i].String(NULL, typed, dim);
     assume(slist[i] != NULL);
-    mmTestL(slist[i]);
+    omCheckAddr(slist[i]);
     if (*(slist[i]) != '\0')
     {
@@ -378 +383 @@
     }
   }
-  s = (char*) AllocL(j+k+2+(typed ? 10 : 0) + (dim == 2 ? k : 0));
+  s = (char*) omAlloc(j+k+2+(typed ? 10 : 0) + (dim == 2 ? k : 0));
 
   if (typed)
@@ -393 +398 @@
       if (dim == 2) strcat(s, "\n");
     }
-    mmTestL(s);
-    FreeL(slist[i]);
+    omCheckAddr(s);
+    omFree(slist[i]);
   }
   if (k > 0) s[strlen(s) - (dim == 2 ? 2 : 1)] = '\0';
   if (typed) strcat(s, ")");
-  mmTestL(s);
-  Free(slist, (l->nr+1) * sizeof(char*));
+  omCheckAddr(s);
+  omFreeSize(slist, (l->nr+1) * sizeof(char*));
   return s;
 }