This is an automated email from the git hooks/post-receive script.
ppm-guest pushed a commit to annotated tag v0.36
in repository libmath-prime-util-perl.
commit 2d499faca74c9fc0415f8d0da4216cb667735221
Author: Dana Jacobsen <d...@acm.org>
Date: Thu Jan 9 15:03:06 2014 -0800
Fix arguments for non-public *_factor functions
---
XS.xs | 37 +++++++++++++++++++------------------
1 file changed, 19 insertions(+), 18 deletions(-)
diff --git a/XS.xs b/XS.xs
index 2e84948..52cd9a9 100644
--- a/XS.xs
+++ b/XS.xs
@@ -16,7 +16,7 @@
#include "ptypes.h"
#include "cache.h"
#include "sieve.h"
-#define FUNC_gcd_ui
+#define FUNC_gcd_ui 1
#include "util.h"
#include "primality.h"
#include "factor.h"
@@ -372,35 +372,36 @@ trial_factor(IN UV n, ...)
pplus1_factor = 5
pbrent_factor = 6
pminus1_factor = 7
+ PREINIT:
+ UV arg1, arg2;
+ static const UV default_arg1[] =
+ {0, 64000000, 8000000, 4000000, 4000000, 200, 4000000, 1000000};
+ /* Trial, Fermat, Holf, SQUFOF, PRHO, P+1, Brent, P-1 */
PPCODE:
if (n == 0) XSRETURN_UV(0);
+ /* Must read arguments before pushing anything */
+ arg1 = (items >= 2) ? my_svuv(ST(1)) : default_arg1[ix];
+ arg2 = (items >= 3) ? my_svuv(ST(2)) : 0;
+ /* Small factors */
while ( (n% 2) == 0 ) { n /= 2; XPUSHs(sv_2mortal(newSVuv( 2 ))); }
while ( (n% 3) == 0 ) { n /= 3; XPUSHs(sv_2mortal(newSVuv( 3 ))); }
while ( (n% 5) == 0 ) { n /= 5; XPUSHs(sv_2mortal(newSVuv( 5 ))); }
if (n == 1) { /* done */ }
else if (_XS_is_prime(n)) { XPUSHs(sv_2mortal(newSVuv( n ))); }
else {
- UV arg1, arg2, factors[MPU_MAX_FACTORS+1];
+ UV factors[MPU_MAX_FACTORS+1];
int i, nfactors = 0;
switch (ix) {
- case 0: arg1 = (items < 2) ? 0 : SvUV(ST(1));
- nfactors = trial_factor (n, factors, arg1); break;
- case 1: arg1 = (items < 2) ? 64*1024*1024 : SvUV(ST(1));
- nfactors = fermat_factor (n, factors, arg1); break;
- case 2: arg1 = (items < 2) ? 8*1024*1024 : SvUV(ST(1));
- nfactors = holf_factor (n, factors, arg1); break;
- case 3: arg1 = (items < 2) ? 4*1024*1024 : SvUV(ST(1));
- nfactors = squfof_factor (n, factors, arg1); break;
- case 4: arg1 = (items < 2) ? 4*1024*1024 : SvUV(ST(1));
- nfactors = prho_factor (n, factors, arg1); break;
- case 5: arg1 = (items < 2) ? 200 : SvUV(ST(1));
- nfactors = pplus1_factor (n, factors, arg1); break;
- case 6: arg1 = (items < 2) ? 4*1024*1024 : SvUV(ST(1));
- arg2 = (items < 3) ? 1 : SvUV(ST(2));
+ case 0: nfactors = trial_factor (n, factors, arg1); break;
+ case 1: nfactors = fermat_factor (n, factors, arg1); break;
+ case 2: nfactors = holf_factor (n, factors, arg1); break;
+ case 3: nfactors = squfof_factor (n, factors, arg1); break;
+ case 4: nfactors = prho_factor (n, factors, arg1); break;
+ case 5: nfactors = pplus1_factor (n, factors, arg1); break;
+ case 6: if (items < 3) arg2 = 1;
nfactors = pbrent_factor (n, factors, arg1, arg2); break;
case 7:
- default: arg1 = (items < 2) ? 1*1024*1024 : SvUV(ST(1));
- arg2 = (items < 3) ? 10*arg1 : SvUV(ST(2));
+ default: if (items < 3) arg2 = 10*arg1;
nfactors = pminus1_factor(n, factors, arg1, arg2); break;
}
EXTEND(SP, nfactors);
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-perl/packages/libmath-prime-util-perl.git
_______________________________________________
Pkg-perl-cvs-commits mailing list
Pkg-perl-cvs-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits
