Changeset 237216 in git

Timestamp:

Jun 9, 2015, 1:35:17 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

f6f286f116cd53a3993443b6eba1ff15979d4d87

Parents:

6105f4f4166e278c2c1a880b1d135f4057777e11

Message:

load("...","try")

Location:

Singular

Files:

• LIB/standard.lib (modified) (1 diff)
• iparith.cc (modified) (1 diff)
• iplib.cc (modified) (2 diffs)

Singular/LIB/standard.lib

@@ -2532 +2532 @@
 static proc mod_init()
 {
+  if(!defined(Singmathic))
+  {
+    load("singmathic.so","try");
+  }
   //int pagelength=24;
   //exportto(Top,pagelength);

Singular/iparith.cc

@@ -5341 +5341 @@
   WerrorS_dummy_cnt=0;
   BOOLEAN bo=jjLOAD(s,TRUE);
-  if (bo || (WerrorS_dummy_cnt>0)) Print("loading of >%s< failed\n",s);
+  if (TEST_OPT_PROT && (bo || (WerrorS_dummy_cnt>0)))
+    Print("loading of >%s< failed\n",s);
   WerrorS_callback=WerrorS_save;
   errorreported=0;

Singular/iplib.cc

@@ -1092 +1092 @@
     Werror("dynl_open failed:%s", dynl_error());
     Werror("%s not found", newlib);
+    killhdl2(pl,&(basePack->idroot),NULL); // remove package
     goto load_modules_end;
   }
@@ -1119 +1120 @@
       RET=FALSE;
     }
-    else Werror("mod_init not found:: %s\nThis is probably not a dynamic module for Singular!\n", dynl_error());
+    else
+    {
+      Werror("mod_init not found:: %s\nThis is probably not a dynamic module for Singular!\n", dynl_error());
+      killhdl2(pl,&(basePack->idroot),NULL); // remove package
+    }
   }