Merge pull request #445 from bazsi/filterx-expr-constructor-improvements

alltilla · web-flow · commit 74fb889802b2 · 2025-01-22T14:59:15.000+01:00
Filterx expr constructor improvements
diff --git a/lib/filterx/expr-assign.c b/lib/filterx/expr-assign.c
@@ -91,16 +91,6 @@ _assign_eval(FilterXExpr *s)
   return _assign(self, value);
 }
 
-FilterXExpr *
-filterx_nullv_assign_new(FilterXExpr *lhs, FilterXExpr *rhs)
-{
-  FilterXBinaryOp *self = g_new0(FilterXBinaryOp, 1);
-
-  filterx_binary_op_init_instance(self, "nullv_assign", lhs, rhs);
-  self->super.eval = _nullv_assign_eval;
-  self->super.ignore_falsy_result = TRUE;
-  return &self->super;
-}
 
 /* NOTE: takes the object reference */
 FilterXExpr *
@@ -113,3 +103,12 @@ filterx_assign_new(FilterXExpr *lhs, FilterXExpr *rhs)
   self->super.ignore_falsy_result = TRUE;
   return &self->super;
 }
+
+FilterXExpr *
+filterx_nullv_assign_new(FilterXExpr *lhs, FilterXExpr *rhs)
+{
+  FilterXExpr *self = filterx_assign_new(lhs, rhs);
+  self->type = "nullv_assign";
+  self->eval = _nullv_assign_eval;
+  return self;
+}
diff --git a/lib/filterx/expr-comparison.c b/lib/filterx/expr-comparison.c
@@ -198,7 +198,7 @@ _eval_based_on_compare_mode(FilterXExpr *expr, gint compare_mode)
 }
 
 static FilterXObject *
-_eval(FilterXExpr *s)
+_eval_comparison(FilterXExpr *s)
 {
   FilterXComparison *self = (FilterXComparison *) s;
 
@@ -250,7 +250,7 @@ _optimize(FilterXExpr *s)
     self->literal_rhs = _eval_based_on_compare_mode(self->super.rhs, compare_mode);
 
   if (self->literal_lhs && self->literal_rhs)
-    return filterx_literal_new(_eval(&self->super.super));
+    return filterx_literal_new(_eval_comparison(&self->super.super));
 
   return NULL;
 }
@@ -273,7 +273,7 @@ filterx_comparison_new(FilterXExpr *lhs, FilterXExpr *rhs, gint operator)
 
   filterx_binary_op_init_instance(&self->super, "comparison", lhs, rhs);
   self->super.super.optimize = _optimize;
-  self->super.super.eval = _eval;
+  self->super.super.eval = _eval_comparison;
   self->super.super.free_fn = _filterx_comparison_free;
   self->operator = operator;
 
diff --git a/lib/filterx/expr-compound.c b/lib/filterx/expr-compound.c
@@ -107,7 +107,7 @@ _eval_exprs(FilterXCompoundExpr *self, FilterXObject **result)
 }
 
 static FilterXObject *
-_eval(FilterXExpr *s)
+_eval_compound(FilterXExpr *s)
 {
   FilterXCompoundExpr *self = (FilterXCompoundExpr *) s;
   FilterXObject *result = NULL;
@@ -220,7 +220,7 @@ filterx_compound_expr_new(gboolean return_value_of_last_expr)
   FilterXCompoundExpr *self = g_new0(FilterXCompoundExpr, 1);
 
   filterx_expr_init_instance(&self->super, "compound");
-  self->super.eval = _eval;
+  self->super.eval = _eval_compound;
   self->super.optimize = _optimize;
   self->super.init = _init;
   self->super.deinit = _deinit;
diff --git a/lib/filterx/expr-condition.c b/lib/filterx/expr-condition.c
@@ -86,7 +86,7 @@ _free(FilterXExpr *s)
 }
 
 static FilterXObject *
