#include <ecoli_completed.h>
#include <ecoli_node_str.h>
+EC_LOG_TYPE_REGISTER(node_str);
+
struct ec_node_str {
struct ec_node gen;
char *string;
static int
ec_node_str_complete(const struct ec_node *gen_node,
struct ec_completed *completed,
- struct ec_parsed *parsed,
const struct ec_strvec *strvec)
{
struct ec_node_str *node = (struct ec_node_str *)gen_node;
const char *str;
size_t n = 0;
- (void)parsed;
-
if (ec_strvec_len(strvec) != 1)
return 0;
break;
}
- if (str[n] == '\0') {
- if (ec_completed_add_match(completed, parsed, gen_node,
- node->string) < 0)
- return -1;
- }
+ /* no completion */
+ if (str[n] != '\0')
+ return 0; // XXX add a no_match instead?
+
+ if (ec_completed_add_item(completed, gen_node, NULL, EC_COMP_FULL,
+ str, node->string) < 0)
+ return -1;
return 0;
}
int ec_node_str_set_str(struct ec_node *gen_node, const char *str)
{
struct ec_node_str *node = (struct ec_node_str *)gen_node;
+ int ret;
+
+ ret = ec_node_check_type(gen_node, &ec_node_str_type);
+ if (ret < 0)
+ return ret;
if (str == NULL)
return -EINVAL;
struct ec_node *node;
int ret = 0;
- /* XXX use EC_NO_ID instead of NULL */
- node = ec_node_str(NULL, "foo");
+ node = ec_node_str(EC_NO_ID, "foo");
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, 1, "foo");
ret |= EC_TEST_CHECK_PARSE(node, -1, "");
ec_node_free(node);
- node = ec_node_str(NULL, "Здравствуйте");
+ node = ec_node_str(EC_NO_ID, "Здравствуйте");
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, 1, "Здравствуйте");
ec_node_free(node);
/* an empty string node always matches */
- node = ec_node_str(NULL, "");
+ node = ec_node_str(EC_NO_ID, "");
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, 1, "");
ec_node_free(node);
/* test completion */
- node = ec_node_str(NULL, "foo");
+ node = ec_node_str(EC_NO_ID, "foo");
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_COMPLETE(node,