[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/XS/main/build_perl_info.c (build_add
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/Texinfo/XS/main/build_perl_info.c (build_additional_info), tp/Texinfo/XS/main/debug.c (print_associate_info_debug), tp/Texinfo/XS/main/extra.c (add_extra_contents) (lookup_extra_contents), tp/Texinfo/XS/main/manipulate_tree.c (copy_associated_info, remove_associated_copy_info), tp/Texinfo/XS/main/tree.c (destroy_associated_info): rename extra_load as extra_contents, lookup_extra_load as lookup_extra_contents and add_extra_load as add_extra_contents. Remove the previous lookup_extra_co [...] |
|
Date: |
Sun, 29 Sep 2024 09:13:35 -0400 |
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 8163873f53 * tp/Texinfo/XS/main/build_perl_info.c
(build_additional_info), tp/Texinfo/XS/main/debug.c
(print_associate_info_debug), tp/Texinfo/XS/main/extra.c (add_extra_contents)
(lookup_extra_contents), tp/Texinfo/XS/main/manipulate_tree.c
(copy_associated_info, remove_associated_copy_info), tp/Texinfo/XS/main/tree.c
(destroy_associated_info): rename extra_load as extra_contents,
lookup_extra_load as lookup_extra_contents and add_extra_load as
add_extra_contents. Remove the pre [...]
8163873f53 is described below
commit 8163873f53cfec7316545df05584797c852e7974
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Jun 29 21:39:54 2024 +0200
* tp/Texinfo/XS/main/build_perl_info.c (build_additional_info),
tp/Texinfo/XS/main/debug.c (print_associate_info_debug),
tp/Texinfo/XS/main/extra.c (add_extra_contents)
(lookup_extra_contents), tp/Texinfo/XS/main/manipulate_tree.c
(copy_associated_info, remove_associated_copy_info),
tp/Texinfo/XS/main/tree.c (destroy_associated_info): rename
extra_load as extra_contents, lookup_extra_load as
lookup_extra_contents and add_extra_load as add_extra_contents.
Remove the previous lookup_extra_contents and add_extra_contents
now that they are not used anymore.
---
ChangeLog | 13 +++++++
tp/Texinfo/XS/convert/convert_html.c | 10 ++---
tp/Texinfo/XS/main/build_perl_info.c | 7 ----
tp/Texinfo/XS/main/debug.c | 16 +-------
tp/Texinfo/XS/main/extra.c | 43 ++--------------------
tp/Texinfo/XS/main/extra.h | 9 ++---
tp/Texinfo/XS/main/manipulate_tree.c | 30 ++-------------
tp/Texinfo/XS/main/output_unit.c | 4 +-
tp/Texinfo/XS/main/tree.c | 3 --
tp/Texinfo/XS/main/tree_types.h | 1 -
tp/Texinfo/XS/parsetexi/handle_commands.c | 4 +-
tp/Texinfo/XS/structuring_transfo/structuring.c | 24 ++++++------
.../XS/structuring_transfo/transformations.c | 12 +++---
13 files changed, 52 insertions(+), 124 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 715f1fd41d..7c5786194b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2024-06-29 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/XS/main/build_perl_info.c (build_additional_info),
+ tp/Texinfo/XS/main/debug.c (print_associate_info_debug),
+ tp/Texinfo/XS/main/extra.c (add_extra_contents)
+ (lookup_extra_contents), tp/Texinfo/XS/main/manipulate_tree.c
+ (copy_associated_info, remove_associated_copy_info),
+ tp/Texinfo/XS/main/tree.c (destroy_associated_info): rename
+ extra_load as extra_contents, lookup_extra_load as
+ lookup_extra_contents and add_extra_load as add_extra_contents.
+ Remove the previous lookup_extra_contents and add_extra_contents
+ now that they are not used anymore.
+
2024-06-29 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/XS/main/tree.c (remove_from_const_element_list): add.
diff --git a/tp/Texinfo/XS/convert/convert_html.c
b/tp/Texinfo/XS/convert/convert_html.c
index 867a83ac4e..8510b76cd0 100644
--- a/tp/Texinfo/XS/convert/convert_html.c
+++ b/tp/Texinfo/XS/convert/convert_html.c
@@ -6390,7 +6390,7 @@ html_default_format_contents (CONVERTER *self, const enum
command_id cmd,
else
return result.text;
- root_children = lookup_extra_load (section_root, AI_key_section_childs);
+ root_children = lookup_extra_contents (section_root, AI_key_section_childs);
min_root_level = lookup_extra_integer (root_children->list[0],
AI_key_section_level,
&status);
@@ -6462,7 +6462,7 @@ html_default_format_contents (CONVERTER *self, const enum
command_id cmd,
int section_level = lookup_extra_integer (section,
AI_key_section_level,
&status);
const CONST_ELEMENT_LIST *section_childs
- = lookup_extra_load (section, AI_key_section_childs);
+ = lookup_extra_contents (section, AI_key_section_childs);
if (section->e.c->cmd != CM_top)
{
char *text;
@@ -10271,7 +10271,7 @@ mini_toc_internal (CONVERTER *self, const ELEMENT
*element, TEXT *result)
{
int entry_index = 0;
- const CONST_ELEMENT_LIST *section_childs = lookup_extra_load (element,
+ const CONST_ELEMENT_LIST *section_childs = lookup_extra_contents (element,
AI_key_section_childs);
if (section_childs && section_childs->number > 0)
{
@@ -10449,7 +10449,7 @@ convert_heading_command (CONVERTER *self, const enum
command_id cmd,
if (node)
{
int automatic_directions = (node->e.c->args.number <= 1);
- const CONST_ELEMENT_LIST *menus = lookup_extra_load (node,
+ const CONST_ELEMENT_LIST *menus = lookup_extra_contents (node,
AI_key_menus);
if (!menus && automatic_directions)
{
@@ -11764,7 +11764,7 @@ convert_quotation_command (CONVERTER *self, const enum
command_id cmd,
text_append (result, content);
}
- authors = lookup_extra_load (element, AI_key_authors);
+ authors = lookup_extra_contents (element, AI_key_authors);
if (authors)
{
int i;
diff --git a/tp/Texinfo/XS/main/build_perl_info.c
b/tp/Texinfo/XS/main/build_perl_info.c
index f26e388988..762c339c84 100644
--- a/tp/Texinfo/XS/main/build_perl_info.c
+++ b/tp/Texinfo/XS/main/build_perl_info.c
@@ -404,13 +404,6 @@ build_additional_info (HV *extra, const ASSOCIATED_INFO *a,
break;
}
case extra_contents:
- {
- const ELEMENT_LIST *l = k->k.list;
- if (l && l->number)
- STORE(build_perl_array (l, avoid_recursion));
- break;
- }
- case extra_load:
{
const CONST_ELEMENT_LIST *l = k->k.const_list;
if (l && l->number)
diff --git a/tp/Texinfo/XS/main/debug.c b/tp/Texinfo/XS/main/debug.c
index 53ddb76afc..d9f40771d9 100644
--- a/tp/Texinfo/XS/main/debug.c
+++ b/tp/Texinfo/XS/main/debug.c
@@ -172,24 +172,10 @@ print_associate_info_debug (const ASSOCIATED_INFO *info)
break;
}
case extra_contents:
- {
- int j;
- const ELEMENT_LIST *l = k->k.list;
- text_append (&text, "contents: ");
- for (j = 0; j < l->number; j++)
- {
- const ELEMENT *e = l->list[j];
- char *element_str = print_element_debug (e, 0);
- text_printf (&text, "%p;%s|", e, element_str);
- free (element_str);
- }
- break;
- }
- case extra_load:
{
int j;
const CONST_ELEMENT_LIST *l = k->k.const_list;
- text_append (&text, "load: ");
+ text_append (&text, "contents: ");
for (j = 0; j < l->number; j++)
{
const ELEMENT *e = l->list[j];
diff --git a/tp/Texinfo/XS/main/extra.c b/tp/Texinfo/XS/main/extra.c
index 0ab1802c60..c32f2d8c93 100644
--- a/tp/Texinfo/XS/main/extra.c
+++ b/tp/Texinfo/XS/main/extra.c
@@ -104,38 +104,20 @@ add_extra_container (ELEMENT *e, enum ai_key_name key,
ELEMENT *value)
if the caller knows that the array has not been set
already.
*/
-ELEMENT_LIST *
-add_extra_contents (ELEMENT *e, enum ai_key_name key, int no_lookup)
-{
- ELEMENT_LIST *n_list;
- if (!no_lookup)
- {
- ELEMENT_LIST *e_list = lookup_extra_contents (e, key);
- if (e_list)
- return e_list;
- }
-
- n_list = new_list ();
- KEY_PAIR *k = get_associated_info_key (&e->e.c->extra_info, key,
- extra_contents);
- k->k.list = n_list;
- return n_list;
-}
-
CONST_ELEMENT_LIST *
-add_extra_load (ELEMENT *e, enum ai_key_name key, int no_lookup)
+add_extra_contents (ELEMENT *e, enum ai_key_name key, int no_lookup)
{
CONST_ELEMENT_LIST *n_list;
if (!no_lookup)
{
- CONST_ELEMENT_LIST *e_list = lookup_extra_load (e, key);
+ CONST_ELEMENT_LIST *e_list = lookup_extra_contents (e, key);
if (e_list)
return e_list;
}
n_list = new_const_element_list ();
KEY_PAIR *k = get_associated_info_key (&e->e.c->extra_info, key,
- extra_load);
+ extra_contents);
k->k.const_list = n_list;
return n_list;
}
@@ -333,7 +315,7 @@ lookup_extra_integer (const ELEMENT *e, enum ai_key_name
key, int *ret)
return lookup_key_pair_integer (k, key, ret);
}
-ELEMENT_LIST *
+CONST_ELEMENT_LIST *
lookup_extra_contents (const ELEMENT *e, enum ai_key_name key)
{
KEY_PAIR *k = lookup_extra (e, key);
@@ -347,23 +329,6 @@ lookup_extra_contents (const ELEMENT *e, enum ai_key_name
key)
fatal (msg);
free (msg);
}
- return k->k.list;
-}
-
-CONST_ELEMENT_LIST *
-lookup_extra_load (const ELEMENT *e, enum ai_key_name key)
-{
- KEY_PAIR *k = lookup_extra (e, key);
- if (!k)
- return 0;
- else if (k->type != extra_load)
- {
- char *msg;
- xasprintf (&msg, "Bad type for lookup_extra_load: %s: %d",
- ai_key_names[key], k->type);
- fatal (msg);
- free (msg);
- }
return k->k.const_list;
}
diff --git a/tp/Texinfo/XS/main/extra.h b/tp/Texinfo/XS/main/extra.h
index bfe161be50..90cb18765a 100644
--- a/tp/Texinfo/XS/main/extra.h
+++ b/tp/Texinfo/XS/main/extra.h
@@ -21,10 +21,8 @@
void add_extra_element (ELEMENT *e, enum ai_key_name key, ELEMENT *value);
void add_extra_element_oot (ELEMENT *e, enum ai_key_name key, ELEMENT *value);
-ELEMENT_LIST *add_extra_contents (ELEMENT *e, enum ai_key_name key,
- int no_lookup);
-CONST_ELEMENT_LIST *add_extra_load (ELEMENT *e, enum ai_key_name key,
- int no_lookup);
+CONST_ELEMENT_LIST *add_extra_contents (ELEMENT *e, enum ai_key_name key,
+ int no_lookup);
void add_extra_container (ELEMENT *e, enum ai_key_name key, ELEMENT *value);
const ELEMENT **add_extra_directions (ELEMENT *e,
enum ai_key_name key);
@@ -38,8 +36,7 @@ KEY_PAIR *lookup_extra (const ELEMENT *e, enum ai_key_name
key);
ELEMENT *lookup_extra_element (const ELEMENT *e, enum ai_key_name key);
ELEMENT *lookup_extra_element_oot (const ELEMENT *e, enum ai_key_name key);
ELEMENT *lookup_extra_container (const ELEMENT *e, enum ai_key_name key);
-ELEMENT_LIST *lookup_extra_contents (const ELEMENT *e, enum ai_key_name key);
-CONST_ELEMENT_LIST * lookup_extra_load (const ELEMENT *e, enum ai_key_name
key);
+CONST_ELEMENT_LIST * lookup_extra_contents (const ELEMENT *e, enum ai_key_name
key);
const STRING_LIST *lookup_extra_misc_args (const ELEMENT *e,
enum ai_key_name key);
const INDEX_ENTRY_LOCATION *lookup_extra_index_entry (const ELEMENT *e,
diff --git a/tp/Texinfo/XS/main/manipulate_tree.c
b/tp/Texinfo/XS/main/manipulate_tree.c
index fc29028e18..9750562ea1 100644
--- a/tp/Texinfo/XS/main/manipulate_tree.c
+++ b/tp/Texinfo/XS/main/manipulate_tree.c
@@ -75,28 +75,15 @@ copy_associated_info (ASSOCIATED_INFO *info,
ASSOCIATED_INFO* new_info)
case extra_contents:
{
KEY_PAIR *k = get_associated_info_key (new_info, key, k_ref->type);
- ELEMENT_LIST *new_extra_contents = new_list ();
- k->k.list = new_extra_contents;
- for (j = 0; j < k_ref->k.list->number; j++)
- {
- ELEMENT *e = k_ref->k.list->list[j];
- ELEMENT *copy = copy_tree_internal (e);
- add_to_element_list (new_extra_contents, copy);
- }
- break;
- }
- case extra_load:
- {
- KEY_PAIR *k = get_associated_info_key (new_info, key, k_ref->type);
- CONST_ELEMENT_LIST *new_extra_load = new_const_element_list ();
- k->k.const_list = new_extra_load;
+ CONST_ELEMENT_LIST *new_extra_contents = new_const_element_list ();
+ k->k.const_list = new_extra_contents;
for (j = 0; j < k_ref->k.const_list->number; j++)
{
/* cast to discard const, as the element needs to be modified
transiently for copy */
ELEMENT *e = (ELEMENT *)k_ref->k.const_list->list[j];
ELEMENT *copy = copy_tree_internal (e);
- add_to_const_element_list (new_extra_load, copy);
+ add_to_const_element_list (new_extra_contents, copy);
}
break;
}
@@ -275,15 +262,6 @@ remove_associated_copy_info (ASSOCIATED_INFO *info)
break;
}
case extra_contents:
- {
- for (j = 0; j < k_ref->k.list->number; j++)
- {
- ELEMENT *e = k_ref->k.list->list[j];
- remove_element_copy_info (e);
- }
- break;
- }
- case extra_load:
{
for (j = 0; j < k_ref->k.const_list->number; j++)
{
@@ -1113,7 +1091,7 @@ normalized_entry_associated_internal_node (const ELEMENT
*entry,
const ELEMENT *
first_menu_node (const ELEMENT *node, const LABEL_LIST *identifiers_target)
{
- const CONST_ELEMENT_LIST *menus = lookup_extra_load (node, AI_key_menus);
+ const CONST_ELEMENT_LIST *menus = lookup_extra_contents (node, AI_key_menus);
if (menus)
{
int i;
diff --git a/tp/Texinfo/XS/main/output_unit.c b/tp/Texinfo/XS/main/output_unit.c
index 8f10b115cf..ca81cda113 100644
--- a/tp/Texinfo/XS/main/output_unit.c
+++ b/tp/Texinfo/XS/main/output_unit.c
@@ -635,7 +635,7 @@ units_directions (const LABEL_LIST *identifiers_target,
AI_key_associated_section);
const CONST_ELEMENT_LIST *section_childs = 0;
if (associated_section)
- section_childs = lookup_extra_load (associated_section,
+ section_childs = lookup_extra_contents (associated_section,
AI_key_section_childs);
if (automatic_directions
&& section_childs && section_childs->number > 0)
@@ -785,7 +785,7 @@ units_directions (const LABEL_LIST *identifiers_target,
break;
}
- up_section_childs = lookup_extra_load (up, AI_key_section_childs);
+ up_section_childs = lookup_extra_contents (up,
AI_key_section_childs);
if (status >= 0 && up_section_level < 1
&& up->e.c->cmd == CM_top && up_section_childs
&& up_section_childs->number > 0)
diff --git a/tp/Texinfo/XS/main/tree.c b/tp/Texinfo/XS/main/tree.c
index 5d7d330376..841ec47ee8 100644
--- a/tp/Texinfo/XS/main/tree.c
+++ b/tp/Texinfo/XS/main/tree.c
@@ -194,9 +194,6 @@ destroy_associated_info (ASSOCIATED_INFO *a)
destroy_element_and_children (k_pair->k.element);
break;
case extra_contents:
- destroy_list (k_pair->k.list);
- break;
- case extra_load:
destroy_const_element_list (k_pair->k.const_list);
break;
case extra_directions:
diff --git a/tp/Texinfo/XS/main/tree_types.h b/tp/Texinfo/XS/main/tree_types.h
index 43db4768ae..6fe238d2c5 100644
--- a/tp/Texinfo/XS/main/tree_types.h
+++ b/tp/Texinfo/XS/main/tree_types.h
@@ -27,7 +27,6 @@ enum extra_type {
extra_element,
extra_element_oot,
extra_contents,
- extra_load,
extra_container,
extra_directions,
extra_misc_args,
diff --git a/tp/Texinfo/XS/parsetexi/handle_commands.c
b/tp/Texinfo/XS/parsetexi/handle_commands.c
index 0a9bcde013..8f680b7b63 100644
--- a/tp/Texinfo/XS/parsetexi/handle_commands.c
+++ b/tp/Texinfo/XS/parsetexi/handle_commands.c
@@ -953,7 +953,7 @@ handle_line_command (ELEMENT *current, const char
**line_inout,
else if (parent->e.c->cmd == CM_quotation
|| parent->e.c->cmd == CM_smallquotation)
{
- CONST_ELEMENT_LIST *l = add_extra_load (parent,
+ CONST_ELEMENT_LIST *l = add_extra_contents (parent,
AI_key_authors, 0);
add_to_const_element_list (l, current);
add_extra_element (current, AI_key_quotation, parent);
@@ -1096,7 +1096,7 @@ handle_block_command (ELEMENT *current, const char
**line_inout,
else
{
CONST_ELEMENT_LIST *l
- = add_extra_load (current_node, AI_key_menus, 0);
+ = add_extra_contents (current_node, AI_key_menus, 0);
add_to_const_element_list (l, block);
}
}
diff --git a/tp/Texinfo/XS/structuring_transfo/structuring.c
b/tp/Texinfo/XS/structuring_transfo/structuring.c
index 76c6fe6c26..4d865046ab 100644
--- a/tp/Texinfo/XS/structuring_transfo/structuring.c
+++ b/tp/Texinfo/XS/structuring_transfo/structuring.c
@@ -136,7 +136,7 @@ sectioning_structure (DOCUMENT *document)
const ELEMENT **section_directions
= add_extra_directions (content, AI_key_section_directions);
CONST_ELEMENT_LIST *section_childs
- = add_extra_load (previous_section,
+ = add_extra_contents (previous_section,
AI_key_section_childs, 1);
if (level - prev_section_level > 1)
{
@@ -232,7 +232,7 @@ sectioning_structure (DOCUMENT *document)
first 'part' just appeared, no direction to set.
*/
CONST_ELEMENT_LIST *sec_root_childs
- = lookup_extra_load (sec_root, AI_key_section_childs);
+ = lookup_extra_contents (sec_root, AI_key_section_childs);
add_extra_integer (sec_root, AI_key_section_level, level -1);
add_to_const_element_list (sec_root_childs, content);
number_top_level = level;
@@ -242,7 +242,7 @@ sectioning_structure (DOCUMENT *document)
else
{
CONST_ELEMENT_LIST *up_section_childs
- = lookup_extra_load (up, AI_key_section_childs);
+ = lookup_extra_contents (up, AI_key_section_childs);
/* cast to remove const to be able to set directions */
ELEMENT *prev = (ELEMENT *)
up_section_childs->list[up_section_childs->number -1];
@@ -272,7 +272,7 @@ sectioning_structure (DOCUMENT *document)
{
sec_root = new_element (ET_NONE);
CONST_ELEMENT_LIST *sec_root_childs
- = add_extra_load (sec_root, AI_key_section_childs, 1);
+ = add_extra_contents (sec_root, AI_key_section_childs, 1);
/* first section determines the level of the root. It is
typically -1 when there is a @top. */
add_extra_integer (sec_root, AI_key_section_level, level -1);
@@ -463,7 +463,7 @@ get_node_node_childs_from_sectioning (const ELEMENT *node)
if (associated_section)
{
const CONST_ELEMENT_LIST *section_childs
- = lookup_extra_load (associated_section,
+ = lookup_extra_contents (associated_section,
AI_key_section_childs);
if (section_childs)
{
@@ -494,7 +494,7 @@ get_node_node_childs_from_sectioning (const ELEMENT *node)
if (current->e.c->cmd == CM_part)
{
const CONST_ELEMENT_LIST *section_childs
- = lookup_extra_load (current, AI_key_section_childs);
+ = lookup_extra_contents (current,
AI_key_section_childs);
if (section_childs)
{
int i;
@@ -616,7 +616,7 @@ check_nodes_are_referenced (DOCUMENT *document)
int is_target = (node->flags & EF_is_target);
const ELEMENT * const *node_directions = lookup_extra_directions (node,
AI_key_node_directions);
- const CONST_ELEMENT_LIST *menus = lookup_extra_load (node, AI_key_menus);
+ const CONST_ELEMENT_LIST *menus = lookup_extra_contents (node,
AI_key_menus);
if (is_target)
nr_nodes_to_find++;
@@ -833,7 +833,7 @@ set_menus_node_directions (DOCUMENT *document)
{
int j;
const ELEMENT *node = nodes_list->list[i];
- const CONST_ELEMENT_LIST *menus = lookup_extra_load (node, AI_key_menus);
+ const CONST_ELEMENT_LIST *menus = lookup_extra_contents (node,
AI_key_menus);
if (!menus)
continue;
@@ -1088,7 +1088,7 @@ complete_node_tree_with_menus (DOCUMENT *document)
AI_key_associated_node);
if (up_node)
menus
- = lookup_extra_load (up_node, AI_key_menus);
+ = lookup_extra_contents (up_node,
AI_key_menus);
}
if (menus
@@ -1256,7 +1256,7 @@ complete_node_tree_with_menus (DOCUMENT *document)
AI_key_manual_content);
int is_target = (node->flags & EF_is_target);
const CONST_ELEMENT_LIST *menus
- = lookup_extra_load (up_node, AI_key_menus);
+ = lookup_extra_contents (up_node, AI_key_menus);
/* No check if node up is an external manual */
if (!manual_content
@@ -1392,7 +1392,7 @@ nodes_tree (DOCUMENT *document)
if (section)
{
const CONST_ELEMENT_LIST *section_childs
- = lookup_extra_load (section, AI_key_section_childs);
+ = lookup_extra_contents (section, AI_key_section_childs);
if (section_childs && section_childs->number > 0)
{
const ELEMENT *first_sec = section_childs->list[0];
@@ -1947,7 +1947,7 @@ print_down_menus (const ELEMENT *node, ELEMENT_STACK
*up_nodes,
{
ELEMENT_LIST *master_menu_contents = new_list ();
CONST_ELEMENT_LIST *menus;
- CONST_ELEMENT_LIST *node_menus = lookup_extra_load (node, AI_key_menus);
+ CONST_ELEMENT_LIST *node_menus = lookup_extra_contents (node, AI_key_menus);
ELEMENT_LIST *node_children;
ELEMENT *new_current_menu = 0;
int i;
diff --git a/tp/Texinfo/XS/structuring_transfo/transformations.c
b/tp/Texinfo/XS/structuring_transfo/transformations.c
index dba875068d..b71fe5b180 100644
--- a/tp/Texinfo/XS/structuring_transfo/transformations.c
+++ b/tp/Texinfo/XS/structuring_transfo/transformations.c
@@ -701,7 +701,7 @@ reassociate_to_node (const char *type, ELEMENT *current,
void *argument)
if (previous_node)
{
CONST_ELEMENT_LIST *menus
- = lookup_extra_load (previous_node, AI_key_menus);
+ = lookup_extra_contents (previous_node, AI_key_menus);
int previous_idx = -1;
if (menus)
{
@@ -731,7 +731,7 @@ reassociate_to_node (const char *type, ELEMENT *current,
void *argument)
}
}
}
- added_node_menus = add_extra_load (added_node, AI_key_menus, 0);
+ added_node_menus = add_extra_contents (added_node, AI_key_menus, 0);
add_to_const_element_list (added_node_menus, current);
}
/* what is really important is to avoid commands without extra information,
@@ -931,7 +931,7 @@ prepend_new_menu_in_node_section (ELEMENT *node, ELEMENT
*section,
ELEMENT *current_menu)
{
ELEMENT *empty_line = new_text_element (ET_empty_line);
- CONST_ELEMENT_LIST *menus = add_extra_load (node, AI_key_menus, 0);
+ CONST_ELEMENT_LIST *menus = add_extra_contents (node, AI_key_menus, 0);
add_to_element_contents (section, current_menu);
text_append (empty_line->e.text, "\n");
@@ -962,7 +962,7 @@ complete_node_menu (ELEMENT *node, int use_sections)
ELEMENT *current_menu = 0;
int i;
- const CONST_ELEMENT_LIST *menus = lookup_extra_load (node, AI_key_menus);
+ const CONST_ELEMENT_LIST *menus = lookup_extra_contents (node,
AI_key_menus);
if (menus)
{
@@ -1137,7 +1137,7 @@ complete_tree_nodes_missing_menu (DOCUMENT *document, int
use_sections)
for (i = 0; i < non_automatic_nodes->number; i++)
{
ELEMENT *node = non_automatic_nodes->list[i];
- const CONST_ELEMENT_LIST *menus = lookup_extra_load (node, AI_key_menus);
+ const CONST_ELEMENT_LIST *menus = lookup_extra_contents (node,
AI_key_menus);
if (!(menus && menus->number > 0))
{
ELEMENT *section = lookup_extra_element (node,
@@ -1169,7 +1169,7 @@ regenerate_master_menu (DOCUMENT *document, int
use_sections)
if (top_node)
{
- menus = lookup_extra_load (top_node, AI_key_menus);
+ menus = lookup_extra_contents (top_node, AI_key_menus);
if (!menus || (menus->number <= 0))
return 0;
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/XS/main/build_perl_info.c (build_additional_info), tp/Texinfo/XS/main/debug.c (print_associate_info_debug), tp/Texinfo/XS/main/extra.c (add_extra_contents) (lookup_extra_contents), tp/Texinfo/XS/main/manipulate_tree.c (copy_associated_info, remove_associated_copy_info), tp/Texinfo/XS/main/tree.c (destroy_associated_info): rename extra_load as extra_contents, lookup_extra_load as lookup_extra_contents and add_extra_load as add_extra_contents. Remove the previous lookup_extra_co [...],
Patrice Dumas <=