Merge pull request #651 from bazsi/filterx-compact-expr-list

Author: MrAnno

lib/filterx/CMakeLists.txt

@@ -32,6 +32,7 @@ set(FILTERX_HEADERS
     filterx/filterx-error.h
     filterx/filterx-eval.h
     filterx/filterx-expr.h
+    filterx/filterx-plist.h
     filterx/filterx-globals.h
     filterx/filterx-metrics-labels.h
     filterx/filterx-metrics.h
@@ -110,6 +111,7 @@ set(FILTERX_SOURCES
     filterx/filterx-error.c
     filterx/filterx-eval.c
     filterx/filterx-expr.c
+    filterx/filterx-plist.c
     filterx/filterx-globals.c
     filterx/filterx-metrics-labels.c
     filterx/filterx-metrics.c

lib/filterx/Makefile.am

@@ -34,6 +34,7 @@ filterxinclude_HEADERS = 			\
 	lib/filterx/filterx-error.h \
 	lib/filterx/filterx-eval.h \
 	lib/filterx/filterx-expr.h \
+	lib/filterx/filterx-plist.h \
 	lib/filterx/filterx-globals.h \
 	lib/filterx/filterx-metrics-labels.h \
 	lib/filterx/filterx-metrics.h \
@@ -111,6 +112,7 @@ filterx_sources = 				\
 	lib/filterx/filterx-error.c \
 	lib/filterx/filterx-eval.c \
 	lib/filterx/filterx-expr.c \
+	lib/filterx/filterx-plist.c \
 	lib/filterx/filterx-globals.c \
 	lib/filterx/filterx-grammar.y \
 	lib/filterx/filterx-metrics-labels.c \

lib/filterx/expr-compound.c

@@ -22,6 +22,7 @@
  */
 
 #include "filterx/expr-compound.h"
+#include "filterx/filterx-plist.h"
 #include "filterx/filterx-eval.h"
 #include "filterx/object-primitive.h"
 #include "scratch-buffers.h"
@@ -33,10 +34,9 @@
 typedef struct _FilterXCompoundExpr
 {
   FilterXExpr super;
+  FilterXExprList exprs;
   /* whether this is a statement expression */
   gboolean return_value_of_last_expr;
-  GPtrArray *exprs;
-
 } FilterXCompoundExpr;
 
 static gboolean
@@ -86,12 +86,12 @@ _eval_exprs(FilterXCompoundExpr *self, FilterXObject **result, gsize start_index
   FilterXEvalContext *context = filterx_eval_get_context();
 
   *result = NULL;
-  gsize len = self->exprs->len;
-  for (gsize i = start_index; i < len; i++)
+  gsize exprs_len = filterx_expr_list_get_length(&self->exprs);
+  for (gsize i = start_index; i < exprs_len; i++)
     {
       filterx_object_unref(*result);
 
-      FilterXExpr *expr = g_ptr_array_index(self->exprs, i);
+      FilterXExpr *expr = filterx_expr_list_index_fast(&self->exprs, i);
       if (!_eval_expr(expr, result))
         return FALSE;
 
@@ -156,38 +156,41 @@ filterx_compound_expr_eval_ext(FilterXExpr *s, gsize start_index)
   return _eval_compound_start(self, start_index);
 }
 
+static gboolean
+_optimize_expr(FilterXExpr **pexpr, gpointer user_data)
+{
+  *pexpr = filterx_expr_optimize(*pexpr);
+  return TRUE;
+}
+
 static FilterXExpr *
 _optimize(FilterXExpr *s)
 {
   FilterXCompoundExpr *self = (FilterXCompoundExpr *) s;
 
-  for (gint i = 0; i < self->exprs->len; i++)
-    {
-      FilterXExpr **expr = (FilterXExpr **) &g_ptr_array_index(self->exprs, i);
-      *expr = filterx_expr_optimize(*expr);
-    }
+  filterx_expr_list_foreach_ref(&self->exprs, _optimize_expr, NULL);
   return NULL;
 }
 
+static gboolean
+_invoke_deinit(FilterXExpr *expr, gpointer cfg)
+{
+  filterx_expr_deinit(expr, (GlobalConfig *) cfg);
+  return TRUE;
+}
+
 static gboolean
 _init(FilterXExpr *s, GlobalConfig *cfg)
 {
   FilterXCompoundExpr *self = (FilterXCompoundExpr *) s;
 
-  for (gint i = 0; i < self->exprs->len; i++)
+  filterx_expr_list_seal(&self->exprs);
+
+  if (!filterx_expr_list_foreach(&self->exprs, (FilterXExprListForeachFunc) filterx_expr_init, cfg))
     {
-      FilterXExpr *expr = g_ptr_array_index(self->exprs, i);
-      if (!filterx_expr_init(expr, cfg))
-        {
-          for (gint j = 0; j < i; j++)
-            {
-              expr = g_ptr_array_index(self->exprs, j);
-              filterx_expr_deinit(expr, cfg);
-            }
-          return FALSE;
-        }
+      filterx_expr_list_foreach(&self->exprs, _invoke_deinit, cfg);
+      return FALSE;
     }
-
   return filterx_expr_init_method(s, cfg);
 }
 
@@ -196,12 +199,7 @@ _deinit(FilterXExpr *s, GlobalConfig *cfg)
 {
   FilterXCompoundExpr *self = (FilterXCompoundExpr *) s;
 
-  for (gint i = 0; i < self->exprs->len; i++)
-    {
-      FilterXExpr *expr = g_ptr_array_index(self->exprs, i);
-      filterx_expr_deinit(expr, cfg);
-    }
-
+  filterx_expr_list_foreach(&self->exprs, _invoke_deinit, cfg);
   filterx_expr_deinit_method(s, cfg);
 }
 
@@ -210,7 +208,7 @@ _free(FilterXExpr *s)
 {
   FilterXCompoundExpr *self = (FilterXCompoundExpr *) s;
 
-  g_ptr_array_free(self->exprs, TRUE);
+  filterx_expr_list_clear(&self->exprs);
   filterx_expr_free_method(s);
 }
 
@@ -220,15 +218,15 @@ gsize
 filterx_compound_expr_get_count(FilterXExpr *s)
 {
   FilterXCompoundExpr *self = (FilterXCompoundExpr *) s;
-  return self->exprs->len;
+  return filterx_expr_list_get_length(&self->exprs);
 }
 
 void
 filterx_compound_expr_add(FilterXExpr *s, FilterXExpr *expr)
 {
   FilterXCompoundExpr *self = (FilterXCompoundExpr *) s;
 
-  g_ptr_array_add(self->exprs, expr);
+  filterx_expr_list_add(&self->exprs, expr);
 }
 
 /* Takes reference of expr_list */
@@ -253,8 +251,8 @@ filterx_compound_expr_new(gboolean return_value_of_last_expr)
   self->super.init = _init;
   self->super.deinit = _deinit;
   self->super.free_fn = _free;
-  self->exprs = g_ptr_array_new_with_free_func((GDestroyNotify) filterx_expr_unref);
   self->return_value_of_last_expr = return_value_of_last_expr;
+  filterx_expr_list_init(&self->exprs);
 
   return &self->super;
 }