Changeset 1aa559b in git

Timestamp:

Feb 23, 2004, 8:04:05 PM (20 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

3ebba4a56769d7784bf8af7c80ff439c6a7b152e

Parents:

a9042d0e9a0cd833346da77996b03bb5379ec4bc

Message:

*hannes: fixes + MPport from 2-0


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

Location:

Singular

Files:

• extra.cc (modified) (5 diffs)
• ipshell.cc (modified) (4 diffs)
• mpsr_GetMisc.cc (modified) (2 diffs)
• mpsr_GetPoly.cc (modified) (2 diffs)
• mpsr_Put.cc (modified) (6 diffs)
• subexpr.cc (modified) (2 diffs)

Singular/extra.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR      *
 *****************************************/
-/* $Id: extra.cc,v 1.201 2003-10-17 15:59:48 levandov Exp $ */
+/* $Id: extra.cc,v 1.202 2004-02-23 19:04:01 Singular Exp $ */
 /*
 * ABSTRACT: general interface to internals of Singular ("system" command)
@@ -110 +110 @@
  * - with    HAVE_DYNAMIC_LOADING: these functions are loaded as module.
  */
-#ifndef HAVE_DYNAMIC_LOADING
+//#ifndef HAVE_DYNAMIC_LOADING
 
 #ifdef HAVE_PCV
@@ -116 +116 @@
 #endif
 
-#endif /* not HAVE_DYNAMIC_LOADING */
+//#endif /* not HAVE_DYNAMIC_LOADING */
 
 // see clapsing.cc for a description of the `FACTORY_*' options
@@ -522 +522 @@
     else
 #endif
-#ifndef HAVE_DYNAMIC_LOADING
+//#ifndef HAVE_DYNAMIC_LOADING
 /*==================== pcv ==================================*/
 #ifdef HAVE_PCV
@@ -582 +582 @@
     else
 #endif
-#endif /* HAVE_DYNAMIC_LOADING */
+//#endif /* HAVE_DYNAMIC_LOADING */
 /*==================== contributors =============================*/
    if(strcmp(sys_cmd,"contributors") == 0)

Singular/ipshell.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipshell.cc,v 1.85 2004-02-12 09:33:39 Singular Exp $ */
+/* $Id: ipshell.cc,v 1.86 2004-02-23 19:04:02 Singular Exp $ */
 /*
 * ABSTRACT:
@@ -1046 +1046 @@
       root=&currRing->idroot;
     }
+    BOOLEAN keepring=FALSE;
     if ((h!=NULL)&&(IDLEV(h)==toLev))
     {
       if (IDTYP(h)==v->Typ())
       {
+        if (((IDTYP(h)==RING_CMD)||(IDTYP(h)==QRING_CMD))
+        && (v->Data()==IDDATA(h)))
+        {
+          IDRING(h)->ref++;
+          keepring=TRUE;
+          IDLEV(h)=toLev;
+          //WarnS("keepring");
+          return FALSE;
+        }
         if (BVERBOSE(V_REDEFINE))
         {
@@ -1055 +1065 @@
         }
 #ifdef USE_IILOCALRING
-        if (iiLocalRing[0]==IDRING(h)) iiLocalRing[0]=NULL;
+        if (iiLocalRing[0]==IDRING(h) && (!keepring)) iiLocalRing[0]=NULL;
 #else
         proclevel *p=procstack;
         while (p->next!=NULL) p=p->next;
-        if (p->cRing==IDRING(h))
+        if ((p->cRing==IDRING(h)) && (!keepring))
         {
           p->cRing=NULL;
@@ -1074 +1084 @@
     h=(idhdl)v->data;
     IDLEV(h)=toLev;
+    if (keepring) IDRING(h)->ref--;
     iiNoKeepRing=FALSE;
     //Print("export %s\n",IDID(h));

Singular/mpsr_GetMisc.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mpsr_GetMisc.cc,v 1.28 2002-11-26 14:25:38 Singular Exp $ */
+/* $Id: mpsr_GetMisc.cc,v 1.29 2004-02-23 19:04:04 Singular Exp $ */
 
 /***************************************************************
@@ -355 +355 @@
 idhdl mpsr_FindIdhdl(char *name, ring &r)
 {
-#ifdef HAVE_NAMESPACES
-  idhdl h = (NSROOT(namespaceroot) != NULL ? namespaceroot->get(name, 0): (idhdl) NULL), h2;
-#else /* HAVE_NAMESPACES */
   idhdl h = (IDROOT != NULL ? IDROOT->get(name, 0): (idhdl) NULL), h2;
-#endif /* HAVE_NAMESPACES */
   r = NULL;
 

Singular/mpsr_GetPoly.cc

@@ -3 +3 @@
 ****************************************/
 
-/* $Id: mpsr_GetPoly.cc,v 1.33 2002-05-16 17:49:22 Singular Exp $ */
+/* $Id: mpsr_GetPoly.cc,v 1.34 2004-02-23 19:04:04 Singular Exp $ */
 
 /***************************************************************
@@ -20 +20 @@
 #include "mpsr_Get.h"
 
-#include "gmp.h"
+#include "si_gmp.h"
 #include "omalloc.h"
 #include "tok.h"

Singular/mpsr_Put.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mpsr_Put.cc,v 1.29 2002-11-26 14:25:38 Singular Exp $ */
+/* $Id: mpsr_Put.cc,v 1.30 2004-02-23 19:04:04 Singular Exp $ */
 
 /***************************************************************
@@ -19 +19 @@
 #ifdef HAVE_MPSR
 
+#include "structs.h"
 #include "mpsr_Put.h"
 #include "mpsr_Tok.h"
@@ -502 +503 @@
                                       3));
   // First, is the ring
-#ifdef HAVE_NAMESPACES
-  failr(mpsr_PutRingLeftv(link, (leftv) namespaceroot->get(m->preimage, 1)));
-#else /* HAVE_NAMESPACES */
   failr(mpsr_PutRingLeftv(link, (leftv) IDROOT->get(m->preimage, 1)));
-#endif /* HAVE_NAMESPACES */
 
   // Second, the name of the ring
@@ -578 +575 @@
              ! (IDTYP(h) == PACKAGE_CMD && strcmp(IDID(h), "Top") == 0))
     {
-#ifdef HAVE_NAMESPACES
-      cmd.arg1.name = (char*)
-        omAlloc(strlen(IDID(h)) + strlen(namespaceroot->name) + 3);
-      sprintf(cmd.arg1.name, "%s::%s", namespaceroot->name, IDID(h));
-#else
       cmd.arg1.name = IDID(h);
-#endif
       cmd.arg2.data=IDDATA(h);
       cmd.arg2.flag=h->flag;
       cmd.arg2.attribute=h->attribute;
       cmd.arg2.rtyp=h->typ;
-#ifdef HAVE_NAMESPACES
-      if (mpsr_PutLeftv(link, lv , r) != mpsr_Success)
-      {
-        omFree(cmd.arg1.name);
-        break;
-      }
-      omFree(cmd.arg1.name);
-#else
       if (mpsr_PutLeftv(link, lv, r) != mpsr_Success) break;
-#endif
 
 #ifdef MPSR_DEBUG_DUMP
       Print("Dumped %s\n", IDID(h));
 #endif
-      if (IDTYP(h) == RING_CMD || IDTYP(h) == QRING_CMD ||
-          (IDTYP(h) == PACKAGE_CMD && strcmp(IDID(h), "Top") != 0))
+      if (IDTYP(h) == RING_CMD || IDTYP(h) == QRING_CMD 
+#if 0
+      || (IDTYP(h) == PACKAGE_CMD && strcmp(IDID(h), "Top") != 0)
+#endif
+      )
       {
         // we don't really need to do that, it's only for convenience
         // for putting numbers
+#if 0
         if (IDTYP(h) == PACKAGE_CMD)
         {
+          namespaceroot->push(IDPACKAGE(h), IDID(h));
           h2 = IDPACKAGE(h)->idroot;
         }
         else
+#endif
         {
           rSetHdl(h);
@@ -620 +608 @@
         while (h2 != NULL)
         {
-#ifdef HAVE_NAMESPACES
-          cmd.arg1.name = (char*)
-            omAlloc(strlen(IDID(h2)) + strlen(namespaceroot->name) + 3);
-          sprintf(cmd.arg1.name, "%s::%s", namespaceroot->name, IDID(h2));
-#else
           cmd.arg1.name = IDID(h2);
-#endif
           cmd.arg2.data=IDDATA(h2);
           cmd.arg2.flag = h2->flag;
           cmd.arg2.attribute = h2->attribute;
           cmd.arg2.rtyp = h2->typ;
-#ifdef HAVE_NAMESPACES
-          if (mpsr_PutLeftv(link, lv , r) != mpsr_Success)
-          {
-            omFree(cmd.arg1.name);
-            break;
-          }
-          omFree(cmd.arg1.name);
-#else
           if (mpsr_PutLeftv(link, lv, r) != mpsr_Success) break;
-#endif
 #ifdef MPSR_DEBUG_DUMP
           Print("Dumped %s\n", IDID(h2));
@@ -646 +619 @@
           h2 = h2->next;
         }
+#if 0
+        if (IDTYP(h) == PACKAGE_CMD)
+        {
+          namespaceroot->pop();
+        }
+#endif
       }
     }

Singular/subexpr.cc

@@ -5 +5 @@
 * ABSTRACT: handling of leftv
 */
-/* $Id: subexpr.cc,v 1.85 2003-03-10 16:43:54 Singular Exp $ */
+/* $Id: subexpr.cc,v 1.86 2004-02-23 19:04:05 Singular Exp $ */
 
 #include <stdlib.h>
@@ -1404 +1404 @@
     {
       BOOLEAN ok=FALSE;
-      poly p = ((currRingHdl!=NULL)     /* ring required */
-               &&(!yyInRingConstruction) /* not in decl */
-               &&(IDLEV(currRingHdl)!=myynest)) /* already in case 4/6 */
+      poly p = ((currRing!=NULL)     /* ring required */
+               && (currRingHdl!=NULL)
+               && (!yyInRingConstruction) /* not in decl */
+               && (IDLEV(currRingHdl)!=myynest)) /* already in case 4/6 */
                      ? pmInit(id,ok) : (poly)NULL;
       if (ok)