Changeset 34388a in git for Singular

Timestamp:

Mar 23, 2022, 11:00:57 PM (2 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

8b9bbee61c66f3f671554a86023c9ed5f7134f02

Parents:

fe9de63c2326ce1fda9b11bcd48015760dd7c982

Message:

fix: loading proc from both syn.module and lib

File:

• Singular/ipid.cc (modified) (3 diffs)

Singular/ipid.cc

@@ -304 +304 @@
         else return h;
       }
+      else if((t==PROC_CMD)&&(IDPROC(h)->language==LANG_C))
+      {
+        if (BVERBOSE(V_REDEFINE))
+        {
+          const char *f=VoiceName();
+          if (strcmp(f,"STDIN")==0)
+            Warn("redefining proc %s (%s)",s,my_yylinebuf);
+          else
+            Warn("redefining proc %s (%s) %s:%d",s,my_yylinebuf,f, yylineno);
+        }
+        if (s==IDID(h)) IDID(h)=NULL;
+      }
       else
       {
@@ -459 +471 @@
   if (IDTYP(h) == PACKAGE_CMD)
   {
-    if (((IDPACKAGE(h)->language==LANG_C)&&(IDPACKAGE(h)->idroot!=NULL))
+    if ((((IDPACKAGE(h)->language==LANG_C) ||(IDPACKAGE(h)->language==LANG_MIX))
+      &&(IDPACKAGE(h)->idroot!=NULL))
     || (strcmp(IDID(h),"Top")==0))
     {
@@ -493 +506 @@
   else if (IDDATA(h)!=NULL)
     s_internalDelete(IDTYP(h),IDDATA(h),r);
+  IDDATA(h)=NULL;
   //  general  -------------------------------------------------------------
   // now dechain it and delete idrec