Merge pull request #5 from JuliaString/spj/usejll

Use PCRE2_jll instead of build

Author: ScottPJones

.github/workflows/ci.yml

@@ -10,8 +10,8 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - '1.5'
           - '1.6'
+          - '1.7'
           - 'nightly'
         os:
           - ubuntu-latest

Project.toml

@@ -4,11 +4,11 @@ keywords = ["Strings", "PCRE", "Regex"]
 license = "MIT"
 name = "PCRE2"
 uuid = "c9310f65-a42c-5928-aca3-d34f64192029"
-version = "1.0.2"
+version = "1.1.0"
 
 [deps]
+PCRE2_jll      = "efcefdf7-47ab-520b-bdef-62a2eaa19f15"
 Libdl          = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
-BinaryProvider = "b99e7846-7c00-51b0-8f62-c81ae34c0232"
 
 [extras]
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
@@ -17,4 +17,4 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 test = ["Test"]
 
 [compat]
-julia = "^1.0.0"
+julia = "^1.7"

deps/build.jl

@@ -1,36 +1,48 @@
 #=
 Low-level wrapper for PCRE2 library
 
-Copyright 2018 Gandalf Software, Inc., Scott P. Jones, and contributors to pcre.jl and pcre2.h
+Copyright 2018,2022 Gandalf Software, Inc., Scott P. Jones, and contributors to pcre.jl and pcre2.h
 (Based in part on julia/base/pcre.jl, and on pcre2.h (copyright University of Cambridge))
 Licensed under MIT License, see LICENSE.md
 =#
 
-__precompile__()
 module PCRE2
 
 import Libdl
+using PCRE2_jll
 
-# Load in `deps.jl`, complaining if it does not exist
-const depsjl_path = joinpath(dirname(@__FILE__), "..", "deps", "deps.jl")
-if !isfile(depsjl_path)
-    error("PCRE2 not installed properly, run Pkg.build(\"PCRE2\"), restart Julia and try again")
-end
-include(depsjl_path)
+const PCRE_LOCK = Base.PCRE.PCRE_COMPILE_LOCK
+
+# Base.Experimental.@compiler_options compile=min optimize=0 infer=false
 
-PCRE_LOCK = nothing
+export libpcre2_8, libpcre2_16, libpcre2_32
+
+# These get calculated in __init__()
+libpcre2_16_handle = C_NULL
+libpcre2_16_path = ""
+libpcre2_32_handle = C_NULL
+libpcre2_32_path = ""
+
+if Sys.iswindows()
+    const libpcre2_16 = "libpcre2-16-0.dll"
+    const libpcre2_32 = "libpcre2-32-0.dll"
+elseif Sys.isapple()
+    const libpcre2_16 = "libpcre2-16.0.dylib"
+    const libpcre2_32 = "libpcre2-32.0.dylib"
+else
+    const libpcre2_16 = "libpcre2-16.so.0"
+    const libpcre2_32 = "libpcre2-32.so.0"
+end
 
-# Module initialization function
 function __init__()
-    # Always check your dependencies from `deps.jl`
-    check_deps()
-    @static if isdefined(Base.PCRE, :PCRE_COMPILE_LOCK)
-        global PCRE_LOCK = Base.PCRE.PCRE_COMPILE_LOCK
-    else
-        global PCRE_LOCK = Threads.SpinLock()
-    end
+    global libpcre2_16_handle = Libdl.dlopen(libpcre2_16)
+    global libpcre2_16_path = Libdl.dlpath(libpcre2_16_handle)
+    global libpcre2_32_handle = Libdl.dlopen(libpcre2_32)
+    global libpcre2_32_path = Libdl.dlpath(libpcre2_32_handle)
 end
 
+# ??? get_libpcre2_8_path() = libpcre2_8_path
+
 const CodeUnitTypes = Union{UInt8, UInt16, UInt32}
 
 import Base.GC: @preserve

deps/build.jl~

@@ -1,7 +1,7 @@
 #=
 Constants for PCRE2 library API
 
-Copyright 2018 Gandalf Software, Inc., Scott P. Jones, and contributors to pcre2.h
+Copyright 2018,2022 Gandalf Software, Inc., Scott P. Jones, and contributors to pcre2.h
 (based on pcre2.h (copyright University of Cambridge), see PCRE2_LICENSE)
 Licensed under MIT License, see LICENSE.md
 =#
@@ -49,19 +49,24 @@ const ALT_VERBNAMES       = 0x00400000  # C
 const USE_OFFSET_LIMIT    = 0x00800000  #   J M D
 const EXTENDED_MORE       = 0x01000000  # C
 const LITERAL             = 0x02000000  # C
+const MATCH_INVALID_UTF   = 0x04000000  #   J M D
 
 ## An additional compile options word is available in the compile context.
 
 const EXTRA_ALLOW_SURROGATE_ESCAPES  = 0x00000001  # C
 const EXTRA_BAD_ESCAPE_IS_LITERAL    = 0x00000002  # C
 const EXTRA_MATCH_WORD               = 0x00000004  # C
 const EXTRA_MATCH_LINE               = 0x00000008  # C
+const EXTRA_ESCAPED_CR_IS_LF         = 0x00000010  # C
+const EXTRA_ALT_BSUX                 = 0x00000020  # C
+const EXTRA_ALLOW_LOOKAROUND_BSK     = 0x00000040  # C
 
 ## These are for pcre2_jit_compile().
 
-const JIT_COMPLETE        = 0x00000001  # For full matching */
+const JIT_COMPLETE        = 0x00000001  # For full matching
 const JIT_PARTIAL_SOFT    = 0x00000002
 const JIT_PARTIAL_HARD    = 0x00000004
+const JIT_INVALID_UTF     = 0x00000100
 
 ## These are for pcre2_match(), pcre2_dfa_match(), and pcre2_jit_match().
 ## Note that PCRE2_ANCHORED and PCRE2_NO_UTF_CHECK can also be passed to these functions
@@ -91,6 +96,11 @@ const SUBSTITUTE_OVERFLOW_LENGTH  = 0x00001000
 
 const NO_JIT              = 0x00002000
 
+const COPY_MATCHED_SUBJECT        = 0x00004000
+const SUBSTITUTE_LITERAL          = 0x00008000  # pcre2_substitute() only
+const SUBSTITUTE_MATCHED          = 0x00010000  # pcre2_substitute() only
+const SUBSTITUTE_REPLACEMENT_ONLY = 0x00020000  # pcre2_substitute() only
+
 ## Options for pattern_convert()
 
 const CONVERT_UTF                    = 0x00000001
@@ -162,8 +172,8 @@ const BSR_ANYCRLF         = 2
       CONFIG_VERSION,
       CONFIG_HEAPLIMIT,
       CONFIG_NEVER_BACKSLASH_C,
-      CONFIG_COMPILED_WIDTHS)
-
+      CONFIG_COMPILED_WIDTHS,
+      CONFIG_TABLES_LENGTH)
 
 # supported options for different use cases