Changeset bb2fb6 in git

Timestamp:

Oct 20, 2014, 1:04:13 AM (10 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

1965800c56ab5ae85bbaa4c89cbae5719bd81515

Parents:

e44b6585772fa41d9893199725238698a09c0ee2

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-10-20 01:04:13+02:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-10-22 13:55:04+02:00

Message:

Minor fixes

Location:

Singular

Files:

• attrib.cc (modified) (1 diff)
• dyn_modules/syzextra/mod_main.cc (modified) (1 diff)
• lists.h (modified) (1 diff)

Singular/attrib.cc

@@ -41 +41 @@
 attr sattr::Copy()
 {
-  if (this!=NULL)
-  {
-    omCheckAddrSize(this,sizeof(sattr));
-    attr n=(attr)omAlloc0Bin(sattr_bin);
-    n->atyp=atyp;
-    if (name!=NULL) n->name=omStrDup(name);
-    n->data=CopyA();
-    if (next!=NULL)
-    {
-      n->next=next->Copy();
-    }
-    return n;
-  }
-  else
-    return NULL;
+  assume (this!=NULL);
+
+  omCheckAddrSize(this,sizeof(sattr));
+  attr n=(attr)omAlloc0Bin(sattr_bin);
+  n->atyp=atyp;
+  if (name!=NULL) n->name=omStrDup(name);
+  n->data=CopyA();
+  if (next!=NULL)
+  {
+    n->next=next->Copy();
+  }  
+  return n;
 }
 

Singular/dyn_modules/syzextra/mod_main.cc

@@ -1188 +1188 @@
 
   _res->length = length + 1; // index + 1;
-  _res->fullres = (resolvente)omAlloc0((_res->length)*sizeof(ideal));
+  _res->fullres = (resolvente)omAlloc0((_res->length+1)*sizeof(ideal));
   int index = 0;
   _res->fullres[index++] = M;

Singular/lists.h

@@ -25 +25 @@
     void Clean(ring r=currRing)
     {
-      if (this!=NULL)
+      assume (this!=NULL);
+      
+      if (nr>=0)
       {
-        if (nr>=0)
+        int i;
+        for(i=nr;i>=0;i--)
         {
-          int i;
-          for(i=nr;i>=0;i--)
-          {
-            if (m[i].rtyp!=DEF_CMD) m[i].CleanUp(r);
-          }
-          omFreeSize((ADDRESS)m, (nr+1)*sizeof(sleftv));
-          nr=-1;
+          if (m[i].rtyp!=DEF_CMD) m[i].CleanUp(r);
         }
-        //omFreeSize((ADDRESS)this, sizeof(slists));
-        omFreeBin((ADDRESS)this,slists_bin);
+        omFreeSize((ADDRESS)m, (nr+1)*sizeof(sleftv));
+        nr=-1;
       }
+      //omFreeSize((ADDRESS)this, sizeof(slists));
+      omFreeBin((ADDRESS)this,slists_bin);
     }
-  INLINE_THIS void Init(int l=0);
+    INLINE_THIS void Init(int l=0);
     int    nr; /* the number of elements in the list -1 */
                /* -1: empty list */