[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/XS/main/element_types.awk, tp/Texinf
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/Texinfo/XS/main/element_types.awk, tp/Texinfo/XS/main/types_data.h (TYPE_DATA): rename TYPE type as TYPE_DATA. |
|
Date: |
Sat, 28 Sep 2024 16:30:38 -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 5977939072 * tp/Texinfo/XS/main/element_types.awk,
tp/Texinfo/XS/main/types_data.h (TYPE_DATA): rename TYPE type as TYPE_DATA.
5977939072 is described below
commit 5977939072a67e9b27071cf565295a6bc90736c3
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Jun 1 16:24:17 2024 +0200
* tp/Texinfo/XS/main/element_types.awk,
tp/Texinfo/XS/main/types_data.h (TYPE_DATA): rename TYPE type as
TYPE_DATA.
* tp/Texinfo/XS/main/element_types.awk, tp/Texinfo/XS/Makefile.am
(libtexinfo_la_SOURCES): generate types data in element_types.c
instead of in types_data.c. Remove main/types_data.c and
element_type_names.
* tp/Texinfo/XS/convert/call_html_perl_function.c
(call_types_conversion, call_types_open),
tp/Texinfo/XS/convert/convert_html.c,
tp/Texinfo/XS/convert/get_html_perl_info.c
(html_converter_initialize_sv), tp/Texinfo/XS/main/build_perl_info.c
(element_to_perl_hash), tp/Texinfo/XS/main/builtin_commands.c
(set_element_type_name_info), tp/Texinfo/XS/main/debug.c
(print_element_debug), tp/Texinfo/XS/parsetexi/close.c
(close_current), tp/Texinfo/XS/parsetexi/handle_commands.c
(handle_block_command), tp/Texinfo/XS/parsetexi/parser.c (merge_text)
(abort_empty_line): use type_data[type].name instead of
element_type_names[type].
---
.gitignore | 1 -
ChangeLog | 24 ++++
tp/Texinfo/XS/Makefile.am | 4 +-
tp/Texinfo/XS/convert/call_html_perl_function.c | 5 +-
tp/Texinfo/XS/convert/convert_html.c | 12 +-
tp/Texinfo/XS/convert/get_html_perl_info.c | 7 +-
tp/Texinfo/XS/main/build_perl_info.c | 2 +-
tp/Texinfo/XS/main/builtin_commands.c | 3 +-
tp/Texinfo/XS/main/debug.c | 4 +-
tp/Texinfo/XS/main/element_types.awk | 27 ++--
tp/Texinfo/XS/main/element_types.c | 173 ++++++++++++------------
tp/Texinfo/XS/main/element_types.h | 1 -
tp/Texinfo/XS/main/types_data.h | 4 +-
tp/Texinfo/XS/parsetexi/close.c | 2 +-
tp/Texinfo/XS/parsetexi/handle_commands.c | 3 +-
tp/Texinfo/XS/parsetexi/parser.c | 4 +-
16 files changed, 146 insertions(+), 130 deletions(-)
diff --git a/.gitignore b/.gitignore
index cf8e68678a..9bd1dfec36 100644
--- a/.gitignore
+++ b/.gitignore
@@ -348,7 +348,6 @@ tp/Texinfo/XS/main/global_unique_commands_case.c
tp/Texinfo/XS/main/options_get_perl.c
tp/Texinfo/XS/main/options_init_free.c
tp/Texinfo/XS/main/options_types.h
-tp/Texinfo/XS/main/types_data.c
tp/Texinfo/XS/main/*.lo
diff --git a/ChangeLog b/ChangeLog
index 9b1bb791b6..fc06844dcc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,30 @@
Reorder ChangeLog to correspond to commits order.
+2024-05-31 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/XS/main/element_types.awk,
+ tp/Texinfo/XS/main/types_data.h (TYPE_DATA): rename TYPE type as
+ TYPE_DATA.
+
+ * tp/Texinfo/XS/main/element_types.awk, tp/Texinfo/XS/Makefile.am
+ (libtexinfo_la_SOURCES): generate types data in element_types.c
+ instead of in types_data.c. Remove main/types_data.c and
+ element_type_names.
+
+ * tp/Texinfo/XS/convert/call_html_perl_function.c
+ (call_types_conversion, call_types_open),
+ tp/Texinfo/XS/convert/convert_html.c,
+ tp/Texinfo/XS/convert/get_html_perl_info.c
+ (html_converter_initialize_sv), tp/Texinfo/XS/main/build_perl_info.c
+ (element_to_perl_hash), tp/Texinfo/XS/main/builtin_commands.c
+ (set_element_type_name_info), tp/Texinfo/XS/main/debug.c
+ (print_element_debug), tp/Texinfo/XS/parsetexi/close.c
+ (close_current), tp/Texinfo/XS/parsetexi/handle_commands.c
+ (handle_block_command), tp/Texinfo/XS/parsetexi/parser.c (merge_text)
+ (abort_empty_line): use type_data[type].name instead of
+ element_type_names[type].
+
2024-05-31 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/XS/convert/convert_html.c (convert_sp_command)
diff --git a/tp/Texinfo/XS/Makefile.am b/tp/Texinfo/XS/Makefile.am
index dfea7e8b2b..2606b6a15b 100644
--- a/tp/Texinfo/XS/Makefile.am
+++ b/tp/Texinfo/XS/Makefile.am
@@ -124,7 +124,6 @@ libtexinfo_la_SOURCES= \
main/command_ids.h \
main/builtin_commands.c \
main/builtin_commands.h \
- main/types_data.c \
main/types_data.h \
main/debug.c \
main/debug.h \
@@ -235,7 +234,6 @@ BUILT_SOURCES=main/accent_tables_8bit_codepoints.c \
main/command_ids.h \
main/element_types.c \
main/element_types.h \
- main/types_data.c \
main/global_commands_types.h \
main/global_multi_commands_case.c \
main/global_unique_commands_case.c \
@@ -247,7 +245,7 @@ BUILT_SOURCES=main/accent_tables_8bit_codepoints.c \
EXTRA_DIST+=main/element_types.txt main/element_types.awk \
main/command_data.awk
-$(srcdir)/main/element_types.c $(srcdir)/main/element_types.h
$(srcdir)/main/types_data.c: main/element_types.txt main/element_types.awk
+$(srcdir)/main/element_types.c $(srcdir)/main/element_types.h:
main/element_types.txt main/element_types.awk
$(GAWK) -v srcdir=$(srcdir)/main -f $(srcdir)/main/element_types.awk \
$(srcdir)/main/element_types.txt
diff --git a/tp/Texinfo/XS/convert/call_html_perl_function.c
b/tp/Texinfo/XS/convert/call_html_perl_function.c
index cf3431b3f7..e9478b88eb 100644
--- a/tp/Texinfo/XS/convert/call_html_perl_function.c
+++ b/tp/Texinfo/XS/convert/call_html_perl_function.c
@@ -33,6 +33,7 @@
#include "text.h"
#include "option_types.h"
#include "converter_types.h"
+#include "types_data.h"
/* for add_associated_info_integer */
#include "extra.h"
/* for element_command_name (or could be builtin_command_data) */
@@ -1905,7 +1906,7 @@ call_types_conversion (CONVERTER *self, const enum
element_type type,
EXTEND(SP, 4);
PUSHs(sv_2mortal (newRV_inc (self->hv)));
- PUSHs(sv_2mortal (newSVpv (element_type_names[type], 0)));
+ PUSHs(sv_2mortal (newSVpv (type_data[type].name, 0)));
PUSHs(sv_2mortal (newRV_inc (element->hv)));
/* content == 0 is possible, hope that newSVpv result corresponds to
undef in that case, but could also need to explicitely use newSV(0) */
@@ -1964,7 +1965,7 @@ call_types_open (CONVERTER *self, const enum element_type
type,
EXTEND(SP, 3);
PUSHs(sv_2mortal (newRV_inc (self->hv)));
- PUSHs(sv_2mortal (newSVpv (element_type_names[type], 0)));
+ PUSHs(sv_2mortal (newSVpv (type_data[type].name, 0)));
PUSHs(sv_2mortal (newRV_inc (element->hv)));
PUTBACK;
diff --git a/tp/Texinfo/XS/convert/convert_html.c
b/tp/Texinfo/XS/convert/convert_html.c
index f4c3c3cbed..c874df251d 100644
--- a/tp/Texinfo/XS/convert/convert_html.c
+++ b/tp/Texinfo/XS/convert/convert_html.c
@@ -4011,7 +4011,7 @@ html_internal_command_text (CONVERTER *self, const
ELEMENT *command,
}
else
{
- context_name = element_type_names[command->type];
+ context_name = type_data[command->type].name;
if (command->type == ET_special_unit_element)
{
char *special_unit_variety
@@ -4104,7 +4104,7 @@ html_command_text (CONVERTER *self, const ELEMENT
*command,
else if (command->type)
xasprintf (&context_str, "command_text %s %s",
html_command_text_type_name[type],
- element_type_names[command->type]);
+ type_data[command->type].name);
else
xasprintf (&context_str, "command_text %s ",
html_command_text_type_name[type]);
@@ -7233,7 +7233,7 @@ file_header_information (CONVERTER *self, const ELEMENT
*command,
element_command_name (command));
else if (command->type)
xasprintf (&context_str, "file_header_title-element-%s",
- element_type_names[command->type]);
+ type_data[command->type].name);
else
context_str = strdup ("file_header_title-element-");
@@ -18393,7 +18393,7 @@ convert_to_html_internal (CONVERTER *self, const
ELEMENT *element,
text_printf (&command_type, "@%s ", command_name);
if (element->type)
- text_append (&command_type, element_type_names[element->type]);
+ text_append (&command_type, type_data[element->type].name);
if (self->conf->DEBUG.o.integer > 0)
{
@@ -18410,7 +18410,7 @@ convert_to_html_internal (CONVERTER *self, const
ELEMENT *element,
text_printf (&debug_str, " cmd: %s,", command_name);
if (element->type)
text_printf (&debug_str, " type: %s",
- element_type_names[element->type]);
+ type_data[element->type].name);
if (type_data[element->type].flags & TF_text)
{
if (element->text.end > 0)
@@ -18849,7 +18849,7 @@ convert_to_html_internal (CONVERTER *self, const
ELEMENT *element,
if (self->conf->DEBUG.o.integer > 0)
{
- fprintf (stderr, "XS|DO type (%s) => `%s'\n",
element_type_names[type],
+ fprintf (stderr, "XS|DO type (%s) => `%s'\n", type_data[type].name,
type_result.text);
}
ADD(type_result.text);
diff --git a/tp/Texinfo/XS/convert/get_html_perl_info.c
b/tp/Texinfo/XS/convert/get_html_perl_info.c
index fdb7686a2f..c7a416aeb6 100644
--- a/tp/Texinfo/XS/convert/get_html_perl_info.c
+++ b/tp/Texinfo/XS/convert/get_html_perl_info.c
@@ -33,6 +33,7 @@
#include "command_ids.h"
#include "converter_types.h"
+#include "types_data.h"
/* also for non_perl_* */
#include "utils.h"
#include "builtin_commands.h"
@@ -368,7 +369,7 @@ html_converter_initialize_sv (SV *converter_sv,
if (i == 0)
ref_name = "";
else
- ref_name = element_type_names[i];
+ ref_name = type_data[i].name;
FORMATTING_REFERENCE *open_formatting_reference
= &converter->types_open[i];
FORMATTING_REFERENCE *conversion_formatting_reference
@@ -396,7 +397,7 @@ html_converter_initialize_sv (SV *converter_sv,
if (i == 0)
ref_name = "";
else
- ref_name = element_type_names[i];
+ ref_name = type_data[i].name;
FORMATTING_REFERENCE *conversion_formatting_reference
= &converter->css_string_types_conversion[i];
@@ -595,7 +596,7 @@ html_converter_initialize_sv (SV *converter_sv,
justified if finding the type index happens more often */
for (j = 1; j < TXI_TREE_TYPES_NUMBER; j++)
{
- if (!strcmp (element_type_names[j], type_name))
+ if (!strcmp (type_data[j].name, type_name))
{
type = j;
break;
diff --git a/tp/Texinfo/XS/main/build_perl_info.c
b/tp/Texinfo/XS/main/build_perl_info.c
index 83aa14a242..761afacf91 100644
--- a/tp/Texinfo/XS/main/build_perl_info.c
+++ b/tp/Texinfo/XS/main/build_perl_info.c
@@ -618,7 +618,7 @@ element_to_perl_hash (ELEMENT *e, int avoid_recursion)
if (e->type && e->type != ET_normal_text && e->type != ET_other_text)
{
- sv = newSVpv (element_type_names[e->type], 0);
+ sv = newSVpv (type_data[e->type].name, 0);
hv_store (e->hv, "type", strlen ("type"), sv, HSH_type);
}
diff --git a/tp/Texinfo/XS/main/builtin_commands.c
b/tp/Texinfo/XS/main/builtin_commands.c
index 33c4e53591..11e50cc41b 100644
--- a/tp/Texinfo/XS/main/builtin_commands.c
+++ b/tp/Texinfo/XS/main/builtin_commands.c
@@ -22,6 +22,7 @@
#include "command_ids.h"
#include "element_types.h"
#include "tree_types.h"
+#include "types_data.h"
#include "extra.h"
#include "debug.h"
#include "builtin_commands.h"
@@ -146,7 +147,7 @@ set_element_type_name_info (void)
int i;
for (i = 1; i < TXI_TREE_TYPES_NUMBER; i++)
{
- type_name_index[i-1].name = element_type_names[i];
+ type_name_index[i-1].name = type_data[i].name;
type_name_index[i-1].type = i;
}
diff --git a/tp/Texinfo/XS/main/debug.c b/tp/Texinfo/XS/main/debug.c
index 6f51076443..815f87d688 100644
--- a/tp/Texinfo/XS/main/debug.c
+++ b/tp/Texinfo/XS/main/debug.c
@@ -83,7 +83,7 @@ print_element_debug (const ELEMENT *e, int print_parent)
text_init (&text);
text_append (&text, "");
if (e->type)
- text_printf (&text, "(%s)", element_type_names[e->type]);
+ text_printf (&text, "(%s)", type_data[e->type].name);
if (type_data[e->type].flags & TF_text)
{
if (e->text.end == 0)
@@ -112,7 +112,7 @@ print_element_debug (const ELEMENT *e, int print_parent)
if (e->parent->cmd)
text_printf (&text, "@%s", element_command_name (e->parent));
if (e->parent->type)
- text_printf (&text, "(%s)", element_type_names[e->parent->type]);
+ text_printf (&text, "(%s)", type_data[e->parent->type].name);
}
return text.text;
}
diff --git a/tp/Texinfo/XS/main/element_types.awk
b/tp/Texinfo/XS/main/element_types.awk
index cccaa28a2b..24099b923e 100644
--- a/tp/Texinfo/XS/main/element_types.awk
+++ b/tp/Texinfo/XS/main/element_types.awk
@@ -20,7 +20,6 @@ BEGIN {
}
ETH = srcdir "/element_types.h"
ETC = srcdir "/element_types.c"
- ETD = srcdir "/types_data.c"
print "/* This file automatically generated by element_types.awk */" > ETH
print "#ifndef ELEMENT_TYPES_H" > ETH
@@ -28,12 +27,12 @@ BEGIN {
print "enum element_type {" > ETH
print "ET_NONE," > ETH
- print "/* This file automatically generated by element_types.awk */" > ETD
- print "" > ETD
- print "#include \"types_data.h\"" > ETD
- print "" > ETD
- print "TYPE type_data[] = {" > ETD
- print "0, 0," > ETD
+ print "/* This file automatically generated by element_types.awk */" > ETC
+ print "" > ETC
+ print "#include \"types_data.h\"" > ETC
+ print "" > ETC
+ print "TYPE_DATA type_data[] = {"
> ETC
+ print "0, 0," > ETC
}
!/^$/ && !/^#/ {
@@ -53,15 +52,9 @@ END {
print > ETH
print "#define TXI_TREE_TYPES_NUMBER (" last_type " +1)" > ETH
print > ETH
- print "extern char *element_type_names[];" > ETH
print "#endif" > ETH
- print "char *element_type_names[] = {" > ETC
- print "0," > ETC
- print array > ETC
- print "};" > ETC
-
for (line_idx in types) {
t = types[line_idx]
flags_str = ""
@@ -82,12 +75,8 @@ END {
flags = "TF_" flags_str
gsub (/,/, " | TF_", flags)
}
- print "\"" t "\", " flags "," > ETD
+ print "\"" t "\", " flags "," > ETC
}
- print "};" > ETD
+ print "};" > ETC
}
-function output_array (string)
-{
- print string > ETC
-}
diff --git a/tp/Texinfo/XS/main/element_types.c
b/tp/Texinfo/XS/main/element_types.c
index 864b104ab1..977dc4a491 100644
--- a/tp/Texinfo/XS/main/element_types.c
+++ b/tp/Texinfo/XS/main/element_types.c
@@ -1,87 +1,90 @@
-char *element_type_names[] = {
-0,
-"command_as_argument",
-"index_entry_command",
-"following_arg",
-"space_command_arg",
-"definfoenclose_command",
-"empty_line",
-"raw",
-"ignorable_spaces_after_command",
-"spaces_at_end",
-"spaces_after_close_brace",
-"spaces_before_paragraph",
-"text_after_end",
-"text_before_beginning",
-"space_at_end_menu_node",
-"after_menu_description_line",
-"spaces_after_cmd_before_arg",
-"normal_text",
-"other_text",
-"document_root",
-"root_line",
-"before_node_section",
-"postamble_after_end",
-"preamble_before_beginning",
-"preamble_before_setfilename",
-"preamble_before_content",
-"paragraph",
-"preformatted",
-"rawpreformatted",
-"brace_command_arg",
-"brace_command_context",
-"block_line_arg",
-"line_arg",
-"rawline_arg",
-"menu_entry",
-"menu_entry_leading_text",
-"menu_entry_name",
-"menu_entry_separator",
-"menu_entry_node",
-"menu_entry_description",
-"menu_comment",
-"internal_menu_star",
-"internal_spaces_after_command",
-"internal_spaces_before_argument",
-"internal_spaces_before_brace_in_index",
-"internal_spaces_after_cmd_before_arg",
-"macro_name",
-"macro_arg",
-"before_item",
-"table_entry",
-"table_term",
-"table_definition",
-"inter_item",
-"def_line",
-"def_item",
-"inter_def_item",
-"before_defline",
-"multitable_head",
-"multitable_body",
-"row",
-"balanced_braces",
-"bracketed_arg",
-"bracketed_linemacro_arg",
-"def_line_arg",
-"untranslated_def_line_arg",
-"def_category",
-"def_class",
-"def_type",
-"def_name",
-"def_typearg",
-"def_arg",
-"delimiter",
-"spaces",
-"untranslated",
-"elided_rawpreformatted",
-"elided_brace_command_arg",
-"macro_call",
-"rmacro_call",
-"linemacro_call",
-"text",
-"_code",
-"_converted",
-"_string",
-"special_unit_element",
+/* This file automatically generated by element_types.awk */
+#include "types_data.h"
+
+TYPE_DATA type_data[] = {
+0, 0,
+"command_as_argument", 0,
+"index_entry_command", 0,
+"following_arg", 0,
+"space_command_arg", 0,
+"definfoenclose_command", 0,
+"empty_line", TF_text,
+"raw", TF_text,
+"ignorable_spaces_after_command", TF_text,
+"spaces_at_end", TF_text,
+"spaces_after_close_brace", TF_text,
+"spaces_before_paragraph", TF_text,
+"text_after_end", TF_text,
+"text_before_beginning", TF_text,
+"space_at_end_menu_node", TF_text,
+"after_menu_description_line", TF_text,
+"spaces_after_cmd_before_arg", TF_text,
+"normal_text", TF_text,
+"other_text", TF_text,
+"document_root", 0,
+"root_line", 0,
+"before_node_section", 0,
+"postamble_after_end", 0,
+"preamble_before_beginning", 0,
+"preamble_before_setfilename", 0,
+"preamble_before_content", 0,
+"paragraph", 0,
+"preformatted", 0,
+"rawpreformatted", 0,
+"brace_command_arg", 0,
+"brace_command_context", 0,
+"block_line_arg", 0,
+"line_arg", 0,
+"rawline_arg", TF_text,
+"menu_entry", 0,
+"menu_entry_leading_text", TF_text,
+"menu_entry_name", 0,
+"menu_entry_separator", TF_text,
+"menu_entry_node", 0,
+"menu_entry_description", 0,
+"menu_comment", 0,
+"internal_menu_star", TF_text,
+"internal_spaces_after_command", TF_text,
+"internal_spaces_before_argument", TF_text,
+"internal_spaces_before_brace_in_index", TF_text,
+"internal_spaces_after_cmd_before_arg", TF_text,
+"macro_name", TF_text,
+"macro_arg", TF_text,
+"before_item", 0,
+"table_entry", 0,
+"table_term", 0,
+"table_definition", 0,
+"inter_item", 0,
+"def_line", 0,
+"def_item", 0,
+"inter_def_item", 0,
+"before_defline", 0,
+"multitable_head", 0,
+"multitable_body", 0,
+"row", 0,
+"balanced_braces", 0,
+"bracketed_arg", 0,
+"bracketed_linemacro_arg", TF_text,
+"def_line_arg", 0,
+"untranslated_def_line_arg", 0,
+"def_category", 0,
+"def_class", 0,
+"def_type", 0,
+"def_name", 0,
+"def_typearg", 0,
+"def_arg", 0,
+"delimiter", TF_text,
+"spaces", TF_text,
+"untranslated", TF_text,
+"elided_rawpreformatted", 0,
+"elided_brace_command_arg", 0,
+"macro_call", 0,
+"rmacro_call", 0,
+"linemacro_call", 0,
+"text", 0,
+"_code", 0,
+"_converted", TF_text,
+"_string", 0,
+"special_unit_element", 0,
};
diff --git a/tp/Texinfo/XS/main/element_types.h
b/tp/Texinfo/XS/main/element_types.h
index 386183418f..5330d4ada0 100644
--- a/tp/Texinfo/XS/main/element_types.h
+++ b/tp/Texinfo/XS/main/element_types.h
@@ -90,5 +90,4 @@ ET_special_unit_element,
#define TXI_TREE_TYPES_NUMBER (ET_special_unit_element +1)
-extern char *element_type_names[];
#endif
diff --git a/tp/Texinfo/XS/main/types_data.h b/tp/Texinfo/XS/main/types_data.h
index 7f473aab5a..4f8e992809 100644
--- a/tp/Texinfo/XS/main/types_data.h
+++ b/tp/Texinfo/XS/main/types_data.h
@@ -21,9 +21,9 @@
typedef struct types_struct {
char *name;
unsigned long flags;
-} TYPE;
+} TYPE_DATA;
-extern TYPE type_data[];
+extern TYPE_DATA type_data[];
#define TF_text 0x0001
diff --git a/tp/Texinfo/XS/parsetexi/close.c b/tp/Texinfo/XS/parsetexi/close.c
index 8edad7f0a0..868f429bbe 100644
--- a/tp/Texinfo/XS/parsetexi/close.c
+++ b/tp/Texinfo/XS/parsetexi/close.c
@@ -455,7 +455,7 @@ close_current (ELEMENT *current,
{
ELEMENT *close_brace;
- debug ("CLOSING type %s", element_type_names[current->type]);
+ debug ("CLOSING type %s", type_data[current->type].name);
switch (current->type)
{
diff --git a/tp/Texinfo/XS/parsetexi/handle_commands.c
b/tp/Texinfo/XS/parsetexi/handle_commands.c
index 82cb26e66c..c92ec3db1e 100644
--- a/tp/Texinfo/XS/parsetexi/handle_commands.c
+++ b/tp/Texinfo/XS/parsetexi/handle_commands.c
@@ -23,6 +23,7 @@
#include "command_ids.h"
#include "element_types.h"
#include "tree_types.h"
+#include "types_data.h"
#include "text.h"
#include "tree.h"
#include "extra.h"
@@ -1046,7 +1047,7 @@ handle_block_command (ELEMENT *current, const char
**line_inout,
else
{
bug_message ("menu description parent not a menu_entry: %s",
- element_type_names[current->type]);
+ type_data[current->type].name);
abort ();
}
}
diff --git a/tp/Texinfo/XS/parsetexi/parser.c b/tp/Texinfo/XS/parsetexi/parser.c
index cfbd12b0da..3980fc27ec 100644
--- a/tp/Texinfo/XS/parsetexi/parser.c
+++ b/tp/Texinfo/XS/parsetexi/parser.c
@@ -704,7 +704,7 @@ merge_text (ELEMENT *current, const char *text, size_t
len_text,
char *additional_text_dbg = strndup (text, leading_spaces);
debug ("MERGE_TEXT ADD leading empty |%s| to %s",
additional_text_dbg,
- element_type_names[last_element->type]);
+ type_data[last_element->type].name);
free (additional_text_dbg);
}
text_append_n (&last_element->text, text, leading_spaces);
@@ -811,7 +811,7 @@ abort_empty_line (ELEMENT **current_inout)
debug_nonl ("ABORT EMPTY in ");
debug_parser_print_element (current, 0);
debug_nonl ("(p:%d): %s; ", in_paragraph_context (current_context
()),
- element_type_names[last_child->type]);
+ type_data[last_child->type].name);
debug_nonl ("|%s|",
last_child->text.end > 0 ? last_child->text.text : "");
debug ("");
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/XS/main/element_types.awk, tp/Texinfo/XS/main/types_data.h (TYPE_DATA): rename TYPE type as TYPE_DATA.,
Patrice Dumas <=