Skip to content

Commit 1789f6e

Browse files
bazsibazsi
committed
filterx: rename _eval() methods to specific names
To make it easier to understand stackdumps. Signed-off-by: Balazs Scheidler <balazs.scheidler@axoflow.com>
1 parent 4c9e715 commit 1789f6e

20 files changed

+47
-47
lines changed

‎lib/filterx/expr-comparison.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ _eval_based_on_compare_mode(FilterXExpr *expr, gint compare_mode)
198198
}
199199

200200
static FilterXObject *
201-
_eval(FilterXExpr *s)
201+
_eval_comparison(FilterXExpr *s)
202202
{
203203
FilterXComparison *self = (FilterXComparison *) s;
204204

@@ -250,7 +250,7 @@ _optimize(FilterXExpr *s)
250250
self->literal_rhs = _eval_based_on_compare_mode(self->super.rhs, compare_mode);
251251

252252
if (self->literal_lhs && self->literal_rhs)
253-
return filterx_literal_new(_eval(&self->super.super));
253+
return filterx_literal_new(_eval_comparison(&self->super.super));
254254

255255
return NULL;
256256
}
@@ -273,7 +273,7 @@ filterx_comparison_new(FilterXExpr *lhs, FilterXExpr *rhs, gint operator)
273273

274274
filterx_binary_op_init_instance(&self->super, "comparison", lhs, rhs);
275275
self->super.super.optimize = _optimize;
276-
self->super.super.eval = _eval;
276+
self->super.super.eval = _eval_comparison;
277277
self->super.super.free_fn = _filterx_comparison_free;
278278
self->operator = operator;
279279

‎lib/filterx/expr-compound.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ _eval_exprs(FilterXCompoundExpr *self, FilterXObject **result)
107107
}
108108

109109
static FilterXObject *
110-
_eval(FilterXExpr *s)
110+
_eval_compound(FilterXExpr *s)
111111
{
112112
FilterXCompoundExpr *self = (FilterXCompoundExpr *) s;
113113
FilterXObject *result = NULL;
@@ -232,7 +232,7 @@ filterx_compound_expr_new(gboolean return_value_of_last_expr)
232232
FilterXCompoundExpr *self = g_new0(FilterXCompoundExpr, 1);
233233

234234
filterx_expr_init_instance(&self->super, "compound");
235-
self->super.eval = _eval;
235+
self->super.eval = _eval_compound;
236236
self->super.optimize = _optimize;
237237
self->super.init = _init;
238238
self->super.deinit = _deinit;

‎lib/filterx/expr-condition.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ _free(FilterXExpr *s)
9898
}
9999

