Merge pull request #3036 from masatake/pcre2

lregex: use pcre2 if p flag is given

Author: masatake

.github/workflows/cross-compile-android-ndk.yml

@@ -60,6 +60,7 @@ jobs:
               --disable-xml \
               --disable-json \
               --disable-yaml \
+              --disable-pcre2 \
               CC="$CC" \
               CFLAGS="\"$CFLAGS\"" \
               CPPFLAGS="\"$CPPFLAGS\"" \

.github/workflows/cross-compile-mingw-w64.yml

@@ -31,6 +31,7 @@ jobs:
               --disable-xml \
               --disable-json \
               --disable-yaml \
+              --disable-pcre2 \
               CC=${{ matrix.target }}-gcc \
               CFLAGS='-v' \
               AR=${{ matrix.target }}-ar \

.github/workflows/testing-gnulinux.yml

@@ -33,7 +33,7 @@ jobs:
     - name: update package information
       run: sudo apt-get -y -o APT::Immediate-Configure=false update
     - name: install tools and libraries
-      run: sudo apt-get -y -o APT::Immediate-Configure=false install valgrind pkg-config automake bash libjansson-dev libyaml-dev libseccomp-dev libxml2-dev gdb python3-docutils
+      run: sudo apt-get -y -o APT::Immediate-Configure=false install valgrind pkg-config automake bash libjansson-dev libyaml-dev libseccomp-dev libxml2-dev gdb python3-docutils libpcre2-dev
     - name: install rubygems and lcov
       if: matrix.compiler == 'gcc' && matrix.os == 'ubuntu-20.04'
       #run: sudo apt-get -y -o APT::Immediate-Configure=false install rubygems lcov

.github/workflows/testing-mac.yml

@@ -27,7 +27,7 @@ jobs:
     - name: install tools and libraries
       run: |
         brew upgrade [email protected] || brew link --overwrite [email protected]
-        brew install automake pkg-config bash libxml2 jansson libyaml gdb docutils
+        brew install automake pkg-config bash libxml2 jansson libyaml gdb docutils pcre2
     - name: autogen.sh
       run: ./autogen.sh
     - name: report the version of cc

.github/workflows/testing-with-vlagrind.yml

@@ -16,7 +16,7 @@ jobs:
     - name: update package information
       run: sudo apt-get update
     - name: install tools and libraries
-      run: sudo apt-get install valgrind pkg-config automake bash libjansson-dev libyaml-dev libseccomp-dev libxml2-dev gdb
+      run: sudo apt-get install valgrind pkg-config automake bash libjansson-dev libyaml-dev libseccomp-dev libxml2-dev libpcre2-dev gdb
     - name: autogen.sh
       run: ./autogen.sh
     - name: report the version of cc

Makefile.am

@@ -87,6 +87,11 @@ readtags_LDADD = $(GNULIB_LIBS)
 dist_readtags_SOURCES += $(READTAGS_DSL_SRCS) $(READTAGS_DSL_HEADS)
 endif
 
+if HAVE_PCRE2
+PARSER_SRCS += $(PCRE2_SRCS)
+PARSER_HEADS += $(PCRE2_HEADS)
+endif
+
 if HAVE_LIBXML
 PARSER_SRCS += $(XML_SRCS)
 PARSER_HEADS += $(XML_HEADS)
@@ -123,6 +128,7 @@ libctags_a_CFLAGS  += $(LIBXML_CFLAGS)
 libctags_a_CFLAGS  += $(JANSSON_CFLAGS)
 libctags_a_CFLAGS  += $(LIBYAML_CFLAGS)
 libctags_a_CFLAGS  += $(SECCOMP_CFLAGS)
+libctags_a_CFLAGS  += $(PCRE2_CFLAGS)
 
 nodist_libctags_a_SOURCES = $(REPOINFO_HEADS) $(PEG_SRCS) $(PEG_HEADS)
 BUILT_SOURCES = $(REPOINFO_HEADS)
@@ -189,6 +195,7 @@ ctags_LDADD += $(JANSSON_LIBS)
 ctags_LDADD += $(LIBYAML_LIBS)
 ctags_LDADD += $(SECCOMP_LIBS)
 ctags_LDADD += $(ICONV_LIBS)
+ctags_LDADD += $(PCRE2_LIBS)
 dist_ctags_SOURCES = $(CMDLINE_HEADS) $(CMDLINE_SRCS)
 
 if HOST_MINGW
@@ -213,6 +220,7 @@ mini_geany_LDADD += $(JANSSON_LIBS)
 mini_geany_LDADD += $(LIBYAML_LIBS)
 mini_geany_LDADD += $(SECCOMP_LIBS)
 mini_geany_LDADD += $(ICONV_LIBS)
+mini_geany_LDADD += $(PCRE2_LIBS)
 mini_geany_SOURCES = $(MINI_GEANY_HEADS) $(MINI_GEANY_SRCS)
 
 bin_PROGRAMS += optscript
@@ -226,6 +234,7 @@ optscript_LDADD += $(JANSSON_LIBS)
 optscript_LDADD += $(LIBYAML_LIBS)
 optscript_LDADD += $(SECCOMP_LIBS)
 optscript_LDADD += $(ICONV_LIBS)
+optscript_LDADD += $(PCRE2_LIBS)
 optscript_SOURCES = $(OPTSCRIPT_SRCS)
 
 if INSTALL_ETAGS

Tmain/list-mline-regex-flags.d/run.sh

@@ -3,4 +3,8 @@
 
 CTAGS=$1
 
+. ../utils.sh
+
+is_feature_available ${CTAGS} pcre2
+
 ${CTAGS} --quiet --options=NONE --list-mline-regex-flags

Tmain/list-mline-regex-flags.d/stdout-expected.txt

@@ -2,6 +2,7 @@
 b       basic                                         interpreted as a Posix basic regular expression.
 e       extend                                        interpreted as a Posix extended regular expression (default)
 i       icase                                         applied in a case-insensitive manner
+p       pcre2                                         use pcre2 regex engine
 -       fatal="MESSAGE"                               print the given MESSAGE and exit
 -       mgroup=N                                      a group in pattern determining the line number of tag
 -       warning="MESSAGE"                             print the given MESSAGE at WARNING level

Tmain/list-mtable-regex-flags.d/run.sh

@@ -3,4 +3,8 @@
 
 CTAGS=$1
 
+. ../utils.sh
+
+is_feature_available ${CTAGS} pcre2
+
 ${CTAGS} --quiet --options=NONE --_list-mtable-regex-flags

Tmain/list-mtable-regex-flags.d/stdout-expected.txt

@@ -2,6 +2,7 @@
 b       basic                                         interpreted as a Posix basic regular expression.
 e       extend                                        interpreted as a Posix extended regular expression (default)
 i       icase                                         applied in a case-insensitive manner
+p       pcre2                                         use pcre2 regex engine
 -       fatal="MESSAGE"                               print the given MESSAGE and exit
 -       mgroup=N                                      a group in pattern determining the line number of tag
 -       placeholder                                   don't put this tag to tags file.