save

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

diff --git a/lib/ecoli_node_cmd.c b/lib/ecoli_node_cmd.c
index 01c2cd2..0aca9b1 100644 (file)
--- a/lib/ecoli_node_cmd.c
+++ b/lib/ecoli_node_cmd.c
@@ -53,6 +53,8 @@
 #include <ecoli_node_re_lex.h>
 #include <ecoli_node_cmd.h>
 
+EC_LOG_TYPE_REGISTER(node_cmd);
+
 struct ec_node_cmd {
        struct ec_node gen;
        char *cmd_str;           /* the command string. */
@@ -83,7 +85,7 @@ ec_node_cmd_eval_var(void **result, void *userctx,
 
        for (i = 0; i < node->len; i++) {
                id = ec_node_id(node->table[i]);
-               printf("i=%d id=%s\n", i, id);
+               //printf("i=%d id=%s\n", i, id);
                if (id == NULL)
                        continue;
                if (strcmp(str, id))
@@ -102,7 +104,7 @@ ec_node_cmd_eval_var(void **result, void *userctx,
                        return -ENOMEM;
        }
 
-       printf("eval var %s %p\n", str, eval);
+       //printf("eval var %s %p\n", str, eval);
        *result = eval;
 
        return 0;
@@ -139,7 +141,7 @@ ec_node_cmd_eval_post_op(void **result, void *userctx, void *operand,
        else
                return -EINVAL;
 
-       printf("eval post_op %p\n", eval);
+       //printf("eval post_op %p\n", eval);
        *result = eval;
 
        return 0;
@@ -157,7 +159,7 @@ ec_node_cmd_eval_bin_op(void **result, void *userctx, void *operand1,
 
        (void)userctx;
 
-       printf("eval bin_op %p %p\n", in1, in2);
+       //printf("eval bin_op %p %p\n", in1, in2);
 
        /* get parsed string vector, it should contain only one str */
        vec = ec_parsed_strvec(operator);
@@ -190,7 +192,7 @@ ec_node_cmd_eval_bin_op(void **result, void *userctx, void *operand1,
                return -EINVAL;
        }
 
-       printf("eval bin_op out %p\n", *result);
+       //printf("eval bin_op out %p\n", *result);
 
        return 0;
 }
@@ -224,7 +226,7 @@ ec_node_cmd_eval_parenthesis(void **result, void *userctx,
                return -EINVAL;
        }
 
-       printf("eval paren\n");
+       //printf("eval paren\n");
        *result = out;
 
        return 0;
@@ -372,7 +374,7 @@ static int ec_node_cmd_build(struct ec_node *gen_node)
        }
        ec_parsed_free(p);
        p = NULL;
-       ec_node_dump(stdout, cmd);
+       //ec_node_dump(stdout, cmd);
 
        ec_node_free(node->expr);
        node->expr = expr;
@@ -411,7 +413,6 @@ int ec_node_cmd_add_child(struct ec_node *gen_node, struct ec_node *child)
 
        assert(node != NULL);
 
-       printf("add child %s\n", child->id);
        if (child == NULL)
                return -EINVAL;
 
@@ -505,7 +506,7 @@ static int ec_node_cmd_testcase(void)
                ec_node_int("y", 20, 30, 10)
        );
        if (node == NULL) {
-               ec_log(EC_LOG_ERR, "cannot create node\n");
+               EC_LOG(EC_LOG_ERR, "cannot create node\n");
                return -1;
        }
        ret |= EC_TEST_CHECK_PARSE(node, 2, "command", "1");
@@ -518,23 +519,20 @@ static int ec_node_cmd_testcase(void)
        node = EC_NODE_CMD(NULL, "good morning [count] bob|bobby|michael",
                        ec_node_int("count", 0, 10, 10));
        if (node == NULL) {
-               ec_log(EC_LOG_ERR, "cannot create node\n");
+               EC_LOG(EC_LOG_ERR, "cannot create node\n");
                return -1;
        }
        ret |= EC_TEST_CHECK_PARSE(node, 4, "good", "morning", "1", "bob");
 
        ret |= EC_TEST_CHECK_COMPLETE(node,
                "", EC_NODE_ENDLIST,
-               "good", EC_NODE_ENDLIST,
-               "good");
+               "good", EC_NODE_ENDLIST);
        ret |= EC_TEST_CHECK_COMPLETE(node,
                "g", EC_NODE_ENDLIST,
-               "ood", EC_NODE_ENDLIST,
-               "ood");
+               "good", EC_NODE_ENDLIST);
        ret |= EC_TEST_CHECK_COMPLETE(node,
                "good", "morning", "", EC_NODE_ENDLIST,
-               "bob", "bobby", "michael", EC_NODE_ENDLIST,
-               "");
+               "bob", "bobby", "michael", EC_NODE_ENDLIST);
 
        ec_node_free(node);