git.droids-corp.org
/
protos
/
libecoli.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rename structures and functions
[protos/libecoli.git]
/
src
/
ecoli_node_many.c
diff --git
a/src/ecoli_node_many.c
b/src/ecoli_node_many.c
index
91a5fbf
..
d99c2e3
100644
(file)
--- a/
src/ecoli_node_many.c
+++ b/
src/ecoli_node_many.c
@@
-30,11
+30,11
@@
struct ec_node_many {
};
static int ec_node_many_parse(const struct ec_node *node,
};
static int ec_node_many_parse(const struct ec_node *node,
- struct ec_p
ars
e *state,
+ struct ec_p
nod
e *state,
const struct ec_strvec *strvec)
{
struct ec_node_many *priv = ec_node_priv(node);
const struct ec_strvec *strvec)
{
struct ec_node_many *priv = ec_node_priv(node);
- struct ec_p
ars
e *child_parse;
+ struct ec_p
nod
e *child_parse;
struct ec_strvec *childvec = NULL;
size_t off = 0, count;
int ret;
struct ec_strvec *childvec = NULL;
size_t off = 0, count;
int ret;
@@
-45,7
+45,7
@@
static int ec_node_many_parse(const struct ec_node *node,
if (childvec == NULL)
goto fail;
if (childvec == NULL)
goto fail;
- ret = ec_
node_
parse_child(priv->child, state, childvec);
+ ret = ec_parse_child(priv->child, state, childvec);
if (ret < 0)
goto fail;
if (ret < 0)
goto fail;
@@
-57,9
+57,9
@@
static int ec_node_many_parse(const struct ec_node *node,
/* it matches an empty strvec, no need to continue */
if (ret == 0) {
/* it matches an empty strvec, no need to continue */
if (ret == 0) {
- child_parse = ec_p
ars
e_get_last_child(state);
- ec_p
ars
e_unlink_child(state, child_parse);
- ec_p
ars
e_free(child_parse);
+ child_parse = ec_p
nod
e_get_last_child(state);
+ ec_p
nod
e_unlink_child(state, child_parse);
+ ec_p
nod
e_free(child_parse);
break;
}
break;
}
@@
-67,7
+67,7
@@
static int ec_node_many_parse(const struct ec_node *node,
}
if (count < priv->min) {
}
if (count < priv->min) {
- ec_p
ars
e_free_children(state);
+ ec_p
nod
e_free_children(state);
return EC_PARSE_NOMATCH;
}
return EC_PARSE_NOMATCH;
}
@@
-83,13
+83,13
@@
__ec_node_many_complete(struct ec_node_many *priv, unsigned int max,
struct ec_comp *comp,
const struct ec_strvec *strvec)
{
struct ec_comp *comp,
const struct ec_strvec *strvec)
{
- struct ec_p
ars
e *parse = ec_comp_get_state(comp);
+ struct ec_p
nod
e *parse = ec_comp_get_state(comp);
struct ec_strvec *childvec = NULL;
unsigned int i;
int ret;
/* first, try to complete with the child node */
struct ec_strvec *childvec = NULL;
unsigned int i;
int ret;
/* first, try to complete with the child node */
- ret = ec_
node_
complete_child(priv->child, comp, strvec);
+ ret = ec_complete_child(priv->child, comp, strvec);
if (ret < 0)
goto fail;
if (ret < 0)
goto fail;
@@
-108,7
+108,7
@@
__ec_node_many_complete(struct ec_node_many *priv, unsigned int max,
if (childvec == NULL)
goto fail;
if (childvec == NULL)
goto fail;
- ret = ec_
node_
parse_child(priv->child, parse, childvec);
+ ret = ec_parse_child(priv->child, parse, childvec);
if (ret < 0)
goto fail;
if (ret < 0)
goto fail;
@@
-117,18
+117,18
@@
__ec_node_many_complete(struct ec_node_many *priv, unsigned int max,
if ((unsigned int)ret != i) {
if (ret != EC_PARSE_NOMATCH)
if ((unsigned int)ret != i) {
if (ret != EC_PARSE_NOMATCH)
- ec_p
ars
e_del_last_child(parse);
+ ec_p
nod
e_del_last_child(parse);
continue;
}
childvec = ec_strvec_ndup(strvec, i, ec_strvec_len(strvec) - i);
if (childvec == NULL) {
continue;
}
childvec = ec_strvec_ndup(strvec, i, ec_strvec_len(strvec) - i);
if (childvec == NULL) {
- ec_p
ars
e_del_last_child(parse);
+ ec_p
nod
e_del_last_child(parse);
goto fail;
}
ret = __ec_node_many_complete(priv, max, comp, childvec);
goto fail;
}
ret = __ec_node_many_complete(priv, max, comp, childvec);
- ec_p
ars
e_del_last_child(parse);
+ ec_p
nod
e_del_last_child(parse);
ec_strvec_free(childvec);
childvec = NULL;
ec_strvec_free(childvec);
childvec = NULL;
@@
-382,26
+382,26
@@
static int ec_node_many_testcase(void)
return -1;
}
testres |= EC_TEST_CHECK_COMPLETE(node,
return -1;
}
testres |= EC_TEST_CHECK_COMPLETE(node,
- "", EC_
NODE_ENDLIST
,
- "foo", EC_
NODE_ENDLIST
);
+ "", EC_
VA_END
,
+ "foo", EC_
VA_END
);
testres |= EC_TEST_CHECK_COMPLETE(node,
testres |= EC_TEST_CHECK_COMPLETE(node,
- "f", EC_
NODE_ENDLIST
,
- "foo", EC_
NODE_ENDLIST
);
+ "f", EC_
VA_END
,
+ "foo", EC_
VA_END
);
testres |= EC_TEST_CHECK_COMPLETE(node,
testres |= EC_TEST_CHECK_COMPLETE(node,
- "foo", EC_
NODE_ENDLIST
,
- "foo", EC_
NODE_ENDLIST
);
+ "foo", EC_
VA_END
,
+ "foo", EC_
VA_END
);
testres |= EC_TEST_CHECK_COMPLETE(node,
testres |= EC_TEST_CHECK_COMPLETE(node,
- "foo", "", EC_
NODE_ENDLIST
,
- "foo", EC_
NODE_ENDLIST
);
+ "foo", "", EC_
VA_END
,
+ "foo", EC_
VA_END
);
testres |= EC_TEST_CHECK_COMPLETE(node,
testres |= EC_TEST_CHECK_COMPLETE(node,
- "foo", "foo", "", EC_
NODE_ENDLIST
,
- "foo", EC_
NODE_ENDLIST
);
+ "foo", "foo", "", EC_
VA_END
,
+ "foo", EC_
VA_END
);
testres |= EC_TEST_CHECK_COMPLETE(node,
testres |= EC_TEST_CHECK_COMPLETE(node,
- "foo", "foo", "foo", "", EC_
NODE_ENDLIST
,
- "foo", EC_
NODE_ENDLIST
);
+ "foo", "foo", "foo", "", EC_
VA_END
,
+ "foo", EC_
VA_END
);
testres |= EC_TEST_CHECK_COMPLETE(node,
testres |= EC_TEST_CHECK_COMPLETE(node,
- "foo", "foo", "foo", "foo", "", EC_
NODE_ENDLIST
,
- EC_
NODE_ENDLIST
);
+ "foo", "foo", "foo", "foo", "", EC_
VA_END
,
+ EC_
VA_END
);
ec_node_free(node);
return testres;
ec_node_free(node);
return testres;