#include <ecoli_log.h>
#include <ecoli_test.h>
#include <ecoli_strvec.h>
-#include <ecoli_keyval.h>
+#include <ecoli_dict.h>
#include <ecoli_node.h>
#include <ecoli_complete.h>
#include <ecoli_parse.h>
tokenize(struct regexp_pattern *table, size_t table_len, const char *str)
{
struct ec_strvec *strvec = NULL;
- struct ec_keyval *attrs = NULL;
+ struct ec_dict *attrs = NULL;
char *dup = NULL;
char c;
size_t len, off = 0;
goto fail;
if (table[i].attr_name != NULL) {
- attrs = ec_keyval();
+ attrs = ec_dict();
if (attrs == NULL)
goto fail;
- if (ec_keyval_set(attrs, table[i].attr_name,
+ if (ec_dict_set(attrs, table[i].attr_name,
NULL, NULL) < 0)
goto fail;
if (ec_strvec_set_attrs(strvec,
node->child = ec_node_clone(child->node);
for (i = 0; i < (ssize_t)node->len; i++) {
ec_free(node->table[i].pattern);
+ ec_free(node->table[i].attr_name);
regfree(&node->table[i].r);
}
ec_free(node->table);