Changeset 46ef83 in git for Singular/iparith.cc

Timestamp:

Nov 20, 2000, 9:17:04 PM (24 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

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

Children:

dbf854d6f6f2ae3fe5c5fa8ccc9c20c1091fbb13

Parents:

470c7c881fa69a3cf4b81eaeeb9289ca75f16cb6

Message:

*hannes: dyn.load stuff: autodetection, better error msg.


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

File:

• Singular/iparith.cc (modified) (6 diffs)

Singular/iparith.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iparith.cc,v 1.232 2000-11-17 14:07:09 Singular Exp $ */
+/* $Id: iparith.cc,v 1.233 2000-11-20 20:17:04 Singular Exp $ */
 
 /*
@@ -2949 +2949 @@
   return FALSE;
 }
-static BOOLEAN jjLIB(leftv res, leftv v)
-{
-  return iiLibCmd((char *)v->CopyD(STRING_CMD));
-}
 static BOOLEAN jjMEMORY(leftv res, leftv v)
 {
@@ -3267 +3263 @@
 static BOOLEAN jjLOAD(leftv res, leftv v, BOOLEAN autoexport)
 {
-  char * s=omStrDup((char *)v->Data());
+  char * s=(char *)v->CopyD();
   char libnamebuf[256];
   lib_types LT = type_of_LIB(s, libnamebuf);
-  BOOLEAN result = TRUE;
 #ifdef HAVE_DYNAMIC_LOADING
   extern BOOLEAN load_modules(char *newlib, char *fullpath, BOOLEAN tellerror);
@@ -3284 +3279 @@
       case LT_SINGULAR:
 #ifdef HAVE_NAMESPACES
-        result = iiLibCmd(s, autoexport);
+        return iiLibCmd(s, autoexport);
 #else
-        result = iiLibCmd(s);
+        return iiLibCmd(s);
 #endif
-        break;
 
       case LT_ELF:
+      case LT_HPUX:
 #ifdef HAVE_DYNAMIC_LOADING
-        result = load_modules(s, libnamebuf, autoexport);
+        return load_modules(s, libnamebuf, autoexport);
 #else /* HAVE_DYNAMIC_LOADING */
         WerrorS("Dynamic modules are not supported by this version of Singular");
+        break;
 #endif /* HAVE_DYNAMIC_LOADING */
-        break;
-
-      case LT_HPUX:
-#ifdef HAVE_DYNAMIC_LOADING
-        result = load_modules(s, libnamebuf, autoexport);
-#else /* HAVE_DYNAMIC_LOADING */
-        WerrorS("Dynamic modules are not supported by this version of Singular");
-#endif /* HAVE_DYNAMIC_LOADING */
-        break;
-  }
-  return result;
+  }
+  return TRUE;
 }
 
@@ -3548 +3535 @@
 ,{jjUMINUS_IV,  '-',             INTMAT_CMD,     INTMAT_CMD }
 ,{jjPROC1,      '(',             ANY_TYPE/*set by p*/,PROC_CMD }
-,{jjLIB,        '(',             NONE,           STRING_CMD }
+,{jjLOAD1,      '(',             NONE,           STRING_CMD }
 // and the procedures with 1 argument:
 ,{atATTRIB1,    ATTRIB_CMD,      NONE,           DEF_CMD }
@@ -3672 +3659 @@
 ,{jjLEADMONOM,  LEADMONOM_CMD,   POLY_CMD,       POLY_CMD }
 ,{jjLEADMONOM,  LEADMONOM_CMD,   VECTOR_CMD,     VECTOR_CMD }
-,{jjLIB,        LIB_CMD,         NONE,           STRING_CMD }
+,{jjLOAD1,      LIB_CMD,         NONE,           STRING_CMD }
 ,{jjDUMMY,      LINK_CMD,        LINK_CMD,       LINK_CMD}
 ,{jjCALL1MANY,  LIST_CMD,        LIST_CMD,       DEF_CMD }