Changeset e5ba1d in git

Timestamp:

Jan 9, 2014, 12:54:22 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

beed2eef2f5fae68a9e7e7ed0f4a9e7710549aa9f3b5e047e9ab225a25b5204d8ea8b5782b3e3267

Parents:

453510f6a321819066be0f51b5747f45bece4d95

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2014-01-09 12:54:22+01:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2014-01-09 12:56:00+01:00

Message:

fix: ring dep. for multiple return results

Files:

• Singular/iplib.cc (modified) (2 diffs)
• Singular/ipshell.cc (modified) (1 diff)
• Tst/Short/bug_23.res.gz.uu (modified) (1 diff)
• Tst/Short/bug_23.stat (modified) (1 diff)
• Tst/Short/bug_26.res.gz.uu (modified) (1 diff)
• Tst/Short/bug_26.stat (modified) (1 diff)

Singular/iplib.cc

@@ -419 +419 @@
     err=iiAllStart(pi,pi->data.s.body,BT_proc,pi->data.s.body_lineno-(v!=NULL));
 
+#ifdef USE_IILOCALRING
+#if 0
+  if(procstack->cRing != iiLocalRing[myynest]) Print("iiMake_proc: 1 ring not saved procs:%x, iiLocal:%x\n",procstack->cRing, iiLocalRing[myynest]);
+#endif
+    if (iiLocalRing[myynest-1] != currRing)
+    {
+      if (iiRETURNEXPR.RingDependend())
+      {
+        //idhdl hn;
+        const char *n;
+        const char *o;
+        idhdl nh=NULL, oh=NULL;
+        if (iiLocalRing[myynest-1]!=NULL)
+          oh=rFindHdl(iiLocalRing[myynest-1],NULL, NULL);
+        if (oh!=NULL)          o=oh->id;
+        else                   o="none";
+        if (currRing!=NULL)
+          nh=rFindHdl(currRing,NULL, NULL);
+        if (nh!=NULL)          n=nh->id;
+        else                   n="none";
+        Werror("ring change during procedure call: %s -> %s (level %d)",o,n,myynest);
+        iiRETURNEXPR.CleanUp();
+        err=TRUE;
+      }
+      currRing=iiLocalRing[myynest-1];
+    }
+    if ((currRing==NULL)
+    && (currRingHdl!=NULL))
+      currRing=IDRING(currRingHdl);
+    else
+    if ((currRing!=NULL) &&
+      ((currRingHdl==NULL)||(IDRING(currRingHdl)!=currRing)
+       ||(IDLEV(currRingHdl)>=myynest-1)))
+    {
+      rSetHdl(rFindHdl(currRing,NULL, NULL));
+      iiLocalRing[myynest-1]=NULL;
+    }
+#else /* USE_IILOCALRING */
+    if (procstack->cRing != currRing)
+    {
+      //if (procstack->cRingHdl!=NULL)
+      //Print("procstack:%s,",IDID(procstack->cRingHdl));
+      //if (currRingHdl!=NULL)
+      //Print(" curr:%s\n",IDID(currRingHdl));
+      //Print("pr:%x, curr: %x\n",procstack->cRing,currRing);
+      if (iiRETURNEXPR.RingDependend())
+      {
+        //idhdl hn;
+        char *n;
+        char *o;
+        if (procstack->cRing!=NULL)
+        {
+          //PrintS("reset ring\n");
+          procstack->cRingHdl=rFindHdl(procstack->cRing,NULL, NULL);
+          if (procstack->cRingHdl==NULL)
+            procstack->cRingHdl=
+              rFindHdl(procstack->cRing,NULL,procstack->currPack->idroot);
+          if (procstack->cRingHdl==NULL)
+            procstack->cRingHdl=
+              rFindHdl(procstack->cRing,NULL,basePack->idroot);
+          o=IDID(procstack->cRingHdl);
+          currRing=procstack->cRing;
+          currRingHdl=procstack->cRingHdl;
+        }
+        else                            o="none";
+        if (currRing!=NULL)             n=IDID(currRingHdl);
+        else                            n="none";
+        if (currRing==NULL)
+        {
+          Werror("ring change during procedure call: %s -> %s",o,n);
+          iiRETURNEXPR.CleanUp();
+          err=TRUE;
+        }
+      }
+      if (procstack->cRingHdl!=NULL)
+      {
+        rSetHdl(procstack->cRingHdl);
+      }
+      else
+      { currRingHdl=NULL; currRing=NULL; }
+    }
+#endif /* USE_IILOCALRING */
     //Print("kill locals for %s (level %d)\n",IDID(pn),myynest);
     killlocals(myynest);
