Changeset a78f216 in git for Singular/misc.cc

Timestamp:

Jan 7, 2002, 6:18:11 PM (22 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38dfc5131670d387a89455159ed1e071997eec94')

Children:

6f37433d1f48fb58800b93d35fec0b1808f3ffdd

Parents:

998f98c30af1dfaf2927f6234ab05cd0eba46cc4

Message:

*hannes: showproc


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

File:

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

Singular/misc.cc

@@ -683 +683 @@
 
 #ifdef HAVE_NS
-void listall()
+void listall(int showproc)
 {
       idhdl hh=basePack->idroot;
@@ -689 +689 @@
       while (hh!=NULL)
       {
-        if (IDDATA(hh)==NULL) PrintS("(N)");
-        else if (IDDATA(hh)==(void *)currRing) PrintS("(R)");
-        else if (IDDATA(hh)==(void *)currPack) PrintS("(P)");
-        else PrintS("   ");
-        Print("::%s, typ %s level %d",
-               IDID(hh),Tok2Cmdname(IDTYP(hh)),IDLEV(hh));
-        if ((IDTYP(hh)==RING_CMD)
-        || (IDTYP(hh)==QRING_CMD))
-          Print(" ref: %d\n",IDRING(hh)->ref);
-        else
-          PrintLn();
+        if (showproc || (IDTYP(hh)!=PROC_CMD))
+        {
+          if (IDDATA(hh)==(void *)currRing) PrintS("(R)");
+          else if (IDDATA(hh)==(void *)currPack) PrintS("(P)");
+          else PrintS("   ");
+          Print("::%s, typ %s level %d data %x",
+                 IDID(hh),Tok2Cmdname(IDTYP(hh)),IDLEV(hh),IDDATA(hh));
+          if ((IDTYP(hh)==RING_CMD)
+          || (IDTYP(hh)==QRING_CMD))
+            Print(" ref: %d\n",IDRING(hh)->ref);
+          else
+            PrintLn();
+        }  
         hh=IDNEXT(hh);
       }
@@ -706 +708 @@
       {
         if (IDDATA(hh)==(void *)basePack)
-          Print("(T)::%s, typ %s level %d\n",
-          IDID(hh),Tok2Cmdname(IDTYP(hh)),IDLEV(hh));
+          Print("(T)::%s, typ %s level %d data %x\n",
+          IDID(hh),Tok2Cmdname(IDTYP(hh)),IDLEV(hh),IDDATA(hh));
         else
         if ((IDTYP(hh)==RING_CMD)
@@ -717 +719 @@
           while (h2!=NULL)
           {
-            if (IDDATA(h2)==NULL) PrintS("(N)");
-            else if (IDDATA(h2)==(void *)currRing) PrintS("(R)");
-            else if (IDDATA(h2)==(void *)currPack) PrintS("(P)");
-            else PrintS("   ");
-            Print("%s::%s, typ %s level %d\n",
-            IDID(hh),IDID(h2),Tok2Cmdname(IDTYP(h2)),IDLEV(h2));
+            if (showproc || (IDTYP(h2)!=PROC_CMD))
+            {
+              if (IDDATA(h2)==(void *)currRing) PrintS("(R)");
+              else if (IDDATA(h2)==(void *)currPack) PrintS("(P)");
+              else PrintS("   ");
+              Print("%s::%s, typ %s level %d data %x\n",
+              IDID(hh),IDID(h2),Tok2Cmdname(IDTYP(h2)),IDLEV(h2),IDDATA(h2));
+            }  
             h2=IDNEXT(h2);
           }
@@ -735 +739 @@
       while (hh!=NULL)
       {
-        omCheckAddr(hh);
-        omCheckAddr(IDID(hh));
+        omCheckAddr(hh);
+        omCheckAddr(IDID(hh));
         if (RingDependend(IDTYP(hh))) Print("%s typ %d in Top\n",IDID(hh),IDTYP(hh));
         hh=IDNEXT(hh);
@@ -748 +752 @@
           while (h2!=NULL)
           {
-            omCheckAddr(h2);
-            omCheckAddr(IDID(h2));
+            omCheckAddr(h2);
+            omCheckAddr(IDID(h2));
             if (RingDependend(IDTYP(h2))) Print("%s typ %d in %s\n",IDID(h2),IDTYP(h2),IDID(hh));
             h2=IDNEXT(h2);