Changeset a71a00 in git

Timestamp:

Jul 25, 2011, 8:03:21 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

959af92dd3c85cbbd9bccbb36164c999d4f65f53

Parents:

15bb91833fa965fdd1eab30eb3d6abcb55565969

Message:

iiAllStart for iiPStart and iiEStart

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

Location:

Singular

Files:

• iplib.cc (modified) (6 diffs)
• misc_ip.cc (modified) (3 diffs)

Singular/iplib.cc

@@ -294 +294 @@
 }
 
+BOOLEAN iiAllStart(procinfov pi, char *p,feBufferTypes t, int l)
+{
+  newBuffer( omStrDup(p /*pi->data.s.body*/), t /*BT_proc*/,
+               pi, l );
+  BOOLEAN err=yyparse();
+  if (sLastPrinted.rtyp!=0)
+  {
+    sLastPrinted.CleanUp();
+  }
+  return err;
+}
 /*2
 * start a proc
@@ -323 +334 @@
 //      int m=om_Info.UsedBytes;
 //      Print("proc %s, mem=%d\n",IDID(pn),m);
-      newBuffer( omStrDup(pi->data.s.body), BT_proc,
-                 pi, pi->data.s.body_lineno-(v!=NULL) );
-    }
-  }
+    }
+  }
+  else return TRUE;
   /* generate argument list ======================================*/
   if (v!=NULL)
@@ -348 +358 @@
   else
   {
-    err=yyparse();
-#ifndef NDEBUG
-    checkall();
-#endif
-    if (sLastPrinted.rtyp!=0)
-    {
-      sLastPrinted.CleanUp();
-    }
+    err=iiAllStart(pi,pi->data.s.body,BT_proc,pi->data.s.body_lineno-(v!=NULL));
+
     //Print("kill locals for %s (level %d)\n",IDID(pn),myynest);
     killlocals(myynest);
@@ -615 +619 @@
   int old_echo=si_echo;
 
-  newBuffer( example, BT_example, pi,
-             (pi != NULL ? pi->data.s.example_lineno: 0));
-
   iiCheckNest();
   procstack->push(example);
@@ -630 +631 @@
   myynest++;
   iiRETURNEXPR[myynest].Init();
-  err=yyparse();
-  if (sLastPrinted.rtyp!=0)
-  {
-    sLastPrinted.CleanUp();
-    //memset(&sLastPrinted,0,sizeof(sleftv)); //done by CleanUp
-  }
+
+  err=iiAllStart(pi,example,BT_example,(pi != NULL ? pi->data.s.example_lineno: 0));
+
   killlocals(myynest);
   myynest--;
@@ -1079 +1077 @@
   const char* bin_dir = feGetResource('b');
   if (!bin_dir)  { return NULL; }
-  
-  char path_name[MAXPATHLEN]; 
+
+  char path_name[MAXPATHLEN];
   sprintf(path_name, "%s%s%s.%s", bin_dir, DIR_SEPP, newlib, MODULE_SUFFIX_STRING);
 

Singular/misc_ip.cc

@@ -426 +426 @@
         {
           iiEStart(s,IDPROC(h));
+          omFree((ADDRESS)s);
           return;
         }
@@ -458 +459 @@
       {
         Werror("Error while reading file %s", sing_file);
-        omFree(s);
       }
       else
@@ -468 +468 @@
         si_echo = old_echo;
       }
+      omFree(s);
     }
     else