@@ -560 +642 @@
     //iiRETURNEXPR.Init(); //done by CleanUp
   }
-#ifdef USE_IILOCALRING
-#if 0
-  if(procstack->cRing != iiLocalRing[myynest]) Print("iiMake_proc: 1 ring not saved procs:%x, iiLocal:%x\n",procstack->cRing, iiLocalRing[myynest]);
-#endif
-  if (iiLocalRing[myynest] != currRing)
-  {
-    if (currRing!=NULL)
-    {
-      if (iiRETURNEXPR.RingDependend())
-      {
-        //idhdl hn;
-        const char *n;
-        const char *o;
-        idhdl nh=NULL, oh=NULL;
-        if (iiLocalRing[myynest]!=NULL)
-          oh=rFindHdl(iiLocalRing[myynest],NULL, NULL);
-        if (oh!=NULL)          o=oh->id;
-        else                   o="none";
-        if (currRing!=NULL)
-          nh=rFindHdl(currRing,NULL, NULL);
-        if (nh!=NULL)          n=nh->id;
-        else                   n="none";
-        Werror("ring change during procedure call: %s -> %s (level %d)",o,n,myynest);
-        iiRETURNEXPR.CleanUp();
-        err=TRUE;
-      }
-    }
-    currRing=iiLocalRing[myynest];
-  }
-  if ((currRing==NULL)
-  && (currRingHdl!=NULL))
-    currRing=IDRING(currRingHdl);
-  else
-  if ((currRing!=NULL) &&
-    ((currRingHdl==NULL)||(IDRING(currRingHdl)!=currRing)
-     ||(IDLEV(currRingHdl)>=myynest)))
-  {
-    rSetHdl(rFindHdl(currRing,NULL, NULL));
-    iiLocalRing[myynest]=NULL;
-  }
-#else /* USE_IILOCALRING */
-  if (procstack->cRing != currRing)
-  {
-    //if (procstack->cRingHdl!=NULL)
-    //Print("procstack:%s,",IDID(procstack->cRingHdl));
-    //if (currRingHdl!=NULL)
-    //Print(" curr:%s\n",IDID(currRingHdl));
-    //Print("pr:%x, curr: %x\n",procstack->cRing,currRing);
-    if (iiRETURNEXPR.RingDependend())
-    {
-      //idhdl hn;
-      char *n;
-      char *o;
-      if (procstack->cRing!=NULL)
-      {
-        //PrintS("reset ring\n");
-        procstack->cRingHdl=rFindHdl(procstack->cRing,NULL, NULL);
-        if (procstack->cRingHdl==NULL)
-          procstack->cRingHdl=
-           rFindHdl(procstack->cRing,NULL,procstack->currPack->idroot);
-        if (procstack->cRingHdl==NULL)
-          procstack->cRingHdl=
-           rFindHdl(procstack->cRing,NULL,basePack->idroot);
-        o=IDID(procstack->cRingHdl);
-        currRing=procstack->cRing;
-        currRingHdl=procstack->cRingHdl;
-      }
-      else                            o="none";
-      if (currRing!=NULL)             n=IDID(currRingHdl);
-      else                            n="none";
-      if (currRing==NULL)
-      {
-        Werror("ring change during procedure call: %s -> %s",o,n);
-        iiRETURNEXPR.CleanUp();
-        err=TRUE;
-      }
-    }
-    if (procstack->cRingHdl!=NULL)
-    {
-      rSetHdl(procstack->cRingHdl);
-    }
-    else
-    { currRingHdl=NULL; currRing=NULL; }
-  }
-#endif /* USE_IILOCALRING */
   if (iiCurrArgs!=NULL)
   {

Singular/ipshell.cc

@@ -5549 +5549 @@
         sLastPrinted.CleanUp();
       }
