Changeset e3e129 in git

Timestamp:

Aug 14, 2015, 1:45:02 PM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

74fe3587102ed73b3858258975abbe6d63139abfa70ae4b16c65be7f0b28fba01f121d5df879d49a

Parents:

9a124249fa498488e7fe6c086eea551c001e016f

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2015-08-14 13:45:02+02:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2015-08-14 13:50:34+02:00

Message:

fix tr. #735, tr. #734 (definition of new aliases)

Files:

• Singular/ipid.cc (modified) (1 diff)
• Singular/ipshell.cc (modified) (3 diffs)
• Tst/Short/alias.res.gz.uu (modified) (1 diff)
• Tst/Short/bug_tr735.res.gz.uu (added)
• Tst/Short/bug_tr735.stat (added)
• Tst/Short/bug_tr735.tst (added)
• Tst/Short/ok_s.lst (modified) (1 diff)

Singular/ipid.cc

@@ -739 +739 @@
   return NULL;
 }
+
+BOOLEAN iiAlias(leftv p)
+{
+  if (iiCurrArgs==NULL)
+  {
+    Werror("not enough arguments for proc %s",VoiceName());
+    p->CleanUp();
+    return TRUE;
+  }
+  leftv h=iiCurrArgs;
+  iiCurrArgs=h->next;
+  h->next=NULL;
+  if (h->rtyp!=IDHDL)
+  {
+    BOOLEAN res=iiAssign(p,h);
+    h->CleanUp();
+    omFreeBin((ADDRESS)h, sleftv_bin);
+    return res;
+  }
+  if ((h->Typ()!=p->Typ()) &&(p->Typ()!=DEF_CMD))
+  {
+    WerrorS("type mismatch");
+    return TRUE;
+  }
+  idhdl pp=(idhdl)p->data;
+  switch(pp->typ)
+  {
+#ifdef SINGULAR_4_1
+      case CRING_CMD:
+        nKillChar((coeffs)pp);
+        break;
+#endif
+      case DEF_CMD:
+      case INT_CMD:
+        break;
+      case INTVEC_CMD:
+      case INTMAT_CMD:
+         delete IDINTVEC(pp);
+         break;
+      case NUMBER_CMD:
+         nDelete(&IDNUMBER(pp));
+         break;
+      case BIGINT_CMD:
+         n_Delete(&IDNUMBER(pp),coeffs_BIGINT);
+         break;
+      case MAP_CMD:
+         {
+           map im = IDMAP(pp);
+           omFree((ADDRESS)im->preimage);
+         }
+         // continue as ideal:
+      case IDEAL_CMD:
+      case MODUL_CMD:
+      case MATRIX_CMD:
+          idDelete(&IDIDEAL(pp));
+         break;
+      case PROC_CMD:
+      case RESOLUTION_CMD:
+      case STRING_CMD:
+         omFree((ADDRESS)IDSTRING(pp));
+         break;
+      case LIST_CMD:
+         IDLIST(pp)->Clean();
+         break;
+      case LINK_CMD:
+         omFreeBin(IDLINK(pp),sip_link_bin);
+         break;
+       // case ring: cannot happen
+       default:
+         Werror("unknown type %d",p->Typ());
+         return TRUE;
+  }
+  pp->typ=ALIAS_CMD;
+  IDDATA(pp)=(char*)h->data;
+  int eff_typ=h->Typ();
+  if ((RingDependend(eff_typ))
+  || ((eff_typ==LIST_CMD) && (lRingDependend((lists)h->Data()))))
+  {
+    ipSwapId(pp,IDROOT,currRing->idroot);
+  }
+  h->CleanUp();
+  omFreeBin((ADDRESS)h, sleftv_bin);
+  return FALSE;
+}
+

Singular/ipshell.cc

@@ -166 +166 @@
   switch(IDTYP(h))
   {
+    case ALIAS_CMD: Print(" for %s",IDID((idhdl)IDDATA(h))); break;
     case INT_CMD:   Print(" %d",IDINT(h)); break;
     case INTVEC_CMD:Print(" (%d)",IDINTVEC(h)->length()); break;
@@ -783 +784 @@
           v->rtyp=IDEAL_CMD;
           char *tmp = theMap->preimage;
-          theMap->preimage=(char*)1L;
+          theMap->preimage=(char*)1L;
           // map gets 1 as its rank (as an ideal)
           v->data=fast_map(IDIDEAL(w), src_ring, (ideal)theMap, currRing);
@@ -1326 +1327 @@
   return res;
 }
