save

[protos/libecoli.git] / lib / ecoli_tk_int.c

diff --git a/lib/ecoli_tk_int.c b/lib/ecoli_tk_int.c
index bd0155d..a3510b3 100644 (file)
--- a/lib/ecoli_tk_int.c
+++ b/lib/ecoli_tk_int.c
@@ -101,19 +101,21 @@ static struct ec_parsed_tk *ec_tk_int_parse(const struct ec_tk *gen_tk,
        return NULL;
 }
 
-static struct ec_tk_ops ec_tk_int_ops = {
-       .typename = "int",
+static struct ec_tk_type ec_tk_int_type = {
+       .name = "int",
        .parse = ec_tk_int_parse,
        .complete = ec_tk_default_complete,
 };
 
+EC_TK_TYPE_REGISTER(ec_tk_int_type);
+
 struct ec_tk *ec_tk_int(const char *id, long long int min,
        long long int max, unsigned int base)
 {
        struct ec_tk *gen_tk = NULL;
        struct ec_tk_int *tk = NULL;
 
-       gen_tk = ec_tk_new(id, &ec_tk_int_ops, sizeof(*tk));
+       gen_tk = ec_tk_new(id, &ec_tk_int_type, sizeof(*tk));
        if (gen_tk == NULL)
                return NULL;
        tk = (struct ec_tk_int *)gen_tk;
@@ -225,4 +227,4 @@ static struct ec_test ec_tk_int_test = {
        .test = ec_tk_int_testcase,
 };
 
-EC_REGISTER_TEST(ec_tk_int_test);
+EC_TEST_REGISTER(ec_tk_int_test);