Changeset 698457 in git

Timestamp:

Nov 6, 1999, 4:07:56 PM (24 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', '91fdef05f09f54b8d58d92a472e9c4a43aa4656f')

Children:

e5295aa5284b62bfbf5d03c92cdf5f62238ed425

Parents:

9d0697170908a6e9669c18eaf6ea6c461ed24375

Message:

* added proc iiLocateLib:
  sees wheter library lib has already been loaded
   if yes, writes filename of lib into where and returns TRUE,
      no, returns FALSE

* healp ~/my.lib" works


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

Location:

Singular

Files:

• fehelp.cc (modified) (1 diff)
• iplib.cc (modified) (2 diffs)
• ipshell.h (modified) (2 diffs)

Singular/fehelp.cc

@@ -575 +575 @@
   char libnamebuf[128];
   FILE *fp=NULL;
-  if ((str[1]!='\0') && ((fp=feFopen(str,"rb", libnamebuf))!=NULL))
+  // first, search for library of that name in LIB string
+  if ((str[1]!='\0') && 
+      ((iiLocateLib(str, libnamebuf) && (fp=feFopen(libnamebuf, "rb")) !=NULL)
+       ||
+       ((fp=feFopen(str,"rb", libnamebuf))!=NULL)))
   {
     extern FILE *yylpin;

Singular/iplib.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iplib.cc,v 1.66 1999-10-14 14:27:09 obachman Exp $ */
+/* $Id: iplib.cc,v 1.67 1999-11-06 15:07:56 obachman Exp $ */
 /*
 * ABSTRACT: interpreter: LIB and help
@@ -653 +653 @@
 
 /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
+/* sees wheter library lib has already been loaded
+   if yes, writes filename of lib into where and returns TRUE,
+      no, returns FALSE
+*/
+BOOLEAN iiLocateLib(const char* lib, char* where)
+{
+  idhdl hl;
+  
+  hl = idroot->get("LIB", 0);
+  if (hl == NULL || strstr(IDSTRING(hl), lib) == NULL) return FALSE;
+  
+  if (strstr(IDSTRING(hl), ",") == NULL)
+  {
+    strcpy(where, IDSTRING(hl));
+  }
+  else
+  {
+    char* tmp = mstrdup(IDSTRING(hl));
+    char* tok = strtok(tmp, ",");
+    do
+    {
+      if (strstr(tok, lib) != NULL) break;
+      tok = strtok(NULL, ",");
+    }
+    while (tok != NULL);
+    assume(tok != NULL);
+    strcpy(where, tok);
+    FreeL(tmp);
+  }
+  return TRUE;
+}
+    
+  
 #ifdef HAVE_NAMESPACES
 BOOLEAN iiLibCmd( char *newlib, BOOLEAN autoexport, BOOLEAN tellerror )

Singular/ipshell.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipshell.h,v 1.21 1999-10-25 18:21:52 Singular Exp $ */
+/* $Id: ipshell.h,v 1.22 1999-11-06 15:07:56 obachman Exp $ */
 /*
 * ABSTRACT
@@ -63 +63 @@
 BOOLEAN iiLibCmd( char *newlib, BOOLEAN tellerror=TRUE );
 #endif /* HAVE_NAMESPACES */
+/* sees wheter library lib has already been loaded
+   if yes, writes filename of lib into where and returns TRUE,
+   if  no, returns FALSE
+*/
+BOOLEAN iiLocateLib(const char* lib, char* where);
 leftv   iiMap(map theMap, char * what);
 void    iiMakeResolv(resolvente r, int length, int rlen, char * name, int typ0,