Changeset 3645fc in git for Singular/tesths.cc

Timestamp:

Jun 8, 2011, 6:45:40 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

b9a4477dffa95152122f8354bb7633b5a708918e

Parents:

ac8e1a6fb7da54fe20dd3b5cb75e2f2cdd68dc06

Message:

init via siInit

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

File:

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

Singular/tesths.cc

@@ -43 +43 @@
 #endif
 
-extern int iiInitArithmetic();
+extern int siInit(char *);
 
 #if ! defined(LIBSINGULAR)
@@ -51 +51 @@
     char** argv)   /* parameter array */
 {
-#ifdef HAVE_FACTORY
-  On(SW_USE_NTL);
-  Off(SW_USE_GCD_P);
-  On(SW_USE_NTL_GCD_0); // On -> seg11 in Old/algnorm, Old/factor...
-  On(SW_USE_NTL_GCD_P); // On -> cyle in Short/brnoeth_s: fixed
-  On(SW_USE_EZGCD);
-  On(SW_USE_CHINREM_GCD);
-  //On(SW_USE_FF_MOD_GCD);
-  //On(SW_USE_fieldGCD);
-  On(SW_USE_EZGCD_P);
-  On(SW_USE_QGCD);
-  Off(SW_USE_NTL_SORT); // may be changed by an command line option
-#endif
-
-#ifdef INIT_BUG
-  jjInitTab1();
-#endif
   // Don't worry: ifdef OM_NDEBUG, then all these calls are undef'ed
   omInitRet_2_Info(argv[0]);
   omInitGetBackTrace();
 
-  /* initialize components */
-  factoryError=WerrorS;
-  siRandomStart=inits();
-  feOptSpec[FE_OPT_RANDOM].value = (void*) ((long)siRandomStart);
+  siInit(argv[0]);
+
+  // parse command line options
   int optc, option_index;
   const char* errormsg;
-
-  // do this first, because -v might print version path
-  feInitResources(argv[0]);
-  iiInitArithmetic();
-
-  // parse command line options
   while((optc = fe_getopt_long(argc, argv,
                                SHORT_OPTS_STRING, feOptSpec, &option_index))
@@ -121 +97 @@
 
   /* say hello */
-#if 0
-  SingularBuilder::Ptr SingularInstance = SingularBuilder::instance();
-#else
-  {
-    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;
 #ifdef HAVE_FANS
-    bbcone_setup();
-    bbfan_setup();
+  bbcone_setup();
+  bbfan_setup();
 #endif /* HAVE_FANS */
-    //for official version: not active
-    //bigintm_setup();
-  }
-#endif
+  //for official version: not active
+  //bigintm_setup();
+
   if (TEST_V_QUIET)
   {
@@ -168 +131 @@
     */
   }
-  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;
-  }
   pyobject_setup();
   errorreported = 0;
-
-  // and again, ifdef OM_NDEBUG this call is undef'ed
-  // otherwise, it marks all memory allocated so far as static
-  // i.e. as memory which is not mention on omPrintUsedAddr:
-  //omMarkMemoryAsStatic();
 
   setjmp(si_start_jmpbuf);