-_eval(FilterXExpr *s)
+_eval_conditional(FilterXExpr *s)
 {
   FilterXConditional *self = (FilterXConditional *) s;
   FilterXObject *condition_value = filterx_expr_eval(self->condition);
@@ -201,7 +201,7 @@ filterx_conditional_new(FilterXExpr *condition)
 {
   FilterXConditional *self = g_new0(FilterXConditional, 1);
   filterx_expr_init_instance(&self->super, "conditional");
-  self->super.eval = _eval;
+  self->super.eval = _eval_conditional;
   self->super.optimize = _optimize;
   self->super.init = _init;
   self->super.deinit = _deinit;
@@ -215,7 +215,7 @@ FilterXExpr *
 filterx_conditional_find_tail(FilterXExpr *s)
 {
   /* check if this is a FilterXConditional instance */
-  if (s->eval != _eval)
+  if (s->eval != _eval_conditional)
     return NULL;
 
   FilterXConditional *self = (FilterXConditional *) s;
diff --git a/lib/filterx/expr-done.c b/lib/filterx/expr-done.c
@@ -28,7 +28,7 @@
 #include "filterx/object-primitive.h"
 
 static FilterXObject *
-_eval(FilterXExpr *s)
+_eval_done(FilterXExpr *s)
 {
   FilterXEvalContext *context = filterx_eval_get_context();
   context->eval_control_modifier = FXC_DONE;
@@ -41,7 +41,7 @@ filterx_expr_done(void)
 {
   FilterXExpr *self = g_new0(FilterXExpr, 1);
   filterx_expr_init_instance(self, "done");
-  self->eval = _eval;
+  self->eval = _eval_done;
 
   return self;
 }
diff --git a/lib/filterx/expr-drop.c b/lib/filterx/expr-drop.c
@@ -27,7 +27,7 @@
 #include "filterx/object-primitive.h"
 
 static FilterXObject *
-_eval(FilterXExpr *s)
+_eval_drop(FilterXExpr *s)
 {
   FilterXEvalContext *context = filterx_eval_get_context();
   context->eval_control_modifier = FXC_DROP;
@@ -40,7 +40,7 @@ filterx_expr_drop_msg(void)
 {
   FilterXExpr *self = g_new0(FilterXExpr, 1);
   filterx_expr_init_instance(self, "drop");
-  self->eval = _eval;
+  self->eval = _eval_drop;
 
   return self;
 }
diff --git a/lib/filterx/expr-generator.c b/lib/filterx/expr-generator.c
@@ -34,7 +34,7 @@ filterx_generator_set_fillable(FilterXExpr *s, FilterXExpr *fillable)
 }
 
 static FilterXObject *
-_eval(FilterXExpr *s)
+_eval_generator(FilterXExpr *s)
 {
   FilterXExprGenerator *self = (FilterXExprGenerator *) s;
 
@@ -52,7 +52,7 @@ _eval(FilterXExpr *s)
 gboolean
 filterx_expr_is_generator(FilterXExpr *s)
 {
-  return s && s->eval == _eval;
+  return s && s->eval == _eval_generator;
 }
 
 FilterXExpr *
@@ -71,7 +71,7 @@ filterx_generator_init_instance(FilterXExpr *s)
   s->optimize = filterx_generator_optimize_method;
   s->init = filterx_generator_init_method;
   s->deinit = filterx_generator_deinit_method;
-  s->eval = _eval;
+  s->eval = _eval_generator;
   s->ignore_falsy_result = TRUE;
 }
 
diff --git a/lib/filterx/expr-get-subscript.c b/lib/filterx/expr-get-subscript.c
@@ -33,7 +33,7 @@ typedef struct _FilterXGetSubscript
 } FilterXGetSubscript;
 
 static FilterXObject *
-_eval(FilterXExpr *s)
+_eval_get_subscript(FilterXExpr *s)
 {
   FilterXGetSubscript *self = (FilterXGetSubscript *) s;
   FilterXObject *result = NULL;
@@ -158,7 +158,7 @@ filterx_get_subscript_new(FilterXExpr *operand, FilterXExpr *key)
   FilterXGetSubscript *self = g_new0(FilterXGetSubscript, 1);
 
   filterx_expr_init_instance(&self->super, "get_subscript");
-  self->super.eval = _eval;
+  self->super.eval = _eval_get_subscript;
   self->super.is_set = _isset;
   self->super.unset = _unset;
   self->super.optimize = _optimize;
diff --git a/lib/filterx/expr-getattr.c b/lib/filterx/expr-getattr.c
@@ -34,7 +34,7 @@ typedef struct _FilterXGetAttr
 } FilterXGetAttr;
 
 static FilterXObject *
-_eval(FilterXExpr *s)
+_eval_getattr(FilterXExpr *s)
 {
   FilterXGetAttr *self = (FilterXGetAttr *) s;
 
@@ -137,7 +137,7 @@ filterx_getattr_new(FilterXExpr *operand, FilterXString *attr_name)
   FilterXGetAttr *self = g_new0(FilterXGetAttr, 1);
 
   filterx_expr_init_instance(&self->super, "getattr");
-  self->super.eval = _eval;
+  self->super.eval = _eval_getattr;
   self->super.unset = _unset;
   self->super.is_set = _isset;
   self->super.optimize = _optimize;
diff --git a/lib/filterx/expr-isset.c b/lib/filterx/expr-isset.c
@@ -25,7 +25,7 @@
 #include "filterx/object-primitive.h"
 
 static FilterXObject *
-_eval(FilterXExpr *s)
+_eval_isset(FilterXExpr *s)
 {
   FilterXUnaryOp *self = (FilterXUnaryOp *) s;
 
@@ -37,6 +37,6 @@ filterx_isset_new(FilterXExpr *expr)
 {
   FilterXUnaryOp *self = g_new0(FilterXUnaryOp, 1);
   filterx_unary_op_init_instance(self, "isset", expr);
-  self->super.eval = _eval;
+  self->super.eval = _eval_isset;
   return &self->super;
 }
diff --git a/lib/filterx/expr-literal.c b/lib/filterx/expr-literal.c
@@ -29,7 +29,7 @@ typedef struct _FilterXLiteral
 } FilterXLiteral;
 
 static FilterXObject *
-_eval(FilterXExpr *s)
+_eval_literal(FilterXExpr *s)
 {
   FilterXLiteral *self = (FilterXLiteral *) s;
   return filterx_object_ref(self->object);
@@ -50,7 +50,7 @@ filterx_literal_new(FilterXObject *object)
   FilterXLiteral *self = g_new0(FilterXLiteral, 1);
 
   filterx_expr_init_instance(&self->super, "literal");
-  self->super.eval = _eval;
+  self->super.eval = _eval_literal;
   self->super.free_fn = _free;
   self->object = object;
   return &self->super;
@@ -59,5 +59,5 @@ filterx_literal_new(FilterXObject *object)
 gboolean
 filterx_expr_is_literal(FilterXExpr *expr)
 {
-  return expr->eval == _eval;
+  return expr->eval == _eval_literal;
 }
diff --git a/lib/filterx/expr-null-coalesce.c b/lib/filterx/expr-null-coalesce.c
@@ -37,7 +37,7 @@ struct _FilterXNullCoalesce
 };
 
 static FilterXObject *
-_eval(FilterXExpr *s)
+_eval_null_coalesce(FilterXExpr *s)
 {
   FilterXNullCoalesce *self = (FilterXNullCoalesce *) s;
 
@@ -86,7 +86,7 @@ filterx_null_coalesce_new(FilterXExpr *lhs, FilterXExpr *rhs)
 {
   FilterXNullCoalesce *self = g_new0(FilterXNullCoalesce, 1);
   filterx_binary_op_init_instance(&self->super, "null_coalesce", lhs, rhs);
-  self->super.super.eval = _eval;
+  self->super.super.eval = _eval_null_coalesce;
   self->super.super.optimize = _optimize;
   return &self->super.super;
 }
diff --git a/lib/filterx/expr-plus.c b/lib/filterx/expr-plus.c
@@ -34,7 +34,7 @@ typedef struct FilterXOperatorPlus
 } FilterXOperatorPlus;
 
 static FilterXObject *
-_eval(FilterXExpr *s)
+_eval_plus(FilterXExpr *s)
 {
   FilterXOperatorPlus *self = (FilterXOperatorPlus *) s;
 
@@ -72,7 +72,7 @@ _optimize(FilterXExpr *s)
     self->literal_rhs = filterx_expr_eval(self->super.rhs);
 
   if (self->literal_lhs && self->literal_rhs)
-    return filterx_literal_new(_eval(&self->super.super));
+    return filterx_literal_new(_eval_plus(&self->super.super));
   return NULL;
 }
 
@@ -92,7 +92,7 @@ filterx_operator_plus_new(FilterXExpr *lhs, FilterXExpr *rhs)
   FilterXOperatorPlus *self = g_new0(FilterXOperatorPlus, 1);
   filterx_binary_op_init_instance(&self->super, "plus", lhs, rhs);
   self->super.super.optimize = _optimize;
-  self->super.super.eval = _eval;
+  self->super.super.eval = _eval_plus;
   self->super.super.free_fn = _filterx_operator_plus_free;
 
   return &self->super.super;
diff --git a/lib/filterx/expr-set-subscript.c b/lib/filterx/expr-set-subscript.c
@@ -206,12 +206,12 @@ _free(FilterXExpr *s)
 }
 
 FilterXExpr *
-filterx_nullv_set_subscript_new(FilterXExpr *object, FilterXExpr *key, FilterXExpr *new_value)
+filterx_set_subscript_new(FilterXExpr *object, FilterXExpr *key, FilterXExpr *new_value)
 {
   FilterXSetSubscript *self = g_new0(FilterXSetSubscript, 1);
 
-  filterx_expr_init_instance(&self->super, "nullv_set_subscript");
-  self->super.eval = _nullv_set_subscript_eval;
+  filterx_expr_init_instance(&self->super, "set_subscript");
+  self->super.eval = _set_subscript_eval;
   self->super.optimize = _optimize;
   self->super.init = _init;
   self->super.deinit = _deinit;
@@ -224,19 +224,11 @@ filterx_nullv_set_subscript_new(FilterXExpr *object, FilterXExpr *key, FilterXEx
 }
 
 FilterXExpr *
-filterx_set_subscript_new(FilterXExpr *object, FilterXExpr *key, FilterXExpr *new_value)
+filterx_nullv_set_subscript_new(FilterXExpr *object, FilterXExpr *key, FilterXExpr *new_value)
 {
-  FilterXSetSubscript *self = g_new0(FilterXSetSubscript, 1);
+  FilterXExpr *self = filterx_set_subscript_new(object, key, new_value);
 
-  filterx_expr_init_instance(&self->super, "set_subscript");
-  self->super.eval = _set_subscript_eval;
-  self->super.optimize = _optimize;
-  self->super.init = _init;
-  self->super.deinit = _deinit;
-  self->super.free_fn = _free;
-  self->object = object;
-  self->key = key;
-  self->new_value = new_value;
-  self->super.ignore_falsy_result = TRUE;
-  return &self->super;
+  self->type = "nullv_set_subscript";
+  self->eval = _nullv_set_subscript_eval;
+  return self;
 }
diff --git a/lib/filterx/expr-setattr.c b/lib/filterx/expr-setattr.c
@@ -179,13 +179,14 @@ _free(FilterXExpr *s)
   filterx_expr_free_method(s);
 }
 
+/* Takes reference of object and new_value */
 FilterXExpr *
-filterx_nullv_setattr_new(FilterXExpr *object, FilterXString *attr_name, FilterXExpr *new_value)
+filterx_setattr_new(FilterXExpr *object, FilterXString *attr_name, FilterXExpr *new_value)
 {
   FilterXSetAttr *self = g_new0(FilterXSetAttr, 1);
 
-  filterx_expr_init_instance(&self->super, "nullv_setattr");
-  self->super.eval = _nullv_setattr_eval;
+  filterx_expr_init_instance(&self->super, "setattr");
+  self->super.eval = _setattr_eval;
   self->super.optimize = _optimize;
   self->super.init = _init;
   self->super.deinit = _deinit;
@@ -196,28 +197,17 @@ filterx_nullv_setattr_new(FilterXExpr *object, FilterXString *attr_name, FilterX
 
   self->new_value = new_value;
   self->super.ignore_falsy_result = TRUE;
+
   /* NOTE: name borrows the string value from the string object */
   self->super.name = filterx_string_get_value_ref(self->attr, NULL);
   return &self->super;
 }
 
-/* Takes reference of object and new_value */
 FilterXExpr *
-filterx_setattr_new(FilterXExpr *object, FilterXString *attr_name, FilterXExpr *new_value)
+filterx_nullv_setattr_new(FilterXExpr *object, FilterXString *attr_name, FilterXExpr *new_value)
 {
-  FilterXSetAttr *self = g_new0(FilterXSetAttr, 1);
-
-  filterx_expr_init_instance(&self->super, "setattr");
-  self->super.eval = _setattr_eval;
-  self->super.optimize = _optimize;
-  self->super.init = _init;
-  self->super.deinit = _deinit;
-  self->super.free_fn = _free;
-  self->object = object;
-
-  self->attr = (FilterXObject *) attr_name;
-
-  self->new_value = new_value;
-  self->super.ignore_falsy_result = TRUE;
-  return &self->super;
+  FilterXExpr *self = filterx_setattr_new(object, attr_name, new_value);
+  self->type = "nullv_setattr";
+  self->eval = _nullv_setattr_eval;
+  return self;
 }
diff --git a/lib/filterx/expr-template.c b/lib/filterx/expr-template.c
@@ -35,7 +35,7 @@ typedef struct _FilterXTemplate
 } FilterXTemplate;
 
 static FilterXObject *
-_eval(FilterXExpr *s)
+_eval_template(FilterXExpr *s)
 {
   FilterXTemplate *self = (FilterXTemplate *) s;
   FilterXEvalContext *context = filterx_eval_get_context();
@@ -72,7 +72,7 @@ filterx_template_new(LogTemplate *template)
   FilterXTemplate *self = g_new0(FilterXTemplate, 1);
 
   filterx_expr_init_instance(&self->super, "template");
-  self->super.eval = _eval;
+  self->super.eval = _eval_template;
   self->super.free_fn = _free;
   self->template = template;
   return &self->super;
diff --git a/lib/filterx/expr-unset.c b/lib/filterx/expr-unset.c
diff --git a/lib/filterx/expr-variable.c b/lib/filterx/expr-variable.c
diff --git a/lib/filterx/func-flatten.c b/lib/filterx/func-flatten.c
diff --git a/lib/filterx/func-istype.c b/lib/filterx/func-istype.c
diff --git a/lib/filterx/func-sdata.c b/lib/filterx/func-sdata.c
diff --git a/lib/filterx/func-set-fields.c b/lib/filterx/func-set-fields.c
diff --git a/lib/filterx/func-unset-empties.c b/lib/filterx/func-unset-empties.c

Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,7 @@ _eval_based_on_compare_mode(FilterXExpr *expr, gint compare_mode)`
`198`	`198`	`}`
`199`	`199`
`200`	`200`	`static FilterXObject *`
`201`		`-_eval(FilterXExpr *s)`
	`201`	`+_eval_comparison(FilterXExpr *s)`
`202`	`202`	`{`
`203`	`203`	`FilterXComparison self = (FilterXComparison ) s;`
`204`	`204`
`@@ -250,7 +250,7 @@ _optimize(FilterXExpr *s)`
`250`	`250`	`self->literal_rhs = _eval_based_on_compare_mode(self->super.rhs, compare_mode);`
`251`	`251`
`252`	`252`	`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));`
`254`	`254`
`255`	`255`	`return NULL;`
`256`	`256`	`}`
`@@ -273,7 +273,7 @@ filterx_comparison_new(FilterXExpr lhs, FilterXExpr rhs, gint operator)`
`273`	`273`
`274`	`274`	`filterx_binary_op_init_instance(&self->super, "comparison", lhs, rhs);`
`275`	`275`	`self->super.super.optimize = _optimize;`
`276`		`- self->super.super.eval = _eval;`
	`276`	`+ self->super.super.eval = _eval_comparison;`
`277`	`277`	`self->super.super.free_fn = _filterx_comparison_free;`
`278`	`278`	`self->operator = operator;`
`279`	`279`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ _free(FilterXExpr *s)`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`static FilterXObject *`
`89`		`-_eval(FilterXExpr *s)`
	`89`	`+_eval_conditional(FilterXExpr *s)`
`90`	`90`	`{`
`91`	`91`	`FilterXConditional self = (FilterXConditional ) s;`
`92`	`92`	`FilterXObject *condition_value = filterx_expr_eval(self->condition);`
`@@ -201,7 +201,7 @@ filterx_conditional_new(FilterXExpr *condition)`
`201`	`201`	`{`
`202`	`202`	`FilterXConditional *self = g_new0(FilterXConditional, 1);`
`203`	`203`	`filterx_expr_init_instance(&self->super, "conditional");`
`204`		`- self->super.eval = _eval;`
	`204`	`+ self->super.eval = _eval_conditional;`
`205`	`205`	`self->super.optimize = _optimize;`
`206`	`206`	`self->super.init = _init;`
`207`	`207`	`self->super.deinit = _deinit;`
`@@ -215,7 +215,7 @@ FilterXExpr *`
`215`	`215`	`filterx_conditional_find_tail(FilterXExpr *s)`
`216`	`216`	`{`
`217`	`217`	`/* check if this is a FilterXConditional instance */`
`218`		`- if (s->eval != _eval)`
	`218`	`+ if (s->eval != _eval_conditional)`
`219`	`219`	`return NULL;`
`220`	`220`
`221`	`221`	`FilterXConditional self = (FilterXConditional ) s;`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`#include "filterx/object-primitive.h"`
`29`	`29`
`30`	`30`	`static FilterXObject *`
`31`		`-_eval(FilterXExpr *s)`
	`31`	`+_eval_done(FilterXExpr *s)`
`32`	`32`	`{`
`33`	`33`	`FilterXEvalContext *context = filterx_eval_get_context();`
`34`	`34`	`context->eval_control_modifier = FXC_DONE;`
`@@ -41,7 +41,7 @@ filterx_expr_done(void)`
`41`	`41`	`{`
`42`	`42`	`FilterXExpr *self = g_new0(FilterXExpr, 1);`
`43`	`43`	`filterx_expr_init_instance(self, "done");`
`44`		`- self->eval = _eval;`
	`44`	`+ self->eval = _eval_done;`
`45`	`45`
`46`	`46`	`return self;`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`#include "filterx/object-primitive.h"`
`28`	`28`
`29`	`29`	`static FilterXObject *`
`30`		`-_eval(FilterXExpr *s)`
	`30`	`+_eval_drop(FilterXExpr *s)`
`31`	`31`	`{`
`32`	`32`	`FilterXEvalContext *context = filterx_eval_get_context();`
`33`	`33`	`context->eval_control_modifier = FXC_DROP;`
`@@ -40,7 +40,7 @@ filterx_expr_drop_msg(void)`
`40`	`40`	`{`
`41`	`41`	`FilterXExpr *self = g_new0(FilterXExpr, 1);`
`42`	`42`	`filterx_expr_init_instance(self, "drop");`
`43`		`- self->eval = _eval;`
	`43`	`+ self->eval = _eval_drop;`
`44`	`44`
`45`	`45`	`return self;`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ filterx_generator_set_fillable(FilterXExpr s, FilterXExpr fillable)`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`static FilterXObject *`
`37`		`-_eval(FilterXExpr *s)`
	`37`	`+_eval_generator(FilterXExpr *s)`
`38`	`38`	`{`
`39`	`39`	`FilterXExprGenerator self = (FilterXExprGenerator ) s;`
`40`	`40`
`@@ -52,7 +52,7 @@ _eval(FilterXExpr *s)`
`52`	`52`	`gboolean`
`53`	`53`	`filterx_expr_is_generator(FilterXExpr *s)`
`54`	`54`	`{`
`55`		`- return s && s->eval == _eval;`
	`55`	`+ return s && s->eval == _eval_generator;`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`FilterXExpr *`
`@@ -71,7 +71,7 @@ filterx_generator_init_instance(FilterXExpr *s)`
`71`	`71`	`s->optimize = filterx_generator_optimize_method;`
`72`	`72`	`s->init = filterx_generator_init_method;`
`73`	`73`	`s->deinit = filterx_generator_deinit_method;`
`74`		`- s->eval = _eval;`
	`74`	`+ s->eval = _eval_generator;`
`75`	`75`	`s->ignore_falsy_result = TRUE;`
`76`	`76`	`}`
`77`	`77`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`#include "filterx/object-primitive.h"`
`26`	`26`
`27`	`27`	`static FilterXObject *`
`28`		`-_eval(FilterXExpr *s)`
	`28`	`+_eval_isset(FilterXExpr *s)`
`29`	`29`	`{`
`30`	`30`	`FilterXUnaryOp self = (FilterXUnaryOp ) s;`
`31`	`31`
`@@ -37,6 +37,6 @@ filterx_isset_new(FilterXExpr *expr)`
`37`	`37`	`{`
`38`	`38`	`FilterXUnaryOp *self = g_new0(FilterXUnaryOp, 1);`
`39`	`39`	`filterx_unary_op_init_instance(self, "isset", expr);`
`40`		`- self->super.eval = _eval;`
	`40`	`+ self->super.eval = _eval_isset;`
`41`	`41`	`return &self->super;`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ struct _FilterXNullCoalesce`
`37`	`37`	`};`
`38`	`38`
`39`	`39`	`static FilterXObject *`
`40`		`-_eval(FilterXExpr *s)`
	`40`	`+_eval_null_coalesce(FilterXExpr *s)`
`41`	`41`	`{`
`42`	`42`	`FilterXNullCoalesce self = (FilterXNullCoalesce ) s;`
`43`	`43`
`@@ -86,7 +86,7 @@ filterx_null_coalesce_new(FilterXExpr lhs, FilterXExpr rhs)`
`86`	`86`	`{`
`87`	`87`	`FilterXNullCoalesce *self = g_new0(FilterXNullCoalesce, 1);`
`88`	`88`	`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;`
`90`	`90`	`self->super.super.optimize = _optimize;`
`91`	`91`	`return &self->super.super;`
`92`	`92`	`}`