Changeset befd80d in git

Timestamp:

Apr 1, 2019, 12:02:40 PM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8d54773d6c9e2f1d2593a28bc68b7eeab54ed529')

Children:

f2749caea51700fb0ba2c2635aeaf6111f86387a

Parents:

1d8d0e5c474f63a8db51f932e87069659c60189d

Message:

opt: iiS2I

Location:

Singular

Files:

• idrec.h (modified) (1 diff)
• ipid.cc (modified) (3 diffs)
• subexpr.cc (modified) (1 diff)

Singular/idrec.h

@@ -45 +45 @@
   short      lev;
   short      ref;
-  int        id_i;
+  unsigned long id_i;
 
   idrec() { memset(this,0,sizeof(*this)); }

Singular/ipid.cc

@@ -63 +63 @@
 /*0 implementation*/
 
-int iiS2I(const char *s)
-{
-  int i;
-  i=s[0];
-  if (s[1]!='\0')
-  {
-    i=(i<<8)+s[1];
-    if (s[2]!='\0')
-    {
-      i=(i<<8)+s[2];
-      if (s[3]!='\0')
-      {
-        i=(i<<8)+s[3];
-      }
-    }
-  }
-  return i;
+static inline long iiS2I(const char *s)
+{
+  long l;
+  strncpy((char*)&l,s,SIZEOF_LONG);
+  return l;
 }
 
@@ -90 +78 @@
   int l;
   const char *id_;
-  int i=iiS2I(s);
-  int less4=(i < (1<<24));
+  unsigned long i=iiS2I(s);
+  int less4=(i < (1L<<((SIZEOF_LONG-1)*8)));
   while (h!=NULL)
   {
@@ -101 +89 @@
       {
         id_=IDID(h);
-        if (less4 || (0 == strcmp(s+4,id_+4)))
+        if (less4 || (0 == strcmp(s+SIZEOF_LONG,id_+SIZEOF_LONG)))
         {
-          if (l==level) return h;
+          if(l==level) return h;
           found=h;
         }

Singular/subexpr.cc

@@ -1647 +1647 @@
       }
       else
-      h=ggetid(id);
+      {
+        h=ggetid(id);
+      }
       /* 3) existing identifier, local */
       if ((h!=NULL) && (IDLEV(h)==myynest))