-      if ((myynest>0) && (iiRETURNEXPR.RingDependend()))
-      {
-        WerrorS("return value depends on local ring variable (export missing ?)");
-        iiRETURNEXPR.CleanUp();
-      }
+      //if ((myynest>0) && (iiRETURNEXPR.RingDependend()))
+      //{
+      //  WerrorS("return value depends on local ring variable (export missing ?)");
+      //  iiRETURNEXPR.CleanUp();
+      //}
       currRing=NULL;
       currRingHdl=NULL;

Tst/Short/bug_23.res.gz.uu

@@ -1 @@
-begin 640 bug_23.res.gz
-M'XL("![O2SP``V)U9U\R,RYR97,`O5*Q3L,P$-WS%4\50U)5+FE3$$1-)<12
-M"3&T[*V3F&(IV);ME$B(?^?25"X,K"RV[[WSNW=G;U\>U\\`T@)/ZP>,O/.L
-MD>4HC[9G9E:`P)U4TL=)'O4[B@)E>]C-YDR)#^8\]R%]7B"<,X;I%*T3-;Q&
-M9;E["]R"P5A=P<1)P&X8/D-PRVBQ4AU@E]>3;E*;BZ>[$R=\:U7<)0%/4X:O
-M$)#QT_7-YI)`[FKQ"F.6IF^&5%9G'1QYTPIBC5"U@U9H=,6;0>+(K>1E(Q"+
-MSFCK\2Z=ZXE5,F@(:[6%KJK66NI6*@P5&ZD$5;W'_J????"3_?9#TQJ/*9$P
-AFC/I&T/`?]G,_K2Y&/Y`_]"MB],DOXJ^`6OV7CDY`@``
+begin 644 bug_23.res.gz
+M'XL("!>+SE(``V)U9U\R,RYR97,`O9)/3\(P&,;O?(HGQ,-&L#@8&EF8B?%"
+M8CR`=]BZ,IHT7=.U2F+\[K[;3-&#5R]MW^?]]WO;[EZ?-B\`DAS/FT>,7>N8
+MDN4X&^V^/?,<).ZEEBZ*LU&W(\]1^GH_7S`MWEGK"A?"%SG".668S>!;4<$U
+MX+9H3\&W9#"VX3!1'+1;AH]@W#%:K-0U[/IF>IY6YL)TW_N$\U9'YSCH2<+P
+M&0P"[].WVTL`T57B"&/6IAN&JCP,0?Q4Z%J@\KW5D0DZ"_!"J165P#550Z3$
+MFU!(XB%36-M8-)Q[:VE&J4%F*8X-)0X=E=2"NJYP^,E["#SI;QZZK<F$`DFC
+@>^Y`#`G_A9G^B;D<_D#WT+Z-DCB[&GT!KV)*!SD"````
 `
 end

Tst/Short/bug_23.stat

@@ -1 @@
-1 >> tst_memory_0 :: 1011609374:2002012110:2-0-2:ix86-Linux:nepomuck:279196 1292524760:3120- 13145 :3-1-2:ix86-Linux:mamawutz:300096
-1 >> tst_memory_1 :: 1011609374:2002012110:2-0-2:ix86-Linux:nepomuck:816256 1292524760:3120- 13145 :3-1-2:ix86-Linux:mamawutz:794332
-1 >> tst_memory_2 :: 1011609374:2002012110:2-0-2:ix86-Linux:nepomuck:816256 1292524760:3120- 13145 :3-1-2:ix86-Linux:mamawutz:827116
-1 >> tst_timer_1 :: 1011609374:2002012110:2-0-2:ix86-Linux:nepomuck:3 1292524760:3120- 13145 :3-1-2:ix86-Linux:mamawutz:9
+1 >> tst_memory_0 :: 1389267735:3170:3-1-7:ix86-Linux:mamawutz:284412
+1 >> tst_memory_1 :: 1389267735:3170:3-1-7:ix86-Linux:mamawutz:2342736
+1 >> tst_memory_2 :: 1389267735:3170:3-1-7:ix86-Linux:mamawutz:2383708
+1 >> tst_timer_1 :: 1389267735:3170:3-1-7:ix86-Linux:mamawutz:2

Tst/Short/bug_26.res.gz.uu

@@ -1 @@
-begin 640 bug_26.res.gz
-M'XL(""/9Y$@``V)U9U\R-BYR97,`39#!:L,P$$3O_HHA]&!?1.6FH=34@=)+
-MH/22WA/'7LR"*IF5G`9*_[UR8N1>).WL2F\T^\^WW0<`7>-]]XI5\$$9/JVJ
-M;#]WRAI1/+#ED!=5-NVH:YS&_E!NE*5OY4,3TOA#C71>*PSB6GCNM<Z+I#\J
-M_*1BH^(B;'O(`GV:1.ZH,>"72]+U_768PB@VYV+12X7?5$0+,['*XOAVOH!S
-M8T9"1P/9SL-9&-=&P)5];H2;DR'D=!F<!'RQ]U-C6]S>(!$G<&T[BE`'MKCA
-D#%N*R&<<_QL[)C/K)0\=_SU%.>4U^EP7U5WV!V,A6MR``0``
+begin 644 bug_26.res.gz
+M'XL("""+SE(``V)U9U\R-BYR97,`35#!2L0P%+SW*X;%0W,PF.ZZR!8CB)<%
+M\;+>=]OT60,AD3110?QWD^V2>DG>3.:]F;S#Z]/^!8"0>-X_8A6FP(WN5VUU
+MN+PT$HD\:JM#S=HJWY`2?1R/S99;^N)3Z$*1KR5*O>'X\$YATJ,0-2O\+<=/
+M`5N>#J_M"+^8WF52#]09Z/OOPHN;LYA"]+;6;.$;CM\"4H2+8ULE^<,\7;UW
+M=B0,\8QR+DHU077&[&"=)5Q+>-2&/LE`L+F7O'<>3JGH/0W0%@GV].92ZVQH
+D=&H5ZQU._Z.=2IS-LA&1?IZ7F3<6IUJP]JKZ`RL!O&B"`0``
 `
 end

Tst/Short/bug_26.stat

@@ -1 @@
-1 >> tst_memory_0 :: 1222957347:3100-2008100209:3-1-0:ix86-Linux:nepomuck:159460 1292524760:3120- 13145 :3-1-2:ix86-Linux:mamawutz:171360
-1 >> tst_memory_1 :: 1222957347:3100-2008100209:3-1-0:ix86-Linux:nepomuck:701572 1292524760:3120- 13145 :3-1-2:ix86-Linux:mamawutz:794624
-1 >> tst_memory_2 :: 1222957347:3100-2008100209:3-1-0:ix86-Linux:nepomuck:836740 1292524760:3120- 13145 :3-1-2:ix86-Linux:mamawutz:794624
-1 >> tst_timer_1 :: 1222957347:3100-2008100209:3-1-0:ix86-Linux:nepomuck:4 1292524760:3120- 13145 :3-1-2:ix86-Linux:mamawutz:4
+1 >> tst_memory_0 :: 1389267744:3170:3-1-7:ix86-Linux:mamawutz:155676
+1 >> tst_memory_1 :: 1389267744:3170:3-1-7:ix86-Linux:mamawutz:2342912
+1 >> tst_memory_2 :: 1389267744:3170:3-1-7:ix86-Linux:mamawutz:2342912
+1 >> tst_timer_1 :: 1389267744:3170:3-1-7:ix86-Linux:mamawutz:2