filterx: add expr-isset and expr-unset

Signed-off-by: Attila Szakacs <[email protected]>

lib/filterx/CMakeLists.txt

@@ -31,6 +31,8 @@ set(FILTERX_HEADERS
     filterx/object-list-interface.h
     filterx/object-dict-interface.h
     filterx/expr-condition.h
+    filterx/expr-isset.h
+    filterx/expr-unset.h
     filterx/filterx-globals-tests.h
     PARENT_SCOPE
     )
@@ -69,6 +71,8 @@ set(FILTERX_SOURCES
     filterx/object-list-interface.c
     filterx/object-dict-interface.c
     filterx/expr-condition.c
+    filterx/expr-isset.c
+    filterx/expr-unset.c
     PARENT_SCOPE
     )
 

lib/filterx/Makefile.am

@@ -33,6 +33,8 @@ filterxinclude_HEADERS = 			\
 	lib/filterx/filterx-pipe.h		\
 	lib/filterx/expr-function.h	\
 	lib/filterx/expr-condition.h \
+	lib/filterx/expr-isset.h \
+	lib/filterx/expr-unset.h		\
 	lib/filterx/filterx-globals-tests.h
 
 
@@ -70,6 +72,8 @@ filterx_sources = 				\
 	lib/filterx/filterx-pipe.c		\
 	lib/filterx/expr-function.c		\
 	lib/filterx/expr-condition.c		\
+	lib/filterx/expr-isset.c		\
+	lib/filterx/expr-unset.c		\
 	lib/filterx/filterx-grammar.y
 
 BUILT_SOURCES += 				\

lib/filterx/expr-isset.c

@@ -0,0 +1,42 @@
+/*
+ * 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-isset.h"
+#include "filterx/object-primitive.h"
+
+FilterXObject *
+_eval(FilterXExpr *s)
+{
+  FilterXUnaryOp *self = (FilterXUnaryOp *) s;
+
+  return filterx_boolean_new(filterx_expr_isset(self->operand));
+}
+
+FilterXExpr *
+filterx_isset_new(FilterXExpr *expr)
+{
+  FilterXUnaryOp *self = g_new0(FilterXUnaryOp, 1);
+  filterx_unary_op_init_instance(self, expr);
+  self->super.eval = _eval;
+  return &self->super;
+}

lib/filterx/expr-isset.h

@@ -0,0 +1,30 @@
+/*
+ * 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.
+ *
+ */
+#ifndef FILTERX_IS_KEY_SET_H_INCLUDED
+#define FILTERX_IS_KEY_SET_H_INCLUDED
+
+#include "filterx/filterx-expr.h"
+
+FilterXExpr *filterx_isset_new(FilterXExpr *expr);
+
+#endif

lib/filterx/expr-unset.c

@@ -0,0 +1,44 @@
+/*
+ * 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-unset.h"
+#include "filterx/object-primitive.h"
+
+FilterXObject *
+_eval(FilterXExpr *s)
+{
+  FilterXUnaryOp *self = (FilterXUnaryOp *) s;
+
+  if (!filterx_expr_unset(self->operand))
+    return NULL;
+  return filterx_boolean_new(TRUE);
+}
+
+FilterXExpr *
+filterx_unset_new(FilterXExpr *expr)
+{
+  FilterXUnaryOp *self = g_new0(FilterXUnaryOp, 1);
+  filterx_unary_op_init_instance(self, expr);
+  self->super.eval = _eval;
+  return &self->super;
+}

lib/filterx/expr-unset.h

@@ -0,0 +1,30 @@
+/*
+ * 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.
+ *
+ */
+#ifndef FILTERX_UNSET_KEY_H_INCLUDED
+#define FILTERX_UNSET_KEY_H_INCLUDED
+
+#include "filterx/filterx-expr.h"
+
+FilterXExpr *filterx_unset_new(FilterXExpr *expr);
+
+#endif