Changeset d5add65 in git

Timestamp:

Nov 16, 2011, 4:00:01 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

b565d4f69d962cf1746a77db46934de7cc17f5e4

Parents:

9875202a2c72496bbc39676b4ca272ba4da36c09

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-11-16 16:00:01+01:00

git-committer:

Martin Lee <martinlee84@web.de>2013-01-18 16:15:04+01:00

Message:

add: names(int level) added

Conflicts:

	Singular/iparith.cc
	Singular/ipid.cc
	Singular/ipid.h

Location:

Singular

Files:

• iparith.cc (modified) (1 diff)
• ipid.cc (modified) (2 diffs)
• ipid.h (modified) (2 diffs)
• table.h (modified) (1 diff)

Singular/iparith.cc

@@ -4542 +4542 @@
 {
   res->data=ipNameList(((ring)v->Data())->idroot);
+  return FALSE;
+}
+static BOOLEAN jjNAMES_I(leftv res, leftv v)
+{
+  res->data=ipNameListLev((IDROOT),(int)(long)v->Data());
   return FALSE;
 }

Singular/ipid.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
+
 /*
 * ABSTRACT: identfier handling
@@ -519 +520 @@
 }
 
+lists ipNameListLev(idhdl root, int lev)
+{
+  idhdl h=root;
+  /* compute the length */
+  int l=0;
+  while (h!=NULL) { if (IDLEV(h)==lev) l++; h=IDNEXT(h); }
+  /* allocate list */
+  lists L=(lists)omAllocBin(slists_bin);
+  L->Init(l);
+  /* copy names */
+  h=root;
+  l=0;
+  while (h!=NULL)
+  {
+    if (IDLEV(h)==lev)
+    {
+      /* list is initialized with 0 => no need to clear anything */
+      L->m[l].rtyp=STRING_CMD;
+      L->m[l].data=omStrDup(IDID(h));
+      l++;
+    }
+    h=IDNEXT(h);
+  }
+  return L;
+}
+
 /*
 * move 'tomove' from root1 list to root2 list

Singular/ipid.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
+
 /*
 * ABSTRACT: identfier handling
@@ -98 +99 @@
 void  killhdl2(idhdl h, idhdl * ih, ring r);
 lists ipNameList(idhdl root);
+lists ipNameListLev(idhdl root, int lev);
 void  ipMoveId(idhdl h);
 BOOLEAN checkPackage(package pack);

Singular/table.h

@@ -189 +189 @@
 ,{D(jjMSTD),       MSTD_CMD,        LIST_CMD,       MODUL_CMD     , NO_PLURAL |ALLOW_RING}
 ,{D(jjNAMEOF),     NAMEOF_CMD,      STRING_CMD,     ANY_TYPE      , ALLOW_PLURAL |ALLOW_RING}
+,{D(jjNAMES_I),    NAMES_CMD,       LIST_CMD,       INT_CMD       , ALLOW_PLURAL |ALLOW_RING}
 ,{D(jjNAMES),      NAMES_CMD,       LIST_CMD,       PACKAGE_CMD   , ALLOW_PLURAL |ALLOW_RING}
 ,{D(jjNAMES),      NAMES_CMD,       LIST_CMD,       RING_CMD      , ALLOW_PLURAL |ALLOW_RING}