-BOOLEAN iiAlias(leftv p)
-{
-  if (iiCurrArgs==NULL)
-  {
-    Werror("not enough arguments for proc %s",VoiceName());
-    p->CleanUp();
-    return TRUE;
-  }
-  leftv h=iiCurrArgs;
-  iiCurrArgs=h->next;
-  h->next=NULL;
-  if (h->rtyp!=IDHDL)
-  {
-    BOOLEAN res=iiAssign(p,h);
-    h->CleanUp();
-    omFreeBin((ADDRESS)h, sleftv_bin);
-    return res;
-  }
-  if (h->Typ()!=p->Typ())
-  {
-    WerrorS("type mismatch");
-    return TRUE;
-  }
-  idhdl pp=(idhdl)p->data;
-  switch(pp->typ)
-  {
-#ifdef SINGULAR_4_1
-      case CRING_CMD:
-        nKillChar((coeffs)pp);
-        break;
-#endif
-      case INT_CMD:
-        break;
-      case INTVEC_CMD:
-      case INTMAT_CMD:
-         delete IDINTVEC(pp);
-         break;
-      case NUMBER_CMD:
-         nDelete(&IDNUMBER(pp));
-         break;
-      case BIGINT_CMD:
-         n_Delete(&IDNUMBER(pp),coeffs_BIGINT);
-         break;
-      case MAP_CMD:
-         {
-           map im = IDMAP(pp);
-           omFree((ADDRESS)im->preimage);
-         }
-         // continue as ideal:
-      case IDEAL_CMD:
-      case MODUL_CMD:
-      case MATRIX_CMD:
-          idDelete(&IDIDEAL(pp));
-         break;
-      case PROC_CMD:
-      case RESOLUTION_CMD:
-      case STRING_CMD:
-         omFree((ADDRESS)IDSTRING(pp));
-         break;
-      case LIST_CMD:
-         IDLIST(pp)->Clean();
-         break;
-      case LINK_CMD:
-         omFreeBin(IDLINK(pp),sip_link_bin);
-         break;
-       // case ring: cannot happen
-       default:
-         Werror("unknown type %d",p->Typ());
-         return TRUE;
-  }
-  pp->typ=ALIAS_CMD;
-  IDDATA(pp)=(char*)h->data;
-  h->CleanUp();
-  omFreeBin((ADDRESS)h, sleftv_bin);
-  return FALSE;
-}
-
 static BOOLEAN iiInternalExport (leftv v, int toLev)
 {

Tst/Short/alias.res.gz.uu

@@ -1 +1 @@
 begin 640 alias.res.gz
-M'XL(""2@A4\``V%L:6%S+G)E<P#M4\MNPC`0O.<K5E4/21N9V.%5(G)`O2!5
-MO=`;JE`H`1E9`=EN2XOX]ZX=<'P(53^@.22V=W9V=C.>O3Q.GP&`YO`TG<"-
-M5IH(OKS)@MDYPG+`PP6ON`ZC+#!?R',H!"\4J<I/HG2A'3K-P:V[!/9R]V9>
-MRS*T"2"XTE#(C8H<K$?@Z#9]8J--^2$!_;4O=^O09KD`30CP2@.',2C^7=KP
-MG+YZ"$;@Y#:>,(K")*\V(#$WB>$0PVK?I/5RX*NR$);ZT)SW\UJ]P&.S"'D,
-MS"LW\"H,R;EK@0!4-0JPE04NQH=@SNHM"PR+2WEHTEGB3X[YH^,1'(%G<')U
-M&?42L64+JU`C;2#8_)FJ\O10%^]Z%#V_=GJN;2==ES;\'X5$+_@B^A[#H/XS
-MVS%KXL/\0KA%!2SH='"\+0]J@]I;!K)MA20(,04L2W458H3&UALC;!6A\BKT
-MSMC!0.PC_D3)'+Z]$:O2^BB<3:(8*&S*JI2%WLD0W8_)YEJ9R_.N%FLN2B]/
-M:>O/]CO&/*>D";G,E=X;,Z:_3]:,+?V?[)7)IMY52O$J-30AC;+;X`<31!RO
-$+04`````
+M'XL("`?2S54``V%L:6%S+G)E<P#M4SUOPC`0W?,K3JA#TD8F=O@J$1E0%Z2J
+M"]U0A4()R%&4(,=M:1'_O6<G.!Y0H4.W9@#;=^_=NZ_Y\\/L"0!H#(^S*71D
+M)4G.5YW(F3<6%@,^+GG!I>M%COJ'.(8DYTE%BO2#5#*1QCN,P9Q[!':B?%4_
+MJ]35`,AY)2$1V\HS;GT"!W,9$&UMPX\(R,]=6FY<C3(&&A#@A00.$ZCX5ZK-
+M"_IB>3`"1W.QA%$4)GBQ!8'8P(>]#^M="^O'P-=IDFOJ??L^B&OU.3ZK@\M]
+M8%:XH15A1)JL<W1`56,'4UGB8;)W%JR^,D>Q&,A]"V>!73EFEXY[<``>P='$
+M9=0"8LK:K4"-M'7!Y!NJPM)#C;UG4?3MV&$36U>Z#JWXWQ.!LV"+&%@,P[HS
+MV82U]E%\(LQ0`7.Z72SOCQ^JA'K*8%,*R!0DNP`)$*)":_[B"F>5C*_G9XSE
+M0)"X`G2KAD<YZR__91AFD)<*H+/1D^C.IYX/%+9ID8I$EL+%_4$:M9AJ_=ZJ
+MY8;GZ5F&2NI9/[^OS)JZ,""G'M$[-=CAM5U2)0__^_,'_0FMY0YQN5M"EWK1
++C?,-2!0&\[\%````
 `
 end

Tst/Short/ok_s.lst

@@ -47 +47 @@
 bug_tr724
 bug_732
+bug_tr735
 bug_genus_etc
 conv_bi