Changeset 82063a in git

Timestamp:

Sep 19, 2000, 2:43:32 PM (24 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

0bf7dff98e17f7166a35a042e1aede1cff4b9fe8

Parents:

f18d15f939265cfd33d45466cb593f6c5b1ad49f

Message:

* hannes: clean up oif some procedeures


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

Location:

Singular

Files:

• iparith.cc (modified) (2 diffs)
• ipassign.cc (modified) (3 diffs)
• subexpr.cc (modified) (6 diffs)

Singular/iparith.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iparith.cc,v 1.225 2000-09-18 09:19:02 obachman Exp $ */
+/* $Id: iparith.cc,v 1.226 2000-09-19 12:43:28 Singular Exp $ */
 
 /*
@@ -16 +16 @@
 
 #include "mod2.h"
-
 #include "tok.h"
 #include "ipid.h"

Singular/ipassign.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipassign.cc,v 1.59 2000-09-18 09:19:04 obachman Exp $ */
+/* $Id: ipassign.cc,v 1.60 2000-09-19 12:43:29 Singular Exp $ */
 
 /*
@@ -39 +39 @@
 
 /*=================== proc =================*/
-#ifdef SRING
-static BOOLEAN jjALTVARS(leftv res, leftv a)
-{
-  pAltVars=(int)a->Data();
-  pSRING=(pAltVars<=pVariables);
-  pSDRING=pSDRING||pSRING;
-  currRing->partN=pAltVars;
-  return FALSE;
-}
-#endif
 static BOOLEAN jjECHO(leftv res, leftv a)
 {
@@ -546 +536 @@
 // sysvars:
  {jjECHO,       VECHO,          INT_CMD }
-#ifdef SRING
-,{jjALTVARS,    VALTVARS,       INT_CMD }
-#endif
 ,{jjPAGELENGTH, VPAGELENGTH,    INT_CMD }
 ,{jjPRINTLEVEL, VPRINTLEVEL,    INT_CMD }

Singular/subexpr.cc

@@ -5 +5 @@
 * ABSTRACT: handling of leftv
 */
-/* $Id: subexpr.cc,v 1.67 2000-09-18 14:31:37 Singular Exp $ */
+/* $Id: subexpr.cc,v 1.68 2000-09-19 12:43:32 Singular Exp $ */
 
 #include <stdlib.h>
@@ -14 +14 @@
 
 #include "mod2.h"
-#define OM_TRACK 5
-#define OM_CHECK 3
-#define OM_KEEP 1
 #include "tok.h"
 #include "ipid.h"
@@ -1003 +1000 @@
     switch (rtyp)
     {
-#ifdef SRING
-      case VALTVARS:   return (void *)pAltVars;
-#endif
       case VECHO:      return (void *)si_echo;
       case VPAGELENGTH:return (void *)pagelength;
@@ -1118 +1112 @@
       {
         tmp.next=next; next=NULL;
+        data=NULL; d=NULL;
         CleanUp();
         memcpy(this,&tmp,sizeof(tmp));
@@ -1126 +1121 @@
         // ???
         // here we still have a memory leak...
-        // example: list L="123","456";
-        // L[1][2];
-        // therefore, it should never happen:
-        assume(0);
-        // but if it happens: here is the temporary fix:
-        omMarkAsStaticAddr(r);
+        // example: list L="123","456";
+        // L[1][2];
+        // therefore, it should never happen:
+        assume(0);
+        // but if it happens: here is the temporary fix:
+        // omMarkAsStaticAddr(r);
       }
       break;
@@ -1158 +1153 @@
         if ((e->next!=NULL)
         && (l->m[index-1].rtyp==STRING_CMD))
-        // string[..].Data() modifies sleftv, so let's do it ourself
-        {
-          char *dd=l->m[index-1].data;
-          int j=e->next->start-1;
-          r=(char *)omAllocBin(size_two_bin);
-          if ((j>=0)&& (j<(int)strlen((char *)dd)))
-          {
-            r[0]=*(((char *)dd)+j);
-            r[1]='\0';
-          }
-          else
-          {
-            r[0]='\0';
-          }
-        }
+        // string[..].Data() modifies sleftv, so let's do it ourself
+        {
+          char *dd=(char *)l->m[index-1].data;
+          int j=e->next->start-1;
+          r=(char *)omAllocBin(size_two_bin);
+          if ((j>=0) && (j<(int)strlen(dd)))
+          {
+            r[0]=*(dd+j);
+            r[1]='\0';
+          }
+          else
+          {
+            r[0]='\0';
+          }
+        }
         else
-        {
-          l->m[index-1].e=e->next;
+        {
+          l->m[index-1].e=e->next;
           r=(char *)l->m[index-1].Data();
           l->m[index-1].e=NULL;
-        }
+        }
       }
       else //if (!errorreported)