Changeset 8db6c3 in git

Timestamp:

Feb 16, 2011, 2:27:50 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

74a04c7beedec063e096ede7db7df150693f87b2

Parents:

f2df0c30be0677407fbe248dc749715bf5ec0e7f

Message:

blackbox: properties for newstruct

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

Location:

Singular

Files:

• blackbox.h (modified) (1 diff)
• ipassign.cc (modified) (1 diff)
• subexpr.cc (modified) (2 diffs)

Singular/blackbox.h

@@ -38 +38 @@
   void *data;
   /// addtinional gneral properties
-  char like_lists; // 1:blackbox is only a wrapper for lists
+  int properties; // bit 0:blackbox is only a wrapper for lists
+#define  BB_LIKE_LIST(B) ((B)->properties &1)
 } ;
 /// default procedure blackboxDefaultOp1, to be called as "default:" branch

Singular/ipassign.cc

@@ -1433 +1433 @@
   {
     /* l[..] = ... */
-    if((l->e!=NULL)
-    && (((l->rtyp==IDHDL) && (IDTYP((idhdl)l->data)==LIST_CMD))
-      || (l->rtyp==LIST_CMD)))
-    {
-       if (TEST_V_ALLWARN) PrintS("assign list[..]=...\n");
-       b=jiAssign_list(l,r);
-       if(!b)
-       {
-         //Print("jjA_L_LIST: - 2 \n");
-         if((l->rtyp==IDHDL) && (l->data!=NULL))
-         {
-           ipMoveId((idhdl)l->data);
-           l->attribute=IDATTR((idhdl)l->data);
-           l->flag=IDFLAG((idhdl)l->data);
-         }
-       }
-       r->CleanUp();
-       Subexpr h;
-       while (l->e!=NULL)
-       {
-         h=l->e->next;
-         omFreeBin((ADDRESS)l->e, sSubexpr_bin);
-         l->e=h;
-       }
-       return b;
-    }
+    if(l->e!=NULL)
+    {
+      BOOLEAN like_lists=0;
+      blackbox *bb=NULL;
+      int bt;
+      if (((bt=l->rtyp)>MAX_TOK)
+      || ((l->rtyp==IDHDL) && ((bt=IDTYP((idhdl)l->data))>MAX_TOK)))
+      {
+        bb=getBlackboxStuff(bt);
+        like_lists=BB_LIKE_LIST(bb);
+      }
+      else if (((l->rtyp==IDHDL) && (IDTYP((idhdl)l->data)==LIST_CMD))
+        || (l->rtyp==LIST_CMD))
+      {
+        like_lists=2;
+      }
+      if(like_lists)
+      {
+        if (TEST_V_ALLWARN) PrintS("assign list[..]=...or similiar\n");
+        b=jiAssign_list(l,r);
+        if((!b) && (like_lists==2))
+        {
+          //Print("jjA_L_LIST: - 2 \n");
+          if((l->rtyp==IDHDL) && (l->data!=NULL))
+          {
+            ipMoveId((idhdl)l->data);
+            l->attribute=IDATTR((idhdl)l->data);
+            l->flag=IDFLAG((idhdl)l->data);
+          }
+        }
+        r->CleanUp();
+        Subexpr h;
+        while (l->e!=NULL)
+        {
+          h=l->e->next;
+          omFreeBin((ADDRESS)l->e, sSubexpr_bin);
+          l->e=h;
+        }
+        if ((!b) && (like_lists==1))
+        {
+          // check blackbox/newtype type:
+          if(bb->blackbox_Check(bb,l->Data())) return TRUE;
+        }
+        return b;
+      }
+    }
+    // end of handling elems of list and similiar
     rl=r->listLength();
     if (rl==1)

Singular/subexpr.cc

@@ -1030 +1030 @@
       r=STRING_CMD;
       break;
-    case LIST_CMD:
-    {
-      lists l;
-      if (rtyp==IDHDL) l=IDLIST((idhdl)data);
-      else             l=(lists)data;
-      if ((0<e->start)&&(e->start<=l->nr+1))
-      {
-        Subexpr tmp=l->m[e->start-1].e;
-        l->m[e->start-1].e=e->next;
-        r=l->m[e->start-1].Typ();
-        e->next=l->m[e->start-1].e;
-        l->m[e->start-1].e=tmp;
+    default:
+    {
+      blackbox *b=NULL;
+      if (t>MAX_TOK)
+      {
+        b=getBlackboxStuff(t);
+      }
+      if ((t==LIST_CMD)||((b!=NULL)&&BB_LIKE_LIST(b)))
+      {
+        lists l;
+        if (rtyp==IDHDL) l=IDLIST((idhdl)data);
+        else             l=(lists)data;
+        if ((0<e->start)&&(e->start<=l->nr+1))
+        {
+          Subexpr tmp=l->m[e->start-1].e;
+          l->m[e->start-1].e=e->next;
+          r=l->m[e->start-1].Typ();
+          e->next=l->m[e->start-1].e;
+          l->m[e->start-1].e=tmp;
+        }
+        else
+        {
+          //Warn("out of range: %d not in 1..%d",e->start,l->nr+1);
+          r=NONE;
+        }
       }
       else
-      {
-        //Warn("out of range: %d not in 1..%d",e->start,l->nr+1);
-        r=NONE;
-      }
+        Werror("cannot index type %s(%d)",Tok2Cmdname(t),t);
       break;
     }
-    default:
-      Werror("cannot index type %d",t);
   }
   return r;
@@ -1248 +1256 @@
       break;
     }
-    case LIST_CMD:
-    {
-      lists l=(lists)d;
-      if ((0<index)&&(index<=l->nr+1))
-      {
-        if ((e->next!=NULL)
-        && (l->m[index-1].rtyp==STRING_CMD))
-        // string[..].Data() modifies sleftv, so let's do it ourself
-        {
-          char *dd=(char *)l->m[index-1].data;
-          int j=e->next->start-1;
-          r=(char *)omAllocBin(size_two_bin);
-          if ((j>=0) && (j<(int)strlen(dd)))
-          {
-            r[0]=*(dd+j);
-            r[1]='\0';
+    default:
+    {
+      blackbox *b=NULL;
+      if (t>MAX_TOK)
+      {
+        b=getBlackboxStuff(t);
+      }
+      if ((t==LIST_CMD)||((b!=NULL)&&(BB_LIKE_LIST(b))))
+      {
+        lists l=(lists)d;
+        if ((0<index)&&(index<=l->nr+1))
+        {
+          if ((e->next!=NULL)
+          && (l->m[index-1].rtyp==STRING_CMD))
+          // string[..].Data() modifies sleftv, so let's do it ourself
+          {
+            char *dd=(char *)l->m[index-1].data;
+            int j=e->next->start-1;
+            r=(char *)omAllocBin(size_two_bin);
+            if ((j>=0) && (j<(int)strlen(dd)))
+            {
+              r[0]=*(dd+j);
+              r[1]='\0';
+            }
+            else
+            {
+              r[0]='\0';
+            }
           }
           else
           {
-            r[0]='\0';
-          }
-        }
-        else
-        {
-          Subexpr tmp=l->m[index-1].e;
-          l->m[index-1].e=e->next;
-          r=(char *)l->m[index-1].Data();
-          e->next=l->m[index-1].e;
-          l->m[index-1].e=tmp;
-        }
-      }
-      else //if (!errorreported)
-        Werror("wrong range[%d] in list(%d)",index,l->nr+1);
+            Subexpr tmp=l->m[index-1].e;
+            l->m[index-1].e=e->next;
+            r=(char *)l->m[index-1].Data();
+            e->next=l->m[index-1].e;
+            l->m[index-1].e=tmp;
+          }
+        }
+        else //if (!errorreported)
+          Werror("wrong range[%d] in list(%d)",index,l->nr+1);
+      }
+      else
+        Werror("cannot index type %s(%d)",Tok2Cmdname(t),t);
       break;
     }
-#ifdef TEST
-    default:
-      Werror("cannot index type %s(%d)",Tok2Cmdname(t),t);
-#endif
   }
   return r;