Changeset ee8cdb in git

Timestamp:

Jan 30, 2017, 4:49:22 PM (6 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

7b4ca1ff3d1b3fda428fb520644afc4fd4ce71d3

Parents:

7fcc5b108e080c630a6e6190bdcccc10fca68ccd

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2017-01-30 16:49:22+01:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2017-01-30 17:07:14+01:00

Message:

fix: branchTo can return results (via _)

Files:

• Singular/ipshell.cc (modified) (2 diffs)
• Tst/Short/branchTo.res.gz.uu (modified) (1 diff)
• Tst/Short/branchTo.stat (modified) (1 diff)
• Tst/Short/branchTo.tst (modified) (1 diff)
• kernel/combinatorics/hilb.cc (modified) (1 diff)

Singular/ipshell.cc

@@ -1251 +1251 @@
     si_opt_2=save2;
     // now save the return-expr.
-    memcpy(res,&iiRETURNEXPR,sizeof(sleftv));
+    sLastPrinted.CleanUp(currRing);
+    memcpy(&sLastPrinted,&iiRETURNEXPR,sizeof(sleftv));
     iiRETURNEXPR.Init();
     // warning about args.:
@@ -1271 +1272 @@
     killlocals(myynest);
     // - return
-    newBuffer(omStrDup("\n;return();\n"),BT_execute);
+    newBuffer(omStrDup("\n;return(_);\n"),BT_execute);
     return (err!=0);
   }

Tst/Short/branchTo.res.gz.uu

@@ -1 +1 @@
 begin 640 branchTo.res.gz
