Upgrade to add Eq/Ord for Match

Author: ChrisPenner

lens-regex-pcre.cabal

@@ -1,13 +1,13 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.31.2.
+-- This file has been generated from package.yaml by hpack version 0.37.0.
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: d1c8fcf51e5b49738911f4885c246d4f3a9e709234fad2feefcd25246e284ac2
+-- hash: 754b704711197304d9dc42fd95daa8ff18d78f8327f4dffac02d893d13ac7ac6
 
 name:           lens-regex-pcre
-version:        1.1.0.0
+version:        1.1.1.0
 synopsis:       A lensy interface to regular expressions
 description:    Please see the README on GitHub at <https://github.com/ChrisPenner/lens-regex-pcre#readme>
 category:       Regex

mac-build.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+# Ensures we have all the correct C-libs in scope
+stack  build --fast --extra-include-dirs "$(brew --prefix)/include" --extra-lib-dirs "$(brew --prefix)/lib"

package.yaml

@@ -1,5 +1,5 @@
 name:                lens-regex-pcre
-version:             1.1.0.0
+version:             1.1.1.0
 github:              "ChrisPenner/lens-regex-pcre"
 license:             BSD3
 author:              "Chris Penner"

src/Control/Lens/Regex/ByteString.hs

@@ -15,6 +15,7 @@ License     : BSD3
 {-# LANGUAGE UndecidableInstances #-}
 {-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE TupleSections #-}
+{-# LANGUAGE DerivingStrategies #-}
 
 module Control.Lens.Regex.ByteString
     (
@@ -62,12 +63,30 @@ import Data.Tuple (swap)
 type MatchRange = (Int, Int)
 type GroupRanges = [(Int, Int)]
 
+unBuilder :: BS.Builder -> BS.ByteString
+unBuilder = BL.toStrict . BS.toLazyByteString
+
+building :: Iso' BS.Builder BS.ByteString
+building = iso unBuilder BS.byteString
+
+
 -- | Match represents an opaque regex match.
 -- You can drill into it using 'match', 'groups', 'group', 'namedGroup', 'namedGroups' or 'matchAndGroups'
 data Match =
     Match { _chunks    :: [Either BS.Builder BS.Builder]
           , _matchRegex :: PCRE.Regex
           }
+
+instance Eq Match where
+  a == b = (_matchRegex a == _matchRegex b)
+    && (((bimap unBuilder unBuilder) <$> _chunks a) == ((bimap unBuilder unBuilder) <$> _chunks b))
+
+instance Ord Match where
+  compare a b = compare (_matchRegex a) (_matchRegex b)
+    <> compare ((bimap unBuilder unBuilder) <$> _chunks a) ((bimap unBuilder unBuilder) <$> _chunks b)
+
+
+
 makeLensesFor [("_chunks", "chunks")] ''Match
 
 instance TypeError
@@ -76,12 +95,6 @@ instance TypeError
   => Show Match where
   show _ = "This is a raw Match object, did you miss a 'match' or 'groups' or 'group' call after your 'regex'?"
 
-unBuilder :: BS.Builder -> BS.ByteString
-unBuilder = BL.toStrict . BS.toLazyByteString
-
-building :: Iso' BS.Builder BS.ByteString
-building = iso unBuilder BS.byteString
-
 -- | Access all groups of a match as a list. Stashes the full match text as the index in case
 -- you need it.
 --

stack.yaml

@@ -1,4 +1,4 @@
-resolver: lts-16.17
+resolver: lts-18.28
 
 packages:
 - .

stack.yaml.lock

@@ -6,7 +6,7 @@
 packages: []
 snapshots:
 - completed:
-    size: 532386
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/17.yaml
-    sha256: d3ee1ae797cf63189c95cf27f00700304946c5cb3c1e6a82001cd6584a221e1b
-  original: lts-16.17
+    sha256: 428ec8d5ce932190d3cbe266b9eb3c175cd81e984babf876b64019e2cbe4ea68
+    size: 590100
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/18/28.yaml
+  original: lts-18.28