Changeset 8cc234 in git

Timestamp:

Jan 6, 2010, 1:27:01 PM (13 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

a7a94edf0d03f2f4cedf69c0e3af1487f084ba10

Parents:

a38b95b9190fdc9786efb4c81bb4ac12ad0e7c84

Message:

HAVE_IDI is now standard

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

Location:

Singular

Files:

• ipid.cc (modified) (5 diffs)
• mpsr_Get.h (modified) (1 diff)

Singular/ipid.cc

@@ -56 +56 @@
 /*0 implementation*/
 
-#ifdef HAVE_IDI
 int iiS2I(const char *s)
 {
@@ -75 +74 @@
   return i;  
 }
-#endif
+
 idhdl idrec::get(const char * s, int lev)
 {
@@ -84 +83 @@
   int l;
   const char *id;
-#ifndef HAVE_IDI
-  if (s[1]=='\0')
-  {
-    while (h!=NULL)
-    {
-      omCheckAddr(IDID(h));
-// =============================================================
-#if 0
-// timings: ratchwum: 515 s, wilde13: 373 s, nepomuck: 267 s, lukas 863 s
-    id=IDID(h);
-    l=IDLEV(h);
-    if ((l==0) && (*(short *)s==*(short *)id) && (0 == strcmp(s+1,id+1)))
-    {
-      found=h;
-    }
-    else if ((l==lev) && (*(short *)s==*(short *)id) && (0 == strcmp(s+1,id+1)))
-    {
-      return h;
-    }
-#endif
-// =============================================================
-#if 0
-// timings: ratchwum: 515 s, wilde13: 398 s, nepomuck: 269 s, lukas 834 s
-    id=IDID(h);
-    if (*(short *)s==*(short *)id)
-    {
-      l=IDLEV(h);
-      if ((l==0) && (0 == strcmp(s+1,id+1)))
-      {
-        found=h;
-      }
-      else if ((l==lev) && (0 == strcmp(s+1,id+1)))
-      {
-        return h;
-      }
-    }
-#endif
-// =============================================================
-#if 1
-// timings: ratchwum: 501 s, wilde13: 357 s, nepomuck: 267 s, lukas 816 s
-// timings bug4: ratchwum: s, wilde13: s, nepomuck: 379.74 s, lukas s
-    l=IDLEV(h);
-    if ((l==0)||(l==lev))
-    {
-      id=IDID(h);
-      if (*s==*id)
-      {
-        if (id[1]=='\0')  // we know: s[1]=='\0'
-        {
-          if (l==lev) return h;
-          found=h;
-        }
-      }
-    }
-#endif
-// =============================================================
-#if 0
-// timings: ratchwum: s, wilde13: s, nepomuck: s, lukas s
-// timings bug4: ratchwum: s, wilde13: s, nepomuck: s, lukas s
-    l=IDLEV(h);
-    if ((l==0)||(l==lev))
-    {
-      id=IDID(h);
-      if (*(short *)s==*(short *)id)
-      {
-        if (l==lev) return h;
-        found=h;
-      }
-    }
-#endif
-// =============================================================
-    h = IDNEXT(h);
-  }
-  }
-  else
-  {
-  while (h!=NULL)
-  {
-    omCheckAddr(IDID(h));
-// =============================================================
-#if 0
-// timings: ratchwum: 515 s, wilde13: 373 s, nepomuck: 267 s, lukas 863 s
-    id=IDID(h);
-    l=IDLEV(h);
-    if ((l==0) && (*(short *)s==*(short *)id) && (0 == strcmp(s+1,id+1)))
-    {
-      found=h;
-    }
-    else if ((l==lev) && (*(short *)s==*(short *)id) && (0 == strcmp(s+1,id+1)))
-    {
-      return h;
-    }
-#endif
-// =============================================================
-#if 0
-// timings: ratchwum: 515 s, wilde13: 398 s, nepomuck: 269 s, lukas 834 s
-    id=IDID(h);
-    if (*(short *)s==*(short *)id)
-    {
-      l=IDLEV(h);
-      if ((l==0) && (0 == strcmp(s+1,id+1)))
-      {
-        found=h;
-      }
-      else if ((l==lev) && (0 == strcmp(s+1,id+1)))
-      {
-        return h;
-      }
-    }
-#endif
-// =============================================================
-#if 0
-// timings: ratchwum: 501 s, wilde13: 357 s, nepomuck: 267 s, lukas 816 s
-// timings bug4: ratchwum: s, wilde13: s, nepomuck: 379.74 s, lukas s
-    l=IDLEV(h);
-    if ((l==0)||(l==lev))
-    {
-      id=IDID(h);
-      if (*(short *)s==*(short *)id)
-      {
-        if (0 == strcmp(s+1,id+1))
-        {
-          if (l==lev) return h;
-          found=h;
-        }
-      }
-    }
-#endif
-// =============================================================
-#if 1
-// timings: ratchwum: s, wilde13: s, nepomuck: s, lukas s
-// timings bug4: ratchwum: s, wilde13: s, nepomuck: s, lukas s
-    l=IDLEV(h);
-    if ((l==0)||(l==lev))
-    {
-      id=IDID(h);
-      if (*(short *)s==*(short *)id)
-      {
-        if (0 == strcmp(s+1,id+1))
-        {
-          if (l==lev) return h;
-          found=h;
-        }
-      }
-    }
-#endif
-// =============================================================
-    h = IDNEXT(h);
-  }
-  }
-  return found;
-#else
   int i=iiS2I(s);
   int less4=(i < (1<<24));
@@ -257 +104 @@
   }
   return found;
-#endif
 }
 
@@ -279 +125 @@
   IDLEV(h)  = lev;
   IDNEXT(h) = this;
-#ifdef HAVE_IDI
   h->id_i=iiS2I(s);
-#endif
   if (init)
   {

Singular/mpsr_Get.h

@@ -111 +111 @@
   IDTYP(h) = tok;
   IDDATA(h) = (char *) data;
-#ifdef HAVE_IDI
   extern int iiS2I(const char *s);
   h->id_i=iiS2I(name);
-#endif
   return h;
 }