branch master updated: * tp/Texinfo/XS/convert/call_html_perl_function.c (init_registered_ids_hv, is_hv_registered_id, hv_register_id) (clear_registered_ids_hv, free_registered_ids_hv), tp/Texinfo/XS/main/converter_types.h (CONVERTER): remove rid union in converter, to be able to have both a string list or Perl HV for registered_ids types.

[Patrice Dumas]

This is an automated email from the git hooks/post-receive script.

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 6a80a8dbed * tp/Texinfo/XS/convert/call_html_perl_function.c 
(init_registered_ids_hv, is_hv_registered_id, hv_register_id) 
(clear_registered_ids_hv, free_registered_ids_hv), 
tp/Texinfo/XS/main/converter_types.h (CONVERTER): remove rid union in 
converter, to be able to have both a string list or Perl HV for registered_ids 
types.
6a80a8dbed is described below

commit 6a80a8dbed6e40fe1c3dae2673bcc979ca0f2632
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Wed Aug 7 18:02:23 2024 +0200

    * tp/Texinfo/XS/convert/call_html_perl_function.c
    (init_registered_ids_hv, is_hv_registered_id, hv_register_id)
    (clear_registered_ids_hv, free_registered_ids_hv),
    tp/Texinfo/XS/main/converter_types.h (CONVERTER): remove rid union in
    converter, to be able to have both a string list or Perl HV for
    registered_ids types.
    
    * tp/Texinfo/XS/main/converter_types.h,
    tp/Texinfo/XS/main/document_types.h (enum command_location): move enum
    command_location declaration to document_types.h.
---
 ChangeLog                                       | 13 +++++++++++++
 tp/Texinfo/XS/convert/call_html_perl_function.c | 10 +++++-----
 tp/Texinfo/XS/main/build_perl_info.c            |  2 +-
 tp/Texinfo/XS/main/converter_types.h            | 15 +++------------
 tp/Texinfo/XS/main/document_types.h             |  8 ++++++++
 5 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 072857181d..a7b98fa9f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,19 @@
        * tp/Texinfo/XS/main/get_perl_info.h: declare html_fill_sv_options and
        html_fill_button_sv_specification_list.
 
+2024-08-07  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/XS/convert/call_html_perl_function.c
+       (init_registered_ids_hv, is_hv_registered_id, hv_register_id)
+       (clear_registered_ids_hv, free_registered_ids_hv),
+       tp/Texinfo/XS/main/converter_types.h (CONVERTER): remove rid union in
+       converter, to be able to have both a string list or Perl HV for
+       registered_ids types.
+
+       * tp/Texinfo/XS/main/converter_types.h,
+       tp/Texinfo/XS/main/document_types.h (enum command_location): move enum
+       command_location declaration to document_types.h.
+
 2024-08-07  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/XS/convert/converter.c
diff --git a/tp/Texinfo/XS/convert/call_html_perl_function.c 
b/tp/Texinfo/XS/convert/call_html_perl_function.c
index 26a35f7424..4235212e66 100644
--- a/tp/Texinfo/XS/convert/call_html_perl_function.c
+++ b/tp/Texinfo/XS/convert/call_html_perl_function.c
@@ -2405,7 +2405,7 @@ init_registered_ids_hv (CONVERTER *self)
 {
   dTHX;
 
-  self->rid.registered_ids_hv = newHV ();
+  self->registered_ids_hv = newHV ();
 }
 
 int
@@ -2413,7 +2413,7 @@ is_hv_registered_id (CONVERTER *self, const char *string)
 {
   dTHX;
 
-  return hv_exists (self->rid.registered_ids_hv, string, strlen (string));
+  return hv_exists (self->registered_ids_hv, string, strlen (string));
 }
 
 void
@@ -2421,7 +2421,7 @@ hv_register_id (CONVERTER *self, const char *string)
 {
   dTHX;
 
-  hv_store (self->rid.registered_ids_hv, string, strlen (string),
+  hv_store (self->registered_ids_hv, string, strlen (string),
             newSViv (1), 0);
 }
 
@@ -2430,7 +2430,7 @@ clear_registered_ids_hv (CONVERTER *self)
 {
   dTHX;
 
-  hv_clear (self->rid.registered_ids_hv);
+  hv_clear (self->registered_ids_hv);
 }
 
 void
@@ -2438,5 +2438,5 @@ free_registered_ids_hv (CONVERTER *self)
 {
   dTHX;
 
-  hv_undef (self->rid.registered_ids_hv);
+  hv_undef (self->registered_ids_hv);
 }
diff --git a/tp/Texinfo/XS/main/build_perl_info.c 
b/tp/Texinfo/XS/main/build_perl_info.c
index f4acaa1ee3..cb1d1fbd0a 100644
--- a/tp/Texinfo/XS/main/build_perl_info.c
+++ b/tp/Texinfo/XS/main/build_perl_info.c
@@ -38,7 +38,7 @@
 #include "types_data.h"
 #include "tree_types.h"
 #include "global_commands_types.h"
-/* for GLOBAL_INFO ERROR_MESSAGE */
+/* for GLOBAL_INFO ERROR_MESSAGE CL_* */
 #include "document_types.h"
 /* CONVERTER sv_string_type */
 #include "converter_types.h"
diff --git a/tp/Texinfo/XS/main/converter_types.h 
b/tp/Texinfo/XS/main/converter_types.h
index 12dbfd421c..77b70e89ea 100644
--- a/tp/Texinfo/XS/main/converter_types.h
+++ b/tp/Texinfo/XS/main/converter_types.h
@@ -846,11 +846,9 @@ typedef struct CONVERTER {
     SPECIAL_UNIT_DIRECTION_LIST global_units_direction_name;
     ELEMENT **special_unit_info_tree[SUIT_type_heading+1];
     SORTED_INDEX_NAMES sorted_index_names;
-    union {
-      STRING_LIST *registered_ids;
-      /* actually HV * but we do not want to drag in Perl headers */
-      void *registered_ids_hv;
-    } rid;
+    STRING_LIST *registered_ids;
+    /* actually HV * but we do not want to drag in Perl headers */
+    void *registered_ids_hv;
     /* potentially one target list per command (only for some actually) */
     HTML_TARGET_LIST html_targets[BUILTIN_CMD_NUMBER];
     HTML_TARGET_LIST html_special_targets[ST_footnote_location+1];
@@ -940,13 +938,6 @@ typedef struct TARGET_FILENAME {
     char *filename;
 } TARGET_FILENAME;
 
-/* enum needed in converters codes, but not in this file */
-enum command_location {
-   CL_before,
-   CL_last,
-   CL_preamble,
-   CL_preamble_or_first,
-};
 
 #endif
 
diff --git a/tp/Texinfo/XS/main/document_types.h 
b/tp/Texinfo/XS/main/document_types.h
index 2bdf5b1acf..7f411f105e 100644
--- a/tp/Texinfo/XS/main/document_types.h
+++ b/tp/Texinfo/XS/main/document_types.h
@@ -255,4 +255,12 @@ typedef struct {
     VALUE *list;
 } VALUE_LIST;
 
+/* enum needed in document and converters codes, but not in this file */
+enum command_location {
+   CL_before,
+   CL_last,
+   CL_preamble,
+   CL_preamble_or_first,
+};
+
 #endif