Changeset 43fb497 in git

Timestamp:

Mar 8, 2017, 1:57:33 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

61c85ae94f50d7bc15aa6a2d330879d7cea6018a

Parents:

19ac4b85e6a4f60c9947c67d092a0dce59187d24

Message:

code cleanup: sleftv* -> leftv, calling proc. etc.

Location:

Singular

Files:

• iparith.cc (modified) (1 diff)
• ipassign.cc (modified) (1 diff)
• iplib.cc (modified) (3 diffs)
• ipshell.cc (modified) (2 diffs)
• ipshell.h (modified) (2 diffs)
• subexpr.cc (modified) (1 diff)
• subexpr.h (modified) (2 diffs)

Singular/iparith.cc

@@ -7968 +7968 @@
                 omFreeBin((ADDRESS)an, sleftv_bin);
                 omFreeBin((ADDRESS)bn, sleftv_bin);
+                a->CleanUp();
+                b->CleanUp();
                 return FALSE;
               }

Singular/ipassign.cc

@@ -1989 +1989 @@
         /* advance the expressionlist to get the next element after the ring */
         hh = r->next;
-        //r=hh;
       }
       else

Singular/iplib.cc

@@ -369 +369 @@
 * return FALSE on success, TRUE if an error occurs
 */
-BOOLEAN iiPStart(idhdl pn, sleftv  * v)
+BOOLEAN iiPStart(idhdl pn, leftv v)
 {
   procinfov pi=NULL;
@@ -396 +396 @@
   else return TRUE;
   /* generate argument list ======================================*/
+  //iiCurrArgs should be NULL here, as the assignment for the parameters
+  // of the prevouis call are already done befor calling another routine
   if (v!=NULL)
   {
@@ -499 +501 @@
   }
 }
-BOOLEAN iiMake_proc(idhdl pn, package pack, sleftv* sl)
+BOOLEAN iiMake_proc(idhdl pn, package pack, leftv sl)
 {
   int err;

Singular/ipshell.cc

@@ -2749 +2749 @@
     R->cf->ref++;
   }
-  else
-  if (L->m[0].Typ()==INT_CMD)
+  else if (L->m[0].Typ()==INT_CMD)
   {
     int ch = (int)(long)L->m[0].Data();
@@ -6061 +6060 @@
     if (traceit &TRACE_SHOW_RINGS) Print("kill ring %lx\n",(long)r);
 #endif
-    if (r->qideal!=NULL)
-    {
-      id_Delete(&r->qideal, r);
-      r->qideal = NULL;
-    }
     int j;
     for (j=0;j<myynest;j++)

Singular/ipshell.h

@@ -45 +45 @@
 int     IsCmd(const char *n, int & tok);
 
-BOOLEAN iiPStart(idhdl pn, sleftv * sl);
+BOOLEAN iiPStart(idhdl pn, leftv sl);
 BOOLEAN iiEStart(char* example, procinfo *pi);
 BOOLEAN iiAllStart(procinfov pi, char *p,feBufferTypes t, int l);
@@ -192 +192 @@
 int     iiDeclCommand(leftv sy, leftv name, int lev, int t, idhdl* root,
   BOOLEAN isring = FALSE, BOOLEAN init_b=TRUE);
-BOOLEAN iiMake_proc(idhdl pn, package pack, sleftv* sl);
+BOOLEAN iiMake_proc(idhdl pn, package pack, leftv sl);
 // from misc.cc:
 char *  showOption();

Singular/subexpr.cc

@@ -1950 +1950 @@
 }
 
-const char *iiSleftv2name(leftv v)
-{
-  return(v->name);
-}
-
 void * sattr::CopyA()
 {

Singular/subexpr.h

@@ -75 +75 @@
 
 extern BOOLEAN siq;
-extern const char *iiSleftv2name(leftv v);
 
 class sleftv;
@@ -126 +125 @@
     inline const char * Fullname()
     {
-      if ((name!=NULL) && (e==NULL)) return(iiSleftv2name(this));
+      if ((name!=NULL) && (e==NULL)) return(this->name);
       else return sNoName_fe;
     }