[no subject]

[Patrice Dumas]

branch: master
commit 24663ecc7df8630a36629d091f3286a10da9734b
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Jun 8 23:09:23 2024 +0200

    Remove info_info ASSOCIATED_INFO from CONTAINER
    
    * tp/Texinfo/XS/main/build_perl_info.c (element_to_perl_hash),
    tp/Texinfo/XS/main/debug.c (print_element_debug_details),
    tp/Texinfo/XS/main/manipulate_tree.c (copy_tree_internal)
    (copy_extra_info), tp/Texinfo/XS/main/tree.c (destroy_element),
    tp/Texinfo/XS/main/tree_types.h (CONTAINER),
    tp/Texinfo/XS/parsetexi/close.c (is_container_empty): remove
    completely the info_info ASSOCIATED_INFO information from CONTAINER
    in ELEMENT now that everything is in other data structures, mainly
    elt_info and string_info.
---
 ChangeLog                            | 14 ++++++++++++++
 tp/Texinfo/XS/main/build_perl_info.c |  3 ---
 tp/Texinfo/XS/main/debug.c           |  6 ++----
 tp/Texinfo/XS/main/manipulate_tree.c |  3 ---
 tp/Texinfo/XS/main/tree.c            |  1 -
 tp/Texinfo/XS/main/tree_types.h      |  1 -
 tp/Texinfo/XS/parsetexi/close.c      |  4 +---
 7 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 67147942f5..b9623c61c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,20 @@
        tp/Texinfo/XS/structuring_transfo/structuring.c (new_node_menu_entry):
        use the union e name.
 
+2024-06-08  Patrice Dumas  <pertusus@free.fr>
+
+       Remove info_info ASSOCIATED_INFO from CONTAINER
+
+       * tp/Texinfo/XS/main/build_perl_info.c (element_to_perl_hash),
+       tp/Texinfo/XS/main/debug.c (print_element_debug_details),
+       tp/Texinfo/XS/main/manipulate_tree.c (copy_tree_internal)
+       (copy_extra_info), tp/Texinfo/XS/main/tree.c (destroy_element),
+       tp/Texinfo/XS/main/tree_types.h (CONTAINER),
+       tp/Texinfo/XS/parsetexi/close.c (is_container_empty): remove
+       completely the info_info ASSOCIATED_INFO information from CONTAINER
+       in ELEMENT now that everything is in other data structures, mainly
+       elt_info and string_info.
+
 2024-06-08  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/XS/main/extra.c: remove add_info_string,
diff --git a/tp/Texinfo/XS/main/build_perl_info.c 
b/tp/Texinfo/XS/main/build_perl_info.c
index c1657fa643..430f55b7ca 100644
--- a/tp/Texinfo/XS/main/build_perl_info.c
+++ b/tp/Texinfo/XS/main/build_perl_info.c
@@ -775,9 +775,6 @@ element_to_perl_hash (ELEMENT *e, int avoid_recursion)
                           "info", "delimiter", &nr_info);
     }
 
-  store_additional_info (e, &e->e.c->info_info, "info", &nr_info,
-                         avoid_recursion);
-
   if (e->e.c->contents.number > 0)
     {
       AV *av;
diff --git a/tp/Texinfo/XS/main/debug.c b/tp/Texinfo/XS/main/debug.c
index 57d07a6859..fde6e228b1 100644
--- a/tp/Texinfo/XS/main/debug.c
+++ b/tp/Texinfo/XS/main/debug.c
@@ -232,14 +232,12 @@ print_element_debug_details (const ELEMENT *e, int 
print_parent)
       free (associated_info_str);
     }
 
+  /* TODO could print elt_info and string_info arrays
   if (e->e.c->info_info.info_number > 0)
     {
-      char *associated_info_str;
       text_append (&text, " INFO\n");
-      associated_info_str = print_associate_info_debug (&e->e.c->info_info);
-      text_append (&text, associated_info_str);
-      free (associated_info_str);
     }
+   */
 
   free (string);
   result = strdup (text.text);
diff --git a/tp/Texinfo/XS/main/manipulate_tree.c 
b/tp/Texinfo/XS/main/manipulate_tree.c
index 43d4403faa..f4559cdf32 100644
--- a/tp/Texinfo/XS/main/manipulate_tree.c
+++ b/tp/Texinfo/XS/main/manipulate_tree.c
@@ -230,7 +230,6 @@ copy_tree_internal (ELEMENT* current, ELEMENT *parent)
           new->e.c->string_info[i] = strdup (current->e.c->string_info[i]);
     }
 
-  copy_associated_info (&current->e.c->info_info, &new->e.c->info_info);
   copy_associated_info (&current->extra_info, &new->extra_info);
   return new;
 }
@@ -440,8 +439,6 @@ copy_extra_info (ELEMENT *current, ELEMENT *new)
                 }
             }
         }
-      associate_info_references (&current->e.c->info_info, 
&new->e.c->info_info);
-
       /* text element have _copy and _counter only in extra, not to be copied 
*/
       associate_info_references (&current->extra_info, &new->extra_info);
     }
diff --git a/tp/Texinfo/XS/main/tree.c b/tp/Texinfo/XS/main/tree.c
index a7adcd8d85..1edc1a9e07 100644
--- a/tp/Texinfo/XS/main/tree.c
+++ b/tp/Texinfo/XS/main/tree.c
@@ -234,7 +234,6 @@ destroy_element (ELEMENT *e)
     {
       int i;
       int string_info_nr = 0;
-      destroy_associated_info (&e->e.c->info_info);
   /* Note the pointers in these lists are not themselves freed. */
       free (e->e.c->contents.list);
       free (e->e.c->args.list);
diff --git a/tp/Texinfo/XS/main/tree_types.h b/tp/Texinfo/XS/main/tree_types.h
index cb35595e80..45c0cb095e 100644
--- a/tp/Texinfo/XS/main/tree_types.h
+++ b/tp/Texinfo/XS/main/tree_types.h
@@ -213,7 +213,6 @@ typedef struct CONTAINER {
     ELEMENT_LIST contents;
     SOURCE_INFO source_info;
 
-    ASSOCIATED_INFO info_info;
     OUTPUT_UNIT *associated_unit;
     /* depends on the element */
     char **string_info;
diff --git a/tp/Texinfo/XS/parsetexi/close.c b/tp/Texinfo/XS/parsetexi/close.c
index 76211e1f28..e472a01002 100644
--- a/tp/Texinfo/XS/parsetexi/close.c
+++ b/tp/Texinfo/XS/parsetexi/close.c
@@ -133,9 +133,7 @@ is_container_empty (ELEMENT *current)
         return 1;
     }
   else if (current->e.c->contents.number == 0
-           && current->e.c->args.number == 0
-           /* FIXME this is certainly wrong */
-           && current->e.c->info_info.info_number == 0)
+           && current->e.c->args.number == 0)
     return 1;
 
   return 0;