Changeset 7f68b2 in git

Timestamp:

Jan 7, 2002, 6:20:48 PM (22 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'd1b01e9d51ade4b46b745d3bada5c5f3696be3a8')

Children:

9f12b01ac1a74d42a84bda5d879008a64a565d71

Parents:

692689de70864c2fce92fb4c9b577701c0b415d4

Message:

*hannes: update error messages


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

File:

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

Singular/ipid.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipid.cc,v 1.55 2001-10-23 14:04:22 Singular Exp $ */
+/* $Id: ipid.cc,v 1.56 2002-01-07 17:20:48 Singular Exp $ */
 
 /*
@@ -418 +418 @@
 
   errlabel:
-    Werror("identifier `%s` in use(lev h=%d,typ=%d,t=%d, curr=%d)",s,IDLEV(h),IDTYP(h),t,lev);
+    //Werror("identifier `%s` in use(lev h=%d,typ=%d,t=%d, curr=%d)",s,IDLEV(h),IDTYP(h),t,lev);
+    Werror("identifier `%s` in use",s);
 #ifdef HAVE_NS
-    listall();
+    //listall();
 #endif
     omFree(s);
@@ -780 +781 @@
 #else /* HAVE_NAMESPACES */
   idhdl h = IDROOT->get(n,myynest);
+  if ((h!=NULL)&&(IDLEV(h)==myynest)) return h;
   idhdl h2=NULL;
-  if ((currRing!=NULL) && ((h==NULL)||(IDLEV(h)!=myynest)))
+  if (currRing!=NULL)
   {
     h2 = currRing->idroot->get(n,myynest);
   }
-  if (h2==NULL) return h;
-  return h2;
+  if (h2!=NULL) return h2;
+  if (h!=NULL) return h;
+#ifdef HAVE_NS  
+  if (basePack!=currPack)
+    return basePack->idroot->get(n,myynest);
+#endif      
+  return NULL; 
 #endif /* HAVE_NAMESPACES */
 }
@@ -1055 +1062 @@
   //Print("push %s\n",n);
   proclevel *p=(proclevel*)omAlloc0(sizeof(proclevel));
-  p->currRing=::currRing;
-  p->currRingHdl=::currRingHdl;
+  //p->currRing=::currRing;
+  //p->currRingHdl=::currRingHdl;
   p->name=n;
   #ifdef HAVE_NS