100100
static FilterXObject *
101-
_eval(FilterXExpr *s)
101+
_eval_conditional(FilterXExpr *s)
102102
{
103103
FilterXConditional *self = (FilterXConditional *) s;
104104
FilterXObject *condition_value = filterx_expr_eval(self->condition);
@@ -213,7 +213,7 @@ filterx_conditional_new(FilterXExpr *condition)
213213
{
214214
FilterXConditional *self = g_new0(FilterXConditional, 1);
215215
filterx_expr_init_instance(&self->super, "conditional");
216-
self->super.eval = _eval;
216+
self->super.eval = _eval_conditional;
217217
self->super.optimize = _optimize;
218218
self->super.init = _init;
219219
self->super.deinit = _deinit;
@@ -227,7 +227,7 @@ FilterXExpr *
227227
filterx_conditional_find_tail(FilterXExpr *s)
228228
{
229229
/* check if this is a FilterXConditional instance */
230-
if (s->eval != _eval)
230+
if (s->eval != _eval_conditional)
231231
return NULL;
232232

233233
FilterXConditional *self = (FilterXConditional *) s;

‎lib/filterx/expr-done.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include "filterx/object-primitive.h"
2929

3030
static FilterXObject *
31-
_eval(FilterXExpr *s)
31+
_eval_done(FilterXExpr *s)
3232
{
3333
FilterXEvalContext *context = filterx_eval_get_context();
3434
context->eval_control_modifier = FXC_DONE;
@@ -41,7 +41,7 @@ filterx_expr_done(void)
4141
{
4242
FilterXExpr *self = g_new0(FilterXExpr, 1);
4343
filterx_expr_init_instance(self, "done");
44-
self->eval = _eval;
44+
self->eval = _eval_done;
4545

4646
return self;
4747
}

‎lib/filterx/expr-drop.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include "filterx/object-primitive.h"
2828

2929
static FilterXObject *
30-
_eval(FilterXExpr *s)
30+
_eval_drop(FilterXExpr *s)
3131
{
3232
FilterXEvalContext *context = filterx_eval_get_context();
3333
context->eval_control_modifier = FXC_DROP;
@@ -40,7 +40,7 @@ filterx_expr_drop_msg(void)
4040
{
4141
FilterXExpr *self = g_new0(FilterXExpr, 1);
4242
filterx_expr_init_instance(self, "drop");
43-
self->eval = _eval;
43+
self->eval = _eval_drop;
4444

4545
return self;
4646
}

‎lib/filterx/expr-generator.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ filterx_generator_set_fillable(FilterXExpr *s, FilterXExpr *fillable)
3434
}
3535

3636
static FilterXObject *
37-
_eval(FilterXExpr *s)
37+
_eval_generator(FilterXExpr *s)
3838
{
3939
FilterXExprGenerator *self = (FilterXExprGenerator *) s;
4040

@@ -52,7 +52,7 @@ _eval(FilterXExpr *s)
5252
gboolean
5353
filterx_expr_is_generator(FilterXExpr *s)
5454
{
55-
return s && s->eval == _eval;
55+
return s && s->eval == _eval_generator;
5656
}
5757

5858
FilterXExpr *
@@ -71,7 +71,7 @@ filterx_generator_init_instance(FilterXExpr *s)
7171
s->optimize = filterx_generator_optimize_method;
7272
s->init = filterx_generator_init_method;
7373
s->deinit = filterx_generator_deinit_method;
74-
s->eval = _eval;
74+
s->eval = _eval_generator;
7575
s->ignore_falsy_result = TRUE;
7676
}
7777

‎lib/filterx/expr-get-subscript.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ typedef struct _FilterXGetSubscript
3333
} FilterXGetSubscript;
3434

3535
static FilterXObject *
36-
_eval(FilterXExpr *s)
36+
_eval_get_subscript(FilterXExpr *s)
3737
{
3838
FilterXGetSubscript *self = (FilterXGetSubscript *) s;
3939
FilterXObject *result = NULL;
@@ -170,7 +170,7 @@ filterx_get_subscript_new(FilterXExpr *operand, FilterXExpr *key)
170170
FilterXGetSubscript *self = g_new0(FilterXGetSubscript, 1);
171171

172172
filterx_expr_init_instance(&self->super, "get_subscript");
173-
self->super.eval = _eval;
173+
self->super.eval = _eval_get_subscript;
174174
self->super.is_set = _isset;
175175
self->super.unset = _unset;
176176
self->super.optimize = _optimize;

‎lib/filterx/expr-getattr.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ typedef struct _FilterXGetAttr
3434
} FilterXGetAttr;
3535

3636
static FilterXObject *
37-
_eval(FilterXExpr *s)
37+
_eval_getattr(FilterXExpr *s)
3838
{
3939
FilterXGetAttr *self = (FilterXGetAttr *) s;
4040

@@ -149,7 +149,7 @@ filterx_getattr_new(FilterXExpr *operand, FilterXString *attr_name)
149149
FilterXGetAttr *self = g_new0(FilterXGetAttr, 1);
150150

151151
filterx_expr_init_instance(&self->super, "getattr");
152-
self->super.eval = _eval;
152+
self->super.eval = _eval_getattr;
153153
self->super.unset = _unset;
154154
self->super.is_set = _isset;
155155
self->super.optimize = _optimize;

‎lib/filterx/expr-isset.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include "filterx/object-primitive.h"
2626

2727
static FilterXObject *
28-
_eval(FilterXExpr *s)
28+
_eval_isset(FilterXExpr *s)
2929
{
3030
FilterXUnaryOp *self = (FilterXUnaryOp *) s;
3131

@@ -37,6 +37,6 @@ filterx_isset_new(FilterXExpr *expr)
3737
{
3838
FilterXUnaryOp *self = g_new0(FilterXUnaryOp, 1);
3939
filterx_unary_op_init_instance(self, "isset", expr);
40-
self->super.eval = _eval;
40+
self->super.eval = _eval_isset;
4141
return &self->super;
4242
}

‎lib/filterx/expr-literal.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ typedef struct _FilterXLiteral
2929
} FilterXLiteral;
3030

3131
static FilterXObject *
32-
_eval(FilterXExpr *s)
32+
_eval_literal(FilterXExpr *s)
3333
{
3434
FilterXLiteral *self = (FilterXLiteral *) s;
3535
return filterx_object_ref(self->object);
@@ -50,7 +50,7 @@ filterx_literal_new(FilterXObject *object)
5050
FilterXLiteral *self = g_new0(FilterXLiteral, 1);
5151

5252
filterx_expr_init_instance(&self->super, "literal");
53-
self->super.eval = _eval;
53+
self->super.eval = _eval_literal;
5454
self->super.free_fn = _free;
5555
self->object = object;
5656
return &self->super;
@@ -59,5 +59,5 @@ filterx_literal_new(FilterXObject *object)
5959
gboolean
6060
filterx_expr_is_literal(FilterXExpr *expr)
6161
{
62-
return expr->eval == _eval;
62+
return expr->eval == _eval_literal;
6363
}

‎lib/filterx/expr-null-coalesce.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ struct _FilterXNullCoalesce
3737
};
3838

3939
static FilterXObject *
40-
_eval(FilterXExpr *s)
40+
_eval_null_coalesce(FilterXExpr *s)
4141
{
4242
FilterXNullCoalesce *self = (FilterXNullCoalesce *) s;
4343

@@ -86,7 +86,7 @@ filterx_null_coalesce_new(FilterXExpr *lhs, FilterXExpr *rhs)
8686
{
8787
FilterXNullCoalesce *self = g_new0(FilterXNullCoalesce, 1);
8888
filterx_binary_op_init_instance(&self->super, "null_coalesce", lhs, rhs);
89-
self->super.super.eval = _eval;
89+
self->super.super.eval = _eval_null_coalesce;
9090
self->super.super.optimize = _optimize;
9191
return &self->super.super;
9292
}

‎lib/filterx/expr-plus.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ typedef struct FilterXOperatorPlus
3434
} FilterXOperatorPlus;
3535

3636
static FilterXObject *
37-
_eval(FilterXExpr *s)
37+
_eval_plus(FilterXExpr *s)
3838
{
3939
FilterXOperatorPlus *self = (FilterXOperatorPlus *) s;
4040

@@ -72,7 +72,7 @@ _optimize(FilterXExpr *s)
7272
self->literal_rhs = filterx_expr_eval(self->super.rhs);
7373

7474
if (self->literal_lhs && self->literal_rhs)
75-
return filterx_literal_new(_eval(&self->super.super));
75+
return filterx_literal_new(_eval_plus(&self->super.super));
7676
return NULL;
7777
}
7878

@@ -92,7 +92,7 @@ filterx_operator_plus_new(FilterXExpr *lhs, FilterXExpr *rhs)
9292
FilterXOperatorPlus *self = g_new0(FilterXOperatorPlus, 1);
9393
filterx_binary_op_init_instance(&self->super, "plus", lhs, rhs);
9494
self->super.super.optimize = _optimize;
95-
self->super.super.eval = _eval;
95+
self->super.super.eval = _eval_plus;
9696
self->super.super.free_fn = _filterx_operator_plus_free;
9797

9898
return &self->super.super;

‎lib/filterx/expr-template.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ typedef struct _FilterXTemplate
3535
} FilterXTemplate;
3636

3737
static FilterXObject *
38-
_eval(FilterXExpr *s)
38+
_eval_template(FilterXExpr *s)
3939
{
4040
FilterXTemplate *self = (FilterXTemplate *) s;
4141
FilterXEvalContext *context = filterx_eval_get_context();
@@ -102,7 +102,7 @@ filterx_template_new(LogTemplate *template)
102102
filterx_expr_init_instance(&self->super, "template");
103103
self->super.init = _template_init;
104104
self->super.deinit = _template_deinit;
105-
self->super.eval = _eval;
105+
self->super.eval = _eval_template;
106106
self->super.free_fn = _free;
107107
self->template = template;
108108
return &self->super;

‎lib/filterx/expr-unset.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ typedef struct FilterXExprUnset_
3232
} FilterXExprUnset;
3333

3434
static FilterXObject *
35-
_eval(FilterXExpr *s)
35+
_eval_unset(FilterXExpr *s)
3636
{
3737
FilterXExprUnset *self = (FilterXExprUnset *) s;
3838

@@ -110,7 +110,7 @@ filterx_function_unset_new(FilterXFunctionArgs *args, GError **error)
110110
FilterXExprUnset *self = g_new0(FilterXExprUnset, 1);
111111
filterx_function_init_instance(&self->super, "unset");
112112

113-
self->super.super.eval = _eval;
113+
self->super.super.eval = _eval_unset;
114114
self->super.super.optimize = _optimize;
115115
self->super.super.init = _init;
116116
self->super.super.deinit = _deinit;

‎lib/filterx/expr-variable.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ _whiteout_variable(FilterXVariableExpr *self, FilterXEvalContext *context)
6565
}
6666

6767
static FilterXObject *
68-
_eval(FilterXExpr *s)
68+
_eval_variable(FilterXExpr *s)
6969
{
7070
FilterXVariableExpr *self = (FilterXVariableExpr *) s;
7171
FilterXEvalContext *context = filterx_eval_get_context();
@@ -212,7 +212,7 @@ filterx_variable_expr_new(FilterXString *name, FilterXVariableType type)
212212
self->super.free_fn = _free;
213213
self->super.init = _init;
214214
self->super.deinit = _deinit;
215-
self->super.eval = _eval;
215+
self->super.eval = _eval_variable;
216216
self->super._update_repr = _update_repr;
217217
self->super.assign = _assign;
218218
self->super.is_set = _isset;
@@ -243,6 +243,6 @@ filterx_variable_expr_declare(FilterXExpr *s)
243243
{
244244
FilterXVariableExpr *self = (FilterXVariableExpr *) s;
245245

246-
g_assert(s->eval == _eval);
246+
g_assert(s->eval == _eval_variable);
247247
self->declared = TRUE;
248248
}

‎lib/filterx/func-flatten.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ _flatten(FilterXFunctionFlatten *self, FilterXObject *dict)
184184
}
185185

186186
static FilterXObject *
187-
_eval(FilterXExpr *s)
187+
_eval_fx_flatten(FilterXExpr *s)
188188
{
189189
FilterXFunctionFlatten *self = (FilterXFunctionFlatten *) s;
190190

@@ -291,7 +291,7 @@ filterx_function_flatten_new(FilterXFunctionArgs *args, GError **error)
291291
{
292292
FilterXFunctionFlatten *self = g_new0(FilterXFunctionFlatten, 1);
293293
filterx_function_init_instance(&self->super, "flatten");
294-
self->super.super.eval = _eval;
294+
self->super.super.eval = _eval_fx_flatten;
295295
self->super.super.optimize = _optimize;
296296
self->super.super.init = _init;
297297
self->super.super.deinit = _deinit;

‎lib/filterx/func-istype.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ typedef struct FilterXFunctionIsType_
4141
} FilterXFunctionIsType;
4242

4343
static FilterXObject *
44-
_eval(FilterXExpr *s)
44+
_eval_fx_istype(FilterXExpr *s)
4545
{
4646
FilterXFunctionIsType *self = (FilterXFunctionIsType *) s;
4747

@@ -68,7 +68,7 @@ _optimize(FilterXExpr *s)
6868

6969
if (filterx_expr_is_literal(self->object_expr))
7070
{
71-
FilterXObject *optimized_object = _eval(s);
71+
FilterXObject *optimized_object = _eval_fx_istype(s);
7272
g_assert(optimized_object);
7373
return filterx_literal_new(optimized_object);
7474
}
@@ -165,7 +165,7 @@ filterx_function_istype_new(FilterXFunctionArgs *args, GError **error)
165165
{
166166
FilterXFunctionIsType *self = g_new0(FilterXFunctionIsType, 1);
167167
filterx_function_init_instance(&self->super, "istype");
168-
self->super.super.eval = _eval;
168+
self->super.super.eval = _eval_fx_istype;
169169
self->super.super.optimize = _optimize;
170170
self->super.super.init = _init;
171171
self->super.super.deinit = _deinit;

‎lib/filterx/func-sdata.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ _extract_args(FilterXFunctionIsSdataFromEnteprise *self, FilterXFunctionArgs *ar
6767
}
6868

6969
static FilterXObject *
70-
_eval(FilterXExpr *s)
70+
_eval_fx_is_sdata_from(FilterXExpr *s)
7171
{
7272
FilterXFunctionIsSdataFromEnteprise *self = (FilterXFunctionIsSdataFromEnteprise *) s;
7373

@@ -105,7 +105,7 @@ filterx_function_is_sdata_from_enterprise_new(FilterXFunctionArgs *args, GError
105105

106106
if (!_extract_args(self, args, error) || !filterx_function_args_check(args, error))
107107
goto error;
108-
self->super.super.eval = _eval;
108+
self->super.super.eval = _eval_fx_is_sdata_from;
109109
self->super.super.free_fn = _free;
110110
filterx_function_args_free(args);
111111
return &self->super.super;

0 commit comments

Comments
 (0)