texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[no subject]


From: Patrice Dumas
Date: Sun, 12 Nov 2023 16:03:38 -0500 (EST)

branch: master
commit 78393c89e7448e062dac1d4dd0760e5f0690e1ba
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Nov 12 21:22:53 2023 +0100

    * tp/Texinfo/XS/parsetexi/parser.h (parser_float_list),
    tp/Texinfo/XS/parsetexi/parser.c (store_document),
    tp/Texinfo/XS/parsetexi/end_line.c (parser_float_list)
    (end_line_starting_block): rename global float_records as
    parser_float_list.
---
 ChangeLog                          |  8 ++++++++
 tp/TODO                            |  2 ++
 tp/Texinfo/XS/parsetexi/end_line.c |  4 ++--
 tp/Texinfo/XS/parsetexi/parser.c   | 12 ++++++------
 tp/Texinfo/XS/parsetexi/parser.h   |  2 +-
 5 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 867040c922..2d2ed5be55 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2023-11-12  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/XS/parsetexi/parser.h (parser_float_list),
+       tp/Texinfo/XS/parsetexi/parser.c (store_document),
+       tp/Texinfo/XS/parsetexi/end_line.c (parser_float_list)
+       (end_line_starting_block): rename global float_records as
+       parser_float_list.
+
 2023-11-12  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/XS/convert/convert_html.c
diff --git a/tp/TODO b/tp/TODO
index 097a1c6bff..abc69ed168 100644
--- a/tp/TODO
+++ b/tp/TODO
@@ -43,6 +43,8 @@ Use ELEMENT_LIST for extra_contents extra_directions?
 error_messages: add a check that it is empty in
 html_destroy?
 
+remove trim_spaces_comment_from_content
+
 Bugs
 ====
 
diff --git a/tp/Texinfo/XS/parsetexi/end_line.c 
b/tp/Texinfo/XS/parsetexi/end_line.c
index aea7913a8a..1c7e17c290 100644
--- a/tp/Texinfo/XS/parsetexi/end_line.c
+++ b/tp/Texinfo/XS/parsetexi/end_line.c
@@ -632,7 +632,7 @@ parse_line_command_args (ELEMENT *line_command)
 }
 
 /* Array of recorded @float's. */
-FLOAT_RECORD_LIST float_records = {0, 0, 0};
+FLOAT_RECORD_LIST parser_float_list = {0, 0, 0};
 
 
 ELEMENT *
@@ -847,7 +847,7 @@ end_line_starting_block (ELEMENT *current)
       float_type = parse_float_type (current);
 
       /* add to global 'floats' array */
-      add_to_float_record_list (&float_records, float_type, current);
+      add_to_float_record_list (&parser_float_list, float_type, current);
 
       if (current_section)
         add_extra_element (current, "float_section", current_section);
diff --git a/tp/Texinfo/XS/parsetexi/parser.c b/tp/Texinfo/XS/parsetexi/parser.c
index a2177b301e..e7a1695daa 100644
--- a/tp/Texinfo/XS/parsetexi/parser.c
+++ b/tp/Texinfo/XS/parsetexi/parser.c
@@ -2510,12 +2510,12 @@ store_document (ELEMENT *root)
   labels->space = labels_number;
 
   floats = malloc (sizeof (FLOAT_RECORD_LIST));
-  float_records.float_types = realloc (float_records.float_types,
-                    float_records.number * sizeof (FLOAT_RECORD));
+  parser_float_list.float_types = realloc (parser_float_list.float_types,
+        parser_float_list.number * sizeof (FLOAT_RECORD));
 
-  floats->float_types = float_records.float_types;
-  floats->number = float_records.number;
-  floats->space = float_records.number;
+  floats->float_types = parser_float_list.float_types;
+  floats->number = parser_float_list.number;
+  floats->space = parser_float_list.number;
 
   internal_references = malloc (sizeof (ELEMENT_LIST));
 
@@ -2584,7 +2584,7 @@ store_document (ELEMENT *root)
   forget_indices ();
   forget_labels ();
 
-  memset (&float_records, 0, sizeof (FLOAT_RECORD_LIST));
+  memset (&parser_float_list, 0, sizeof (FLOAT_RECORD_LIST));
 
   forget_internal_xrefs ();
   forget_small_strings ();
diff --git a/tp/Texinfo/XS/parsetexi/parser.h b/tp/Texinfo/XS/parsetexi/parser.h
index 7171db9cfc..97b2bf8355 100644
--- a/tp/Texinfo/XS/parsetexi/parser.h
+++ b/tp/Texinfo/XS/parsetexi/parser.h
@@ -58,7 +58,7 @@ ELEMENT *end_line (ELEMENT *current);
 ELEMENT *end_line_misc_line (ELEMENT *current);
 ELEMENT *end_line_starting_block (ELEMENT *current);
 
-extern FLOAT_RECORD_LIST float_records;
+extern FLOAT_RECORD_LIST parser_float_list;
 
 /* In labels.c */
 extern LABEL *labels_list;



reply via email to

[Prev in Thread] Current Thread [Next in Thread]