Changeset 098f457 in git for Singular

Timestamp:

May 12, 2020, 11:10:14 AM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'c5facdfddea2addfd91babd8b9019161dea4b695')

Children:

1a1d56caf454024233cd6058c9e85a02bb4d3430

Parents:

d7085a5fab165816d2c6c0df031e0e838d694526

Message:

opt: iiLibCmd

Location:

Singular

Files:

• iplib.cc (modified) (6 diffs)
• ipshell.h (modified) (1 diff)
• misc_ip.cc (modified) (1 diff)
• subexpr.cc (modified) (1 diff)

Singular/iplib.cc

@@ -663 +663 @@
   if (h==NULL)
   {
-    BOOLEAN bo=iiLibCmd(omStrDup(lib),TRUE,TRUE,FALSE);
+    BOOLEAN bo=iiLibCmd(lib,TRUE,TRUE,FALSE);
     if (bo) return NULL;
   }
@@ -682 +682 @@
   if (h==NULL)
   {
-    BOOLEAN bo=iiLibCmd(omStrDup(lib),TRUE,TRUE,FALSE);
+    BOOLEAN bo=iiLibCmd(lib,TRUE,TRUE,FALSE);
     if (bo) return 0;
   }
@@ -837 +837 @@
 
       if (LT==LT_SINGULAR)
-        LoadResult = iiLibCmd(s, FALSE, FALSE,TRUE);
+      {
+        omFree(s);
+        LoadResult = iiLibCmd(libname, FALSE, FALSE,TRUE);
+      }
       #ifdef HAVE_DYNAMIC_LOADING
       else if ((LT==LT_ELF) || (LT==LT_HPUX))
@@ -876 +879 @@
 }
 
-BOOLEAN iiLibCmd( char *newlib, BOOLEAN autoexport, BOOLEAN tellerror, BOOLEAN force )
+BOOLEAN iiLibCmd( const char *newlib, BOOLEAN autoexport, BOOLEAN tellerror, BOOLEAN force )
 {
   char libnamebuf[1024];
-  // procinfov pi;
-  // idhdl h;
   idhdl pl;
-  // idhdl hl;
-  // long pos = 0L;
-  char *plib = iiConvName(newlib);
+  // handle "special" lib Singular:
+  if (strcmp(newlib,"Singular")==0) return FALSE;
   FILE * fp = feFopen( newlib, "r", libnamebuf, tellerror );
   // int lines = 1;
@@ -893 +893 @@
     return TRUE;
   }
+  char *plib = iiConvName(newlib);
   pl = basePack->idroot->get(plib,0);
   if (pl==NULL)
@@ -917 +918 @@
   }
   LoadResult = iiLoadLIB(fp, libnamebuf, newlib, pl, autoexport, tellerror);
-  omFree((ADDRESS)newlib);
 
   if(!LoadResult) IDPACKAGE(pl)->loaded = TRUE;

Singular/ipshell.h

@@ -68 +68 @@
 char *  iiProcName(char *buf, char & ct, char* &e);
 char *  iiProcArgs(char *e,BOOLEAN withParenth);
-BOOLEAN iiLibCmd( char *newlib, BOOLEAN autoexport, BOOLEAN tellerror, BOOLEAN force );
-/* sees wheter library lib has already been loaded
-   if yes, writes filename of lib into where and returns TRUE,
-   if  no, returns FALSE
-*/
+BOOLEAN iiLibCmd(const char *newlib, BOOLEAN autoexport, BOOLEAN tellerror, BOOLEAN force );
 /// load lib/module given in v
 BOOLEAN jjLOAD(const char *s, BOOLEAN autoexport = FALSE);

Singular/misc_ip.cc

@@ -1460 +1460 @@
     SI_SAVE_OPT(save1,save2);
     si_opt_2 &= ~Sy_bit(V_LOAD_LIB);
-    iiLibCmd(omStrDup("standard.lib"), TRUE,TRUE,TRUE);
+    iiLibCmd("standard.lib", TRUE,TRUE,TRUE);
     SI_RESTORE_OPT(save1,save2);
   }

Singular/subexpr.cc

@@ -485 +485 @@
         {
           r->ref++;
-          //Print("s_internalCopy:+  ring %d, ref %d\n",r,r->ref);
+          Print("s_internalCopy:+  ring %lx, ref %d\n",r,r->ref);
         }
         return d;