Remove enum before/after for description visitor

[libside.git] / src / visit-description.h

diff --git a/src/visit-description.h b/src/visit-description.h
index 17292f44b339c14b66a814474f49fbea0df96eca..3f9ae6bd093b2b0cea0c5c6c4c63cfc4bfe8d65c 100644 (file)
--- a/src/visit-description.h
+++ b/src/visit-description.h
@@ -8,30 +8,20 @@
 
 #include <side/trace.h>
 
-enum side_description_visitor_location {
-       SIDE_DESCRIPTION_VISITOR_BEFORE,
-       SIDE_DESCRIPTION_VISITOR_AFTER,
-};
-
-enum side_description_visitor_vla_location {
-       SIDE_DESCRIPTION_VISITOR_VLA_BEFORE,
-       SIDE_DESCRIPTION_VISITOR_VLA_AFTER_LENGTH,
-       SIDE_DESCRIPTION_VISITOR_VLA_AFTER_ELEMENT,
-};
-
 struct side_description_visitor {
-       void (*event_func)(enum side_description_visitor_location loc,
-                       const struct side_event_description *desc,
-                       void *priv);
+       void (*before_event_func)(const struct side_event_description *desc, void *priv);
+       void (*after_event_func)(const struct side_event_description *desc, void *priv);
 
-       void (*static_fields_func)(enum side_description_visitor_location loc,
-                       const struct side_event_description *desc,
-                       void *priv);
+       void (*before_static_fields_func)(const struct side_event_description *desc, void *priv);
+       void (*after_static_fields_func)(const struct side_event_description *desc, void *priv);
 
        /* Stack-copy basic types. */
-       void (*field_func)(enum side_description_visitor_location loc, const struct side_event_field *item_desc, void *priv);
-       void (*elem_func)(enum side_description_visitor_location loc, const struct side_type *type_desc, void *priv);
-       void (*option_func)(enum side_description_visitor_location loc, const struct side_variant_option *option_desc, void *priv);
+       void (*before_field_func)(const struct side_event_field *item_desc, void *priv);
+       void (*after_field_func)(const struct side_event_field *item_desc, void *priv);
+       void (*before_elem_func)(const struct side_type *type_desc, void *priv);
+       void (*after_elem_func)(const struct side_type *type_desc, void *priv);
+       void (*before_option_func)(const struct side_variant_option *option_desc, void *priv);
+       void (*after_option_func)(const struct side_variant_option *option_desc, void *priv);
 
        void (*null_type_func)(const struct side_type *type_desc, void *priv);
        void (*bool_type_func)(const struct side_type *type_desc, void *priv);
@@ -42,15 +32,24 @@ struct side_description_visitor {
        void (*string_type_func)(const struct side_type *type_desc, void *priv);
 
        /* Stack-copy compound types. */
-       void (*struct_type_func)(enum side_description_visitor_location loc, const struct side_type_struct *side_struct, void *priv);
-       void (*variant_type_func)(enum side_description_visitor_location loc, const struct side_type_variant *side_variant, void *priv);
-       void (*array_type_func)(enum side_description_visitor_location loc, const struct side_type_array *side_array, void *priv);
-       void (*vla_type_func)(enum side_description_visitor_vla_location loc, const struct side_type_vla *side_vla, void *priv);
-       void (*vla_visitor_type_func)(enum side_description_visitor_vla_location loc, const struct side_type_vla_visitor *side_vla_visitor, void *priv);
+       void (*before_struct_type_func)(const struct side_type_struct *side_struct, void *priv);
+       void (*after_struct_type_func)(const struct side_type_struct *side_struct, void *priv);
+       void (*before_variant_type_func)(const struct side_type_variant *side_variant, void *priv);
+       void (*after_variant_type_func)(const struct side_type_variant *side_variant, void *priv);
+       void (*before_array_type_func)(const struct side_type_array *side_array, void *priv);
+       void (*after_array_type_func)(const struct side_type_array *side_array, void *priv);
+       void (*before_vla_type_func)(const struct side_type_vla *side_vla, void *priv);
+       void (*after_length_vla_type_func)(const struct side_type_vla *side_vla, void *priv);
+       void (*after_element_vla_type_func)(const struct side_type_vla *side_vla, void *priv);
+       void (*before_vla_visitor_type_func)(const struct side_type_vla_visitor *side_vla_visitor, void *priv);
+       void (*after_length_vla_visitor_type_func)(const struct side_type_vla_visitor *side_vla_visitor, void *priv);
+       void (*after_element_vla_visitor_type_func)(const struct side_type_vla_visitor *side_vla_visitor, void *priv);
 
        /* Stack-copy enumeration types. */
-       void (*enum_type_func)(enum side_description_visitor_location loc, const struct side_type *type_desc, void *priv);
-       void (*enum_bitmap_type_func)(enum side_description_visitor_location loc, const struct side_type *type_desc, void *priv);
+       void (*before_enum_type_func)(const struct side_type *type_desc, void *priv);
+       void (*after_enum_type_func)(const struct side_type *type_desc, void *priv);
+       void (*before_enum_bitmap_type_func)(const struct side_type *type_desc, void *priv);
+       void (*after_enum_bitmap_type_func)(const struct side_type *type_desc, void *priv);
 
        /* Gather basic types. */
        void (*gather_bool_type_func)(const struct side_type_gather_bool *type, void *priv);
@@ -61,12 +60,17 @@ struct side_description_visitor {
        void (*gather_string_type_func)(const struct side_type_gather_string *type, void *priv);
 
        /* Gather compound types. */
-       void (*gather_struct_type_func)(enum side_description_visitor_location loc, const struct side_type_gather_struct *type, void *priv);
-       void (*gather_array_type_func)(enum side_description_visitor_location loc, const struct side_type_gather_array *type, void *priv);
-       void (*gather_vla_type_func)(enum side_description_visitor_vla_location loc, const struct side_type_gather_vla *type, void *priv);
+       void (*before_gather_struct_type_func)(const struct side_type_gather_struct *type, void *priv);
+       void (*after_gather_struct_type_func)(const struct side_type_gather_struct *type, void *priv);
+       void (*before_gather_array_type_func)(const struct side_type_gather_array *type, void *priv);
+       void (*after_gather_array_type_func)(const struct side_type_gather_array *type, void *priv);
+       void (*before_gather_vla_type_func)(const struct side_type_gather_vla *type, void *priv);
+       void (*after_length_gather_vla_type_func)(const struct side_type_gather_vla *type, void *priv);
+       void (*after_element_gather_vla_type_func)(const struct side_type_gather_vla *type, void *priv);
 
        /* Gather enumeration types. */
-       void (*gather_enum_type_func)(enum side_description_visitor_location loc, const struct side_type_gather_enum *type, void *priv);
+       void (*before_gather_enum_type_func)(const struct side_type_gather_enum *type, void *priv);
+       void (*after_gather_enum_type_func)(const struct side_type_gather_enum *type, void *priv);
 
        /* Dynamic types. */
        void (*dynamic_type_func)(const struct side_type *type_desc, void *priv);