Stackage LTS 22.23; PCRE2 10.44; rename toAlternativeOf to altOf

Per ekmett/lens#1031 (comment)

README.md

@@ -62,7 +62,7 @@ forMOf kv'd file $ execStateT $ do
 * Zero-copying of substrings where beneficial.
 * Few dependencies.
 * Bundled, statically-linked UTF-8 (formerly UTF-16) build of up-to-date PCRE2
-  (version 10.42), with a complete, exposed Haskell binding.
+  (version 10.44), with a complete, exposed Haskell binding.
 
 ## Performance
 Currently we are slower than other libraries.  For example:

package.yaml

@@ -38,6 +38,7 @@ library:
   # Per src/c/pcre2/NON-AUTOTOOLS-BUILD
   - src/c/pcre2/src/pcre2_auto_possess.c
   - src/c/pcre2_chartables.c
+  - src/c/pcre2/src/pcre2_chkdint.c
   - src/c/pcre2/src/pcre2_compile.c
   - src/c/pcre2/src/pcre2_config.c
   - src/c/pcre2/src/pcre2_context.c
@@ -67,11 +68,11 @@ library:
   - -W
   - -optc=-DPCRE2_CODE_UNIT_WIDTH=8
   - -optc=-DPCRE2_STATIC=1
+  - -optc=-DSUPPORT_PCRE2_8
   - -optc=-Wno-discarded-qualifiers
   - -optc=-Wno-incompatible-pointer-types
   cc-options:
   - -DHAVE_CONFIG_H
-  - -DPCRE2_CODE_UNIT_WIDTH=8
   - -DHAVE_INTTYPES_H=1
   - -DHAVE_LIMITS_H=1
   - -DHAVE_MEMMOVE_H=1

pcre2.cabal

@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.1.
+-- This file has been generated from package.yaml by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack
 
@@ -30,11 +30,14 @@ extra-source-files:
     src/c/pcre2/src/pcre2_ucp.h
     src/c/pcre2/src/pcre2posix.h
     src/c/pcre2/src/sljit/sljitConfig.h
+    src/c/pcre2/src/sljit/sljitConfigCPU.h
     src/c/pcre2/src/sljit/sljitConfigInternal.h
     src/c/pcre2/src/sljit/sljitLir.h
+    src/c/pcre2/vms/stdint.h
     src/c/pcre2/maint/ucptest.c
     src/c/pcre2/maint/utf8.c
     src/c/pcre2/src/pcre2_auto_possess.c
+    src/c/pcre2/src/pcre2_chkdint.c
     src/c/pcre2/src/pcre2_compile.c
     src/c/pcre2/src/pcre2_config.c
     src/c/pcre2/src/pcre2_context.c
@@ -72,11 +75,20 @@ extra-source-files:
     src/c/pcre2/src/pcre2posix.c
     src/c/pcre2/src/pcre2posix_test.c
     src/c/pcre2/src/pcre2test.c
-    src/c/pcre2/src/sljit/sljitExecAllocator.c
+    src/c/pcre2/src/sljit/allocator_src/sljitExecAllocatorApple.c
+    src/c/pcre2/src/sljit/allocator_src/sljitExecAllocatorCore.c
+    src/c/pcre2/src/sljit/allocator_src/sljitExecAllocatorFreeBSD.c
+    src/c/pcre2/src/sljit/allocator_src/sljitExecAllocatorPosix.c
+    src/c/pcre2/src/sljit/allocator_src/sljitExecAllocatorWindows.c
+    src/c/pcre2/src/sljit/allocator_src/sljitProtExecAllocatorNetBSD.c
+    src/c/pcre2/src/sljit/allocator_src/sljitProtExecAllocatorPosix.c
+    src/c/pcre2/src/sljit/allocator_src/sljitWXExecAllocatorPosix.c
+    src/c/pcre2/src/sljit/allocator_src/sljitWXExecAllocatorWindows.c
     src/c/pcre2/src/sljit/sljitLir.c
     src/c/pcre2/src/sljit/sljitNativeARM_32.c
     src/c/pcre2/src/sljit/sljitNativeARM_64.c
     src/c/pcre2/src/sljit/sljitNativeARM_T2_32.c
