Merge pull request syslog-ng#4899 from alltilla/filterx-literal-gener…

…ator-assignment

filterx: literal generator assignment

lib/filterx/CMakeLists.txt

@@ -5,8 +5,6 @@ set(FILTERX_HEADERS
     filterx/expr-function.h
     filterx/expr-getattr.h
     filterx/expr-get-subscript.h
-    filterx/expr-dict.h
-    filterx/expr-list.h
     filterx/expr-literal.h
     filterx/expr-message-ref.h
     filterx/expr-setattr.h
@@ -33,6 +31,9 @@ set(FILTERX_HEADERS
     filterx/expr-condition.h
     filterx/expr-isset.h
     filterx/expr-unset.h
+    filterx/expr-shorthand.h
+    filterx/expr-generator.h
+    filterx/expr-literal-generator.h
     filterx/filterx-private.h
     PARENT_SCOPE
     )
@@ -44,8 +45,6 @@ set(FILTERX_SOURCES
     filterx/expr-function.c
     filterx/expr-getattr.c
     filterx/expr-get-subscript.c
-    filterx/expr-dict.c
-    filterx/expr-list.c
     filterx/expr-literal.c
     filterx/expr-message-ref.c
     filterx/expr-setattr.c
@@ -73,6 +72,9 @@ set(FILTERX_SOURCES
     filterx/expr-condition.c
     filterx/expr-isset.c
     filterx/expr-unset.c
+    filterx/expr-shorthand.c
+    filterx/expr-generator.c
+    filterx/expr-literal-generator.c
     filterx/filterx-private.c
     PARENT_SCOPE
     )

lib/filterx/Makefile.am

@@ -12,8 +12,6 @@ filterxinclude_HEADERS = 			\
 	lib/filterx/expr-setattr.h		\
 	lib/filterx/expr-get-subscript.h	\
 	lib/filterx/expr-set-subscript.h	\
-	lib/filterx/expr-dict.h			\
-	lib/filterx/expr-list.h			\
 	lib/filterx/expr-message-ref.h		\
 	lib/filterx/expr-comparison.h		\
 	lib/filterx/filterx-object.h		\
@@ -35,6 +33,9 @@ filterxinclude_HEADERS = 			\
 	lib/filterx/expr-condition.h \
 	lib/filterx/expr-isset.h \
 	lib/filterx/expr-unset.h		\
+	lib/filterx/expr-shorthand.h		\
+	lib/filterx/expr-generator.h		\
+	lib/filterx/expr-literal-generator.h		\
 	lib/filterx/filterx-private.h
 
 
@@ -50,8 +51,6 @@ filterx_sources = 				\
 	lib/filterx/expr-setattr.c		\
 	lib/filterx/expr-get-subscript.c	\
 	lib/filterx/expr-set-subscript.c	\
-	lib/filterx/expr-dict.c			\
-	lib/filterx/expr-list.c			\
 	lib/filterx/expr-message-ref.c		\
 	lib/filterx/expr-comparison.c		\
 	lib/filterx/filterx-object.c		\
@@ -74,6 +73,9 @@ filterx_sources = 				\
 	lib/filterx/expr-condition.c		\
 	lib/filterx/expr-isset.c		\
 	lib/filterx/expr-unset.c		\
+	lib/filterx/expr-shorthand.c		\
+	lib/filterx/expr-generator.c		\
+	lib/filterx/expr-literal-generator.c		\
 	lib/filterx/filterx-private.c	\
 	lib/filterx/filterx-grammar.y
 

lib/filterx/expr-generator.c

@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2024 Attila Szakacs
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As an additional exemption you are allowed to compile & link against the
+ * OpenSSL libraries as published by the OpenSSL project. See the file
+ * COPYING for details.
+ *
+ */
+
+#include "filterx/expr-generator.h"
+
+/* Takes reference of fillable */
+void
+filterx_generator_set_fillable(FilterXExpr *s, FilterXExpr *fillable)
+{
+  FilterXExprGenerator *self = (FilterXExprGenerator *) s;
+
+  self->fillable = fillable;
+}
+
+void
+filterx_generator_init_instance(FilterXExpr *s)
+{
+  filterx_expr_init_instance(s);
+}
+
+void
+filterx_generator_free_method(FilterXExpr *s)
+{
+  FilterXExprGenerator *self = (FilterXExprGenerator *) s;
+
+  filterx_expr_unref(self->fillable);
+  filterx_expr_free_method(s);
+}
+
+typedef struct FilterXExprGeneratorCreateContainer_
+{
+  FilterXExpr super;
+  FilterXExprGenerator *generator;
+  FilterXExpr *fillable_parent;
+} FilterXExprGeneratorCreateContainer;
+
+static FilterXObject *
+_create_container_eval(FilterXExpr *s)
+{
+  FilterXExprGeneratorCreateContainer *self = (FilterXExprGeneratorCreateContainer *) s;
+
+  return self->generator->create_container(self->generator, self->fillable_parent);
+}
+
+static void
+_create_container_free(FilterXExpr *s)
+{
+  FilterXExprGeneratorCreateContainer *self = (FilterXExprGeneratorCreateContainer *) s;
+
+  filterx_expr_unref(&self->generator->super);
+  filterx_expr_unref(self->fillable_parent);
+  filterx_expr_free_method(s);
+}
+
+FilterXExpr *
+filterx_generator_create_container_new(FilterXExpr *g, FilterXExpr *fillable_parent)
+{
+  FilterXExprGeneratorCreateContainer *self = g_new0(FilterXExprGeneratorCreateContainer, 1);
+
+  filterx_expr_init_instance(&self->super);
+  self->generator = (FilterXExprGenerator *) filterx_expr_ref(g);
+  self->fillable_parent = filterx_expr_ref(fillable_parent);
+  self->super.eval = _create_container_eval;
+  self->super.free_fn = _create_container_free;
+
+  return &self->super;
+}

lib/filterx/expr-dict.h → lib/filterx/expr-generator.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Balazs Scheidler <balazs.scheidler@axoflow.com>
+ * Copyright (c) 2024 Attila Szakacs
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,18 +20,24 @@
  * COPYING for details.
  *
  */
-#ifndef FILTERX_EXPR_JSON_H_INCLUDED
-#define FILTERX_EXPR_JSON_H_INCLUDED
 
-#include "filterx/filterx-expr.h"
+#ifndef FILTERX_EXPR_GENERATOR_H_INCLUDED
+#define FILTERX_EXPR_GENERATOR_H_INCLUDED
 
-typedef struct _FilterXKeyValue FilterXKeyValue;
+#include "filterx/filterx-expr.h"
 
-FilterXKeyValue *filterx_kv_new(const gchar *key, FilterXExpr *value_expr);
-void filterx_kv_free(FilterXKeyValue *self);
+typedef struct FilterXExprGenerator_ FilterXExprGenerator;
+struct FilterXExprGenerator_
+{
+  FilterXExpr super;
+  FilterXExpr *fillable;
+  FilterXObject *(*create_container)(FilterXExprGenerator *self, FilterXExpr *fillable_parent);
+};
 
-FilterXExpr *filterx_dict_expr_new(FilterXExpr *fillable, GList *key_values);
-FilterXExpr *filterx_dict_expr_inner_new(FilterXExpr *fillable, GList *key_values);
+void filterx_generator_set_fillable(FilterXExpr *s, FilterXExpr *fillable);
+void filterx_generator_init_instance(FilterXExpr *s);
+void filterx_generator_free_method(FilterXExpr *s);
 
+FilterXExpr *filterx_generator_create_container_new(FilterXExpr *g, FilterXExpr *fillable_parent);
 
 #endif