check/*_memleak.cpp: fix botched CVS commit[s].

diff --git a/check/mul_eval_memleak.cpp b/check/mul_eval_memleak.cpp
index d5d4b2b33a87c8d94c3daaba88f35c55a4c4214a..78e9312c0d8f7a8e46b9b08891c6559721e4328c 100644 (file)
--- a/check/mul_eval_memleak.cpp
+++ b/check/mul_eval_memleak.cpp
@@ -47,30 +47,30 @@ const unsigned check_mul_eval_memleak(const unsigned N)
 )*(2539001*(-1+2*eps)*((-2539001/2)*eps^(-2)+(-7617003/2+1692800*log\
 (920*scale^(-1))+3385202*log(1301*scale^(-1)))*eps^(-1)+F)+286523497\
 2800*(-1+eps)^(-1)*eps^(-2)*(920*scale^(-1))^(-2*eps)*(1301*scale^(-\
 )*(2539001*(-1+2*eps)*((-2539001/2)*eps^(-2)+(-7617003/2+1692800*log\
 (920*scale^(-1))+3385202*log(1301*scale^(-1)))*eps^(-1)+F)+286523497\
 2800*(-1+eps)^(-1)*eps^(-2)*(920*scale^(-1))^(-2*eps)*(1301*scale^(-\

-1))^(-2*eps)*tgamma(1+eps)2)+6061411748045832000*(-1+eps)^(-1)*eps^\
+1))^(-2*eps)*tgamma(1+eps)^2)+6061411748045832000*(-1+eps)^(-1)*eps^\

 (-2)*(920*scale^(-1))^(-2*eps)*(1301*scale^(-1))^(-2*eps)*tgamma(1+e\
 (-2)*(920*scale^(-1))^(-2*eps)*(1301*scale^(-1))^(-2*eps)*tgamma(1+e\

-ps)2+716056132401*((-2539001/2)*eps^(-2)+(-7617003/2+1692800*log(92\
+ps)^2+716056132401*((-2539001/2)*eps^(-2)+(-7617003/2+1692800*log(92\

 0*scale^(-1))+3385202*log(1301*scale^(-1)))*eps^(-1)+F))+71656139360\
 0*scale^(-1))+3385202*log(1301*scale^(-1)))*eps^(-1)+F))+71656139360\

-0/716056132401*tgamma(1-eps)*tgamma(2*eps)^(-1)*tgamma(eps)2*tgamma\
+0/716056132401*tgamma(1-eps)*tgamma(2*eps)^(-1)*tgamma(eps)^2*tgamma\

 (3-eps)^(-1)*(920*scale^(-1))^(-4*eps)*tgamma(-1+2*eps)-2/6059274152\
 93858601*tgamma(3-eps)^(-1)*(2149010446400*(-1+2*eps)*((-2539001/2)*\
 eps^(-2)+(-7617003/2+1692800*log(920*scale^(-1))+3385202*log(1301*sc\
 ale^(-1)))*eps^(-1)+F)+2425134880977920000*(-1+eps)^(-1)*eps^(-2)*(9\
 (3-eps)^(-1)*(920*scale^(-1))^(-4*eps)*tgamma(-1+2*eps)-2/6059274152\
 93858601*tgamma(3-eps)^(-1)*(2149010446400*(-1+2*eps)*((-2539001/2)*\
 eps^(-2)+(-7617003/2+1692800*log(920*scale^(-1))+3385202*log(1301*sc\
 ale^(-1)))*eps^(-1)+F)+2425134880977920000*(-1+eps)^(-1)*eps^(-2)*(9\

-20*scale^(-1))^(-2*eps)*(1301*scale^(-1))^(-2*eps)*tgamma(1+eps)2-7\
+20*scale^(-1))^(-2*eps)*(1301*scale^(-1))^(-2*eps)*tgamma(1+eps)^2-7\

 16056132401*((-2539001/2)*eps^(-2)+(-7617003/2+1692800*log(920*scale\
 ^(-1))+3385202*log(1301*scale^(-1)))*eps^(-1)+F)+1692601*(-1+2*eps)*\
 (2539001*(-1+2*eps)*((-2539001/2)*eps^(-2)+(-7617003/2+1692800*log(9\
 20*scale^(-1))+3385202*log(1301*scale^(-1)))*eps^(-1)+F)+28652349728\
 00*(-1+eps)^(-1)*eps^(-2)*(920*scale^(-1))^(-2*eps)*(1301*scale^(-1)\
 16056132401*((-2539001/2)*eps^(-2)+(-7617003/2+1692800*log(920*scale\
 ^(-1))+3385202*log(1301*scale^(-1)))*eps^(-1)+F)+1692601*(-1+2*eps)*\
 (2539001*(-1+2*eps)*((-2539001/2)*eps^(-2)+(-7617003/2+1692800*log(9\
 20*scale^(-1))+3385202*log(1301*scale^(-1)))*eps^(-1)+F)+28652349728\
 00*(-1+eps)^(-1)*eps^(-2)*(920*scale^(-1))^(-2*eps)*(1301*scale^(-1)\

-)^(-2*eps)*tgamma(1+eps)2))*tgamma(2-eps)+(1/716056132401*I)*tgamma\
-(-1+eps)*mb2*(mb*scale^(-1))^(-2*eps)*((716392960000*I)*mb^(-2)*(92\
+)^(-2*eps)*tgamma(1+eps)^2))*tgamma(2-eps)+(1/716056132401*I)*tgamma\
+(-1+eps)*mb^2*(mb*scale^(-1))^(-2*eps)*((716392960000*I)*mb^(-2)*(92\

 0*scale^(-1))^(-2*eps)*tgamma(-2+eps)-(2864898145201*I)*mb^(-2)*(130\
 1*scale^(-1))^(-2*eps)*tgamma(-2+eps)-(716224526400*I)*tgamma(-1+eps\
 )*mb^(-2)*(920*scale^(-1))^(-2*eps))-3385202/605927415293858601*tgam\
 ma(3-eps)^(-1)*tgamma(2-eps)*(2539001*(-1+2*eps)*((-2539001/2)*eps^(\
 -2)+(-7617003/2+1692800*log(920*scale^(-1))+3385202*log(1301*scale^(\
 -1)))*eps^(-1)+F)+2865234972800*(-1+eps)^(-1)*eps^(-2)*(920*scale^(-\
 0*scale^(-1))^(-2*eps)*tgamma(-2+eps)-(2864898145201*I)*mb^(-2)*(130\
 1*scale^(-1))^(-2*eps)*tgamma(-2+eps)-(716224526400*I)*tgamma(-1+eps\
 )*mb^(-2)*(920*scale^(-1))^(-2*eps))-3385202/605927415293858601*tgam\
 ma(3-eps)^(-1)*tgamma(2-eps)*(2539001*(-1+2*eps)*((-2539001/2)*eps^(\
 -2)+(-7617003/2+1692800*log(920*scale^(-1))+3385202*log(1301*scale^(\
 -1)))*eps^(-1)+F)+2865234972800*(-1+eps)^(-1)*eps^(-2)*(920*scale^(-\

-1))^(-2*eps)*(1301*scale^(-1))^(-2*eps)*tgamma(1+eps)2+846201*((-25\
+1))^(-2*eps)*(1301*scale^(-1))^(-2*eps)*tgamma(1+eps)^2+846201*((-25\

 39001/2)*eps^(-2)+(-7617003/2+1692800*log(920*scale^(-1))+3385202*lo\
 g(1301*scale^(-1)))*eps^(-1)+F))\
 ");
 39001/2)*eps^(-2)+(-7617003/2+1692800*log(920*scale^(-1))+3385202*lo\
 g(1301*scale^(-1)))*eps^(-1)+F))\
 ");

diff --git a/check/parser_memleak.cpp b/check/parser_memleak.cpp
index d1d4bccd35716d7e3095377ff301bea5bf66c19a..f347ce9aca10c471502de492e0a5478d1c65cccf 100644 (file)
--- a/check/parser_memleak.cpp
+++ b/check/parser_memleak.cpp
@@ -18,7 +18,7 @@ int main(int argc, char** argv) {
        const symbol x("x"), y("y");
        const lst syms(x, y);
        // parser-generated symbol => memory leak.
        const symbol x("x"), y("y");
        const lst syms(x, y);
        // parser-generated symbol => memory leak.

-       static const char* str[] = { "x²+2*x*y + cos(x)", "Li2(x/y) + log(y/x)" };
+       static const char* str[] = { "x^2+2*x*y + cos(x)", "Li2(x/y) + log(y/x)" };

        
        // depends on the amount of the available VM, compiler options, etc.
        const unsigned N_max = 500000;
        
        // depends on the amount of the available VM, compiler options, etc.
        const unsigned N_max = 500000;