save

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

diff --git a/lib/ecoli_tk_int.c b/lib/ecoli_tk_int.c
index 57971ee..a3510b3 100644 (file)
--- a/lib/ecoli_tk_int.c
+++ b/lib/ecoli_tk_int.c
@@ -88,7 +88,7 @@ static struct ec_parsed_tk *ec_tk_int_parse(const struct ec_tk *gen_tk,
        if (parse_llint(tk, str, &val) < 0)
                return parsed_tk;
 
-       match_strvec = ec_strvec_ndup(strvec, 1);
+       match_strvec = ec_strvec_ndup(strvec, 0, 1);
        if (match_strvec == NULL)
                goto fail;
 
@@ -101,20 +101,24 @@ 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,
 };
 
-struct ec_tk *ec_tk_int_new(const char *id, long long int min,
+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;
 
-       tk = (struct ec_tk_int *)ec_tk_new(id, &ec_tk_int_ops, sizeof(*tk));
-       if (tk == NULL)
+       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;
 
        tk->min = min;
        tk->max = max;
@@ -143,61 +147,60 @@ static int ec_tk_int_testcase(void)
        const char *s;
        int ret = 0;
 
-       tk = ec_tk_int_new(NULL, 0, 256, 0);
+       tk = ec_tk_int(NULL, 0, 256, 0);
        if (tk == NULL) {
                ec_log(EC_LOG_ERR, "cannot create tk\n");
                return -1;
        }
-       ret |= EC_TEST_CHECK_TK_PARSE(tk, 1, "0", EC_TK_ENDLIST);
-       ret |= EC_TEST_CHECK_TK_PARSE(tk, 1, "256", "foo", EC_TK_ENDLIST);
-       ret |= EC_TEST_CHECK_TK_PARSE(tk, 1, "0x100", EC_TK_ENDLIST);
-       ret |= EC_TEST_CHECK_TK_PARSE(tk, 1, " 1", EC_TK_ENDLIST);
-       ret |= EC_TEST_CHECK_TK_PARSE(tk, -1, "-1", EC_TK_ENDLIST);
-       ret |= EC_TEST_CHECK_TK_PARSE(tk, -1, "0x101", EC_TK_ENDLIST);
+       ret |= EC_TEST_CHECK_TK_PARSE(tk, 1, "0");
+       ret |= EC_TEST_CHECK_TK_PARSE(tk, 1, "256", "foo");
+       ret |= EC_TEST_CHECK_TK_PARSE(tk, 1, "0x100");
+       ret |= EC_TEST_CHECK_TK_PARSE(tk, 1, " 1");
+       ret |= EC_TEST_CHECK_TK_PARSE(tk, -1, "-1");
+       ret |= EC_TEST_CHECK_TK_PARSE(tk, -1, "0x101");
 
        p = ec_tk_parse(tk, "0");
-       s = ec_parsed_tk_to_string(p);
+       s = ec_strvec_val(ec_parsed_tk_strvec(p), 0);
        EC_TEST_ASSERT(s != NULL && ec_tk_int_getval(tk, s) == 0);
        ec_parsed_tk_free(p);
 
        p = ec_tk_parse(tk, "10");
-       s = ec_parsed_tk_to_string(p);
+       s = ec_strvec_val(ec_parsed_tk_strvec(p), 0);
        EC_TEST_ASSERT(s != NULL && ec_tk_int_getval(tk, s) == 10);
        ec_parsed_tk_free(p);
        ec_tk_free(tk);
 
-       tk = ec_tk_int_new(NULL, -1, LLONG_MAX, 16);
+       tk = ec_tk_int(NULL, -1, LLONG_MAX, 16);
        if (tk == NULL) {
                ec_log(EC_LOG_ERR, "cannot create tk\n");
                return -1;
        }
-       ret |= EC_TEST_CHECK_TK_PARSE(tk, 1, "0", EC_TK_ENDLIST);
-       ret |= EC_TEST_CHECK_TK_PARSE(tk, 1, "-1", EC_TK_ENDLIST);
-       ret |= EC_TEST_CHECK_TK_PARSE(tk, 1, "7fffffffffffffff", EC_TK_ENDLIST);
-       ret |= EC_TEST_CHECK_TK_PARSE(tk, 1, "0x7fffffffffffffff", EC_TK_ENDLIST);
-       ret |= EC_TEST_CHECK_TK_PARSE(tk, -1, "-2", EC_TK_ENDLIST);
+       ret |= EC_TEST_CHECK_TK_PARSE(tk, 1, "0");
+       ret |= EC_TEST_CHECK_TK_PARSE(tk, 1, "-1");
+       ret |= EC_TEST_CHECK_TK_PARSE(tk, 1, "7fffffffffffffff");
+       ret |= EC_TEST_CHECK_TK_PARSE(tk, 1, "0x7fffffffffffffff");
+       ret |= EC_TEST_CHECK_TK_PARSE(tk, -1, "-2");
 
        p = ec_tk_parse(tk, "10");
-       s = ec_parsed_tk_to_string(p);
+       s = ec_strvec_val(ec_parsed_tk_strvec(p), 0);
        EC_TEST_ASSERT(s != NULL && ec_tk_int_getval(tk, s) == 16);
        ec_parsed_tk_free(p);
        ec_tk_free(tk);
 
-       tk = ec_tk_int_new(NULL, LLONG_MIN, 0, 10);
+       tk = ec_tk_int(NULL, LLONG_MIN, 0, 10);
        if (tk == NULL) {
                ec_log(EC_LOG_ERR, "cannot create tk\n");
                return -1;
        }
-       ret |= EC_TEST_CHECK_TK_PARSE(tk, 1, "0", EC_TK_ENDLIST);
-       ret |= EC_TEST_CHECK_TK_PARSE(tk, 1, "-1", EC_TK_ENDLIST);
-       ret |= EC_TEST_CHECK_TK_PARSE(tk, 1, "-9223372036854775808",
-               EC_TK_ENDLIST);
-       ret |= EC_TEST_CHECK_TK_PARSE(tk, -1, "0x0", EC_TK_ENDLIST);
-       ret |= EC_TEST_CHECK_TK_PARSE(tk, -1, "1", EC_TK_ENDLIST);
+       ret |= EC_TEST_CHECK_TK_PARSE(tk, 1, "0");
+       ret |= EC_TEST_CHECK_TK_PARSE(tk, 1, "-1");
+       ret |= EC_TEST_CHECK_TK_PARSE(tk, 1, "-9223372036854775808");
+       ret |= EC_TEST_CHECK_TK_PARSE(tk, -1, "0x0");
+       ret |= EC_TEST_CHECK_TK_PARSE(tk, -1, "1");
        ec_tk_free(tk);
 
        /* test completion */
-       tk = ec_tk_int_new(NULL, 0, 10, 0);
+       tk = ec_tk_int(NULL, 0, 10, 0);
        if (tk == NULL) {
                ec_log(EC_LOG_ERR, "cannot create tk\n");
                return -1;
@@ -224,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);