[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/XS/main/call_perl_function.h (FILE_N
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/Texinfo/XS/main/call_perl_function.h (FILE_NAME_PATH) (TARGET_CONTENTS_FILENAME): move to call_perl_function.h. |
|
Date: |
Tue, 31 Oct 2023 12:36:05 -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 7143a64ab0 * tp/Texinfo/XS/main/call_perl_function.h (FILE_NAME_PATH)
(TARGET_CONTENTS_FILENAME): move to call_perl_function.h.
7143a64ab0 is described below
commit 7143a64ab0792f8584ea5cc1e1306aaf69a992ad
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Tue Oct 31 17:35:52 2023 +0100
* tp/Texinfo/XS/main/call_perl_function.h (FILE_NAME_PATH)
(TARGET_CONTENTS_FILENAME): move to call_perl_function.h.
Update includes in many files.
---
ChangeLog | 7 +++++++
tp/Texinfo/XS/convert/convert_html.h | 2 ++
tp/Texinfo/XS/convert/convert_plain_texinfo.c | 2 +-
tp/Texinfo/XS/convert/convert_plain_texinfo.h | 2 +-
tp/Texinfo/XS/convert/convert_text.c | 2 +-
tp/Texinfo/XS/convert/convert_text.h | 2 +-
tp/Texinfo/XS/convert/converter.h | 4 +++-
tp/Texinfo/XS/convert/indices_in_conversion.h | 2 +-
tp/Texinfo/XS/main/build_perl_info.h | 2 ++
tp/Texinfo/XS/main/call_perl_function.h | 14 +++++++++++++-
tp/Texinfo/XS/main/convert_to_text.c | 4 +++-
tp/Texinfo/XS/main/converter_types.h | 5 -----
tp/Texinfo/XS/main/document.h | 4 +---
tp/Texinfo/XS/main/errors.c | 6 +++++-
tp/Texinfo/XS/main/errors.h | 1 -
tp/Texinfo/XS/main/get_perl_info.h | 5 +++--
tp/Texinfo/XS/main/targets.c | 1 +
tp/Texinfo/XS/main/translations.h | 2 +-
tp/Texinfo/XS/main/utils.h | 10 ----------
tp/Texinfo/XS/parsetexi/api.c | 1 -
tp/Texinfo/XS/parsetexi/close.c | 6 ++++--
tp/Texinfo/XS/parsetexi/end_line.c | 2 +-
tp/Texinfo/XS/parsetexi/handle_commands.h | 1 -
tp/Texinfo/XS/parsetexi/indices.c | 5 +++--
tp/Texinfo/XS/parsetexi/parser.h | 4 ++--
tp/Texinfo/XS/parsetexi/separator.c | 6 +++++-
tp/Texinfo/XS/structuring_transfo/structuring.c | 3 +--
tp/Texinfo/XS/structuring_transfo/structuring.h | 2 +-
tp/Texinfo/XS/structuring_transfo/transformations.c | 2 +-
tp/Texinfo/XS/structuring_transfo/transformations.h | 2 +-
30 files changed, 65 insertions(+), 46 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index db9b2eb1b6..cd0d8caccb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2023-10-31 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/XS/main/call_perl_function.h (FILE_NAME_PATH)
+ (TARGET_CONTENTS_FILENAME): move to call_perl_function.h.
+
+ Update includes in many files.
+
2023-10-31 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/Convert/HTML.pm ($XS_convert): add a variable, set to 1
diff --git a/tp/Texinfo/XS/convert/convert_html.h
b/tp/Texinfo/XS/convert/convert_html.h
index 35413ef36f..d1d84c091e 100644
--- a/tp/Texinfo/XS/convert/convert_html.h
+++ b/tp/Texinfo/XS/convert/convert_html.h
@@ -2,6 +2,8 @@
#ifndef CONVERT_HTML_H
#define CONVERT_HTML_H
+#include "converter_types.h"
+/* for FILE_SOURCE_INFO_LIST */
#include "utils.h"
void html_converter_initialize (CONVERTER *self);
diff --git a/tp/Texinfo/XS/convert/convert_plain_texinfo.c
b/tp/Texinfo/XS/convert/convert_plain_texinfo.c
index f4e1b66c2d..2afd0b6626 100644
--- a/tp/Texinfo/XS/convert/convert_plain_texinfo.c
+++ b/tp/Texinfo/XS/convert/convert_plain_texinfo.c
@@ -17,8 +17,8 @@
#include <string.h>
+#include "converter_types.h"
#include "convert_to_texinfo.h"
-#include "document.h"
#include "convert_plain_texinfo.h"
char *
diff --git a/tp/Texinfo/XS/convert/convert_plain_texinfo.h
b/tp/Texinfo/XS/convert/convert_plain_texinfo.h
index 50cc57aebf..ed17f8bfc4 100644
--- a/tp/Texinfo/XS/convert/convert_plain_texinfo.h
+++ b/tp/Texinfo/XS/convert/convert_plain_texinfo.h
@@ -2,7 +2,7 @@
#ifndef CONVERT_PLAIN_TEXINFO_H
#define CONVERT_PLAIN_TEXINFO_H
-#include "document.h"
+#include "converter_types.h"
char *plain_texinfo_convert (DOCUMENT *document);
diff --git a/tp/Texinfo/XS/convert/convert_text.c
b/tp/Texinfo/XS/convert/convert_text.c
index 1c6337bc6b..d1f6a48c95 100644
--- a/tp/Texinfo/XS/convert/convert_text.c
+++ b/tp/Texinfo/XS/convert/convert_text.c
@@ -17,8 +17,8 @@
#include <string.h>
+#include "converter_types.h"
#include "convert_to_text.h"
-#include "document.h"
#include "convert_text.h"
char *
diff --git a/tp/Texinfo/XS/convert/convert_text.h
b/tp/Texinfo/XS/convert/convert_text.h
index 532c47821d..1845daa76f 100644
--- a/tp/Texinfo/XS/convert/convert_text.h
+++ b/tp/Texinfo/XS/convert/convert_text.h
@@ -2,7 +2,7 @@
#ifndef CONVERT_TEXT_H
#define CONVERT_TEXT_H
-#include "document.h"
+#include "converter_types.h"
#include "convert_to_text.h"
char *text_convert (DOCUMENT *document, TEXT_OPTIONS *options);
diff --git a/tp/Texinfo/XS/convert/converter.h
b/tp/Texinfo/XS/convert/converter.h
index be0a7029e2..e7e8c087f8 100644
--- a/tp/Texinfo/XS/convert/converter.h
+++ b/tp/Texinfo/XS/convert/converter.h
@@ -5,8 +5,10 @@
#include <stddef.h>
#include "tree_types.h"
-#include "utils.h"
#include "command_ids.h"
+#include "converter_types.h"
+/* for TARGET_FILENAME */
+#include "utils.h"
CONVERTER *retrieve_converter (int converter_descriptor);
size_t register_converter (CONVERTER *converter);
diff --git a/tp/Texinfo/XS/convert/indices_in_conversion.h
b/tp/Texinfo/XS/convert/indices_in_conversion.h
index bf0c252020..d37ec9c755 100644
--- a/tp/Texinfo/XS/convert/indices_in_conversion.h
+++ b/tp/Texinfo/XS/convert/indices_in_conversion.h
@@ -3,7 +3,7 @@
#define INDICES_IN_CONVERSION_H
#include "tree_types.h"
-#include "utils.h"
+#include "indices_in_conversion.h"
typedef struct LETTER_SORTABLE_ENTRIES {
char *letter;
diff --git a/tp/Texinfo/XS/main/build_perl_info.h
b/tp/Texinfo/XS/main/build_perl_info.h
index 3fb9e1197b..b790c175ed 100644
--- a/tp/Texinfo/XS/main/build_perl_info.h
+++ b/tp/Texinfo/XS/main/build_perl_info.h
@@ -6,6 +6,8 @@
#include "global_commands_types.h"
#include "tree_types.h"
+#include "converter_types.h"
+/* for FILE_SOURCE_INFO_LIST and HTML_ARGS_FORMATTED */
#include "utils.h"
int init (int texinfo_uninstalled, char *srcdir_in);
diff --git a/tp/Texinfo/XS/main/call_perl_function.h
b/tp/Texinfo/XS/main/call_perl_function.h
index f9bdd91b9c..77be421f09 100644
--- a/tp/Texinfo/XS/main/call_perl_function.h
+++ b/tp/Texinfo/XS/main/call_perl_function.h
@@ -3,7 +3,19 @@
#define CALL_PERL_FUNCTION_H
#include "tree_types.h"
-#include "utils.h"
+#include "converter_types.h"
+
+typedef struct FILE_NAME_PATH {
+ char *filename;
+ char *filepath;
+} FILE_NAME_PATH;
+
+typedef struct TARGET_CONTENTS_FILENAME {
+ char *target;
+ char *filename;
+ char *target_contents;
+ char *target_shortcontents;
+} TARGET_CONTENTS_FILENAME;
char *call_nodenamenormalization_unicode_to_transliterate (char *text);
diff --git a/tp/Texinfo/XS/main/convert_to_text.c
b/tp/Texinfo/XS/main/convert_to_text.c
index e3694f7d09..bd223862cc 100644
--- a/tp/Texinfo/XS/main/convert_to_text.c
+++ b/tp/Texinfo/XS/main/convert_to_text.c
@@ -24,8 +24,10 @@
#include <stdio.h>
#include "tree_types.h"
-#include "tree.h"
#include "command_ids.h"
+#include "options_types.h"
+#include "converter_types.h"
+#include "tree.h"
#include "text.h"
#include "utils.h"
#include "convert_utils.h"
diff --git a/tp/Texinfo/XS/main/converter_types.h
b/tp/Texinfo/XS/main/converter_types.h
index 447be5e5b5..4d7e4ba42c 100644
--- a/tp/Texinfo/XS/main/converter_types.h
+++ b/tp/Texinfo/XS/main/converter_types.h
@@ -275,11 +275,6 @@ typedef struct TRANSLATED_COMMAND {
char *translation;
} TRANSLATED_COMMAND;
-typedef struct FILE_NAME_PATH {
- char *filename;
- char *filepath;
-} FILE_NAME_PATH;
-
typedef struct FILE_NAME_PATH_COUNTER {
char *filename;
char *normalized_filename;
diff --git a/tp/Texinfo/XS/main/document.h b/tp/Texinfo/XS/main/document.h
index bb043be3c9..50813cb9e5 100644
--- a/tp/Texinfo/XS/main/document.h
+++ b/tp/Texinfo/XS/main/document.h
@@ -7,10 +7,8 @@
#include "options_types.h"
#include "global_commands_types.h"
#include "tree_types.h"
-/* for ERROR_MESSAGE_LIST */
+/* for DOCUMENT ERROR_MESSAGE_LIST GLOBAL_INFO */
#include "converter_types.h"
-/* for GLOBAL_INFO */
-#include "utils.h"
typedef struct TREE_AND_STRINGS {
ELEMENT *tree;
diff --git a/tp/Texinfo/XS/main/errors.c b/tp/Texinfo/XS/main/errors.c
index 8fdede63e5..1f533edaeb 100644
--- a/tp/Texinfo/XS/main/errors.c
+++ b/tp/Texinfo/XS/main/errors.c
@@ -26,10 +26,14 @@
#include <stdio.h>
#include <string.h>
+#include "tree_types.h"
+#include "converter_types.h"
/* also for xvasprintf */
#include "text.h"
+/* for debug_output */
#include "debug.h"
-#include "converter_types.h"
+/* for fatal */
+#include "utils.h"
#include "errors.h"
diff --git a/tp/Texinfo/XS/main/errors.h b/tp/Texinfo/XS/main/errors.h
index 72c067a1fd..39ae582a22 100644
--- a/tp/Texinfo/XS/main/errors.h
+++ b/tp/Texinfo/XS/main/errors.h
@@ -6,7 +6,6 @@
#include "tree_types.h"
#include "converter_types.h"
-#include "utils.h"
void line_error (char *format, ...);
void line_warn (char *format, ...);
diff --git a/tp/Texinfo/XS/main/get_perl_info.h
b/tp/Texinfo/XS/main/get_perl_info.h
index dcb4ff50e4..409ceafd84 100644
--- a/tp/Texinfo/XS/main/get_perl_info.h
+++ b/tp/Texinfo/XS/main/get_perl_info.h
@@ -4,9 +4,10 @@
#include "options_types.h"
#include "tree_types.h"
-#include "document.h"
-#include "utils.h"
+#include "converter_types.h"
#include "convert_to_text.h"
+/* for INDEX_SORTABLE_ENTRIES */
+#include "utils.h"
DOCUMENT *get_sv_tree_document (SV *tree_in, char *warn_string);
DOCUMENT *get_sv_document_document (SV *document_in, char *warn_string);
diff --git a/tp/Texinfo/XS/main/targets.c b/tp/Texinfo/XS/main/targets.c
index 4830298313..1d0b5fc7b4 100644
--- a/tp/Texinfo/XS/main/targets.c
+++ b/tp/Texinfo/XS/main/targets.c
@@ -20,6 +20,7 @@
#include <string.h>
#include "tree_types.h"
+#include "converter_types.h"
#include "tree.h"
#include "errors.h"
#include "debug.h"
diff --git a/tp/Texinfo/XS/main/translations.h
b/tp/Texinfo/XS/main/translations.h
index bbb45f1dab..290739a81e 100644
--- a/tp/Texinfo/XS/main/translations.h
+++ b/tp/Texinfo/XS/main/translations.h
@@ -6,7 +6,7 @@
#include "options_types.h"
#include "tree_types.h"
-#include "document.h"
+#include "converter_types.h"
/* element or string may not always be present */
typedef struct NAMED_STRING_ELEMENT {
diff --git a/tp/Texinfo/XS/main/utils.h b/tp/Texinfo/XS/main/utils.h
index 2e74f009c5..3fd9949407 100644
--- a/tp/Texinfo/XS/main/utils.h
+++ b/tp/Texinfo/XS/main/utils.h
@@ -167,9 +167,6 @@ enum conversion_context {
#define HMSF_multiple_pass 0x2000
#define HMSF_translations 0x4000
-/* down here because it requires error data from before */
-#include "document.h"
-
typedef struct TRANSLATED_SUI_ASSOCIATION {
int tree_type;
int string_type;
@@ -183,13 +180,6 @@ typedef struct TARGET_FILENAME {
char *filename;
} TARGET_FILENAME;
-typedef struct TARGET_CONTENTS_FILENAME {
- char *target;
- char *filename;
- char *target_contents;
- char *target_shortcontents;
-} TARGET_CONTENTS_FILENAME;
-
typedef struct FILE_SOURCE_INFO {
char *filename;
char *type;
diff --git a/tp/Texinfo/XS/parsetexi/api.c b/tp/Texinfo/XS/parsetexi/api.c
index acec0ded23..b3fd1a1b78 100644
--- a/tp/Texinfo/XS/parsetexi/api.c
+++ b/tp/Texinfo/XS/parsetexi/api.c
@@ -40,7 +40,6 @@
/* forget_indices init_index_commands */
#include "indices.h"
#include "errors.h"
-#include "document.h"
/* for wipe_user_commands */
#include "commands.h"
#include "command_stack.h"
diff --git a/tp/Texinfo/XS/parsetexi/close.c b/tp/Texinfo/XS/parsetexi/close.c
index cf71e75adf..83fd160e28 100644
--- a/tp/Texinfo/XS/parsetexi/close.c
+++ b/tp/Texinfo/XS/parsetexi/close.c
@@ -18,11 +18,9 @@
#include <stdlib.h>
#include <string.h>
-#include "parser.h"
#include "command_ids.h"
#include "element_types.h"
#include "tree_types.h"
-#include "tree.h"
#include "def.h"
#include "debug.h"
#include "debug_parser.h"
@@ -33,6 +31,10 @@
#include "command_stack.h"
#include "context_stack.h"
#include "extra.h"
+#include "tree.h"
+/* for fatal */
+#include "utils.h"
+#include "parser.h"
/* Return CURRENT->parent. The other arguments are used if an error message
should be printed. */
diff --git a/tp/Texinfo/XS/parsetexi/end_line.c
b/tp/Texinfo/XS/parsetexi/end_line.c
index e16a1ebbd5..aea7913a8a 100644
--- a/tp/Texinfo/XS/parsetexi/end_line.c
+++ b/tp/Texinfo/XS/parsetexi/end_line.c
@@ -28,7 +28,7 @@
#include "debug.h"
#include "errors.h"
/* for isascii_alnum whitespace_chars read_flag_name
- indices_info_index_by_name ultimate_index */
+ indices_info_index_by_name ultimate_index fatal */
#include "utils.h"
/* for parse_node_manual */
#include "manipulate_tree.h"
diff --git a/tp/Texinfo/XS/parsetexi/handle_commands.h
b/tp/Texinfo/XS/parsetexi/handle_commands.h
index 467373a6c5..f41929d130 100644
--- a/tp/Texinfo/XS/parsetexi/handle_commands.h
+++ b/tp/Texinfo/XS/parsetexi/handle_commands.h
@@ -3,7 +3,6 @@
#define HANDLE_COMMANDS_H
#include "tree_types.h"
-#include "utils.h"
ELEMENT *handle_other_command (ELEMENT *current, char **line_inout,
enum command_id cmd_id, int *status,
diff --git a/tp/Texinfo/XS/parsetexi/indices.c
b/tp/Texinfo/XS/parsetexi/indices.c
index 1b558b3dc8..7c4c4bb681 100644
--- a/tp/Texinfo/XS/parsetexi/indices.c
+++ b/tp/Texinfo/XS/parsetexi/indices.c
@@ -18,11 +18,11 @@
#include <stdio.h>
#include <stdlib.h>
-#include "parser.h"
#include "options_types.h"
+#include "converter_types.h"
#include "tree_types.h"
-#include "tree.h"
#include "command_ids.h"
+#include "tree.h"
/* for xasprintf and other */
#include "errors.h"
#include "debug.h"
@@ -40,6 +40,7 @@
/*
#include "convert_to_texinfo.h"
*/
+#include "parser.h"
#include "indices.h"
INDEX **index_names = 0;
diff --git a/tp/Texinfo/XS/parsetexi/parser.h b/tp/Texinfo/XS/parsetexi/parser.h
index 82f98ee2a1..7171db9cfc 100644
--- a/tp/Texinfo/XS/parsetexi/parser.h
+++ b/tp/Texinfo/XS/parsetexi/parser.h
@@ -21,10 +21,10 @@
#include <stddef.h>
-/* for GLOBAL_INFO */
-#include "utils.h"
#include "global_commands_types.h"
#include "tree_types.h"
+/* for GLOBAL_INFO */
+#include "converter_types.h"
#include "tree.h"
#include "context_stack.h"
#include "commands.h"
diff --git a/tp/Texinfo/XS/parsetexi/separator.c
b/tp/Texinfo/XS/parsetexi/separator.c
index c0f2720991..f43db9b8ae 100644
--- a/tp/Texinfo/XS/parsetexi/separator.c
+++ b/tp/Texinfo/XS/parsetexi/separator.c
@@ -18,8 +18,9 @@
#include <string.h>
#include <stdio.h>
-#include "parser.h"
#include "tree_types.h"
+#include "element_types.h"
+#include "command_ids.h"
#include "tree.h"
#include "text.h"
#include "counter.h"
@@ -38,7 +39,10 @@
#include "commands.h"
#include "extra.h"
#include "input.h"
+/* for fatal */
+#include "utils.h"
#include "convert_to_texinfo.h"
+#include "parser.h"
ELEMENT *
handle_open_brace (ELEMENT *current, char **line_inout)
diff --git a/tp/Texinfo/XS/structuring_transfo/structuring.c
b/tp/Texinfo/XS/structuring_transfo/structuring.c
index 5617e3975f..b16897e992 100644
--- a/tp/Texinfo/XS/structuring_transfo/structuring.c
+++ b/tp/Texinfo/XS/structuring_transfo/structuring.c
@@ -24,6 +24,7 @@
#include "element_types.h"
#include "options_types.h"
#include "tree_types.h"
+#include "converter_types.h"
#include "tree.h"
#include "extra.h"
#include "errors.h"
@@ -37,10 +38,8 @@
#include "node_name_normalization.h"
#include "convert_to_texinfo.h"
#include "targets.h"
-#include "document.h"
#include "transformations.h"
#include "translations.h"
-#include "output_unit.h"
#include "structuring.h"
void
diff --git a/tp/Texinfo/XS/structuring_transfo/structuring.h
b/tp/Texinfo/XS/structuring_transfo/structuring.h
index 9ff1f33b34..df618d0625 100644
--- a/tp/Texinfo/XS/structuring_transfo/structuring.h
+++ b/tp/Texinfo/XS/structuring_transfo/structuring.h
@@ -4,7 +4,7 @@
#include "options_types.h"
#include "tree_types.h"
-#include "document.h"
+#include "converter_types.h"
void associate_internal_references (DOCUMENT *document);
ELEMENT *sectioning_structure (DOCUMENT *document);
diff --git a/tp/Texinfo/XS/structuring_transfo/transformations.c
b/tp/Texinfo/XS/structuring_transfo/transformations.c
index 95c9c4f2b9..bb4283109a 100644
--- a/tp/Texinfo/XS/structuring_transfo/transformations.c
+++ b/tp/Texinfo/XS/structuring_transfo/transformations.c
@@ -29,6 +29,7 @@
#include "element_types.h"
#include "tree_types.h"
#include "command_ids.h"
+#include "converter_types.h"
#include "text.h"
#include "tree.h"
#include "builtin_commands.h"
@@ -41,7 +42,6 @@
#include "structuring.h"
#include "convert_to_texinfo.h"
#include "targets.h"
-#include "document.h"
#include "node_name_normalization.h"
#include "transformations.h"
diff --git a/tp/Texinfo/XS/structuring_transfo/transformations.h
b/tp/Texinfo/XS/structuring_transfo/transformations.h
index 71ef827a36..bf2bff58ea 100644
--- a/tp/Texinfo/XS/structuring_transfo/transformations.h
+++ b/tp/Texinfo/XS/structuring_transfo/transformations.h
@@ -3,7 +3,7 @@
#define TRANSFORMATIONS_H
#include "tree_types.h"
-#include "document.h"
+#include "converter_types.h"
ELEMENT *fill_gaps_in_sectioning (ELEMENT *root);
void relate_index_entries_to_table_items_in_tree (ELEMENT *tree,
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/XS/main/call_perl_function.h (FILE_NAME_PATH) (TARGET_CONTENTS_FILENAME): move to call_perl_function.h.,
Patrice Dumas <=