Changeset f8c970f in git

Timestamp:

Feb 10, 2020, 9:32:43 PM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

aef2f88078eb68823122da1a077a35a6f8606c79

Parents:

ad2c165657ffefeec4d0a4d69bde05109f9b218f

Message:

ierror check: force single argument for map

File:

• Singular/iparith.cc (modified) (2 diffs)

Singular/iparith.cc

@@ -1644 +1644 @@
 {
   //Print("try to map %s with %s\n",$3.Name(),$1.Name());
-  leftv sl=NULL;
-  if ((v->e==NULL)&&(v->name!=NULL))
+  if ((v->e==NULL)&&(v->name!=NULL)&&(v->next==NULL))
   {
     map m=(map)u->Data();
-    sl=iiMap(m,v->name);
+    leftv sl=iiMap(m,v->name);
+    if (sl!=NULL)
+    {
+      memcpy(res,sl,sizeof(sleftv));
+      omFreeBin((ADDRESS)sl, sleftv_bin);
+      return FALSE;
+    }
   }
   else
@@ -1654 +1659 @@
     Werror("%s(<name>) expected",u->Name());
   }
-  if (sl==NULL) return TRUE;
-  memcpy(res,sl,sizeof(sleftv));
-  omFreeBin((ADDRESS)sl, sleftv_bin);
-  return FALSE;
+  return TRUE; /*sl==NULL or Werror*/
 }
 static BOOLEAN jjRING_1(leftv res, leftv u, leftv v)