-M'XL("()C15@``V)R86YC:%1O+G)E<P!U4LMJPS`0O.<K%M&##,:)E$?3&'PH
-M[2%04DAR;G$2.18TLFM)A&+R[Y4L6Q&%@I'7NS/KW='L]B_K#0"0#-[6SX"4
-M5,D7/Z!TM.LK-`.3_.2"*QRE(_N&+(-#DXMCN:\2P:Z)5+GRA&D&/IXEYJB;
-MZ@@UP5PHX!&T@$RT0C%/X>:1\\PC*<%2-5R<079H]V$(,B0L`@+U!!+#$-*.
-MK*Y5GY&V`XDE#;L\WKO@R&>7=NS6[XCMP"BN2>1E(1,+@0#B?H)B'YBQ`CS]
-M#V_6#6`S!WO=;M^W&(E*P8D57+`3%%4#JF220=Z<]849,=5/S20*V`O+]LL1
-MMQPFW;6I%1!?6;H**K6E]P)#J3W@:0#D9B-S&%2H))2Y>08TG60P'D/#E&Y$
-MI[W21;'R99(XB>6WSAO6^Z!U<,P_C$PWOP,U?NO`QG0X:O]<@>L0I8-`FPHN
-L3)65E4>+DQG3;T^GG7&QO8293\[NYJ3SI'.V-:^65J6'=/0+A@RJBA`#````
+M'XL("(5DCU@``V)R86YC:%1O+G)E<P"E5$V/VC`0O?,K1E$/CC;-8B<!%DH.
+M57M8B:42[&VUK0*8)0@2&CM"NVC_>\=.F+BM>BJ"X(\WDS=OGKU\_'(_!P">
+MPNS^,WA:Z?"0K[Q);]GNB!1P\4=>Y)KYDY[YAS2%5945Z]UC&1;R'"J=:0J(
+M4J!Q'.+C5)5K.'&6%QIR'R[@X6CL!?D$W@F9I(04G"E=Y<4+*(MN)AB@W("!
+M$R`H@`=P'0H;K,]ENZ),!AXHX689=EF83ZLC0_M"-3)#V`M.W"=9>-]`P($T
+M+_$"&B`M!R_^A<=R'5C<P+XN%M\6S"M*#1NYS0NY@6U9@=Y))2&K7NJC1#'U
+MZTDJSXD>F&@JCC?%,6[;IL?`:6?4['B[VH2W`L.N)L#=%9!A1?A`E*LD[#+\
+M7M&BG\+M+512UU5AM=?U=CNF;1XV$JN?=5;)U@>7!L[R[RC3.]4@T&\6C*9C
+M_N6/%C09_,E5H'D)1ZEWI9&G+C9(DZH7D34N,TV(:3$V3#_^WX>2)2&@^U&3
+M>JV1BT2"WB%7&JKR[/9%#+HC(8:M&"=44F,,PQ_,R7L"O7>AR9UIJ$TY@RG,
+M0Y.8TD;<[!I?6$GW4SZ!_:>IRM\DFZ%&^YL;2AM%UM(T31J?61)L]K1_[MA&
+MP]]<%"$'FL3]KI(87Z]>E99'TQR\`@X'K+]1P>9%;[<U!H[%8^&DB%HQ"JF7
+MUEK7@_Q`S./8$22VO*UB7<)A)U*W:)6;/?'GZ0,M)E:P1L5IATVL-JT=YQW3
+M)'$J3YP>)L..-L-;YN]#3?4XADQ&3@:D9TYON64FAY>MUIZ/;\;*KI`!2FT+
+AQ<9W&"(WX%VV`5XNYHXVUW"MS'G_,.G]`G?#JX_:!0``
 `
 end

Tst/Short/branchTo.stat

@@ -1 @@
-1 >> tst_memory_0 :: 1480942444:4100, 64 bit:4.1.0:x86_64-Linux:nepomuck:108080
-1 >> tst_memory_1 :: 1480942444:4100, 64 bit:4.1.0:x86_64-Linux:nepomuck:2228224
-1 >> tst_memory_2 :: 1480942444:4100, 64 bit:4.1.0:x86_64-Linux:nepomuck:2228224
-1 >> tst_timer_1 :: 1480942444:4100, 64 bit:4.1.0:x86_64-Linux:nepomuck:0
+1 >> tst_memory_0 :: 1485792389:4100, 64 bit:4.1.0:x86_64-Linux:nepomuck:85072
+1 >> tst_memory_1 :: 1485792389:4100, 64 bit:4.1.0:x86_64-Linux:nepomuck:2211840
+1 >> tst_memory_2 :: 1485792389:4100, 64 bit:4.1.0:x86_64-Linux:nepomuck:2211840
+1 >> tst_timer_1 :: 1485792389:4100, 64 bit:4.1.0:x86_64-Linux:nepomuck:0

Tst/Short/branchTo.tst

@@ -18 +18 @@
 proc tst(){branchTo("int",square); ERROR("No method found");}
 tst(2);
+//---------------------------------------------------------------
+newstruct("Net","list rows");
+
+proc printNet(Net N)
+{
+  list L = N.rows;
+  for (int j=1; j<=size(L); j++)
+  {
+    print(L[j]);
+  }
+}
+
+system("install","Net","print",printNet,1);
+
+proc netString(string M)
+{
+  Net N;
+  list L;
+  L[1]=M;
+  N.rows=L;
+  return(N);
+}
+
+proc net() {branchTo("string",netString);}
+
+typeof(net("abc"));
+Net N = net("abc");
 
 tst_status(1);$;

kernel/combinatorics/hilb.cc

@@ -1428 +1428 @@
 }
 
-/*
-poly p_DivideMon(poly a, poly b, const ring r)
-{
-  int i;
-  poly result = p_Init(r);
-  int N=r->N;
-  for(i=1;i<=N; i++)
-  p_SetExp(result,i, p_GetExp(a,i,r)- p_GetExp(b,i,r),r);
-  p_SetComp(result, p_GetComp(a,r) - p_GetComp(b,r),r);
-  p_Setm(result,r);
-  return result;
-}
-*/
-
 static int isMonoIdBasesSame(ideal J, ideal Ob)
 {