ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-09 10:39:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename regex_pcre2 to regex_pcre.

Browse Source
This commit is contained in:
Sadie Powell 2021-11-14 23:47:44 +00:00
parent e6d2a291e8
commit 96f673e7e1
8 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ci-linux.yml vendored
View File

@ -44,7 +44,7 @@ jobs:
- name: Run configure
run: |
./configure --enable-extras "argon2 geo_maxmind ldap mysql pgsql regex_pcre2 regex_posix regex_re2 sqlite3 ssl_gnutls ssl_mbedtls ssl_openssl sslrehashsignal"
./configure --enable-extras "argon2 geo_maxmind ldap mysql pgsql regex_pcre regex_posix regex_re2 sqlite3 ssl_gnutls ssl_mbedtls ssl_openssl sslrehashsignal"
./configure --development --disable-auto-extras --socketengine ${{ matrix.socketengine }}
- name: Build core

2
.github/workflows/ci-macos.yml vendored
View File

@ -28,7 +28,7 @@ jobs:
- name: Run configure
run: |
./configure --enable-extras "argon2 geo_maxmind ldap mysql pgsql regex_pcre2 regex_posix regex_re2 sqlite3 ssl_gnutls ssl_mbedtls ssl_openssl sslrehashsignal"
./configure --enable-extras "argon2 geo_maxmind ldap mysql pgsql regex_pcre regex_posix regex_re2 sqlite3 ssl_gnutls ssl_mbedtls ssl_openssl sslrehashsignal"
./configure --development --disable-auto-extras --socketengine ${{ matrix.socketengine }}
- name: Build core

2
.gitignore vendored
View File

@ -19,7 +19,7 @@
/src/modules/m_ldap.cpp
/src/modules/m_mysql.cpp
/src/modules/m_pgsql.cpp
/src/modules/m_regex_pcre2.cpp
/src/modules/m_regex_pcre.cpp
/src/modules/m_regex_posix.cpp
/src/modules/m_regex_re2.cpp
/src/modules/m_sqlite3.cpp

2
configure vendored
View File

@ -395,7 +395,7 @@ if (prompt_bool $interactive, $question, 0) {
'm_mysql.cpp' => 'mysql_config --version',
'm_pgsql.cpp' => 'pg_config --version',
'm_ldap.cpp' => "echo '#include <ldap.h>' | $config{CXX} -E -",
'm_regex_pcre2.cpp' => 'pkg-config --exists libpcre2-8',
'm_regex_pcre.cpp' => 'pkg-config --exists libpcre2-8',
'm_regex_posix.cpp' => undef,
'm_regex_re2.cpp' => 'pkg-config --exists re2',
'm_sqlite3.cpp' => 'pkg-config --exists sqlite3',

4
docs/conf/modules.conf.example
View File

@ -877,7 +877,7 @@
# Valid engines are: #
# #
# glob - Glob patterns, provided via regex_glob. #
# pcre2 - PCRE regexps, provided via regex_pcre2, needs libpcre2. #
# pcre - PCRE regexps, provided via regex_pcre, needs libpcre2. #
# posix - POSIX regexps, provided via regex_posix, not available #
# on Windows, no dependencies on other operating systems. #
# stdregex - stdlib regexps, provided via regex_stdlib, see comment #
@ -1757,7 +1757,7 @@
# Expressions). You need libpcre2 installed to compile and load this
# module. You must have at least 1 provider loaded to use the filter or
# R-line modules.
#<module name="regex_pcre2">
#<module name="regex_pcre">
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
# Regular Expression Provider for RE2 Regular Expressions.

2
src/modules/extra/README
View File

@ -1,5 +1,5 @@
This directory stores modules which require external libraries to compile.
For example, m_regex_pcre2 requires the PCRE libraries.
For example, m_regex_pcre requires the PCRE2 library.
To compile any of these modules first ensure you have the required dependencies
(read the online documentation at https://docs.inspircd.org) and then symlink

18
src/modules/extra/m_regex_pcre2.cpp → src/modules/extra/m_regex_pcre.cpp
View File

@ -36,14 +36,14 @@
# pragma comment(lib, "pcre2-8.lib")
#endif
class PCRE2Pattern final
class PCREPattern final
: public Regex::Pattern
{
private:
pcre2_code* regex;
public:
PCRE2Pattern(const std::string& pattern, uint8_t options)
PCREPattern(const std::string& pattern, uint8_t options)
: Regex::Pattern(pattern, options)
{
int flags = 0;
@ -61,7 +61,7 @@ class PCRE2Pattern final
}
}
~PCRE2Pattern() override
~PCREPattern() override
{
pcre2_code_free(regex);
}
@ -75,18 +75,18 @@ class PCRE2Pattern final
}
};
class ModuleRegexPCRE2 final
class ModuleRegexPCRE final
: public Module
{
private:
Regex::SimpleEngine<PCRE2Pattern> regex;
Regex::SimpleEngine<PCREPattern> regex;
public:
ModuleRegexPCRE2()
: Module(VF_VENDOR, "Provides the pcre2 regular expression engine which uses the PCRE2 library.")
, regex(this, "pcre2")
ModuleRegexPCRE()
: Module(VF_VENDOR, "Provides the pcre regular expression engine which uses the PCRE library.")
, regex(this, "pcre")
{
}
};
MODULE_INIT(ModuleRegexPCRE2)
MODULE_INIT(ModuleRegexPCRE)

2
win/modules/CMakeLists.txt
View File

@ -2,7 +2,7 @@ if(EXISTS "${CMAKE_BINARY_DIR}/conanbuildinfo.cmake")
file(COPY "${INSPIRCD_BASE}/src/modules/extra/m_argon2.cpp" DESTINATION "${INSPIRCD_BASE}/src/modules/")
file(COPY "${INSPIRCD_BASE}/src/modules/extra/m_pgsql.cpp" DESTINATION "${INSPIRCD_BASE}/src/modules/")
file(COPY "${INSPIRCD_BASE}/src/modules/extra/m_mysql.cpp" DESTINATION "${INSPIRCD_BASE}/src/modules/")
file(COPY "${INSPIRCD_BASE}/src/modules/extra/m_regex_pcre2.cpp" DESTINATION "${INSPIRCD_BASE}/src/modules/")
file(COPY "${INSPIRCD_BASE}/src/modules/extra/m_regex_pcre.cpp" DESTINATION "${INSPIRCD_BASE}/src/modules/")
file(COPY "${INSPIRCD_BASE}/src/modules/extra/m_regex_re2.cpp" DESTINATION "${INSPIRCD_BASE}/src/modules/")
file(COPY "${INSPIRCD_BASE}/src/modules/extra/m_sqlite3.cpp" DESTINATION "${INSPIRCD_BASE}/src/modules/")