Renamed a bunch of generators.

5 files changed, 24 insertions, 26 deletions

diff --git a/src/gen/equation.c b/src/gen/equation.c
index 14409b4..7c90ab7 100644
--- a/src/gen/equation.c
+++ b/src/gen/equation.c
@@ -3,8 +3,8 @@
  * Copyright (C) 2017 J08nY
  */
 #include "equation.h"
-#include "io/input.h"
 #include "field.h"
+#include "io/input.h"
 
 GENERATOR(a_gen_random) {
 	curve->a = genrand(curve->field);
diff --git a/src/gen/seed.c b/src/gen/seed.c
index 44663c8..f26a9a2 100644
--- a/src/gen/seed.c
+++ b/src/gen/seed.c
@@ -54,7 +54,7 @@ static GEN seed_stoi(const char *cstr) {
 	return gerepilecopy(ltop, seed);
 }
 
-char *seed_itos(GEN seed) {
+static char *seed_itos(GEN seed) {
 	pari_sp ltop = avma;
 	GEN bits = binary_zv(seed);
 
@@ -69,7 +69,7 @@ char *seed_itos(GEN seed) {
 	return result;
 }
 
-int seed_random(curve_t *curve, const config_t *cfg, arg_t *args) {
+GENERATOR(seed_gen_random) {
 	curve->seed = seed_new();
 	curve->seed->seed = random_int(160);
 	curve->seed->raw = seed_itos(curve->seed->seed);
@@ -77,7 +77,7 @@ int seed_random(curve_t *curve, const config_t *cfg, arg_t *args) {
 	return 1;
 }
 
-int seed_argument(curve_t *curve, const config_t *cfg, arg_t *args) {
+GENERATOR(seed_gen_argument) {
 	curve->seed = seed_new();
 	curve->seed->seed = seed_stoi(cfg->seed);
 	curve->seed->raw = cfg->seed;
@@ -85,7 +85,7 @@ int seed_argument(curve_t *curve, const config_t *cfg, arg_t *args) {
 	return 1;
 }
 
-int seed_input(curve_t *curve, const config_t *cfg, arg_t *args) {
+GENERATOR(seed_gen_input) {
 	pari_sp ltop = avma;
 
 	GEN str = input_string("seed:");
diff --git a/src/gen/seed.h b/src/gen/seed.h
index e4b7ac0..82eb499 100644
--- a/src/gen/seed.h
+++ b/src/gen/seed.h
@@ -55,29 +55,29 @@ void seed_free(seed_t **seed);
 
 /**
  *
- * @param curve
- * @param config
- * @param args
- * @return
+ * @param curve A curve_t being generated
+ * @param cfg An application config
+ * @param args unused
+ * @return state diff
  */
-int seed_random(curve_t *curve, const config_t *cfg, arg_t *args);
+GENERATOR(seed_gen_random);
 
 /**
  *
- * @param curve
- * @param config
- * @param args
- * @return
+ * @param curve A curve_t being generated
+ * @param cfg An application config
+ * @param args unused
+ * @return state diff
  */
-int seed_argument(curve_t *curve, const config_t *cfg, arg_t *args);
+GENERATOR(seed_gen_argument);
 
 /**
  *
- * @param curve
- * @param config
- * @param args
- * @return
+ * @param curve A curve_t being generated
+ * @param cfg An application config
+ * @param args unused
+ * @return state diff
  */
-int seed_input(curve_t *curve, const config_t *cfg, arg_t *args);
+GENERATOR(seed_gen_input);
 
 #endif  // ECGEN_SEED_H
diff --git a/src/gen/types.c b/src/gen/types.c
index afd6542..63d5401 100644
--- a/src/gen/types.c
+++ b/src/gen/types.c
@@ -4,8 +4,6 @@
  */
 #include "types.h"
 
-int gen_skip(curve_t *curve, const config_t *cfg, arg_t *args) { return 1; }
+GENERATOR(gen_skip) { return 1; }
 
-int unroll_skip(curve_t *curve, const config_t *cfg, pari_sp from, pari_sp to) {
-	return -1;
-}
+UNROLL(unroll_skip) { return -1; }
diff --git a/src/gen/types.h b/src/gen/types.h
index a6494cf..5500e85 100644
--- a/src/gen/types.h
+++ b/src/gen/types.h
@@ -116,7 +116,7 @@ typedef UNROLL((*unroll_t));
  * @param args unused
  * @return state diff
  */
-int gen_skip(curve_t *curve, const config_t *cfg, arg_t *args);
+GENERATOR(gen_skip);
 
 /**
  * UNROLL(unroll_t)
@@ -127,6 +127,6 @@ int gen_skip(curve_t *curve, const config_t *cfg, arg_t *args);
  * @param to
  * @return
  */
-int unroll_skip(curve_t *curve, const config_t *cfg, pari_sp from, pari_sp to);
+UNROLL(unroll_skip);
 
 #endif  // ECGEN_TYPES_H