aboutsummaryrefslogtreecommitdiff
path: root/src/invalid
diff options
context:
space:
mode:
authorJ08nY2017-04-26 23:36:24 +0200
committerJ08nY2017-04-26 23:36:24 +0200
commit52f205c0fb76ec39a12cbd8a68676485898856ea (patch)
tree5fd704e107d80eee388150796c9f5a0fc8551832 /src/invalid
parent9dd8c4d727da797eae0d63667531e20c51ac3a7a (diff)
downloadecgen-52f205c0fb76ec39a12cbd8a68676485898856ea.tar.gz
ecgen-52f205c0fb76ec39a12cbd8a68676485898856ea.tar.zst
ecgen-52f205c0fb76ec39a12cbd8a68676485898856ea.zip
Add output separators, invalid curve generation now outputs valid JSON
Diffstat (limited to 'src/invalid')
-rw-r--r--src/invalid/invalid.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/invalid/invalid.c b/src/invalid/invalid.c
index 20a7063..18224e8 100644
--- a/src/invalid/invalid.c
+++ b/src/invalid/invalid.c
@@ -155,6 +155,9 @@ static size_t invalid_curves(curve_t *curve, config_t *cfg, pari_ulong *primes,
curves[i] = curve_new_copy(invalid);
}
output_o(curves[i], cfg);
+ if (ncurves != nprimes - 1) {
+ output_o_separator(cfg);
+ }
ncurves++;
count++;
}
@@ -241,6 +244,9 @@ static size_t invalid_curves_threaded(curve_t *curve, config_t *cfg,
for (size_t i = 0; i < nprimes; ++i) {
if (old_states[i] != states[i] && states[i] == STATE_GENERATED) {
output_o(local_curves[i], cfg);
+ if (generated != nprimes) {
+ output_o_separator(cfg);
+ }
old_states[i] = states[i];
}
}
@@ -285,7 +291,9 @@ int invalid_do(config_t *cfg) {
curve_free(&curve);
return 1;
}
+ output_o_begin(cfg);
output_o(curve, cfg);
+ output_o_separator(cfg);
// now, generate primes upto order^2
pari_ulong *primes;
@@ -316,6 +324,7 @@ int invalid_do(config_t *cfg) {
ncurves = invalid_curves_threaded(curve, cfg, primes, nprimes, curves,
invalid_gen, unrolls);
}
+ output_o_end(cfg);
for (size_t i = 0; i < ncurves; ++i) {
curve_free(&curves[i]);