Changeset f8362b in git for Singular

Timestamp:

Feb 4, 2005, 3:33:13 PM (19 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'c5facdfddea2addfd91babd8b9019161dea4b695')

Children:

ece273bf86ecd2568558896ab9ce46bd773d7998

Parents:

78dd2b3d0b1cc9d2694b5c5b6307a7b7483596c2

Message:

*hannes: proc variables


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

File:

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

Singular/iparith.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iparith.cc,v 1.334 2005-02-03 16:41:07 Singular Exp $ */
+/* $Id: iparith.cc,v 1.335 2005-02-04 14:33:13 Singular Exp $ */
 
 /*
@@ -1445 +1445 @@
 static BOOLEAN jjPROC(leftv res, leftv u, leftv v)
 {
+  idrec tmp_proc;
+  BOOLEAN t=FALSE;
+  if (u->rtyp!=IDHDL) 
+  {
+    tmp_proc.id="_auto";
+    tmp_proc.typ=IDHDL;
+    tmp_proc.data.pinf=(procinfo *)u->data;  
+    tmp_proc.ref=1;
+    u->data=(void *)&tmp_proc;
+    t=TRUE;
+  }
 #ifdef HAVE_NS
   leftv sl;
@@ -1454 +1465 @@
   leftv sl = iiMake_proc((idhdl)u->data,v);
 #endif /* HAVE_NS */
+  if (t)
+  {
+    u->rtyp=PROC_CMD;
+    u->data=(void *)tmp_proc.data.pinf;
+  }
   if (sl==NULL)
   {
@@ -2827 +2843 @@
 static BOOLEAN jjPROC1(leftv res, leftv u)
 {
-  if ((u->rtyp!=IDHDL) || (u->e!=NULL))
-    return TRUE;
-#ifdef HAVE_NS
-  leftv sl = iiMake_proc((idhdl) u->data,u->req_packhdl,NULL);
-#else /* HAVE_NS */
-  leftv sl = iiMake_proc((idhdl) u->data,NULL);
-#endif /* HAVE_NS */
-  if (sl==NULL)
-  {
-    return TRUE;
-  }
-  else
-  {
-    memcpy(res,sl,sizeof(sleftv));
-  }
-  return FALSE;
+  return jjPROC(res,u,NULL);
 }
 static BOOLEAN jjBAREISS(leftv res, leftv v)