Changeset 848bd5 in git

Timestamp:

Feb 24, 2014, 4:13:27 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

9c82d8656d6a8fc8ae0ab3fd0989ebbbe71544ff

Parents:

ae4fd2a2c8a8cd01517f045ee0e8a5c0ddac75df715dd47563498e6a22cb8c3f7e422c912d814f52

Message:

Merge pull request #515 from surface-smoothers/fix.baseringchange.in.HomJJ

fixed accidental basering change in HomJJ

Files:

• Singular/LIB/normal.lib (modified) (1 diff)
• Singular/iparith.cc (modified) (1 diff)
• Singular/ipshell.cc (modified) (1 diff)
• Singular/subexpr.cc (modified) (1 diff)
• doc/reference.doc (modified) (previous)
• kernel/kutil.cc (modified) (2 diffs)

Singular/LIB/normal.lib

@@ -925 +925 @@
    L = insert(L,0,1);
    L[3] = delt;
+   setring(P);
    return(L);
 }

Singular/iparith.cc

@@ -2495 +2495 @@
 {
   res->data=(char *)idSect((ideal)u->Data(),(ideal)v->Data());
-  setFlag(res,FLAG_STD);
   return FALSE;
 }

Singular/ipshell.cc

@@ -2198 +2198 @@
     lists v=(lists)L->m[1].Data();
     R->N = v->nr+1;
+    if (R->N<=0) 
+    {
+      WerrorS("no ring variables");
+      goto rCompose_err;
+    }
     R->names   = (char **)omAlloc0(R->N * sizeof(char_ptr));
     int i;

Singular/subexpr.cc

@@ -954 +954 @@
         return INT_CMD;
       case VMINPOLY:
+        data=NULL;
         return NUMBER_CMD;
       case VNOETHER:
+        data=NULL;
         return POLY_CMD;
       //case COMMAND:

kernel/kutil.cc

@@ -725 +725 @@
   }
 
-  if (i >= 0 && T->pLength != 0
-  && ! rIsSyzIndexRing(currRing) && T->pLength != pLength(p))
+  if ((i >= 0) && (T->pLength != 0)
+  && (! rIsSyzIndexRing(currRing)) && (T->pLength != pLength(p)))
   {
     int l=T->pLength;
@@ -5510 +5510 @@
   {
     L->length = 0;
+    L->pLength = 0;
   }