Rename files which are #included

Author: NWilson

BUILD.bazel

@@ -20,9 +20,6 @@ copy_file(
     out = "src/pcre2_chartables.c",
 )
 
-# Removed src/pcre2_ucptables.c below because it is #included in
-# src/pcre2_tables.c. Also fixed typo: ckdint should be chkdint.
-# PH, 22-March-2023.
 cc_library(
     name = "pcre2",
     srcs = [
@@ -38,12 +35,15 @@ cc_library(
         "src/pcre2_extuni.c",
         "src/pcre2_find_bracket.c",
         "src/pcre2_jit_compile.c",
+        "src/pcre2_jit_match_inc.h",
+        "src/pcre2_jit_misc_inc.h",
         "src/pcre2_maketables.c",
         "src/pcre2_match.c",
         "src/pcre2_match_data.c",
         "src/pcre2_newline.c",
         "src/pcre2_ord2utf.c",
         "src/pcre2_pattern_info.c",
+        "src/pcre2_printint_inc.h",
         "src/pcre2_script_run.c",
         "src/pcre2_serialize.c",
         "src/pcre2_string_utils.c",
@@ -59,13 +59,11 @@ cc_library(
         "src/pcre2_internal.h",
         "src/pcre2_intmodedep.h",
         "src/pcre2_ucp.h",
+        "src/pcre2_ucptables_inc.h",
         "src/pcre2_util.h",
         ":config_h_generic",
     ],
     textual_hdrs = [
-        "src/pcre2_jit_match.c",
-        "src/pcre2_jit_misc.c",
-        "src/pcre2_ucptables.c",
     ],
     hdrs = [
         ":pcre2_h_generic",
@@ -118,7 +116,6 @@ cc_library(
     name = "pcre2test_dotc_headers",
     hdrs = [
         "src/pcre2_chkdint.c",
-        "src/pcre2_printint.c",
         "src/pcre2_tables.c",
         "src/pcre2_ucd.c",
         "src/pcre2_valid_utf.c",

Makefile.am

@@ -402,6 +402,8 @@ COMMON_SOURCES = \
   src/pcre2_intmodedep.h \
   src/pcre2_jit_char_inc.h \
   src/pcre2_jit_compile.c \
+  src/pcre2_jit_match_inc.h \
+  src/pcre2_jit_misc_inc.h \
   src/pcre2_jit_neon_inc.h \
   src/pcre2_jit_simd_inc.h \
   src/pcre2_maketables.c \
@@ -410,6 +412,7 @@ COMMON_SOURCES = \
   src/pcre2_newline.c \
   src/pcre2_ord2utf.c \
   src/pcre2_pattern_info.c \
+  src/pcre2_printint_inc.h \
   src/pcre2_script_run.c \
   src/pcre2_serialize.c \
   src/pcre2_string_utils.c \
@@ -419,14 +422,11 @@ COMMON_SOURCES = \
   src/pcre2_tables.c \
   src/pcre2_ucd.c \
   src/pcre2_ucp.h \
+  src/pcre2_ucptables_inc.h \
   src/pcre2_util.h \
   src/pcre2_valid_utf.c \
   src/pcre2_xclass.c
 
-# The pcre2_ucptables.c file is #included by pcre2_tables.c
-
-EXTRA_DIST += src/pcre2_ucptables.c
-
 if WITH_PCRE2_8
 lib_LTLIBRARIES += libpcre2-8.la
 libpcre2_8_la_SOURCES = \
@@ -518,12 +518,6 @@ EXTRA_DIST += \
   deps/sljit/sljit_src/allocator_src/sljitWXExecAllocatorPosix.c \
   deps/sljit/sljit_src/allocator_src/sljitWXExecAllocatorWindows.c
 
-# Some of the JIT sources are also in separate files that are #included.
-
-EXTRA_DIST += \
-  src/pcre2_jit_match.c \
-  src/pcre2_jit_misc.c
-
 if WITH_PCRE2_8
 libpcre2_8_la_LDFLAGS = $(EXTRA_LIBPCRE2_8_LDFLAGS)
 endif # WITH_PCRE2_8
@@ -679,12 +673,9 @@ pcre2_jit_test_LDADD += $(GCOV_LIBS)
 endif # WITH_GCOV
 endif # WITH_JIT
 
-# Build the general pcre2test program. The file src/pcre2_printint.c is
-# #included by pcre2test as many times as needed, at different code unit
-# widths.
+# Build the general pcre2test program.
 
 bin_PROGRAMS += pcre2test
-EXTRA_DIST += src/pcre2_printint.c
 pcre2test_SOURCES = src/pcre2test.c
 pcre2test_CFLAGS = $(AM_CFLAGS)
 pcre2test_LDADD = $(LIBREADLINE)

NON-AUTOTOOLS-BUILD

@@ -142,9 +142,7 @@ example.
      defined SUPPORT_JIT in src/config.h, because when JIT support is not
      configured, dummy functions are compiled. When JIT support IS configured,
      pcre2_jit_compile.c #includes other files from the sljit dependency,
-     all of whose names begin with "sljit". It also #includes
-     src/pcre2_jit_match.c and src/pcre2_jit_misc.c, so you should not compile
-     those yourself.
+     all of whose names begin with "sljit".
 
      Note also that the pcre2_fuzzsupport.c file contains special code that is
      useful to those who want to run fuzzing tests on the PCRE2 library. Unless

README

@@ -859,10 +859,8 @@ The distribution should contain the files listed below.
   src/pcre2_extuni.c         )
   src/pcre2_find_bracket.c   )
   src/pcre2_jit_compile.c    )
-  src/pcre2_jit_match.c      ) sources for the functions in the library,
-  src/pcre2_jit_misc.c       )   and some internal functions that they use
-  src/pcre2_maketables.c     )
-  src/pcre2_match.c          )
+  src/pcre2_maketables.c     ) sources for the functions in the library,
+  src/pcre2_match.c          )   and some internal functions that they use
   src/pcre2_match_data.c     )
   src/pcre2_newline.c        )
   src/pcre2_ord2utf.c        )