+    src/c/pcre2/src/sljit/sljitNativeLOONGARCH_64.c
     src/c/pcre2/src/sljit/sljitNativeMIPS_32.c
     src/c/pcre2/src/sljit/sljitNativeMIPS_64.c
     src/c/pcre2/src/sljit/sljitNativeMIPS_common.c
@@ -90,9 +102,8 @@ extra-source-files:
     src/c/pcre2/src/sljit/sljitNativeX86_32.c
     src/c/pcre2/src/sljit/sljitNativeX86_64.c
     src/c/pcre2/src/sljit/sljitNativeX86_common.c
-    src/c/pcre2/src/sljit/sljitProtExecAllocator.c
+    src/c/pcre2/src/sljit/sljitSerialize.c
     src/c/pcre2/src/sljit/sljitUtils.c
-    src/c/pcre2/src/sljit/sljitWXExecAllocator.c
     src/c/pcre2_chartables.c
 
 source-repository head
@@ -111,14 +122,15 @@ library
       Paths_pcre2
   hs-source-dirs:
       src/hs
-  ghc-options: -W -optc=-DPCRE2_CODE_UNIT_WIDTH=8 -optc=-DPCRE2_STATIC=1 -optc=-Wno-discarded-qualifiers -optc=-Wno-incompatible-pointer-types
-  cc-options: -DHAVE_CONFIG_H -DPCRE2_CODE_UNIT_WIDTH=8 -DHAVE_INTTYPES_H=1 -DHAVE_LIMITS_H=1 -DHAVE_MEMMOVE_H=1 -DHAVE_STDINT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRERROR_H=1 -DHAVE_STRING_H=1 -DSUPPORT_JIT=1 -DSUPPORT_UNICODE=1
+  ghc-options: -W -optc=-DPCRE2_CODE_UNIT_WIDTH=8 -optc=-DPCRE2_STATIC=1 -optc=-DSUPPORT_PCRE2_8 -optc=-Wno-discarded-qualifiers -optc=-Wno-incompatible-pointer-types
+  cc-options: -DHAVE_CONFIG_H -DHAVE_INTTYPES_H=1 -DHAVE_LIMITS_H=1 -DHAVE_MEMMOVE_H=1 -DHAVE_STDINT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRERROR_H=1 -DHAVE_STRING_H=1 -DSUPPORT_JIT=1 -DSUPPORT_UNICODE=1
   include-dirs:
       src/c
       src/c/pcre2/src
   c-sources:
       src/c/pcre2/src/pcre2_auto_possess.c
       src/c/pcre2_chartables.c
+      src/c/pcre2/src/pcre2_chkdint.c
       src/c/pcre2/src/pcre2_compile.c
       src/c/pcre2/src/pcre2_config.c
       src/c/pcre2/src/pcre2_context.c

src/hs/Text/Regex/Pcre2/Internal.hs

@@ -128,8 +128,8 @@ toCUs = castPtr
 -- ** Lens utilities
 
 -- | A more general `toListOf` that collects targets into any `Alternative`.
-toAlternativeOf :: (Alternative f) => Getting (Alt f a) s a -> s -> f a
-toAlternativeOf l = let alt = Alt . pure in getAlt . view (l . to alt)
+altOf :: (Applicative f) => Getting (Alt f a) s a -> s -> f a
+altOf l = let alt = Alt . pure in getAlt . view (l . to alt)
 
 _Identity :: Lens' (Identity a) a
 _Identity f (Identity x) = Identity <$> f x
@@ -1095,7 +1095,7 @@ captures = capturesOpt mempty
 --
 -- @since 2.0.0
 capturesOpt :: (Alternative f) => Option -> Text -> Text -> f (NonEmpty Text)
