Remove enum before/after for description visitor

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

diff --git a/src/visit-description.c b/src/visit-description.c
index d94864e0e33206d37ef6bc421047ea675841f3df..84752899fe9b5ae8ba04e985edb4e8c3ea25c2d1 100644 (file)
--- a/src/visit-description.c
+++ b/src/visit-description.c
@@ -26,31 +26,31 @@ void description_visitor_gather_enum(const struct side_description_visitor *desc
 static
 void side_visit_elem(const struct side_description_visitor *description_visitor, const struct side_type *type_desc, void *priv)
 {
-       if (description_visitor->elem_func)
-               description_visitor->elem_func(SIDE_DESCRIPTION_VISITOR_BEFORE, type_desc, priv);
+       if (description_visitor->before_elem_func)
+               description_visitor->before_elem_func(type_desc, priv);
        side_visit_type(description_visitor, type_desc, priv);
-       if (description_visitor->elem_func)
-               description_visitor->elem_func(SIDE_DESCRIPTION_VISITOR_AFTER, type_desc, priv);
+       if (description_visitor->after_elem_func)
+               description_visitor->after_elem_func(type_desc, priv);
 }
 
 static
 void side_visit_field(const struct side_description_visitor *description_visitor, const struct side_event_field *item_desc, void *priv)
 {
-       if (description_visitor->field_func)
-               description_visitor->field_func(SIDE_DESCRIPTION_VISITOR_BEFORE, item_desc, priv);
+       if (description_visitor->before_field_func)
+               description_visitor->before_field_func(item_desc, priv);
        side_visit_type(description_visitor, &item_desc->side_type, priv);
-       if (description_visitor->field_func)
-               description_visitor->field_func(SIDE_DESCRIPTION_VISITOR_AFTER, item_desc, priv);
+       if (description_visitor->after_field_func)
+               description_visitor->after_field_func(item_desc, priv);
 }
 
 static
 void side_visit_option(const struct side_description_visitor *description_visitor, const struct side_variant_option *option_desc, void *priv)
 {
-       if (description_visitor->option_func)
-               description_visitor->option_func(SIDE_DESCRIPTION_VISITOR_BEFORE, option_desc, priv);
+       if (description_visitor->before_option_func)
+               description_visitor->before_option_func(option_desc, priv);
        side_visit_type(description_visitor, &option_desc->side_type, priv);
-       if (description_visitor->option_func)
-               description_visitor->option_func(SIDE_DESCRIPTION_VISITOR_AFTER, option_desc, priv);
+       if (description_visitor->after_option_func)
+               description_visitor->after_option_func(option_desc, priv);
 }
 
 static
@@ -58,11 +58,11 @@ void description_visitor_enum(const struct side_description_visitor *description
 {
        const struct side_type *elem_type = side_ptr_get(type_desc->u.side_enum.elem_type);
 
-       if (description_visitor->enum_type_func)
-               description_visitor->enum_type_func(SIDE_DESCRIPTION_VISITOR_BEFORE, type_desc, priv);
+       if (description_visitor->before_enum_type_func)
+               description_visitor->before_enum_type_func(type_desc, priv);
        side_visit_elem(description_visitor, elem_type, priv);
-       if (description_visitor->enum_type_func)
-               description_visitor->enum_type_func(SIDE_DESCRIPTION_VISITOR_AFTER, type_desc, priv);
+       if (description_visitor->after_enum_type_func)
+               description_visitor->after_enum_type_func(type_desc, priv);
 }
 
 static
@@ -70,12 +70,11 @@ void description_visitor_enum_bitmap(const struct side_description_visitor *desc
 {
        const struct side_type *elem_type = side_ptr_get(type_desc->u.side_enum_bitmap.elem_type);
 
-
-       if (description_visitor->enum_bitmap_type_func)
-               description_visitor->enum_bitmap_type_func(SIDE_DESCRIPTION_VISITOR_BEFORE, type_desc, priv);
+       if (description_visitor->before_enum_bitmap_type_func)
+               description_visitor->before_enum_bitmap_type_func(type_desc, priv);
        side_visit_elem(description_visitor, elem_type, priv);
-       if (description_visitor->enum_bitmap_type_func)
-               description_visitor->enum_bitmap_type_func(SIDE_DESCRIPTION_VISITOR_AFTER, type_desc, priv);
+       if (description_visitor->after_enum_bitmap_type_func)
+               description_visitor->after_enum_bitmap_type_func(type_desc, priv);
 }
 
 static
@@ -84,12 +83,12 @@ void description_visitor_struct(const struct side_description_visitor *descripti
        const struct side_type_struct *side_struct = side_ptr_get(type_desc->u.side_struct);
        uint32_t i, len = side_struct->nr_fields;
 
-       if (description_visitor->struct_type_func)
-               description_visitor->struct_type_func(SIDE_DESCRIPTION_VISITOR_BEFORE, side_struct, priv);
+       if (description_visitor->before_struct_type_func)
+               description_visitor->before_struct_type_func(side_struct, priv);
        for (i = 0; i < len; i++)
                side_visit_field(description_visitor, &side_ptr_get(side_struct->fields)[i], priv);
-       if (description_visitor->struct_type_func)
-               description_visitor->struct_type_func(SIDE_DESCRIPTION_VISITOR_AFTER, side_struct, priv);
+       if (description_visitor->after_struct_type_func)
+               description_visitor->after_struct_type_func(side_struct, priv);
 }
 
 static
@@ -115,58 +114,58 @@ void description_visitor_variant(const struct side_description_visitor *descript
                fprintf(stderr, "ERROR: Expecting integer variant selector type\n");
                abort();
        }
-       if (description_visitor->variant_type_func)
-               description_visitor->variant_type_func(SIDE_DESCRIPTION_VISITOR_BEFORE, side_type_variant, priv);
+       if (description_visitor->before_variant_type_func)
+               description_visitor->before_variant_type_func(side_type_variant, priv);
        for (i = 0; i < len; i++)
                side_visit_option(description_visitor, &side_ptr_get(side_type_variant->options)[i], priv);
-       if (description_visitor->variant_type_func)
-               description_visitor->variant_type_func(SIDE_DESCRIPTION_VISITOR_AFTER, side_type_variant, priv);
+       if (description_visitor->after_variant_type_func)
+               description_visitor->after_variant_type_func(side_type_variant, priv);
 }
 
 static
 void description_visitor_array(const struct side_description_visitor *description_visitor, const struct side_type *type_desc, void *priv)
 {
-       if (description_visitor->array_type_func)
-               description_visitor->array_type_func(SIDE_DESCRIPTION_VISITOR_BEFORE, &type_desc->u.side_array, priv);
+       if (description_visitor->before_array_type_func)
+               description_visitor->before_array_type_func(&type_desc->u.side_array, priv);
        side_visit_elem(description_visitor, side_ptr_get(type_desc->u.side_array.elem_type), priv);
-       if (description_visitor->array_type_func)
-               description_visitor->array_type_func(SIDE_DESCRIPTION_VISITOR_AFTER, &type_desc->u.side_array, priv);
+       if (description_visitor->after_array_type_func)
+               description_visitor->after_array_type_func(&type_desc->u.side_array, priv);
 }
 
 static
 void description_visitor_vla(const struct side_description_visitor *description_visitor, const struct side_type *type_desc, void *priv)
 {
-       if (description_visitor->vla_type_func)
-               description_visitor->vla_type_func(SIDE_DESCRIPTION_VISITOR_VLA_BEFORE, &type_desc->u.side_vla, priv);
+       if (description_visitor->before_vla_type_func)
+               description_visitor->before_vla_type_func(&type_desc->u.side_vla, priv);
        side_visit_elem(description_visitor, side_ptr_get(type_desc->u.side_vla.length_type), priv);
-       if (description_visitor->vla_type_func)
-               description_visitor->vla_type_func(SIDE_DESCRIPTION_VISITOR_VLA_AFTER_LENGTH, &type_desc->u.side_vla, priv);
+       if (description_visitor->after_length_vla_type_func)
+               description_visitor->after_length_vla_type_func(&type_desc->u.side_vla, priv);
        side_visit_elem(description_visitor, side_ptr_get(type_desc->u.side_vla.elem_type), priv);
-       if (description_visitor->vla_type_func)
-               description_visitor->vla_type_func(SIDE_DESCRIPTION_VISITOR_VLA_AFTER_ELEMENT, &type_desc->u.side_vla, priv);
+       if (description_visitor->after_element_vla_type_func)
+               description_visitor->after_element_vla_type_func(&type_desc->u.side_vla, priv);
 }
 
 static
 void description_visitor_vla_visitor(const struct side_description_visitor *description_visitor, const struct side_type *type_desc, void *priv)
 {
-       if (description_visitor->vla_visitor_type_func)
-               description_visitor->vla_visitor_type_func(SIDE_DESCRIPTION_VISITOR_VLA_BEFORE, side_ptr_get(type_desc->u.side_vla_visitor), priv);
+       if (description_visitor->before_vla_visitor_type_func)
+               description_visitor->before_vla_visitor_type_func(side_ptr_get(type_desc->u.side_vla_visitor), priv);
        side_visit_elem(description_visitor, side_ptr_get(side_ptr_get(type_desc->u.side_vla_visitor)->length_type), priv);
-       if (description_visitor->vla_visitor_type_func)
-               description_visitor->vla_visitor_type_func(SIDE_DESCRIPTION_VISITOR_VLA_AFTER_LENGTH, side_ptr_get(type_desc->u.side_vla_visitor), priv);
+       if (description_visitor->after_length_vla_visitor_type_func)
+               description_visitor->after_length_vla_visitor_type_func(side_ptr_get(type_desc->u.side_vla_visitor), priv);
        side_visit_elem(description_visitor, side_ptr_get(side_ptr_get(type_desc->u.side_vla_visitor)->elem_type), priv);
-       if (description_visitor->vla_visitor_type_func)
-               description_visitor->vla_visitor_type_func(SIDE_DESCRIPTION_VISITOR_VLA_AFTER_ELEMENT, side_ptr_get(type_desc->u.side_vla_visitor), priv);
+       if (description_visitor->after_element_vla_visitor_type_func)
+               description_visitor->after_element_vla_visitor_type_func(side_ptr_get(type_desc->u.side_vla_visitor), priv);
 }
 
 static
 void visit_gather_field(const struct side_description_visitor *description_visitor, const struct side_event_field *field, void *priv)
 {
-       if (description_visitor->field_func)
-               description_visitor->field_func(SIDE_DESCRIPTION_VISITOR_BEFORE, field, priv);
+       if (description_visitor->before_field_func)
+               description_visitor->before_field_func(field, priv);
        (void) visit_gather_type(description_visitor, &field->side_type, priv);
-       if (description_visitor->field_func)
-               description_visitor->field_func(SIDE_DESCRIPTION_VISITOR_AFTER, field, priv);
+       if (description_visitor->after_field_func)
+               description_visitor->after_field_func(field, priv);
 }
 
 static
@@ -176,12 +175,12 @@ void description_visitor_gather_struct(const struct side_description_visitor *de
        const struct side_type_struct *side_struct = side_ptr_get(side_gather_struct->type);
        uint32_t i;
 
-       if (description_visitor->gather_struct_type_func)
-               description_visitor->gather_struct_type_func(SIDE_DESCRIPTION_VISITOR_BEFORE, side_gather_struct, priv);
+       if (description_visitor->before_gather_struct_type_func)
+               description_visitor->before_gather_struct_type_func(side_gather_struct, priv);
        for (i = 0; i < side_struct->nr_fields; i++)
                visit_gather_field(description_visitor, &side_ptr_get(side_struct->fields)[i], priv);
-       if (description_visitor->gather_struct_type_func)
-               description_visitor->gather_struct_type_func(SIDE_DESCRIPTION_VISITOR_AFTER, side_gather_struct, priv);
+       if (description_visitor->after_gather_struct_type_func)
+               description_visitor->after_gather_struct_type_func(side_gather_struct, priv);
 }
 
 static
@@ -191,8 +190,8 @@ void description_visitor_gather_array(const struct side_description_visitor *des
        const struct side_type_array *side_array = &side_gather_array->type;
        const struct side_type *elem_type = side_ptr_get(side_array->elem_type);
 
-       if (description_visitor->gather_array_type_func)
-               description_visitor->gather_array_type_func(SIDE_DESCRIPTION_VISITOR_BEFORE, side_gather_array, priv);
+       if (description_visitor->before_gather_array_type_func)
+               description_visitor->before_gather_array_type_func(side_gather_array, priv);
        switch (side_enum_get(elem_type->type)) {
        case SIDE_TYPE_GATHER_VLA:
                fprintf(stderr, "<gather VLA only supported within gather structures>\n");
@@ -201,8 +200,8 @@ void description_visitor_gather_array(const struct side_description_visitor *des
                break;
        }
        visit_gather_elem(description_visitor, elem_type, priv);
-       if (description_visitor->gather_array_type_func)
-               description_visitor->gather_array_type_func(SIDE_DESCRIPTION_VISITOR_AFTER, side_gather_array, priv);
+       if (description_visitor->after_gather_array_type_func)
+               description_visitor->after_gather_array_type_func(side_gather_array, priv);
 }
 
 static
@@ -228,14 +227,14 @@ void description_visitor_gather_vla(const struct side_description_visitor *descr
        default:
                break;
        }
-       if (description_visitor->gather_vla_type_func)
-               description_visitor->gather_vla_type_func(SIDE_DESCRIPTION_VISITOR_VLA_BEFORE, side_gather_vla, priv);
+       if (description_visitor->before_gather_vla_type_func)
+               description_visitor->before_gather_vla_type_func(side_gather_vla, priv);
        visit_gather_elem(description_visitor, length_type, priv);
-       if (description_visitor->gather_vla_type_func)
-               description_visitor->gather_vla_type_func(SIDE_DESCRIPTION_VISITOR_VLA_AFTER_LENGTH, side_gather_vla, priv);
+       if (description_visitor->after_length_gather_vla_type_func)
+               description_visitor->after_length_gather_vla_type_func(side_gather_vla, priv);
        visit_gather_elem(description_visitor, elem_type, priv);
-       if (description_visitor->gather_vla_type_func)
-               description_visitor->gather_vla_type_func(SIDE_DESCRIPTION_VISITOR_VLA_AFTER_ELEMENT, side_gather_vla, priv);
+       if (description_visitor->after_element_gather_vla_type_func)
+               description_visitor->after_element_gather_vla_type_func(side_gather_vla, priv);
 }
 
 static
@@ -334,11 +333,11 @@ void visit_gather_type(const struct side_description_visitor *description_visito
 static
 void visit_gather_elem(const struct side_description_visitor *description_visitor, const struct side_type *type_desc, void *priv)
 {
-       if (description_visitor->elem_func)
-               description_visitor->elem_func(SIDE_DESCRIPTION_VISITOR_BEFORE, type_desc, priv);
+       if (description_visitor->before_elem_func)
+               description_visitor->before_elem_func(type_desc, priv);
        visit_gather_type(description_visitor, type_desc, priv);
-       if (description_visitor->elem_func)
-               description_visitor->elem_func(SIDE_DESCRIPTION_VISITOR_AFTER, type_desc, priv);
+       if (description_visitor->after_elem_func)
+               description_visitor->after_elem_func(type_desc, priv);
 }
 
 static
@@ -346,11 +345,11 @@ void description_visitor_gather_enum(const struct side_description_visitor *desc
 {
        const struct side_type *elem_type = side_ptr_get(type_gather->u.side_enum.elem_type);
 
-       if (description_visitor->gather_enum_type_func)
-               description_visitor->gather_enum_type_func(SIDE_DESCRIPTION_VISITOR_BEFORE, &type_gather->u.side_enum, priv);
+       if (description_visitor->before_gather_enum_type_func)
+               description_visitor->before_gather_enum_type_func(&type_gather->u.side_enum, priv);
        side_visit_elem(description_visitor, elem_type, priv);
-       if (description_visitor->gather_enum_type_func)
-               description_visitor->gather_enum_type_func(SIDE_DESCRIPTION_VISITOR_AFTER, &type_gather->u.side_enum, priv);
+       if (description_visitor->after_gather_enum_type_func)
+               description_visitor->after_gather_enum_type_func(&type_gather->u.side_enum, priv);
 }
 
 static
@@ -480,16 +479,16 @@ void description_visitor_event(const struct side_description_visitor *descriptio
 {
        uint32_t i, len = desc->nr_fields;
 
-       if (description_visitor->event_func)
-               description_visitor->event_func(SIDE_DESCRIPTION_VISITOR_BEFORE, desc, priv);
+       if (description_visitor->before_event_func)
+               description_visitor->before_event_func(desc, priv);
        if (len) {
-               if (description_visitor->static_fields_func)
-                       description_visitor->static_fields_func(SIDE_DESCRIPTION_VISITOR_BEFORE, desc, priv);
+               if (description_visitor->before_static_fields_func)
+                       description_visitor->before_static_fields_func(desc, priv);
                for (i = 0; i < len; i++)
                        side_visit_field(description_visitor, &side_ptr_get(desc->fields)[i], priv);
-               if (description_visitor->static_fields_func)
-                       description_visitor->static_fields_func(SIDE_DESCRIPTION_VISITOR_AFTER, desc, priv);
+               if (description_visitor->after_static_fields_func)
+                       description_visitor->after_static_fields_func(desc, priv);
        }
-       if (description_visitor->event_func)
-               description_visitor->event_func(SIDE_DESCRIPTION_VISITOR_AFTER, desc, priv);
+       if (description_visitor->after_event_func)
+               description_visitor->after_event_func(desc, priv);
 }