Changeset db34980 in git

Timestamp:

Feb 20, 2012, 7:52:45 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

9b8b090bca59f6bb48b468a6a1b63a90e53e6299

Parents:

e3198f2a9226b630c86adfee27dac28803f035df

Message:

fix: alias in proc headers (tr. 404) (from master)
fix: alias and lists (tr. 404) (from master)

Location:

Singular

Files:

• iplib.cc (modified) (1 diff)
• subexpr.cc (modified) (6 diffs)

Singular/iplib.cc

@@ -149 +149 @@
     s=e; // set s to the starting point of the arg
          // and search for the end
+    while(*s==' ') s++; e=s; // skip leading paces
     while ((*e!=',')
     &&((par!=0) || (*e!=')'))

Singular/subexpr.cc

@@ -126 +126 @@
         case RING_CMD:
         case QRING_CMD:
-        {             
+        {
           PrintNSpaces(spaces);
-          const ring r = (const ring)d;
+          const ring r = (const ring)d;
           rWrite(r, currRing == r);
           break;
-        }        
+        }
         case MATRIX_CMD:
           iiWriteMatrix((matrix)d,n,2, currRing, spaces);
@@ -632 +632 @@
     {
       const ring A = currRing->cf->extRing;
-      
+
       assume( A != NULL );
       assume( A->minideal != NULL );
-    
+
       x=(void *)p_Copy(A->minideal->m[0], A);
     }
@@ -832 +832 @@
             {
               char* id = iiStringMatrix((matrix) ((ring) d)->qideal, dim,
-                              currRing);
+                              currRing);
               ns = (char*) omAlloc(strlen(s) + strlen(id) + 20);
               sprintf(ns, "\"%s\";%sideal(%s)", s,(dim == 2 ? "\n" : " "), id);
@@ -964 +964 @@
         lists l;
         if (rtyp==IDHDL) l=IDLIST((idhdl)data);
+        else if (rtyp==ALIAS_CMD)
+        {
+          idhdl h=(idhdl)data;
+          l=(lists)(((idhdl)h->data.ustring)->data.ustring);
+        }
         else             l=(lists)data;
         if ((0<e->start)&&(e->start<=l->nr+1))
@@ -1047 +1052 @@
           /* Q(a), Fp(a), but not GF(q) */
           const ring A = currRing->cf->extRing;
-          
+
           assume( A != NULL );
           assume( A->minideal != NULL );
-          
+
           return (void *)A->minideal->m[0];
         }
         else
           return (void *)currRing->cf->nNULL;
-        
+
       case VNOETHER:   return (void *) (currRing->ppNoether);
       case IDHDL:
@@ -1256 +1261 @@
     if (rtyp==LIST_CMD)
       l=(lists)data;
-    if ((rtyp==IDHDL)&& (IDTYP((idhdl)data)==LIST_CMD))
+    else if ((rtyp==IDHDL)&& (IDTYP((idhdl)data)==LIST_CMD))
       l=IDLIST((idhdl)data);
+    else if (rtyp==ALIAS_CMD)
+    {
+      idhdl h=(idhdl)data;
+      l= (lists)(((idhdl)h->data.ustring)->data.ustring);
+    }
     if (l!=NULL)
     {