Changeset 4ccb094 in git

Timestamp:

May 2, 2005, 5:59:29 PM (18 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

47ec284c095176a99fb82c1ee239e162d30b658c

Parents:

bdd18d5b55a34b858cdda3eae1a0a2f81a06229b

Message:

*hannes: load on demand


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

Location:

Singular

Files:

• iparith.cc (modified) (3 diffs)
• iplib.cc (modified) (2 diffs)

Singular/iparith.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iparith.cc,v 1.350 2005-04-29 13:23:02 Singular Exp $ */
+/* $Id: iparith.cc,v 1.351 2005-05-02 15:58:45 Singular Exp $ */
 
 /*
@@ -746 +746 @@
       case 0:
         Print("%s of type 'ANY'. Trying load.\n", v->name);
-        //if(iiTryLoadLib(u, u->name))
+        if(iiTryLoadLib(u, u->name))
         {
           Werror("'%s' no such package", u->name);
           return TRUE;
         }
-        //syMake(u,u->name,NULL);
+        syMake(u,u->name,NULL);
         // else: use next case !!! no break !!!
 
@@ -2111 +2111 @@
     case NUMBER_CMD:
       {
-        /* since basefields are equal, we can apply nCopy */
-        res->data = nCopy((number)IDDATA(w));
-        res->rtyp = argtype;
-        break;
+        /* since basefields are equal, we can apply nCopy */
+        res->data = nCopy((number)IDDATA(w));
+        res->rtyp = argtype;
+        break;
       }
     case POLY_CMD:
     case VECTOR_CMD:
       {
-        poly    q = (poly)IDDATA(w);
-        res->data = pOppose(r,q);
-        res->rtyp = argtype;
-        break;
+        poly    q = (poly)IDDATA(w);
+        res->data = pOppose(r,q);
+        res->rtyp = argtype;
+        break;
       }
     case IDEAL_CMD:
     case MODUL_CMD:
       {
-        ideal   Q = (ideal)IDDATA(w);
-        res->data = idOppose(r,Q);
-        res->rtyp = argtype;
-        break;
+        ideal   Q = (ideal)IDDATA(w);
+        res->data = idOppose(r,Q);
+        res->rtyp = argtype;
+        break;
       }
     case MATRIX_CMD:
       {
-        ring save = currRing;
-        rChangeCurrRing(r);
-        matrix  m = (matrix)IDDATA(w);
-        ideal   Q = idMatrix2Module(mpCopy(m));
-        rChangeCurrRing(save);
+        ring save = currRing;
+        rChangeCurrRing(r);
+        matrix  m = (matrix)IDDATA(w);
+        ideal   Q = idMatrix2Module(mpCopy(m));
+        rChangeCurrRing(save);
         ideal   S = idOppose(r,Q);
-        id_Delete(&Q, r);
-        res->data = idModule2Matrix(S);
-        res->rtyp = argtype;
-        break;
+        id_Delete(&Q, r);
+        res->data = idModule2Matrix(S);
+        res->rtyp = argtype;
+        break;
       }
     default:
       {
-        WerrorS("unsupported type in oppose");
-        return TRUE;
+        WerrorS("unsupported type in oppose");
+        return TRUE;
       }
     }

Singular/iplib.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iplib.cc,v 1.106 2005-01-18 15:41:59 Singular Exp $ */
+/* $Id: iplib.cc,v 1.107 2005-05-02 15:59:29 Singular Exp $ */
 /*
 * ABSTRACT: interpreter: LIB and help
@@ -665 +665 @@
 {
   BOOLEAN LoadResult = TRUE;
-#ifdef HAVE_NAMESPACES
+#ifdef HAVE_NS
   char libnamebuf[128];
   char *libname = (char *)omAlloc(strlen(id)+5);