Changeset 379cd1 in git

Timestamp:

Apr 2, 2019, 4:57:28 PM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

a74fa8837632268cfdb724eabc42506f5e99818e

Parents:

d389e9c18b7e7012d070921b40652668193eca24

Message:

opt: syMake

File:

• Singular/subexpr.cc (modified) (3 diffs)

Singular/subexpr.cc

@@ -1612 +1612 @@
 #endif
   {
-    if (!isdigit(id[0]))
-    {
-      if (strcmp(id,"basering")==0)
-      {
-        if (currRingHdl!=NULL)
-        {
-          if (id!=IDID(currRingHdl)) omFreeBinAddr((ADDRESS)id);
-          h=currRingHdl;
-          goto id_found;
-        }
-        else
-        {
-          v->name = id;
-          return; /* undefined */
-        }
-      }
-      else if (strcmp(id,"Current")==0)
-      {
-        if (currPackHdl!=NULL)
-        {
-          omFreeBinAddr((ADDRESS)id);
-          h=currPackHdl;
-          goto id_found;
-        }
-        else
-        {
-          v->name = id;
-          return; /* undefined */
-        }
-      }
-      if(v->req_packhdl!=currPack)
-      {
-        h=v->req_packhdl->idroot->get(id,myynest);
+    if (strcmp(id,"basering")==0)
+    {
+      if (currRingHdl!=NULL)
+      {
+        if (id!=IDID(currRingHdl)) omFreeBinAddr((ADDRESS)id);
+        h=currRingHdl;
+        goto id_found;
       }
       else
       {
-        h=ggetid(id);
-      }
-      /* 3) existing identifier, local */
-      if ((h!=NULL) && (IDLEV(h)==myynest))
-      {
-        if (id!=IDID(h)) omFreeBinAddr((ADDRESS)id); /*assume strlen(id) <1000 */
+        v->name = id;
+        return; /* undefined */
+      }
+    }
+    else if (strcmp(id,"Current")==0)
+    {
+      if (currPackHdl!=NULL)
+      {
+        omFreeBinAddr((ADDRESS)id);
+        h=currPackHdl;
         goto id_found;
       }
+      else
+      {
+        v->name = id;
+        return; /* undefined */
+      }
+    }
+    if(v->req_packhdl!=currPack)
+    {
+      h=v->req_packhdl->idroot->get(id,myynest);
+    }
+    else
+    {
+      h=ggetid(id);
+    }
+    /* 3) existing identifier, local */
+    if ((h!=NULL) && (IDLEV(h)==myynest))
+    {
+      if (id!=IDID(h)) omFreeBinAddr((ADDRESS)id); /*assume strlen(id) <1000 */
+      goto id_found;
     }
     if (yyInRingConstruction)
@@ -1844 +1841 @@
 void syMakeMonom(leftv v,const char * id)
 {
+  if (!isdigit(id[0]))
+  {
+    Print("non-digit:%s\n",id);
+  }
   /* resolv an identifier: (to DEF_CMD, if siq>0)
   * 6) monom (resp. number), local ring
@@ -1904 +1905 @@
 #ifdef SIQ
   else
+  {
     v->rtyp=DEF_CMD;
+  }
 #endif
   /* 9: _ */