@@ -875,11 +873,9 @@ The distribution should contain the files listed below.
   src/pcre2_substring.c      )
   src/pcre2_tables.c         )
   src/pcre2_ucd.c            )
-  src/pcre2_ucptables.c      )
   src/pcre2_valid_utf.c      )
   src/pcre2_xclass.c         )
 
-  src/pcre2_printint.c     debugging function that is used by pcre2test,
   src/pcre2_fuzzsupport.c  function for (optional) fuzzing support
 
   src/config.h.in          template for config.h, when built by "configure"
@@ -889,9 +885,13 @@ The distribution should contain the files listed below.
   src/pcre2_internal.h     header for internal use
   src/pcre2_intmodedep.h   a mode-specific internal header
   src/pcre2_jit_char_inc.h header used by JIT
+  src/pcre2_jit_match_inc.h header used by JIT
+  src/pcre2_jit_misc_inc.h header used by JIT
   src/pcre2_jit_neon_inc.h header used by JIT
   src/pcre2_jit_simd_inc.h header used by JIT
+  src/pcre2_printint_inc.h debugging function that is used by pcre2test
   src/pcre2_ucp.h          header for Unicode property handling
+  src/pcre2_ucptables_inc.h header with Unicode data tables
   src/pcre2_util.h         header for internal utils
 
   deps/sljit/sljit_src/*   source files for the JIT compiler

doc/html/NON-AUTOTOOLS-BUILD.txt

@@ -142,9 +142,7 @@ example.
      defined SUPPORT_JIT in src/config.h, because when JIT support is not
      configured, dummy functions are compiled. When JIT support IS configured,
      pcre2_jit_compile.c #includes other files from the sljit dependency,
-     all of whose names begin with "sljit". It also #includes
-     src/pcre2_jit_match.c and src/pcre2_jit_misc.c, so you should not compile
-     those yourself.
+     all of whose names begin with "sljit".
 
      Note also that the pcre2_fuzzsupport.c file contains special code that is
      useful to those who want to run fuzzing tests on the PCRE2 library. Unless

doc/html/README.txt

@@ -859,10 +859,8 @@ The distribution should contain the files listed below.
   src/pcre2_extuni.c         )
   src/pcre2_find_bracket.c   )
   src/pcre2_jit_compile.c    )
-  src/pcre2_jit_match.c      ) sources for the functions in the library,
-  src/pcre2_jit_misc.c       )   and some internal functions that they use
-  src/pcre2_maketables.c     )
-  src/pcre2_match.c          )
+  src/pcre2_maketables.c     ) sources for the functions in the library,
+  src/pcre2_match.c          )   and some internal functions that they use
   src/pcre2_match_data.c     )
   src/pcre2_newline.c        )
   src/pcre2_ord2utf.c        )
@@ -875,11 +873,9 @@ The distribution should contain the files listed below.
   src/pcre2_substring.c      )
   src/pcre2_tables.c         )
   src/pcre2_ucd.c            )
-  src/pcre2_ucptables.c      )
   src/pcre2_valid_utf.c      )
   src/pcre2_xclass.c         )
 
-  src/pcre2_printint.c     debugging function that is used by pcre2test,
   src/pcre2_fuzzsupport.c  function for (optional) fuzzing support
 
   src/config.h.in          template for config.h, when built by "configure"
@@ -889,9 +885,13 @@ The distribution should contain the files listed below.
   src/pcre2_internal.h     header for internal use
   src/pcre2_intmodedep.h   a mode-specific internal header
   src/pcre2_jit_char_inc.h header used by JIT
+  src/pcre2_jit_match_inc.h    header used by JIT
+  src/pcre2_jit_misc_inc.h     header used by JIT
   src/pcre2_jit_neon_inc.h header used by JIT
   src/pcre2_jit_simd_inc.h header used by JIT
+  src/pcre2_printint_inc.h     debugging function that is used by pcre2test
   src/pcre2_ucp.h          header for Unicode property handling
+  src/pcre2_ucptables_inc.h    header with Unicode data tables
   src/pcre2_util.h         header for internal utils
 
   deps/sljit/sljit_src/*   source files for the JIT compiler

maint/.gitignore

@@ -2,7 +2,7 @@ ucptest
 utf8
 
 pcre2_ucp.h
-pcre2_ucptables.c
+pcre2_ucptables_inc.h
 pcre2_ucd.c
 
 testinput

maint/GenerateUcpTables.py

@@ -3,7 +3,7 @@
 #                   PCRE2 UNICODE PROPERTY SUPPORT
 #                   ------------------------------
 
-# This script generates the pcre2_ucptables.c file, which contains tables for
+# This script generates the pcre2_ucptables_inc.h file, which contains tables for
 # recognizing Unicode property names. It is #included by pcre2_tables.c. In
 # order to reduce the number of relocations when loading the PCRE2 library, the
 # names are held as a single large string, with offsets in the table. This is
@@ -60,7 +60,7 @@
 # Open the output file (no return on failure). This call also writes standard
 # header boilerplate.
 
-f = open_output("pcre2_ucptables.c")
+f = open_output("pcre2_ucptables_inc.h")
 
 # The list in bidi_classes contains just the Unicode classes such as AN, LRE,
 # etc., along with comments. We need to add "bidi" in front of each value, in
@@ -195,7 +195,7 @@ def stdnames(x):
 
 #endif /* SUPPORT_UNICODE */
 
