Changeset 56ffd98 in git

Timestamp:

Apr 3, 2019, 2:08:46 PM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8d54773d6c9e2f1d2593a28bc68b7eeab54ed529')

Children:

f573055591b5819fc2d6a5795ca9b931a998ad1d

Parents:

2473c953979c291dd9b3163a11c034a8f2518cba

Message:

chg: several versions of ggetid

File:

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

Singular/ipid.cc

@@ -543 +543 @@
 
 #if 0
+// debug version
+idhdl ggetid(const char *n)
+{
+  if (currRing!=NULL)
+  {
+    idhdl h2 = currRing->idroot->get(n,myynest);
+    idhdl h = IDROOT->get(n,myynest);
+    if ((h!=NULL)&&(h2!=NULL)&&(IDLEV(h)==IDLEV(h2)))
+    {
+      Warn("SHADOW %s(%s) vs %s(%s) in %s\n",IDID(h),Tok2Cmdname(IDTYP(h)),IDID(h2),Tok2Cmdname(IDTYP(h2)),my_yylinebuf);
+    }
+    if ((h2!=NULL)&&(IDLEV(h2)==myynest)) return h2;
+    if (h!=NULL) return h;
+    if (h2!=NULL) return h2;
+  }
+  else
+  {
+    idhdl h = IDROOT->get(n,myynest);
+    if (h!=NULL) return h;
+  }
+  if (basePack!=currPack)
+    return basePack->idroot->get(n,myynest);
+  return NULL;
+}
+#endif
+#if 1
+// try currRing before non-ring stuff
 idhdl ggetid(const char *n)
 {
@@ -563 +590 @@
 }
 #endif
-#if 1
+#if 0
+// try non-ring stuff before ring stuff
 idhdl ggetid(const char *n)
 {