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_node_expr.c
diff --git
a/src/ecoli_node_expr.c
b/src/ecoli_node_expr.c
index
2ca0ed3
..
2a78d4f
100644
(file)
--- a/
src/ecoli_node_expr.c
+++ b/
src/ecoli_node_expr.c
@@
-43,7
+43,7
@@
struct ec_node_expr {
};
static int ec_node_expr_parse(const struct ec_node *node,
};
static int ec_node_expr_parse(const struct ec_node *node,
- struct ec_p
arse *
state,
+ struct ec_p
node *p
state,
const struct ec_strvec *strvec)
{
struct ec_node_expr *priv = ec_node_priv(node);
const struct ec_strvec *strvec)
{
struct ec_node_expr *priv = ec_node_priv(node);
@@
-53,7
+53,7
@@
static int ec_node_expr_parse(const struct ec_node *node,
return -1;
}
return -1;
}
- return ec_
node_parse_child(priv->child,
state, strvec);
+ return ec_
parse_child(priv->child, p
state, strvec);
}
static int
}
static int
@@
-68,7
+68,7
@@
ec_node_expr_complete(const struct ec_node *node,
return -1;
}
return -1;
}
- return ec_
node_
complete_child(priv->child, comp, strvec);
+ return ec_complete_child(priv->child, comp, strvec);
}
static void ec_node_expr_free_priv(struct ec_node *node)
}
static void ec_node_expr_free_priv(struct ec_node *node)
@@
-463,7
+463,7
@@
static enum expr_node_type get_node_type(const struct ec_node *expr_node,
struct result {
bool has_val;
void *val;
struct result {
bool has_val;
void *val;
- const struct ec_p
ars
e *op;
+ const struct ec_p
nod
e *op;
enum expr_node_type op_type;
};
enum expr_node_type op_type;
};
@@
-520,18
+520,18
@@
static int eval_expression(struct result *result,
void *userctx,
const struct ec_node_expr_eval_ops *ops,
const struct ec_node *expr_node,
void *userctx,
const struct ec_node_expr_eval_ops *ops,
const struct ec_node *expr_node,
- const struct ec_p
ars
e *parse)
+ const struct ec_p
nod
e *parse)
{
{
- struct ec_p
ars
e *open = NULL, *close = NULL;
+ struct ec_p
nod
e *open = NULL, *close = NULL;
struct result child_result;
struct result child_result;
- struct ec_p
ars
e *child;
+ struct ec_p
nod
e *child;
enum expr_node_type type;
memset(result, 0, sizeof(*result));
memset(&child_result, 0, sizeof(child_result));
enum expr_node_type type;
memset(result, 0, sizeof(*result));
memset(&child_result, 0, sizeof(child_result));
- type = get_node_type(expr_node, ec_p
ars
e_get_node(parse));
+ type = get_node_type(expr_node, ec_p
nod
e_get_node(parse));
if (type == VAL) {
if (ops->eval_var(&result->val, userctx, parse) < 0)
goto fail;
if (type == VAL) {
if (ops->eval_var(&result->val, userctx, parse) < 0)
goto fail;
@@
-541,9
+541,9
@@
static int eval_expression(struct result *result,
result->op_type = type;
}
result->op_type = type;
}
- EC_P
ARS
E_FOREACH_CHILD(child, parse) {
+ EC_P
NOD
E_FOREACH_CHILD(child, parse) {
- type = get_node_type(expr_node, ec_p
ars
e_get_node(child));
+ type = get_node_type(expr_node, ec_p
nod
e_get_node(child));
if (type == PAREN_OPEN) {
open = child;
continue;
if (type == PAREN_OPEN) {
open = child;
continue;
@@
-581,7
+581,7
@@
fail:
}
int ec_node_expr_eval(void **user_result, const struct ec_node *node,
}
int ec_node_expr_eval(void **user_result, const struct ec_node *node,
- struct ec_p
ars
e *parse, const struct ec_node_expr_eval_ops *ops,
+ struct ec_p
nod
e *parse, const struct ec_node_expr_eval_ops *ops,
void *userctx)
{
struct result result;
void *userctx)
{
struct result result;
@@
-597,7
+597,7
@@
int ec_node_expr_eval(void **user_result, const struct ec_node *node,
if (ec_node_check_type(node, &ec_node_expr_type) < 0)
return -1;
if (ec_node_check_type(node, &ec_node_expr_type) < 0)
return -1;
- if (!ec_p
ars
e_matches(parse)) {
+ if (!ec_p
nod
e_matches(parse)) {
errno = EINVAL;
return -1;
}
errno = EINVAL;
return -1;
}