-/* End of pcre2_ucptables.c */
+/* End of pcre2_ucptables_inc.h */
 """)
 
 f.close

maint/README

@@ -56,7 +56,7 @@ GenerateUcpHeader.py
   Unicode property values.
 
 GenerateUcpTables.py
-  A Python script that generates the file pcre2_ucptables.c from
+  A Python script that generates the file pcre2_ucptables_inc.h from
   GenerateCommon.py and Unicode data files. The generated file contains tables
   for looking up Unicode property names.
 
@@ -145,17 +145,17 @@ of supported scripts, and the command to do so is part of the documentation.
 You can give an output file name as an argument to the following scripts, but
 by default:
 
-GenerateUcd.py        creates pcre2_ucd.c        )
-GenerateUcpHeader.py  creates pcre2_ucp.h        ) in the current directory
-GenerateUcpTables.py  creates pcre2_ucptables.c  )
+GenerateUcd.py        creates pcre2_ucd.c            )
+GenerateUcpHeader.py  creates pcre2_ucp.h            ) in the current directory
+GenerateUcpTables.py  creates pcre2_ucptables_inc.h  )
 
 These files can be compared against the existing versions in the src directory
 to check on any changes before replacing the old files, but you can also
 generate directly into the final location by running:
 
 ./GenerateUcd.py       ../src/pcre2_ucd.c
 ./GenerateUcpHeader.py ../src/pcre2_ucp.h
-./GenerateUcpTables.py ../src/pcre2_ucptables.c
+./GenerateUcpTables.py ../src/pcre2_ucptables_inc.h
 
 Once the .c and .h files are in the ../src directory, the ucptest program can
 be compiled and used to check that the new tables work properly. The data files
@@ -176,7 +176,7 @@ In summary:
 ```
 ./GenerateUcd.py       ../src/pcre2_ucd.c
 ./GenerateUcpHeader.py ../src/pcre2_ucp.h
-./GenerateUcpTables.py ../src/pcre2_ucptables.c
+./GenerateUcpTables.py ../src/pcre2_ucptables_inc.h
 ./GenerateTest.py
 mv testinput ../testdata/testinput27
 mv testoutput ../testdata/testoutput27

maint/UpdateAlways

@@ -281,8 +281,8 @@ c_files=(
   src/pcre2_intmodedep.h
   src/pcre2_jit_char_inc.h
   src/pcre2_jit_compile.c
-  src/pcre2_jit_match.c
-  src/pcre2_jit_misc.c
+  src/pcre2_jit_match_inc.h
+  src/pcre2_jit_misc_inc.h
   src/pcre2_jit_neon_inc.h
   src/pcre2_jit_simd_inc.h
   src/pcre2_jit_test.c
@@ -292,7 +292,7 @@ c_files=(
   src/pcre2_newline.c
   src/pcre2_ord2utf.c
   src/pcre2_pattern_info.c
-  src/pcre2_printint.c
+  src/pcre2_printint_inc.h
   src/pcre2_script_run.c
   src/pcre2_serialize.c
   src/pcre2_string_utils.c
@@ -302,7 +302,7 @@ c_files=(
   src/pcre2_tables.c
   src/pcre2_ucd.c
   src/pcre2_ucp.h
-  src/pcre2_ucptables.c
+  src/pcre2_ucptables_inc.h
   src/pcre2_util.h
   src/pcre2_valid_utf.c
   src/pcre2_xclass.c