Changeset 11ca48 in git

Timestamp:

Aug 3, 2010, 4:49:57 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

99bdcf719779ed8127742694cda3e29f272e2683

Parents:

57dfde6393ffc702f8e898e313d4b76980cdddd5

Message:

alias and Typ/Data

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

File:

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

Singular/subexpr.cc

@@ -830 +830 @@
     switch (rtyp)
     {
+      case IDHDL:
+        return IDTYP((idhdl)data);
       case ALIAS_CMD:
          {
@@ -835 +837 @@
            return  ((idhdl)h->data.ustring)->typ;
          }
-      case IDHDL:
-        return IDTYP((idhdl)data);
       case VECHO:
       case VPAGELENGTH:
@@ -865 +865 @@
   int r=0;
   int t=rtyp;
-  if (t==ALIAS_CMD) { idhdl h=(idhdl)IDDATA((idhdl)data); t=IDTYP(h); }
-  else if (t==IDHDL) t=IDTYP((idhdl)data);
+  if (t==IDHDL) t=IDTYP((idhdl)data);
+  else if (t==ALIAS_CMD) { idhdl h=(idhdl)IDDATA((idhdl)data); t=IDTYP(h); }
   switch (t)
   {
@@ -956 +956 @@
 void * sleftv::Data()
 {
-  if(rtyp==ALIAS_CMD)
-  {
-    idhdl h=(idhdl)data;
-    return  ((idhdl)h->data.ustring)->data.ustring;
-  }
   if ((rtyp!=IDHDL) && iiCheckRing(rtyp))
      return NULL;
@@ -967 +962 @@
     switch (rtyp)
     {
+      case ALIAS_CMD:
+      {
+        idhdl h=(idhdl)data;
+        return  ((idhdl)h->data.ustring)->data.ustring;
+      }
       case VECHO:      return (void *)si_echo;
       case VPAGELENGTH:return (void *)pagelength;
@@ -1008 +1008 @@
     d=IDDATA((idhdl)data);
   }
+  else if (t==ALIAS_CMD)
+  {
+    idhdl h=(idhdl)IDDATA((idhdl)data);
+    t=IDTYP(h);
+    d=IDDATA(h);
+  }
   if (iiCheckRing(t))
     return NULL;