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
api doc and minor changes
[protos/libecoli.git]
/
src
/
ecoli_parse.c
diff --git
a/src/ecoli_parse.c
b/src/ecoli_parse.c
index
e1b6018
..
9a6eabc
100644
(file)
--- a/
src/ecoli_parse.c
+++ b/
src/ecoli_parse.c
@@
-35,7
+35,7
@@
struct ec_pnode {
};
static int __ec_parse_child(const struct ec_node *node,
};
static int __ec_parse_child(const struct ec_node *node,
- struct ec_pnode *state,
+ struct ec_pnode *
p
state,
bool is_root, const struct ec_strvec *strvec)
{
struct ec_strvec *match_strvec;
bool is_root, const struct ec_strvec *strvec)
{
struct ec_strvec *match_strvec;
@@
-54,9
+54,9
@@
static int __ec_parse_child(const struct ec_node *node,
if (child == NULL)
return -1;
if (child == NULL)
return -1;
- ec_pnode_link_child(state, child);
+ ec_pnode_link_child(
p
state, child);
} else {
} else {
- child = state;
+ child =
p
state;
}
ret = ec_node_type(node)->parse(node, child, strvec);
if (ret < 0)
}
ret = ec_node_type(node)->parse(node, child, strvec);
if (ret < 0)
@@
-64,7
+64,7
@@
static int __ec_parse_child(const struct ec_node *node,
if (ret == EC_PARSE_NOMATCH) {
if (!is_root) {
if (ret == EC_PARSE_NOMATCH) {
if (!is_root) {
- ec_pnode_unlink_child(state, child);
+ ec_pnode_unlink_child(
p
state, child);
ec_pnode_free(child);
}
return ret;
ec_pnode_free(child);
}
return ret;
@@
-80,17
+80,17
@@
static int __ec_parse_child(const struct ec_node *node,
fail:
if (!is_root) {
fail:
if (!is_root) {
- ec_pnode_unlink_child(state, child);
+ ec_pnode_unlink_child(
p
state, child);
ec_pnode_free(child);
}
return -1;
}
ec_pnode_free(child);
}
return -1;
}
-int ec_parse_child(const struct ec_node *node, struct ec_pnode *state,
+int ec_parse_child(const struct ec_node *node, struct ec_pnode *
p
state,
const struct ec_strvec *strvec)
{
const struct ec_strvec *strvec)
{
- assert(state != NULL);
- return __ec_parse_child(node, state, false, strvec);
+ assert(
p
state != NULL);
+ return __ec_parse_child(node,
p
state, false, strvec);
}
// XXX what is returned if no match ??
}
// XXX what is returned if no match ??