-capturesOpt option patt = toAlternativeOf $ _capturesOpt option patt
+capturesOpt option patt = altOf $ _capturesOpt option patt
 
 -- | Does the pattern match the subject at least once?
 matches :: Text -> Text -> Bool
@@ -1117,7 +1117,7 @@ match = matchOpt mempty
 --
 -- @since 2.0.0
 matchOpt :: (Alternative f) => Option -> Text -> Text -> f Text
-matchOpt option patt = toAlternativeOf $ _matchOpt option patt
+matchOpt option patt = altOf $ _matchOpt option patt
 
 -- | Perform at most one substitution.  See
 -- [the docs](https://pcre.org/current/doc/html/pcre2api.html#SEC36) for the

src/hs/Text/Regex/Pcre2/TH.hs

@@ -180,12 +180,12 @@ capturesInfoQ s = predictCapturesInfoQ s >>= \case
 
 -- | Helper for `regex` with no parenthesized captures.
 matchTH :: (Alternative f) => Text -> Text -> f Text
-matchTH patt = toAlternativeOf $ _matchTH patt
+matchTH patt = altOf $ _matchTH patt
 
 -- | Helper for `regex` with parenthesized captures.
 capturesTH :: forall info f. (Alternative f) =>
     Text -> Text -> f (Captures info)
-capturesTH patt = toAlternativeOf $ _capturesTH patt
+capturesTH patt = altOf $ _capturesTH patt
 
 -- | Helper for `regex` as a guard pattern.
 matchesTH :: Text -> Text -> Bool

stack.yaml

@@ -17,7 +17,7 @@
 #
 # resolver: ./custom-snapshot.yaml
 # resolver: https://example.com/snapshots/2018-01-01.yaml
-resolver: lts-20.5
+resolver: lts-22.23
 
 # User packages to be built.
 # Various formats can be used as shown in the example below.
@@ -39,18 +39,7 @@ packages:
 # - git: https://github.com/commercialhaskell/stack.git
 #   commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a
 #
-extra-deps:
-- exceptions-0.10.7
-- hashable-1.4.1.0
-- microlens-0.4.13.1
-- microlens-ghc-0.4.14.1
-- microlens-mtl-0.2.0.3
-- microlens-platform-0.4.3.3
-- mtl-2.3.1
-- parsec-3.1.15.1
-- random-1.2.1.1
-- statistics-0.16.1.2
-- text-2.0.1
+extra-deps: []
 
 # Override default flag values for local packages and extra-deps
 # flags: {}

stack.yaml.lock

@@ -3,87 +3,10 @@
 # For more information, please see the documentation at:
 #   https://docs.haskellstack.org/en/stable/lock_files
 
-packages:
-- completed:
-    hackage: exceptions-0.10.7@sha256:14e90e14927f55b1c1172ee9fc3d6a481474f3ac4e58e1f53aa3d157b7d8fbf2,2788
-    pantry-tree:
-      sha256: bd4c82588200923ff221ffcda4adeaf89848ef436943514e254532897304828b
-      size: 739
-  original:
-    hackage: exceptions-0.10.7
-- completed:
-    hackage: hashable-1.4.1.0@sha256:50b2f002c68fe67730ee7a3cd8607486197dd99b084255005ad51ecd6970a41b,5019
-    pantry-tree:
-      sha256: 9af2f7a42674f7effcabbebc043f97057240783f1709338a77f58216f4a5f18c
-      size: 1248
-  original:
-    hackage: hashable-1.4.1.0
-- completed:
-    hackage: microlens-0.4.13.1@sha256:0cd8a0da5fe1b5a5c327bb5296d30940dc9f92c169372939bfcecd3faee953d7,4642
-    pantry-tree:
-      sha256: 8cf825336264bb5b0434b2b57fc808b84e503c4ec4106d5e05d975f22b9ca5cd
-      size: 461
-  original:
-    hackage: microlens-0.4.13.1
-- completed:
-    hackage: microlens-ghc-0.4.14.1@sha256:d0880578fc41358eaa38e8222ebd578ccf3c079dc6d4e55bae0b105ac89b53d4,2662
-    pantry-tree:
-      sha256: 6a83fdeeaf536b4b005570055496cf88fa652272dbfe39598dad88412685accc
-      size: 343
-  original:
-    hackage: microlens-ghc-0.4.14.1
-- completed:
-    hackage: microlens-mtl-0.2.0.3@sha256:0ace1ba95677117219681fb9a8b08b3bf049ab5973eed14453b260aaf1feb582,1965
-    pantry-tree:
-      sha256: 6a67528c409030bda8dd7b775288fc4c86bbd235bc82b77216c0ff7fb715b58a
-      size: 344
-  original:
-    hackage: microlens-mtl-0.2.0.3
-- completed:
-    hackage: microlens-platform-0.4.3.3@sha256:8ef4c8d5b9e0948489aa0b0b6a90c3d0c52e768e4e1f0e3f87697f6abd5d88fd,2930
-    pantry-tree:
-      sha256: 88798635590d2dc4920d956f3b8c43f942851bd88569f27150a9765b3fc40a58
-      size: 358
-  original:
-    hackage: microlens-platform-0.4.3.3
-- completed:
-    hackage: mtl-2.3.1@sha256:5377696d7315e2ef31a8d15d67b22d733c20cac2caf8b26756ff8524c8217e6d,1868
-    pantry-tree:
-      sha256: ac3cf1dc9ef397512d4bf8f2c3fbe4d64fb8aabd253288b34bf86c09ae234d4f
-      size: 1853
-  original:
-    hackage: mtl-2.3.1
-- completed:
-    hackage: parsec-3.1.15.1@sha256:8c7a36aaadff12a38817fc3c4ff6c87e3352cffd1a58df640de7ed7a97ad8fa3,4601
-    pantry-tree:
-      sha256: 147ad21b8aa90273721903a6b294cc4ecd660d229d88c4e84c6275bc5d630ae6
-      size: 2630
-  original:
-    hackage: parsec-3.1.15.1
-- completed:
-    hackage: random-1.2.1.1@sha256:dea1f11e5569332dc6c8efaad1cb301016a5587b6754943a49f9de08ae0e56d9,6541
-    pantry-tree:
-      sha256: 646ee77fe01178837ee928b61ae8653dcf190e9b5353ebebd094079c77a18b76
-      size: 1528
-  original:
-    hackage: random-1.2.1.1
-- completed:
-    hackage: statistics-0.16.1.2@sha256:b20c8c52eb9f7d4e4a7b15f639f29595c22d72b7265d8ab7f480c43398e59ed0,5618
-    pantry-tree:
-      sha256: a2e090c862b1b0331f1ece66e4cb45419db7f1a87bb13c51ffbb2bb98f19778e
-      size: 5335
-  original:
-    hackage: statistics-0.16.1.2
-- completed:
-    hackage: text-2.0.1@sha256:907ecca6d20c42dafceb709ebac546f5d72e8b7dda3c39b286888c2f09e3bad8,9262
-    pantry-tree:
-      sha256: 2a661574e5663d733c08f4c34e1bdaaa9fd530be551aef0db99f1689541839c8
-      size: 7359
-  original:
-    hackage: text-2.0.1
+packages: []
 snapshots:
 - completed:
-    sha256: a684cdbdf9304b325a503e0fe1d9648e9c18155ce4c7cfebbe8a7f93674e6295
-    size: 649106
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/5.yaml
-  original: lts-20.5
+    sha256: 73ad581de7c5306278aec7706cafaf3b1c2eb7abf4ab586e4d9dc675c6106c4e
+    size: 718708
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/23.yaml
+  original: lts-22.23