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_expr_test.c
diff --git
a/src/ecoli_node_expr_test.c
b/src/ecoli_node_expr_test.c
index
e3a0c79
..
c2096ed
100644
(file)
--- a/
src/ecoli_node_expr_test.c
+++ b/
src/ecoli_node_expr_test.c
@@
-25,7
+25,7
@@
struct my_eval_result {
static int
ec_node_expr_test_eval_var(void **result, void *userctx,
static int
ec_node_expr_test_eval_var(void **result, void *userctx,
- const struct ec_p
ars
e *var)
+ const struct ec_p
nod
e *var)
{
const struct ec_strvec *vec;
const struct ec_node *node;
{
const struct ec_strvec *vec;
const struct ec_node *node;
@@
-35,13
+35,13
@@
ec_node_expr_test_eval_var(void **result, void *userctx,
(void)userctx;
/* get parsed string vector, it should contain only one str */
(void)userctx;
/* get parsed string vector, it should contain only one str */
- vec = ec_p
ars
e_strvec(var);
+ vec = ec_p
nod
e_strvec(var);
if (ec_strvec_len(vec) != 1) {
errno = EINVAL;
return -1;
}
if (ec_strvec_len(vec) != 1) {
errno = EINVAL;
return -1;
}
- node = ec_p
ars
e_get_node(var);
+ node = ec_p
nod
e_get_node(var);
if (ec_node_int_getval(node, ec_strvec_val(vec, 0), &val) < 0)
return -1;
if (ec_node_int_getval(node, ec_strvec_val(vec, 0), &val) < 0)
return -1;
@@
-58,7
+58,7
@@
ec_node_expr_test_eval_var(void **result, void *userctx,
static int
ec_node_expr_test_eval_pre_op(void **result, void *userctx, void *operand,
static int
ec_node_expr_test_eval_pre_op(void **result, void *userctx, void *operand,
- const struct ec_p
ars
e *operator)
+ const struct ec_p
nod
e *operator)
{
const struct ec_strvec *vec;
struct my_eval_result *eval = operand;;
{
const struct ec_strvec *vec;
struct my_eval_result *eval = operand;;
@@
-66,7
+66,7
@@
ec_node_expr_test_eval_pre_op(void **result, void *userctx, void *operand,
(void)userctx;
/* get parsed string vector, it should contain only one str */
(void)userctx;
/* get parsed string vector, it should contain only one str */
- vec = ec_p
ars
e_strvec(operator);
+ vec = ec_p
nod
e_strvec(operator);
if (ec_strvec_len(vec) != 1) {
errno = EINVAL;
return -1;
if (ec_strvec_len(vec) != 1) {
errno = EINVAL;
return -1;
@@
-88,7
+88,7
@@
ec_node_expr_test_eval_pre_op(void **result, void *userctx, void *operand,
static int
ec_node_expr_test_eval_post_op(void **result, void *userctx, void *operand,
static int
ec_node_expr_test_eval_post_op(void **result, void *userctx, void *operand,
- const struct ec_p
ars
e *operator)
+ const struct ec_p
nod
e *operator)
{
const struct ec_strvec *vec;
struct my_eval_result *eval = operand;;
{
const struct ec_strvec *vec;
struct my_eval_result *eval = operand;;
@@
-96,7
+96,7
@@
ec_node_expr_test_eval_post_op(void **result, void *userctx, void *operand,
(void)userctx;
/* get parsed string vector, it should contain only one str */
(void)userctx;
/* get parsed string vector, it should contain only one str */
- vec = ec_p
ars
e_strvec(operator);
+ vec = ec_p
nod
e_strvec(operator);
if (ec_strvec_len(vec) != 1) {
errno = EINVAL;
return -1;
if (ec_strvec_len(vec) != 1) {
errno = EINVAL;
return -1;
@@
-117,7
+117,7
@@
ec_node_expr_test_eval_post_op(void **result, void *userctx, void *operand,
static int
ec_node_expr_test_eval_bin_op(void **result, void *userctx, void *operand1,
static int
ec_node_expr_test_eval_bin_op(void **result, void *userctx, void *operand1,
- const struct ec_p
ars
e *operator, void *operand2)
+ const struct ec_p
nod
e *operator, void *operand2)
{
const struct ec_strvec *vec;
{
const struct ec_strvec *vec;
@@
-127,7
+127,7
@@
ec_node_expr_test_eval_bin_op(void **result, void *userctx, void *operand1,
(void)userctx;
/* get parsed string vector, it should contain only one str */
(void)userctx;
/* get parsed string vector, it should contain only one str */
- vec = ec_p
ars
e_strvec(operator);
+ vec = ec_p
nod
e_strvec(operator);
if (ec_strvec_len(vec) != 1) {
errno = EINVAL;
return -1;
if (ec_strvec_len(vec) != 1) {
errno = EINVAL;
return -1;
@@
-151,8
+151,8
@@
ec_node_expr_test_eval_bin_op(void **result, void *userctx, void *operand1,
static int
ec_node_expr_test_eval_parenthesis(void **result, void *userctx,
static int
ec_node_expr_test_eval_parenthesis(void **result, void *userctx,
- const struct ec_p
ars
e *open_paren,
- const struct ec_p
ars
e *close_paren,
+ const struct ec_p
nod
e *open_paren,
+ const struct ec_p
nod
e *close_paren,
void *value)
{
(void)userctx;
void *value)
{
(void)userctx;
@@
-185,17
+185,17
@@
static int ec_node_expr_test_eval(struct ec_node *lex_node,
const struct ec_node *expr_node,
const char *str, int val)
{
const struct ec_node *expr_node,
const char *str, int val)
{
- struct ec_p
ars
e *p;
+ struct ec_p
nod
e *p;
void *result;
struct my_eval_result *eval;
int ret;
void *result;
struct my_eval_result *eval;
int ret;
- p = ec_
node_
parse(lex_node, str);
+ p = ec_parse(lex_node, str);
if (p == NULL)
return -1;
ret = ec_node_expr_eval(&result, expr_node, p, &test_ops, NULL);
if (p == NULL)
return -1;
ret = ec_node_expr_eval(&result, expr_node, p, &test_ops, NULL);
- ec_p
ars
e_free(p);
+ ec_p
nod
e_free(p);
if (ret < 0)
return -1;
if (ret < 0)
return -1;