#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;
struct ec_parsed *parsed,
const struct ec_strvec *strvec)
{
+ struct ec_completed_item *item = NULL;
struct ec_node_str *node = (struct ec_node_str *)gen_node;
const char *str;
size_t n = 0;
+ int ret;
(void)parsed;
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?
+
+ item = ec_completed_item(parsed, gen_node);
+ if (item == NULL)
+ return -ENOMEM;
+ ret = ec_completed_item_set(item, EC_MATCH, node->string);
+ if (ret < 0) {
+ ec_completed_item_free(item);
+ return ret;
+ }
+ ret = ec_completed_item_add(completed, item);
+ if (ret < 0) {
+ ec_completed_item_free(item);
+ return ret;
}
return 0;
/* XXX use EC_NO_ID instead of NULL */
node = ec_node_str(NULL, "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");
node = ec_node_str(NULL, "Здравствуйте");
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, "Здравствуйте");
/* an empty string node always matches */
node = ec_node_str(NULL, "");
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, "");
/* test completion */
node = ec_node_str(NULL, "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,