Changeset b372b8b in git

Timestamp:

Jan 25, 2010, 11:59:41 AM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

e6ae1d623306d16e52fbf4dbd52b4addc5556978

Parents:

c4ebdd3110559ab3c57068d479913f9ca58655a4

Message:

SAGE patch

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

File:

• Singular/tesths.cc (modified) (2 diffs)

Singular/tesths.cc

@@ -81 +81 @@
     om_Opts.Keep = OM_SING_KEEP;
 #endif
-#ifdef LIBSINGULAR   
-   // interpreter init for libsingular
-   iiInitArithmetic();
- 
-   basePack=(package)omAlloc0(sizeof(*basePack));
-   currPack=basePack;
-   idhdl h;
-   h=enterid("Top", 0, PACKAGE_CMD, &IDROOT, TRUE);
-   IDPACKAGE(h)->language = LANG_TOP;
-   IDPACKAGE(h)=basePack;
-   currPackHdl=h;
-   basePackHdl=h;
- 
-   slStandardInit();
-   myynest=0;
-   if (! feOptValue(FE_OPT_NO_STDLIB))
-   {
-     int vv=verbose;
-     verbose &= ~Sy_bit(V_LOAD_LIB);
-     iiLibCmd(omStrDup("standard.lib"), TRUE,TRUE,TRUE);
-     verbose=vv;
-   }
-   errorreported = 0;
-#endif   
   }
   mmIsInitialized=1;
@@ -115 +91 @@
   // hack such that all shared' libs in the bindir are loaded correctly
   feInitResources(name);
+  iiInitArithmetic();
+
+  basePack=(package)omAlloc0(sizeof(*basePack));
+  currPack=basePack;
+  idhdl h;
+  h=enterid("Top", 0, PACKAGE_CMD, &IDROOT, TRUE);
+  IDPACKAGE(h)->language = LANG_TOP;
+  IDPACKAGE(h)=basePack;
+  currPackHdl=h;
+  basePackHdl=h;
+
+  slStandardInit();
+  myynest=0;
+  if (! feOptValue(FE_OPT_NO_STDLIB))
+  {
+    int vv=verbose;
+    verbose &= ~Sy_bit(V_LOAD_LIB);
+    iiLibCmd(omStrDup("standard.lib"), TRUE,TRUE,TRUE);
+    verbose=vv;
+  }
+  errorreported = 0;
 }
 #endif