aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/mds-kbdc/tree.c184
-rw-r--r--src/mds-kbdc/tree.h144
2 files changed, 277 insertions, 51 deletions
diff --git a/src/mds-kbdc/tree.c b/src/mds-kbdc/tree.c
new file mode 100644
index 0000000..45d2ca0
--- /dev/null
+++ b/src/mds-kbdc/tree.c
@@ -0,0 +1,184 @@
+/**
+ * mds — A micro-display server
+ * Copyright © 2014 Mattias Andrée (maandree@member.fsf.org)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "tree.h"
+
+#include <stdlib.h>
+
+
+/**
+ * Common procedure for `mds_kbdc_tree_destroy` and `mds_kbdc_tree_destroy_nonrecursive`
+ *
+ * @param this The tree node
+ * @param recursive Whether subtree should be destroyed and freed
+ */
+static void mds_kbdc_tree_destroy_(mds_kbdc_tree_t* restrict this, int recursive)
+{
+#define V(type, var) (((type)this)->var)
+#define xfree(t, v) (free(V(t, v)), V(t, v) = NULL)
+#define xdestroy(t, v) (recursive ? (mds_kbdc_tree_destroy_(V(t, v), 1), xfree(t, v)) : (V(t, v) = NULL))
+
+ again:
+ if (this == NULL)
+ return;
+
+ switch (this->type)
+ {
+ case MDS_KBDC_TREE_TYPE_INFORMATION:
+ case MDS_KBDC_TREE_TYPE_ASSUMPTION:
+ case MDS_KBDC_TREE_TYPE_ALTERNATION:
+ case MDS_KBDC_TREE_TYPE_UNORDERED:
+ xdestroy(struct mds_kbdc_tree_nesting*, inner);
+ break;
+
+ case MDS_KBDC_TREE_TYPE_INFORMATION_LANGUAGE:
+ case MDS_KBDC_TREE_TYPE_INFORMATION_COUNTRY:
+ case MDS_KBDC_TREE_TYPE_INFORMATION_VARIANT:
+ xfree(struct mds_kbdc_tree_information_data*, data);
+ break;
+
+ case MDS_KBDC_TREE_TYPE_FUNCTION:
+ case MDS_KBDC_TREE_TYPE_MACRO:
+ xfree(struct mds_kbdc_tree_callable*, name);
+ xdestroy(struct mds_kbdc_tree_callable*, inner);
+ break;
+
+ case MDS_KBDC_TREE_TYPE_INCLUDE:
+ xfree(mds_kbdc_tree_include_t*, filename);
+ break;
+
+ case MDS_KBDC_TREE_TYPE_ASSUMPTION_HAVE:
+ xfree(mds_kbdc_tree_assumption_have_t*, data);
+ break;
+
+ case MDS_KBDC_TREE_TYPE_ASSUMPTION_HAVE_CHARS:
+ xfree(mds_kbdc_tree_assumption_have_chars_t*, chars);
+ break;
+
+ case MDS_KBDC_TREE_TYPE_ASSUMPTION_HAVE_RANGE:
+ xfree(mds_kbdc_tree_assumption_have_range_t*, first);
+ xfree(mds_kbdc_tree_assumption_have_range_t*, last);
+ break;
+
+ case MDS_KBDC_TREE_TYPE_FOR:
+ xfree(mds_kbdc_tree_for_t*, first);
+ xfree(mds_kbdc_tree_for_t*, last);
+ xfree(mds_kbdc_tree_for_t*, variable);
+ xdestroy(mds_kbdc_tree_for_t*, inner);
+ break;
+
+ case MDS_KBDC_TREE_TYPE_IF:
+ xfree(mds_kbdc_tree_if_t*, condition);
+ xdestroy(mds_kbdc_tree_if_t*, inner);
+ xdestroy(mds_kbdc_tree_if_t*, otherwise);
+ break;
+
+ case MDS_KBDC_TREE_TYPE_LET:
+ xfree(mds_kbdc_tree_let_t*, variable);
+ xdestroy(mds_kbdc_tree_let_t*, value);
+ break;
+
+ case MDS_KBDC_TREE_TYPE_MAP:
+ xdestroy(mds_kbdc_tree_map_t*, sequence);
+ xdestroy(mds_kbdc_tree_map_t*, result);
+ break;
+
+ case MDS_KBDC_TREE_TYPE_ARRAY:
+ xdestroy(mds_kbdc_tree_array_t*, elements);
+ break;
+
+ case MDS_KBDC_TREE_TYPE_KEYS:
+ xfree(mds_kbdc_tree_keys_t*, keys);
+ break;
+
+ case MDS_KBDC_TREE_TYPE_STRING:
+ xfree(mds_kbdc_tree_string_t*, string);
+ break;
+
+ case MDS_KBDC_TREE_TYPE_MACRO_CALL:
+ xfree(mds_kbdc_tree_macro_call_t*, name);
+ xdestroy(mds_kbdc_tree_macro_call_t*, arguments);
+ break;
+
+ default:
+ break;
+ }
+
+ this = this->next;
+ goto again;
+
+#undef xdestroy
+#undef xfree
+#undef V
+}
+
+
+
+/**
+ * Release all resources stored in a tree node,
+ * without freeing the node itself or freeing
+ * or destroying inner `mds_kbdc_tree_t*`:s
+ *
+ * @param this The tree node
+ */
+void mds_kbdc_tree_destroy_nonrecursive(mds_kbdc_tree_t* restrict this)
+{
+ mds_kbdc_tree_destroy_(this, 0);
+}
+
+
+/**
+ * Release all resources stored in a tree node,
+ * without freeing or destroying inner
+ * `mds_kbdc_tree_t*`:s, but free this node's
+ * allocation
+ *
+ * @param this The tree node
+ */
+void mds_kbdc_tree_free_nonrecursive(mds_kbdc_tree_t* restrict this)
+{
+ mds_kbdc_tree_destroy_nonrecursive(this);
+ free(this);
+}
+
+
+/**
+ * Release all resources stored in a tree node
+ * recursively, but do not free the allocation
+ * of the tree node
+ *
+ * @param this The tree node
+ */
+void mds_kbdc_tree_destroy(mds_kbdc_tree_t* restrict this)
+{
+ mds_kbdc_tree_destroy_(this, 1);
+}
+
+
+/**
+ * Release all resources stored in a tree node
+ * recursively, and free the allocation
+ * of the tree node
+ *
+ * @param this The tree node
+ */
+void mds_kbdc_tree_free(mds_kbdc_tree_t* restrict this)
+{
+ mds_kbdc_tree_destroy(this);
+ free(this);
+}
+
diff --git a/src/mds-kbdc/tree.h b/src/mds-kbdc/tree.h
index d6ad0db..ac6ba7e 100644
--- a/src/mds-kbdc/tree.h
+++ b/src/mds-kbdc/tree.h
@@ -24,127 +24,127 @@
/**
- * Value of `mds_kbdc_tree_t.type` for `mds_kbdc_tree_type_information_t`
+ * Value of `mds_kbdc_tree_t.type` for `mds_kbdc_tree_information_t`
*/
#define MDS_KBDC_TREE_TYPE_INFORMATION 0
/**
- * Value of `mds_kbdc_tree_t.type` for `mds_kbdc_tree_type_information_language_t`
+ * Value of `mds_kbdc_tree_t.type` for `mds_kbdc_tree_information_language_t`
*/
#define MDS_KBDC_TREE_TYPE_INFORMATION_LANGUAGE 1
/**
- * Value of `mds_kbdc_tree_t.type` for `mds_kbdc_tree_type_information_country_t`
+ * Value of `mds_kbdc_tree_t.type` for `mds_kbdc_tree_information_country_t`
*/
#define MDS_KBDC_TREE_TYPE_INFORMATION_COUNTRY 2
/**
- * Value of `mds_kbdc_tree_t.type` for `mds_kbdc_tree_type_information_variant_t`
+ * Value of `mds_kbdc_tree_t.type` for `mds_kbdc_tree_information_variant_t`
*/
#define MDS_KBDC_TREE_TYPE_INFORMATION_VARIANT 3
/**
- * Value of `mds_kbdc_tree_t.type` for `mds_kbdc_tree_type_include_t`
+ * Value of `mds_kbdc_tree_t.type` for `mds_kbdc_tree_include_t`
*/
#define MDS_KBDC_TREE_TYPE_INCLUDE 4
/**
- * Value of `mds_kbdc_tree_t.type` for `mds_kbdc_tree_type_function_t`
+ * Value of `mds_kbdc_tree_t.type` for `mds_kbdc_tree_function_t`
*/
#define MDS_KBDC_TREE_TYPE_FUNCTION 5
/**
- * Value of `mds_kbdc_tree_t.type` for `mds_kbdc_tree_type_macro_t`
+ * Value of `mds_kbdc_tree_t.type` for `mds_kbdc_tree_macro_t`
*/
#define MDS_KBDC_TREE_TYPE_MACRO 6
/**
- * Value of `mds_kbdc_tree_t.type` for `mds_kbdc_tree_type_assumption`
+ * Value of `mds_kbdc_tree_t.type` for `mds_kbdc_tree_assumption`
*/
#define MDS_KBDC_TREE_TYPE_ASSUMPTION 7
/**
- * Value of `mds_kbdc_tree_t.type` for `mds_kbdc_tree_type_assumption_have_t`
+ * Value of `mds_kbdc_tree_t.type` for `mds_kbdc_tree_assumption_have_t`
*/
#define MDS_KBDC_TREE_TYPE_ASSUMPTION_HAVE 8
/**
- * Value of `mds_kbdc_tree_t.type` for `mds_kbdc_tree_type_assumption_have_chars_t`
+ * Value of `mds_kbdc_tree_t.type` for `mds_kbdc_tree_assumption_have_chars_t`
*/
#define MDS_KBDC_TREE_TYPE_ASSUMPTION_HAVE_CHARS 9
/**
- * Value of `mds_kbdc_tree_t.type` for `mds_kbdc_tree_type_assumption_have_range_t`
+ * Value of `mds_kbdc_tree_t.type` for `mds_kbdc_tree_assumption_have_range_t`
*/
#define MDS_KBDC_TREE_TYPE_ASSUMPTION_HAVE_RANGE 10
/**
- * Value of `mds_kbdc_tree_t.type` for `mds_kbdc_tree_type_for_t`
+ * Value of `mds_kbdc_tree_t.type` for `mds_kbdc_tree_for_t`
*/
#define MDS_KBDC_TREE_TYPE_FOR 11
/**
- * Value of `mds_kbdc_tree_t.type` for `mds_kbdc_tree_type_if_t`
+ * Value of `mds_kbdc_tree_t.type` for `mds_kbdc_tree_if_t`
*/
#define MDS_KBDC_TREE_TYPE_IF 12
/**
- * Value of `mds_kbdc_tree_t.type` for `mds_kbdc_tree_type_let_t`
+ * Value of `mds_kbdc_tree_t.type` for `mds_kbdc_tree_let_t`
*/
#define MDS_KBDC_TREE_TYPE_LET 13
/**
- * Value of `mds_kbdc_tree_t.type` for `mds_kbdc_tree_type_map_t`
+ * Value of `mds_kbdc_tree_t.type` for `mds_kbdc_tree_map_t`
*/
#define MDS_KBDC_TREE_TYPE_MAP 15
/**
- * Value of `mds_kbdc_tree_t.type` for `mds_kbdc_tree_type_array_t`
+ * Value of `mds_kbdc_tree_t.type` for `mds_kbdc_tree_array_t`
*/
#define MDS_KBDC_TREE_TYPE_ARRAY 16
/**
- * Value of `mds_kbdc_tree_t.type` for `mds_kbdc_tree_type_keys_t`
+ * Value of `mds_kbdc_tree_t.type` for `mds_kbdc_tree_keys_t`
*/
#define MDS_KBDC_TREE_TYPE_KEYS 17
/**
- * Value of `mds_kbdc_tree_t.type` for `mds_kbdc_tree_type_string_t`
+ * Value of `mds_kbdc_tree_t.type` for `mds_kbdc_tree_string_t`
*/
#define MDS_KBDC_TREE_TYPE_STRING 18
/**
- * Value of `mds_kbdc_tree_t.type` for `mds_kbdc_tree_type_nothing_t`
+ * Value of `mds_kbdc_tree_t.type` for `mds_kbdc_tree_nothing_t`
*/
#define MDS_KBDC_TREE_TYPE_NOTHING 19
/**
- * Value of `mds_kbdc_tree_t.type` for `mds_kbdc_tree_type_alternation_t`
+ * Value of `mds_kbdc_tree_t.type` for `mds_kbdc_tree_alternation_t`
*/
#define MDS_KBDC_TREE_TYPE_ALTERNATION 20
/**
- * Value of `mds_kbdc_tree_t.type` for `mds_kbdc_tree_type_unordered_t`
+ * Value of `mds_kbdc_tree_t.type` for `mds_kbdc_tree_unordered_t`
*/
#define MDS_KBDC_TREE_TYPE_UNORDERED 21
/**
- * Value of `mds_kbdc_tree_t.type` for `mds_kbdc_tree_type_macro_call_t`
+ * Value of `mds_kbdc_tree_t.type` for `mds_kbdc_tree_macro_call_t`
*/
#define MDS_KBDC_TREE_TYPE_MACRO_CALL 22
/**
- * Value of `mds_kbdc_tree_t.type` for `mds_kbdc_tree_type_return_t`
+ * Value of `mds_kbdc_tree_t.type` for `mds_kbdc_tree_return_t`
*/
#define MDS_KBDC_TREE_TYPE_RETURN 23
/**
- * Value of `mds_kbdc_tree_t.type` for `mds_kbdc_tree_type_break_t`
+ * Value of `mds_kbdc_tree_t.type` for `mds_kbdc_tree_break_t`
*/
#define MDS_KBDC_TREE_TYPE_BREAK 24
/**
- * Value of `mds_kbdc_tree_t.type` for `mds_kbdc_tree_type_continue_t`
+ * Value of `mds_kbdc_tree_t.type` for `mds_kbdc_tree_continue_t`
*/
#define MDS_KBDC_TREE_TYPE_CONTINUE 25
@@ -171,7 +171,7 @@ typedef union mds_kbdc_tree mds_kbdc_tree_t;
* - int type; -- Integer that specifies which structure is used
* - mds_kbdc_tree_t*; -- The next node in the tree, at the same level; a sibling
*/
-#define MDS_KBDC_TREE_COMMON int type; mds_kbdc_tree_t* next
+#define MDS_KBDC_TREE_COMMON int type; mds_kbdc_tree_t* next
/**
* This macro is used in this header file, and is then
@@ -190,7 +190,7 @@ typedef union mds_kbdc_tree mds_kbdc_tree_t;
* structure excluding this padding and the members defined
* by the macro `MDS_KBDC_TREE_COMMON`
*/
-#define MDS_KBDC_TREE_PADDING(N) MDS_KBDC_TREE_PADDING((N) * sizeof(void*))
+#define MDS_KBDC_TREE_PADDING(N) MDS_KBDC_TREE_PADDING_((N) * sizeof(void*))
@@ -516,7 +516,7 @@ typedef struct mds_kbdc_tree_keys
MDS_KBDC_TREE_PADDING(1);
-} mds_kbdc_trees_key_t;
+} mds_kbdc_tree_keys_t;
/**
@@ -562,22 +562,6 @@ typedef struct mds_kbdc_tree_nesting mds_kbdc_tree_unordered_t;
/**
- * Leaf structure for "return"-keyword
- */
-typedef struct mds_kbdc_tree_nothing mds_kbdc_tree_type_return_t return_;
-
-/**
- * Leaf structure for "break"-keyword
- */
-typedef struct mds_kbdc_tree_nothing mds_kbdc_tree_type_break_t break_;
-
-/**
- * Leaf structure for "continue"-keyword
- */
-typedef struct mds_kbdc_tree_nothing mds_kbdc_tree_type_continue_t continue_;
-
-
-/**
* Tree structure for a macro call
*/
typedef struct mds_kbdc_tree_macro_call
@@ -601,29 +585,48 @@ typedef struct mds_kbdc_tree_macro_call
} mds_kbdc_tree_macro_call_t;
+/**
+ * Leaf structure for "return"-keyword
+ */
+typedef struct mds_kbdc_tree_nothing mds_kbdc_tree_return_t;
+
+/**
+ * Leaf structure for "break"-keyword
+ */
+typedef struct mds_kbdc_tree_nothing mds_kbdc_tree_break_t;
+
+/**
+ * Leaf structure for "continue"-keyword
+ */
+typedef struct mds_kbdc_tree_nothing mds_kbdc_tree_continue_t;
+
+
/**
* Keyboard layout syntax tree
*/
union mds_kbdc_tree
{
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wpedantic" /* unnamed struct */
struct
{
MDS_KBDC_TREE_COMMON;
MDS_KBDC_TREE_PADDING(0);
};
+# pragma GCC diagnostic pop
mds_kbdc_tree_information_t information;
mds_kbdc_tree_information_language_t language;
mds_kbdc_tree_information_country_t country;
mds_kbdc_tree_information_variant_t variant;
- mds_kbdc_tree_information_include_t include;
+ mds_kbdc_tree_include_t include;
mds_kbdc_tree_function_t function;
mds_kbdc_tree_macro_t macro;
mds_kbdc_tree_assumption_t assumption;
- mds_kbdc_tree_assumption_have have;
- mds_kbdc_tree_assumption_have_chars have_chars;
- mds_kbdc_tree_assumption_have_range have_range;
+ mds_kbdc_tree_assumption_have_t have;
+ mds_kbdc_tree_assumption_have_chars_t have_chars;
+ mds_kbdc_tree_assumption_have_range_t have_range;
mds_kbdc_tree_for_t for_;
mds_kbdc_tree_if_t if_;
mds_kbdc_tree_let_t let;
@@ -635,13 +638,52 @@ union mds_kbdc_tree
mds_kbdc_tree_alternation_t alternation;
mds_kbdc_tree_unordered_t unordered;
mds_kbdc_tree_macro_call_t macro_call;
- mds_kbdc_tree_type_return_t return_;
- mds_kbdc_tree_type_break_t break_;
- mds_kbdc_tree_type_continue_t continue_;
+ mds_kbdc_tree_return_t return_;
+ mds_kbdc_tree_break_t break_;
+ mds_kbdc_tree_continue_t continue_;
};
+/**
+ * Release all resources stored in a tree node,
+ * without freeing the node itself or freeing
+ * or destroying inner `mds_kbdc_tree_t*`:s
+ *
+ * @param this The tree node
+ */
+void mds_kbdc_tree_destroy_nonrecursive(mds_kbdc_tree_t* restrict this);
+
+/**
+ * Release all resources stored in a tree node,
+ * without freeing or destroying inner
+ * `mds_kbdc_tree_t*`:s, but free this node's
+ * allocation
+ *
+ * @param this The tree node
+ */
+void mds_kbdc_tree_free_nonrecursive(mds_kbdc_tree_t* restrict this);
+
+/**
+ * Release all resources stored in a tree node
+ * recursively, but do not free the allocation
+ * of the tree node
+ *
+ * @param this The tree node
+ */
+void mds_kbdc_tree_destroy(mds_kbdc_tree_t* restrict this);
+
+/**
+ * Release all resources stored in a tree node
+ * recursively, and free the allocation
+ * of the tree node
+ *
+ * @param this The tree node
+ */
+void mds_kbdc_tree_free(mds_kbdc_tree_t* restrict this);
+
+
+
#undef MDS_KBDC_TREE_PADDING
#undef MDS_KBDC_TREE_PADDING_
#undef MDS_KBDC_TREE_COMMON