Changeset 1bd25e in git for Singular/iplib.cc

Timestamp:

Mar 26, 2001, 8:11:54 PM (23 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

f2dff0208c4fd2afbfbb1bca8b063e4f1377e89d

Parents:

48c165a608078d503fcbb6a62955ac6b94835a63

Message:

*hannes: LIB string


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

File:

• Singular/iplib.cc (modified) (8 diffs)

Singular/iplib.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iplib.cc,v 1.80 2000-12-06 11:03:16 Singular Exp $ */
+/* $Id: iplib.cc,v 1.81 2001-03-26 18:11:53 Singular Exp $ */
 /*
 * ABSTRACT: interpreter: LIB and help
@@ -685 +685 @@
   idhdl hl;
 
+#ifndef HAVE_NAMESPACES
   hl = IDROOT->get("LIB", 0);
   if (hl == NULL || strstr(IDSTRING(hl), lib) == NULL) return FALSE;
@@ -706 +707 @@
     omFree(tmp);
   }
+#else
+  char *plib = iiConvName(lib);
+  hl = namespaceroot->get(plib,0, TRUE);
+  if((hl==NULL) ||(IDTYP(hl)!=PACKAGE_CMD))
+    return FALSE;
+  strcpy(where,IDPACKAGE(hl)->libname);
+  omFree(plib);
+#endif
   return TRUE;
 }
@@ -717 +726 @@
   char buf[256];
   char libnamebuf[128];
-  idhdl h,hl;
+  idhdl h;
   BOOLEAN LoadResult = TRUE;
 #ifdef HAVE_NAMESPACES
   idhdl pl;
+#else
+  idhdl hl;
 #endif /* HAVE_NAMESPACES */
   int lines = 1;
@@ -742 +753 @@
     return TRUE;
   }
-  hl = namespaceroot->get("LIB",0, TRUE);
 #else /* HAVE_NAMESPACES */
   hl = idroot->get("LIB",0);
-#endif /* HAVE_NAMESPACES */
   if (hl==NULL)
   {
-#ifdef HAVE_NAMESPACES
-    hl = enterid( omStrDup("LIB"),0, STRING_CMD,
-                  &NSROOT(namespaceroot->root), FALSE );
-#else /* HAVE_NAMESPACES */
     hl = enterid( omStrDup("LIB"),0, STRING_CMD, &idroot, FALSE );
-#endif /* HAVE_NAMESPACES */
     IDSTRING(hl) = omStrDup(newlib);
   }
@@ -800 +804 @@
 #endif
   }
+#endif /* HAVE_NAMESPACES */
 #ifdef HAVE_TCL
   if (tclmode)
@@ -1053 +1058 @@
     goto load_modules_end;
   }
-
+#ifdef HAVE_NAMESPACES
   pl = namespaceroot->get(plib,0, TRUE);
+#else
+  pl = IDROOT->get(plib,0);
+#endif
   if (pl==NULL)
   {
+#ifdef HAVE_NAMESPACES
     pl = enterid( omStrDup(plib),0, PACKAGE_CMD,
                   &NSROOT(namespaceroot->root), TRUE );
+#else
+    pl = enterid( omStrDup(plib),0, PACKAGE_CMD,
+                  TRUE );
+#endif
     IDPACKAGE(pl)->language = LANG_C;
     IDPACKAGE(pl)->libname=omStrDup(newlib);
@@ -1201 +1214 @@
 void libstack::push(char *p, char *libname)
 {
-#  ifdef HAVE_NAMESPACES
-  idhdl hl = namespaceroot->get("LIB",0, TRUE);
-#  else /* HAVE_NAMESPACES */
+  libstackv lp;
+#ifndef HAVE_NAMESPACES
   idhdl hl = idroot->get("LIB",0);
-#  endif /* HAVE_NAMESPACES */
-  libstackv lp;
   char *f = NULL;
   if(hl!=NULL) f = strstr(IDSTRING(hl),libname);
   if( (hl==NULL) || (f == NULL))
+#else
+  char dummy[128];
+  if (!iiLocateLib(libname, dummy))
+#endif
   {
     for(lp = this;lp!=NULL;lp=lp->next)