From bc0458ee540da677a04eeddf9b4e0fe8a8991e93 Mon Sep 17 00:00:00 2001 From: Joe Crayne Date: Mon, 1 Jul 2019 02:37:20 -0400 Subject: Attempted to merge 0bc53f99cfd70f3a18802604d7ef3174d004db4c. I left lib/Kiki.hs out for later. --- lib/ScanningParser.hs | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lib/ScanningParser.hs') diff --git a/lib/ScanningParser.hs b/lib/ScanningParser.hs index f99e120..305402e 100644 --- a/lib/ScanningParser.hs +++ b/lib/ScanningParser.hs @@ -34,6 +34,8 @@ instance Functor (ScanningParser a) where first f (x,y) = (f x, y) +instance Semigroup (ScanningParser a b) where + (<>) = mappend instance Monoid (ScanningParser a b) where mempty = ScanningParser (const Nothing) (const $ const (Nothing,[])) mappend (ScanningParser ffstA pbdyA) -- cgit v1.2.3