Changeset 610881 in git

Timestamp:

Feb 20, 2009, 7:39:21 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '8d54773d6c9e2f1d2593a28bc68b7eeab54ed529')

Children:

29102a3e11d1517325e49708df7e7dad15950eec

Parents:

14ec8feac299623426d7fed980ed57de208d4e46

Message:

*hannes: attr also for aliases, unified found handling


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

File:

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

Singular/subexpr.cc

@@ -5 +5 @@
 * ABSTRACT: handling of leftv
 */
-/* $Id: subexpr.cc,v 1.102 2008-08-13 15:16:23 Singular Exp $ */
+/* $Id: subexpr.cc,v 1.103 2009-02-20 18:39:21 Singular Exp $ */
 
 #include <stdlib.h>
@@ -1270 +1270 @@
 //    Print("search %s in %s\n",id,v->req_packhdl->libname);
 #endif /* HAVE_NS */
+  idhdl h=NULL;
 #ifdef SIQ
   if (siq<=0)
 #endif
   {
-    idhdl h=NULL;
     if (!isdigit(id[0]))
     {
@@ -1282 +1282 @@
         {
           if (id!=IDID(currRingHdl)) omFree((ADDRESS)id);
-          v->rtyp = IDHDL;
-          v->data = (char *)currRingHdl;
-          v->name = IDID(currRingHdl);
-          v->flag = IDFLAG(currRingHdl);
-          return;
+          h=currRingHdl;
+          goto id_found;
         }
         else
@@ -1295 +1292 @@
       }
 #ifdef HAVE_NS
-      if (strcmp(id,"Current")==0)
+      else if (strcmp(id,"Current")==0)
       {
         if (currPackHdl!=NULL)
         {
           omFree((ADDRESS)id);
-          v->rtyp = IDHDL;
-          v->data = (char *)currPackHdl;
-          v->name = IDID(currPackHdl);
-          v->flag = IDFLAG(currPackHdl);
-          return;
+          h=currPackHdl;
+          goto id_found;
         }
         else
@@ -1323 +1317 @@
       {
         if (id!=IDID(h)) omFree((ADDRESS)id);
-        v->rtyp = IDHDL;
-        v->data = (char *)h;
-        v->flag = IDFLAG(h);
-        v->name = IDID(h);
-        v->attribute=IDATTR(h);
-        return;
+        goto id_found;
       }
     }
@@ -1350 +1339 @@
     {
       if (id!=IDID(h)) omFree((ADDRESS)id);
-      v->rtyp = IDHDL;
-      v->data = (char *)h;
-      v->flag = IDFLAG(h);
-      v->name = IDID(h);
-      v->attribute=IDATTR(h);
-      return;
+      goto id_found;
     }
     /* 6. local ring: number/poly */
@@ -1438 +1422 @@
       {
         if (IDID(currRingHdl)!=id) omFree((ADDRESS)id);
-        v->rtyp=IDHDL;
-        v->data=currRingHdl;
-        v->name=IDID(currRingHdl);
-        v->attribute=IDATTR(currRingHdl);
-        return;
+        h=currRingHdl;
+        goto id_found;
       }
     }
@@ -1452 +1433 @@
       {
         if (id!=IDID(h)) omFree((ADDRESS)id);
-        v->rtyp = IDHDL;
-        v->data = (char *)h;
-        v->flag = IDFLAG(h);
-        v->name = IDID(h);
-        v->attribute=IDATTR(h);
         v->req_packhdl=basePack;
-        return;
+        goto id_found;
       }
     }
@@ -1479 +1455 @@
     v->name = id;
   }
+  return;
+id_found: // we have an id (in h) found, to set the data in from h
+  v->rtyp = IDHDL;
+  v->data = (char *)h;
+  v->flag = IDFLAG(h);
+  v->name = IDID(h);
+  v->attribute=IDATTR(h);
 }