Rename some executable files for consistency
diff --git a/.github/codecov.yml b/.github/codecov.yml
index d27e0cc..f2a2465 100644
--- a/.github/codecov.yml
+++ b/.github/codecov.yml
@@ -33,7 +33,7 @@
- component_id: library
name: "Core library"
paths:
- - '!src/(pcre2test|pcre2grep|pcre2_jit_test|pcre2posix_test|pcre2_printint)\.c'
+ - '!src/(pcre2test|pcre2grep|pcre2jit_test|pcre2posix_test|pcre2_printint)\.c'
statuses:
- type: project
target: auto
@@ -42,7 +42,7 @@
- component_id: test_binaries
name: "Test binaries"
paths:
- - 'src/(pcre2test|pcre2grep|pcre2_jit_test|pcre2posix_test|pcre2_printint)\.c'
+ - 'src/(pcre2test|pcre2grep|pcre2jit_test|pcre2posix_test|pcre2_printint)\.c'
statuses:
- type: project
target: auto
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 901f78b..4b002c0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -42,7 +42,7 @@
run: ./RunTest
- name: Test (JIT test program)
- run: ./pcre2_jit_test
+ run: ./pcre2jit_test
- name: Test (pcre2grep test script)
run: ./RunGrepTest
@@ -82,7 +82,7 @@
run: ./RunTest
- name: Test (JIT test program)
- run: ./pcre2_jit_test
+ run: ./pcre2jit_test
- name: Test (pcre2grep test script)
run: ./RunGrepTest
@@ -373,14 +373,14 @@
llvm-cov-$LLVM_VER show \
-format=html -output-dir=coverage-report -show-line-counts-or-regions -show-branches=percent \
-instr-profile=coverage.profdata \
- ./pcre2test -object ./pcre2grep -object ./pcre2posix_test -object ./pcre2_jit_test \
+ ./pcre2test -object ./pcre2grep -object ./pcre2posix_test -object ./pcre2jit_test \
../src/ ./
# Output LCOV-compatible output, for downstream tools
llvm-cov-$LLVM_VER export \
-format=lcov \
-instr-profile=coverage.profdata \
- ./pcre2test -object ./pcre2grep -object ./pcre2posix_test -object ./pcre2_jit_test \
+ ./pcre2test -object ./pcre2grep -object ./pcre2posix_test -object ./pcre2jit_test \
../src/ ./ \
> ./coverage-lcov.info
@@ -388,7 +388,7 @@
echo '```' > "$GITHUB_STEP_SUMMARY"
llvm-cov-$LLVM_VER report \
-instr-profile=coverage.profdata \
- ./pcre2test -object ./pcre2grep -object ./pcre2posix_test -object ./pcre2_jit_test \
+ ./pcre2test -object ./pcre2grep -object ./pcre2posix_test -object ./pcre2jit_test \
../src/ ./ \
>> "$GITHUB_STEP_SUMMARY"
echo '```' >> "$GITHUB_STEP_SUMMARY"
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
index a405bde..29e15da 100644
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@@ -43,7 +43,7 @@
run: ./RunTest
- name: Test (JIT test program)
- run: ./pcre2_jit_test
+ run: ./pcre2jit_test
- name: Test (pcre2grep test script)
run: ./RunGrepTest
@@ -80,7 +80,7 @@
./RunTest
- name: Test (JIT test program)
- run: ./pcre2_jit_test
+ run: ./pcre2jit_test
- name: Test (pcre2grep test script)
run: ./RunGrepTest
diff --git a/.gitignore b/.gitignore
index a23d6aa..8ac4e90 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,11 +40,11 @@
ltmain.sh
missing
pcre2-config
-pcre2_dftables
-pcre2_jit_test
-pcre2_jit_test.exe
-pcre2_jit_test.log
-pcre2_jit_test.trs
+pcre2dftables
+pcre2jit_test
+pcre2jit_test.exe
+pcre2jit_test.log
+pcre2jit_test.trs
pcre2posix_test
pcre2posix_test.exe
pcre2posix_test.log
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 10bbf2e..fb244f5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -693,12 +693,12 @@
# Character table generation
if(REBUILD_CHARTABLES)
- add_executable(pcre2_dftables src/pcre2_dftables.c)
+ add_executable(pcre2dftables src/pcre2dftables.c)
add_custom_command(
OUTPUT ${PROJECT_BINARY_DIR}/pcre2_chartables.c
- COMMAND pcre2_dftables
+ COMMAND pcre2dftables
ARGS ${PROJECT_BINARY_DIR}/pcre2_chartables.c
- DEPENDS pcre2_dftables
+ DEPENDS pcre2dftables
COMMENT "Generating character tables (pcre2_chartables.c) for current locale"
VERBATIM
)
@@ -1140,18 +1140,18 @@
endif()
if(PCRE2_SUPPORT_JIT)
- add_executable(pcre2_jit_test src/pcre2_jit_test.c)
- set(PCRE2_JIT_TEST_LIBS)
+ add_executable(pcre2jit_test src/pcre2jit_test.c)
+ set(PCRE2JIT_TEST_LIBS)
if(PCRE2_BUILD_PCRE2_8)
- list(APPEND PCRE2_JIT_TEST_LIBS pcre2-8)
+ list(APPEND PCRE2JIT_TEST_LIBS pcre2-8)
endif()
if(PCRE2_BUILD_PCRE2_16)
- list(APPEND PCRE2_JIT_TEST_LIBS pcre2-16)
+ list(APPEND PCRE2JIT_TEST_LIBS pcre2-16)
endif()
if(PCRE2_BUILD_PCRE2_32)
- list(APPEND PCRE2_JIT_TEST_LIBS pcre2-32)
+ list(APPEND PCRE2JIT_TEST_LIBS pcre2-32)
endif()
- target_link_libraries(pcre2_jit_test ${PCRE2_JIT_TEST_LIBS})
+ target_link_libraries(pcre2jit_test ${PCRE2JIT_TEST_LIBS})
endif()
# =================================================
@@ -1268,7 +1268,7 @@
# Changed to accommodate testing whichever location was just built
if(PCRE2_SUPPORT_JIT)
- add_test(pcre2_jit_test pcre2_jit_test)
+ add_test(pcre2jit_test pcre2jit_test)
endif()
if(PCRE2_BUILD_PCRE2_8)
diff --git a/Makefile.am b/Makefile.am
index 0700a35..5ffe6ed 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -251,8 +251,8 @@
# we list them here.
CLEANFILES = \
- pcre2_dftables \
- pcre2_jit_test \
+ pcre2dftables \
+ pcre2jit_test \
pcre2fuzzcheck-8 \
pcre2fuzzcheck-16 \
pcre2fuzzcheck-32 \
@@ -349,18 +349,18 @@
bin_SCRIPTS = pcre2-config
## ---------------------------------------------------------------
-## The pcre2_dftables program is used to rebuild character tables before
+## The pcre2dftables program is used to rebuild character tables before
## compiling PCRE2, if --enable-rebuild-chartables is specified. It is not an
## installed program. The default (when --enable-rebuild-chartables is not
## specified) is to copy a distributed set of tables that are defined for ASCII
-## code. In this case, pcre2_dftables is not needed.
+## code. In this case, pcre2dftables is not needed.
if WITH_REBUILD_CHARTABLES
-noinst_PROGRAMS += pcre2_dftables
-pcre2_dftables_SOURCES = src/pcre2_dftables.c
-src/pcre2_chartables.c: pcre2_dftables$(EXEEXT)
+noinst_PROGRAMS += pcre2dftables
+pcre2dftables_SOURCES = src/pcre2dftables.c
+src/pcre2_chartables.c: pcre2dftables$(EXEEXT)
rm -f $@
- ./pcre2_dftables$(EXEEXT) $@
+ ./pcre2dftables$(EXEEXT) $@
else
if WITH_EBCDIC
if WITH_EBCDIC_NL25
@@ -562,7 +562,7 @@
if WITH_PCRE2_8
lib_LTLIBRARIES += libpcre2-posix.la
-libpcre2_posix_la_SOURCES = src/pcre2posix.c
+libpcre2_posix_la_SOURCES = src/pcre2posix.c # XXX RENAME to _posix.c?
libpcre2_posix_la_CFLAGS = \
-DPCRE2_CODE_UNIT_WIDTH=8 @PCRE2POSIX_CFLAG@ \
$(VISIBILITY_CFLAGS) $(AM_CFLAGS)
@@ -659,23 +659,23 @@
## If JIT support is enabled, arrange for the JIT test program to run.
if WITH_JIT
-TESTS += pcre2_jit_test
-noinst_PROGRAMS += pcre2_jit_test
-pcre2_jit_test_SOURCES = src/pcre2_jit_test.c
-pcre2_jit_test_CFLAGS = $(AM_CFLAGS)
-pcre2_jit_test_LDADD =
+TESTS += pcre2jit_test
+noinst_PROGRAMS += pcre2jit_test
+pcre2jit_test_SOURCES = src/pcre2jit_test.c
+pcre2jit_test_CFLAGS = $(AM_CFLAGS)
+pcre2jit_test_LDADD =
if WITH_PCRE2_8
-pcre2_jit_test_LDADD += libpcre2-8.la
+pcre2jit_test_LDADD += libpcre2-8.la
endif # WITH_PCRE2_8
if WITH_PCRE2_16
-pcre2_jit_test_LDADD += libpcre2-16.la
+pcre2jit_test_LDADD += libpcre2-16.la
endif # WITH_PCRE2_16
if WITH_PCRE2_32
-pcre2_jit_test_LDADD += libpcre2-32.la
+pcre2jit_test_LDADD += libpcre2-32.la
endif # WITH_PCRE2_32
if WITH_GCOV
-pcre2_jit_test_CFLAGS += $(GCOV_CFLAGS)
-pcre2_jit_test_LDADD += $(GCOV_LIBS)
+pcre2jit_test_CFLAGS += $(GCOV_CFLAGS)
+pcre2jit_test_LDADD += $(GCOV_LIBS)
endif # WITH_GCOV
endif # WITH_JIT
diff --git a/NON-AUTOTOOLS-BUILD b/NON-AUTOTOOLS-BUILD
index d60e425..15ac623 100644
--- a/NON-AUTOTOOLS-BUILD
+++ b/NON-AUTOTOOLS-BUILD
@@ -85,13 +85,13 @@
src/pcre2_chartables.c.
OR:
- Compile src/pcre2_dftables.c as a stand-alone program (using
+ Compile src/pcre2dftables.c as a stand-alone program (using
-DHAVE_CONFIG_H if you have set up src/config.h), and then run it with
the single argument "src/pcre2_chartables.c". This generates a set of
standard character tables and writes them to that file. The tables are
generated using the default C locale for your system. If you want to use
a locale that is specified by LC_xxx environment variables, add the -L
- option to the pcre2_dftables command. You must use this method if you
+ option to the pcre2dftables command. You must use this method if you
are building on a system that uses EBCDIC code.
The tables in src/pcre2_chartables.c are defaults. The caller of PCRE2 can
@@ -194,7 +194,7 @@
(10) If you have built PCRE2 with SUPPORT_JIT, the JIT features can be tested
by running pcre2test with the -jit option. This is done automatically by
the RunTest script. You might also like to build and run the freestanding
- JIT test program, src/pcre2_jit_test.c.
+ JIT test program, src/pcre2jit_test.c.
(11) The pcre2test program tests the POSIX wrapper library, but there is also a
freestanding test program in src/pcre2posix_test.c. It must be linked with
@@ -416,7 +416,7 @@
4. Run RunTest.bat. Test outputs will automatically be compared to expected
results, and discrepancies will be identified in the console output.
-To independently test the just-in-time compiler, run pcre2_jit_test.exe.
+To independently test the just-in-time compiler, run pcre2jit_test.exe.
Building PCRE2 on native z/OS and z/VM
diff --git a/README b/README
index a7479c9..f0957c3 100644
--- a/README
+++ b/README
@@ -298,7 +298,7 @@
--enable-rebuild-chartables
- a program called pcre2_dftables is compiled and run in the default C locale
+ a program called pcre2dftables is compiled and run in the default C locale
when you obey "make". It builds a source file called pcre2_chartables.c. If
you do not specify this option, pcre2_chartables.c is created as a copy of
pcre2_chartables.c.dist. See "Character tables" below for further
@@ -468,7 +468,7 @@
Once "configure" has run, you can run "make". This builds whichever of the
libraries libpcre2-8, libpcre2-16 and libpcre2-32 are configured, and a test
program called pcre2test. If you enabled JIT support with --enable-jit, another
-test program called pcre2_jit_test is built as well. If the 8-bit library is
+test program called pcre2jit_test is built as well. If the 8-bit library is
built, libpcre2-posix, pcre2posix_test, and the pcre2grep command are also
built. Running "make" with the -j option may speed up compilation on
multiprocessor systems.
@@ -592,10 +592,10 @@
You can specify CC and CFLAGS in the normal way to the "configure" command, in
order to cross-compile PCRE2 for some other host. However, you should NOT
-specify --enable-rebuild-chartables, because if you do, the pcre2_dftables.c
+specify --enable-rebuild-chartables, because if you do, the pcre2dftables.c
source file is compiled and run on the local host, in order to generate the
inbuilt character tables (the pcre2_chartables.c file). This will probably not
-work, because pcre2_dftables.c needs to be compiled with the local compiler,
+work, because pcre2dftables.c needs to be compiled with the local compiler,
not the cross compiler.
When --enable-rebuild-chartables is not specified, pcre2_chartables.c is
@@ -604,7 +604,7 @@
not be a problem.
If you need to modify the character tables when cross-compiling, you should
-move pcre2_chartables.c.dist out of the way, then compile pcre2_dftables.c by
+move pcre2_chartables.c.dist out of the way, then compile pcre2dftables.c by
hand and run it on the local host to make a new version of
pcre2_chartables.c.dist. See the pcre2build section "Creating character tables
at build time" for more details.
@@ -630,7 +630,7 @@
There is another script called RunGrepTest that tests the pcre2grep command.
When the 8-bit library is built, a test program for the POSIX wrapper, called
pcre2posix_test, is compiled, and when JIT support is enabled, a test program
-called pcre2_jit_test is built. The scripts and the program tests are all run
+called pcre2jit_test is built. The scripts and the program tests are all run
when you obey "make check". For other environments, see the instructions in
NON-AUTOTOOLS-BUILD.
@@ -781,7 +781,7 @@
By default, this is created as a copy of pcre2_chartables.c.dist, which
contains tables for ASCII coding. However, if --enable-rebuild-chartables is
specified for ./configure, a new version of pcre2_chartables.c is built by the
-program pcre2_dftables (compiled from pcre2_dftables.c), which uses the ANSI C
+program pcre2dftables (compiled from pcre2dftables.c), which uses the ANSI C
character handling functions such as isalnum(), isalpha(), isupper(),
islower(), etc. to build the table sources. This means that the default C
locale that is set for your system will control the contents of these default
@@ -791,15 +791,15 @@
move pcre2_chartables.c.dist out of the way and replace it with your customized
tables.
-When the pcre2_dftables program is run as a result of specifying
+When the pcre2dftables program is run as a result of specifying
--enable-rebuild-chartables, it uses the default C locale that is set on your
system. It does not pay attention to the LC_xxx environment variables. In other
words, it uses the system's default locale rather than whatever the compiling
user happens to have set. If you really do want to build a source set of
character tables in a locale that is specified by the LC_xxx variables, you can
-run the pcre2_dftables program by hand with the -L option. For example:
+run the pcre2dftables program by hand with the -L option. For example:
- ./pcre2_dftables -L pcre2_chartables.c.special
+ ./pcre2dftables -L pcre2_chartables.c.special
The second argument names the file where the source code for the tables is
written. The first two 256-byte tables provide lower casing and case flipping
@@ -815,7 +815,7 @@
8 decimal digit
16 alphanumeric or '_'
-You can also specify -b (with or without -L) when running pcre2_dftables. This
+You can also specify -b (with or without -L) when running pcre2dftables. This
causes the tables to be written in binary instead of as source code. A set of
binary tables can be loaded into memory by an application and passed to
pcre2_compile() in the same way as tables created dynamically by calling
@@ -835,7 +835,7 @@
(A) Source files for the PCRE2 library functions and their headers are found in
the src directory:
- src/pcre2_dftables.c auxiliary program for building pcre2_chartables.c
+ src/pcre2dftables.c auxiliary program for building pcre2_chartables.c
when --enable-rebuild-chartables is specified
src/pcre2_chartables.c.dist a default set of character tables that assume
@@ -901,7 +901,7 @@
src/pcre2demo.c simple demonstration of coding calls to PCRE2
src/pcre2grep.c source of a grep utility that uses PCRE2
src/pcre2test.c comprehensive test program
- src/pcre2_jit_test.c JIT test program
+ src/pcre2jit_test.c JIT test program
src/pcre2posix_test.c POSIX wrapper API test program
(C) Auxiliary files:
diff --git a/doc/html/NON-AUTOTOOLS-BUILD.txt b/doc/html/NON-AUTOTOOLS-BUILD.txt
index d60e425..d8d60b1 100644
--- a/doc/html/NON-AUTOTOOLS-BUILD.txt
+++ b/doc/html/NON-AUTOTOOLS-BUILD.txt
@@ -194,7 +194,7 @@
(10) If you have built PCRE2 with SUPPORT_JIT, the JIT features can be tested
by running pcre2test with the -jit option. This is done automatically by
the RunTest script. You might also like to build and run the freestanding
- JIT test program, src/pcre2_jit_test.c.
+ JIT test program, src/pcre2jit_test.c.
(11) The pcre2test program tests the POSIX wrapper library, but there is also a
freestanding test program in src/pcre2posix_test.c. It must be linked with
@@ -416,7 +416,7 @@
4. Run RunTest.bat. Test outputs will automatically be compared to expected
results, and discrepancies will be identified in the console output.
-To independently test the just-in-time compiler, run pcre2_jit_test.exe.
+To independently test the just-in-time compiler, run pcre2jit_test.exe.
Building PCRE2 on native z/OS and z/VM
diff --git a/doc/pcre2_set_character_tables.3 b/doc/pcre2_set_character_tables.3
index b95d087..f71754a 100644
--- a/doc/pcre2_set_character_tables.3
+++ b/doc/pcre2_set_character_tables.3
@@ -18,7 +18,7 @@
context. The second argument must point to a set of PCRE2 character tables or
be NULL to request the default tables. The result is always zero. Character
tables can be created by calling \fBpcre2_maketables()\fP or by running the
-\fBpcre2_dftables\fP maintenance command in binary mode (see the
+\fBpcre2dftables\fP maintenance command in binary mode (see the
.\" HREF
\fBpcre2build\fP
.\"
diff --git a/doc/pcre2api.3 b/doc/pcre2api.3
index f57c628..c8decbe 100644
--- a/doc/pcre2api.3
+++ b/doc/pcre2api.3
@@ -2340,7 +2340,7 @@
different program or on another computer. The size of the tables (number of
bytes) must be obtained by calling \fBpcre2_config()\fP with the
PCRE2_CONFIG_TABLES_LENGTH option because \fBpcre2_maketables()\fP does not
-return this value. Note that the \fBpcre2_dftables\fP program, which is part of
+return this value. Note that the \fBpcre2dftables\fP program, which is part of
the PCRE2 build system, can be used stand-alone to create a file that contains
a set of binary tables. See the
.\" HTML <a href="pcre2build.html#createtables">
diff --git a/doc/pcre2build.3 b/doc/pcre2build.3
index 990e84f..461aace 100644
--- a/doc/pcre2build.3
+++ b/doc/pcre2build.3
@@ -356,25 +356,25 @@
--enable-rebuild-chartables
.sp
to the \fBconfigure\fP command, the distributed tables are no longer used.
-Instead, a program called \fBpcre2_dftables\fP is compiled and run. This
+Instead, a program called \fBpcre2dftables\fP is compiled and run. This
outputs the source for new set of tables, created in the default locale of your
C run-time system. This method of replacing the tables does not work if you are
-cross compiling, because \fBpcre2_dftables\fP needs to be run on the local
+cross compiling, because \fBpcre2dftables\fP needs to be run on the local
host and therefore not compiled with the cross compiler.
.P
If you need to create alternative tables when cross compiling, you will have to
do so "by hand". There may also be other reasons for creating tables manually.
-To cause \fBpcre2_dftables\fP to be built on the local host, run a normal
+To cause \fBpcre2dftables\fP to be built on the local host, run a normal
compiling command, and then run the program with the output file as its
argument, for example:
.sp
- cc src/pcre2_dftables.c -o pcre2_dftables
- ./pcre2_dftables src/pcre2_chartables.c
+ cc src/pcre2dftables.c -o pcre2dftables
+ ./pcre2dftables src/pcre2_chartables.c
.sp
This builds the tables in the default locale of the local host. If you want to
specify a locale, you must use the -L option:
.sp
- LC_ALL=fr_FR ./pcre2_dftables -L src/pcre2_chartables.c
+ LC_ALL=fr_FR ./pcre2dftables -L src/pcre2_chartables.c
.sp
You can also specify -b (with or without -L). This causes the tables to be
written in binary instead of as source code. A set of binary tables can be
diff --git a/doc/pcre2test.1 b/doc/pcre2test.1
index dece4f0..d54ce5e 100644
--- a/doc/pcre2test.1
+++ b/doc/pcre2test.1
@@ -349,7 +349,7 @@
.sp
This command is used to load a set of binary character tables that can be
accessed by the tables=3 qualifier. Such tables can be created by the
-\fBpcre2_dftables\fP program with the -b option.
+\fBpcre2dftables\fP program with the -b option.
.sp
#newline_default [<newline-list>]
.sp
diff --git a/maint/ManyConfigTests b/maint/ManyConfigTests
index 0c5203e..3a7c908 100755
--- a/maint/ManyConfigTests
+++ b/maint/ManyConfigTests
@@ -159,7 +159,7 @@
runtest()
{
- rm -f $srcdir/pcre2test $srcdir/pcre2grep $srcdir/pcre2_jit_test $srcdir/pcre2posix_test
+ rm -f $srcdir/pcre2test $srcdir/pcre2grep $srcdir/pcre2jit_test $srcdir/pcre2posix_test
testcount=`expr $testcount + 1`
if [ "$opts" = "" ] ; then
@@ -260,7 +260,7 @@
echo "Skipping JIT regression tests: tests not supported on EBCDIC"
else
echo "Running JIT regression tests $withvalgrind"
- $jrvalgrind ./pcre2_jit_test >teststdoutM 2>teststderrM
+ $jrvalgrind ./pcre2jit_test >teststdoutM 2>teststderrM
if [ $? -ne 0 -o -s teststderrM ]; then
echo " "
echo "**** Test failed ****"
diff --git a/maint/UpdateAlways b/maint/UpdateAlways
index 20fd150..7e835c3 100755
--- a/maint/UpdateAlways
+++ b/maint/UpdateAlways
@@ -272,7 +272,7 @@
src/pcre2_context.c
src/pcre2_convert.c
src/pcre2_dfa_match.c
- src/pcre2_dftables.c
+ src/pcre2dftables.c
src/pcre2_error.c
src/pcre2_extuni.c
src/pcre2_find_bracket.c
@@ -285,7 +285,7 @@
src/pcre2_jit_misc.c
src/pcre2_jit_neon_inc.h
src/pcre2_jit_simd_inc.h
- src/pcre2_jit_test.c
+ src/pcre2jit_test.c
src/pcre2_maketables.c
src/pcre2_match.c
src/pcre2_match_data.c
diff --git a/maint/manifest-tarball b/maint/manifest-tarball
index 33cb190..72a46e8 100644
--- a/maint/manifest-tarball
+++ b/maint/manifest-tarball
@@ -316,7 +316,7 @@
-rw-r--r-- tarball-dir/pcre2-SNAPSHOT/src/pcre2_context.c
-rw-r--r-- tarball-dir/pcre2-SNAPSHOT/src/pcre2_convert.c
-rw-r--r-- tarball-dir/pcre2-SNAPSHOT/src/pcre2_dfa_match.c
--rw-r--r-- tarball-dir/pcre2-SNAPSHOT/src/pcre2_dftables.c
+-rw-r--r-- tarball-dir/pcre2-SNAPSHOT/src/pcre2dftables.c
-rw-r--r-- tarball-dir/pcre2-SNAPSHOT/src/pcre2_error.c
-rw-r--r-- tarball-dir/pcre2-SNAPSHOT/src/pcre2_extuni.c
-rw-r--r-- tarball-dir/pcre2-SNAPSHOT/src/pcre2_find_bracket.c
@@ -329,7 +329,7 @@
-rw-r--r-- tarball-dir/pcre2-SNAPSHOT/src/pcre2_jit_misc.c
-rw-r--r-- tarball-dir/pcre2-SNAPSHOT/src/pcre2_jit_neon_inc.h
-rw-r--r-- tarball-dir/pcre2-SNAPSHOT/src/pcre2_jit_simd_inc.h
--rw-r--r-- tarball-dir/pcre2-SNAPSHOT/src/pcre2_jit_test.c
+-rw-r--r-- tarball-dir/pcre2-SNAPSHOT/src/pcre2jit_test.c
-rw-r--r-- tarball-dir/pcre2-SNAPSHOT/src/pcre2_maketables.c
-rw-r--r-- tarball-dir/pcre2-SNAPSHOT/src/pcre2_match.c
-rw-r--r-- tarball-dir/pcre2-SNAPSHOT/src/pcre2_match_data.c
diff --git a/src/pcre2_chartables.c.dist b/src/pcre2_chartables.c.dist
index 29f9200..55d3aa5 100644
--- a/src/pcre2_chartables.c.dist
+++ b/src/pcre2_chartables.c.dist
@@ -2,7 +2,7 @@
* Perl-Compatible Regular Expressions *
*************************************************/
-/* This file was automatically written by the pcre2_dftables auxiliary
+/* This file was automatically written by the pcre2dftables auxiliary
program. It contains character tables that are used when no external
tables are passed to PCRE2 by the application that calls it. The tables
are used only for characters whose code values are less than 256, and
@@ -13,10 +13,10 @@
/* The pcre2_ftables program (which is distributed with PCRE2) can be used
to build alternative versions of this file. This is necessary if you are
running in an EBCDIC environment, or if you want to default to a different
-encoding, for example ISO-8859-1. When pcre2_dftables is run, it creates
+encoding, for example ISO-8859-1. When pcre2dftables is run, it creates
these tables in the "C" locale by default. This happens automatically if
PCRE2 is configured with --enable-rebuild-chartables. However, you can run
-pcre2_dftables manually with the -L option to build tables using the LC_ALL
+pcre2dftables manually with the -L option to build tables using the LC_ALL
locale. */
#include "pcre2_internal.h"
diff --git a/src/pcre2_internal.h b/src/pcre2_internal.h
index b6f05b1..e614be4 100644
--- a/src/pcre2_internal.h
+++ b/src/pcre2_internal.h
@@ -68,7 +68,7 @@
abandoned, but trying to include a non-existent file seems cleanest. Otherwise
there will be many irrelevant consequential errors. */
-#if (!defined PCRE2_PCRE2TEST && !defined PCRE2_DFTABLES) && \
+#if (!defined PCRE2_PCRE2TEST && !defined PCRE2_PCRE2DFTABLES) && \
(!defined PCRE2_CODE_UNIT_WIDTH || \
(PCRE2_CODE_UNIT_WIDTH != 8 && \
PCRE2_CODE_UNIT_WIDTH != 16 && \
diff --git a/src/pcre2_jit_compile.c b/src/pcre2_jit_compile.c
index 19672c9..fa5f060 100644
--- a/src/pcre2_jit_compile.c
+++ b/src/pcre2_jit_compile.c
@@ -14047,7 +14047,7 @@
2. Replace PCRE2_JIT_INVALID_UTF with a local flag in this module.
- 3. Replace PCRE2_JIT_INVALID_UTF in pcre2_jit_test.c.
+ 3. Replace PCRE2_JIT_INVALID_UTF in pcre2jit_test.c.
4. Delete the following short block of code. The setting of "re" and
"functions" can be moved into the JIT-only block below, but if that is
diff --git a/src/pcre2_maketables.c b/src/pcre2_maketables.c
index 0f6c511..99f9fef 100644
--- a/src/pcre2_maketables.c
+++ b/src/pcre2_maketables.c
@@ -42,11 +42,11 @@
/* This module contains the external function pcre2_maketables(), which builds
character tables for PCRE2 in the current locale. The file is compiled on its
own as part of the PCRE2 library. It is also included in the compilation of
-pcre2_dftables.c as a freestanding program, in which case the macro
-PCRE2_DFTABLES is defined. */
+pcre2dftables.c as a freestanding program, in which case the macro
+PCRE2_PCRE2DFTABLES is defined. */
-#ifndef PCRE2_DFTABLES /* Compiling the library */
+#ifndef PCRE2_PCRE2DFTABLES /* Compiling the library */
#include "pcre2_internal.h"
#endif
@@ -60,23 +60,23 @@
a pointer to them. They are build using the ctype functions, and consequently
their contents will depend upon the current locale setting. When compiled as
part of the library, the store is obtained via a general context malloc, if
-supplied, but when PCRE2_DFTABLES is defined (when compiling the pcre2_dftables
-freestanding auxiliary program) malloc() is used, and the function has a
-different name so as not to clash with the prototype in pcre2.h.
+supplied, but when PCRE2_PCRE2DFTABLES is defined (when compiling the
+pcre2dftables freestanding auxiliary program) malloc() is used, and the function
+has a different name so as not to clash with the prototype in pcre2.h.
-Arguments: pointers to character-transforming functions when PCRE2_DFTABLES is
- defined;
+Arguments: pointers to character-transforming functions when
+ PCRE2_PCRE2DFTABLES is defined;
else a PCRE2 general context or NULL
Returns: pointer to the contiguous block of data;
else NULL if memory allocation failed
*/
-#ifdef PCRE2_DFTABLES /* Included in freestanding pcre2_dftables program */
+#ifdef PCRE2_PCRE2DFTABLES /* Included in freestanding pcre2dftables program */
static const uint8_t *maketables(int (*charfn_to)(int), int (*charfn_from)(int))
{
uint8_t *yield = (uint8_t *)malloc(TABLES_LENGTH);
-#else /* Not PCRE2_DFTABLES, that is, compiling the library */
+#else /* Not PCRE2_PCRE2DFTABLES, that is, compiling the library */
PCRE2_EXP_DEFN const uint8_t * PCRE2_CALL_CONVENTION
pcre2_maketables(pcre2_general_context *gcontext)
{
@@ -86,7 +86,7 @@
#define charfn_to(c) (c)
#define charfn_from(c) (c)
-#endif /* PCRE2_DFTABLES */
+#endif /* PCRE2_PCRE2DFTABLES */
int i;
uint8_t *p;
@@ -160,7 +160,7 @@
return yield;
}
-#ifndef PCRE2_DFTABLES /* Compiling the library */
+#ifndef PCRE2_PCRE2DFTABLES /* Compiling the library */
#undef charfn_to
#undef charfn_from
diff --git a/src/pcre2_dftables.c b/src/pcre2dftables.c
similarity index 92%
rename from src/pcre2_dftables.c
rename to src/pcre2dftables.c
index 1d19870..1f59660 100644
--- a/src/pcre2_dftables.c
+++ b/src/pcre2dftables.c
@@ -55,7 +55,7 @@
#include <locale.h>
/* For pcre2_internal.h, pcre2_maketables.c, pcre2_tables.c */
-#define PCRE2_DFTABLES
+#define PCRE2_PCRE2DFTABLES
/* For pcre2_tables.c */
#define PRIV(name) name
@@ -99,7 +99,7 @@
usage(void)
{
(void)fprintf(stderr,
- "Usage: pcre2_dftables [options] <output file>\n"
+ "Usage: pcre2dftables [options] <output file>\n"
" -b Write output in binary (default is source code)\n"
" -L Use locale from LC_ALL (default is \"C\" locale)\n"
#ifdef EBCDIC
@@ -143,7 +143,7 @@
{
if (setlocale(LC_ALL, "") == NULL)
{
- (void)fprintf(stderr, "pcre2_dftables: setlocale() failed\n");
+ (void)fprintf(stderr, "pcre2dftables: setlocale() failed\n");
return 1;
}
env = getenv("LC_ALL");
@@ -172,14 +172,14 @@
else
{
- (void)fprintf(stderr, "pcre2_dftables: unrecognized option %s\n", arg);
+ (void)fprintf(stderr, "pcre2dftables: unrecognized option %s\n", arg);
return 1;
}
}
if (i != argc - 1)
{
- (void)fprintf(stderr, "pcre2_dftables: one filename argument is required\n");
+ (void)fprintf(stderr, "pcre2dftables: one filename argument is required\n");
return 1;
}
@@ -191,7 +191,7 @@
f = fopen(argv[i], "wb");
if (f == NULL)
{
- fprintf(stderr, "pcre2_dftables: failed to open %s for writing\n", argv[1]);
+ fprintf(stderr, "pcre2dftables: failed to open %s for writing\n", argv[1]);
return 1;
}
@@ -203,7 +203,7 @@
size_t len = fwrite(tables, 1, TABLES_LENGTH, f);
if (len != TABLES_LENGTH)
{
- (void)fprintf(stderr, "pcre2_dftables: fwrite() returned wrong length %d "
+ (void)fprintf(stderr, "pcre2dftables: fwrite() returned wrong length %d "
"instead of %d\n", (int)len, TABLES_LENGTH);
yield = 1;
}
@@ -220,7 +220,7 @@
"/*************************************************\n"
"* Perl-Compatible Regular Expressions *\n"
"*************************************************/\n\n"
- "/* This file was automatically written by the pcre2_dftables auxiliary\n"
+ "/* This file was automatically written by the pcre2dftables auxiliary\n"
"program. It contains character tables that are used when no external\n"
"tables are passed to PCRE2 by the application that calls it. The tables\n"
"are used only for characters whose code values are less than 256, and\n"
@@ -233,10 +233,10 @@
"/* The pcre2_ftables program (which is distributed with PCRE2) can be used\n"
"to build alternative versions of this file. This is necessary if you are\n"
"running in an EBCDIC environment, or if you want to default to a different\n"
- "encoding, for example ISO-8859-1. When pcre2_dftables is run, it creates\n"
+ "encoding, for example ISO-8859-1. When pcre2dftables is run, it creates\n"
"these tables in the \"C\" locale by default. This happens automatically if\n"
"PCRE2 is configured with --enable-rebuild-chartables. However, you can run\n"
- "pcre2_dftables manually with the -L option to build tables using the LC_ALL\n"
+ "pcre2dftables manually with the -L option to build tables using the LC_ALL\n"
"locale. */\n\n");
(void)fprintf(f,
@@ -323,4 +323,4 @@
return 0;
}
-/* End of pcre2_dftables.c */
+/* End of pcre2dftables.c */
diff --git a/src/pcre2_jit_test.c b/src/pcre2jit_test.c
similarity index 99%
rename from src/pcre2_jit_test.c
rename to src/pcre2jit_test.c
index f344b62..53c3177 100644
--- a/src/pcre2_jit_test.c
+++ b/src/pcre2jit_test.c
@@ -112,7 +112,7 @@
pcre2_config_32(PCRE2_CONFIG_JIT, &jit);
#endif
if (!jit) {
- printf("JIT must be enabled to run pcre2_jit_test\n");
+ printf("JIT must be enabled to run pcre2jit_test\n");
return 1;
}
return regression_tests()
@@ -1239,7 +1239,7 @@
/* This test compares the behaviour of interpreter and JIT. Although disabling
utf or ucp may make tests fail, if the pcre2_match result is the SAME, it is
- still considered successful from pcre2_jit_test point of view. */
+ still considered successful from pcre2jit_test point of view. */
#if defined SUPPORT_PCRE2_8
pcre2_config_8(PCRE2_CONFIG_JITTARGET, &cpu_info);
@@ -2542,4 +2542,4 @@
#endif /* SUPPORT_UNICODE && SUPPORT_PCRE2_32 */
-/* End of pcre2_jit_test.c */
+/* End of pcre2jit_test.c */
