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_sh_lex.c
diff --git
a/src/ecoli_node_sh_lex.c
b/src/ecoli_node_sh_lex.c
index
9bd06ce
..
2461620
100644
(file)
--- a/
src/ecoli_node_sh_lex.c
+++ b/
src/ecoli_node_sh_lex.c
@@
-213,12
+213,12
@@
static struct ec_strvec *tokenize(const char *str, int completion,
static int
ec_node_sh_lex_parse(const struct ec_node *node,
static int
ec_node_sh_lex_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_sh_lex *priv = ec_node_priv(node);
struct ec_strvec *new_vec = NULL;
const struct ec_strvec *strvec)
{
struct ec_node_sh_lex *priv = ec_node_priv(node);
struct ec_strvec *new_vec = NULL;
- struct ec_p
ars
e *child_parse;
+ struct ec_p
nod
e *child_parse;
const char *str;
int ret;
const char *str;
int ret;
@@
-233,16
+233,16
@@
ec_node_sh_lex_parse(const struct ec_node *node,
if (new_vec == NULL)
goto fail;
if (new_vec == NULL)
goto fail;
- ret = ec_
node_
parse_child(priv->child, state, new_vec);
+ ret = ec_parse_child(priv->child, state, new_vec);
if (ret < 0)
goto fail;
if ((unsigned)ret == ec_strvec_len(new_vec)) {
ret = 1;
} else if (ret != EC_PARSE_NOMATCH) {
if (ret < 0)
goto fail;
if ((unsigned)ret == ec_strvec_len(new_vec)) {
ret = 1;
} else if (ret != EC_PARSE_NOMATCH) {
- 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);
ret = EC_PARSE_NOMATCH;
}
ret = EC_PARSE_NOMATCH;
}
@@
-285,7
+285,7
@@
ec_node_sh_lex_complete(const struct ec_node *node,
if (tmp_comp == NULL)
goto fail;
if (tmp_comp == NULL)
goto fail;
- ret = ec_
node_
complete_child(priv->child, tmp_comp, new_vec);
+ ret = ec_complete_child(priv->child, tmp_comp, new_vec);
if (ret < 0)
goto fail;
if (ret < 0)
goto fail;
@@
-440,44
+440,44
@@
static int ec_node_sh_lex_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,
- " ", 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
,
- "bar", "toto", EC_
NODE_ENDLIST
);
+ "foo ", EC_
VA_END
,
+ "bar", "toto", EC_
VA_END
);
testres |= EC_TEST_CHECK_COMPLETE(node,
testres |= EC_TEST_CHECK_COMPLETE(node,
- "foo t", EC_
NODE_ENDLIST
,
- "toto", EC_
NODE_ENDLIST
);
+ "foo t", EC_
VA_END
,
+ "toto", EC_
VA_END
);
testres |= EC_TEST_CHECK_COMPLETE(node,
testres |= EC_TEST_CHECK_COMPLETE(node,
- "foo b", EC_
NODE_ENDLIST
,
- "bar", EC_
NODE_ENDLIST
);
+ "foo b", EC_
VA_END
,
+ "bar", EC_
VA_END
);
testres |= EC_TEST_CHECK_COMPLETE(node,
testres |= EC_TEST_CHECK_COMPLETE(node,
- "foo bar", EC_
NODE_ENDLIST
,
- "bar", EC_
NODE_ENDLIST
);
+ "foo bar", EC_
VA_END
,
+ "bar", EC_
VA_END
);
testres |= EC_TEST_CHECK_COMPLETE(node,
testres |= EC_TEST_CHECK_COMPLETE(node,
- "foo bar ", EC_
NODE_ENDLIST
,
- "titi", EC_
NODE_ENDLIST
);
+ "foo bar ", EC_
VA_END
,
+ "titi", EC_
VA_END
);
testres |= EC_TEST_CHECK_COMPLETE(node,
testres |= EC_TEST_CHECK_COMPLETE(node,
- "foo toto bar ", EC_
NODE_ENDLIST
,
- "titi", EC_
NODE_ENDLIST
);
+ "foo toto bar ", EC_
VA_END
,
+ "titi", EC_
VA_END
);
testres |= EC_TEST_CHECK_COMPLETE(node,
testres |= EC_TEST_CHECK_COMPLETE(node,
- "x", EC_
NODE_ENDLIST
,
- EC_
NODE_ENDLIST
);
+ "x", EC_
VA_END
,
+ EC_
VA_END
);
testres |= EC_TEST_CHECK_COMPLETE(node,
testres |= EC_TEST_CHECK_COMPLETE(node,
- "foo barx", EC_
NODE_ENDLIST
,
- EC_
NODE_ENDLIST
);
+ "foo barx", EC_
VA_END
,
+ EC_
VA_END
);
testres |= EC_TEST_CHECK_COMPLETE(node,
testres |= EC_TEST_CHECK_COMPLETE(node,
- "foo 'b", EC_
NODE_ENDLIST
,
- "'bar'", EC_
NODE_ENDLIST
);
+ "foo 'b", EC_
VA_END
,
+ "'bar'", EC_
VA_END
);
ec_node_free(node);
return testres;
ec_node_free(node);
return testres;