Changeset 42c4e6 in git

Timestamp:

Sep 13, 2010, 10:13:12 AM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

9f8f6afb8ac99a39218070eaeb13288ac7400082

Parents:

5e9e9c1562faf9f0fa575cfb990e24bbcd147a43

Message:

iiRunInit

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

File:

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

Singular/iplib.cc

@@ -72 +72 @@
   char *plib = iiConvName(lib);
   hl = basePack->idroot->get(plib,0);
+  omFree(plib);
   if((hl==NULL) ||(IDTYP(hl)!=PACKAGE_CMD))
   {
-    omFree(plib);
     return FALSE;
   }
-  omFree(plib);
   return (strcmp(lib,IDPACKAGE(hl)->libname)==0);
 }
@@ -292 +291 @@
 BOOLEAN iiPStart(idhdl pn, sleftv  * v)
 {
+  procinfov pi=NULL;
+  int old_echo=si_echo;
   BOOLEAN err=FALSE;
-  int old_echo=si_echo;
   char save_flags=0;
-  procinfov pi=NULL;
 
   /* init febase ======================================== */
@@ -747 +746 @@
 BOOLEAN iiLibCmd( char *newlib, BOOLEAN autoexport, BOOLEAN tellerror, BOOLEAN force )
 {
-  char buf[256];
   char libnamebuf[128];
+  procinfov pi;
   idhdl h;
-  BOOLEAN LoadResult = TRUE;
   idhdl pl;
   idhdl hl;
-  int lines = 1;
   long pos = 0L;
-  procinfov pi;
   char *plib = iiConvName(newlib);
   FILE * fp = feFopen( newlib, "r", libnamebuf, tellerror );
+  int lines = 1;
+  BOOLEAN LoadResult = TRUE;
+
   if (fp==NULL)
   {
@@ -789 +788 @@
 }
 /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
-static void iiCleanProcs(idhdl &root)
+static void iiCleanProcs(idhdl root)
 {
   idhdl prev=NULL;
@@ -818 +817 @@
   }
 }
+static void iiRunInit(package p)
+{
+  idhdl h=p->idroot;
+  idhdl prev=NULL;
+  myynest++;
+  loop
+  {
+    if (h==NULL) return;
+    if (IDTYP(h)==PROC_CMD)
+    {
+      procinfo *pi=(procinfo*)IDDATA(h);
+      if ((strcmp(IDID(h),"mod_init")==0)
+      && (pi->language == LANG_SINGULAR))
+      {
+        //PrintS("mod_init found\n");
+        iiMake_proc(h,p,NULL);
+        idhdl hh=IDNEXT(h);
+        killhdl(h);
+        if (prev==NULL)
+          p->idroot=hh;
+      }
+    }
+    prev=h;
+    h=IDNEXT(h);
+  }
+  myynest--;
+}
 /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
 BOOLEAN iiLoadLIB(FILE *fp, char *libnamebuf, char*newlib,
              idhdl pl, BOOLEAN autoexport, BOOLEAN tellerror)
 {
-  char buf[256];
   extern FILE *yylpin;
   libstackv ls_start = library_stack;
@@ -866 +891 @@
   fclose( yylpin );
   fp = NULL;
+  iiRunInit(IDPACKAGE(pl));
 
   {