diff options
| author | Joe Crayne <joe@jerkface.net> | 2019-07-01 02:37:20 -0400 |
|---|---|---|
| committer | Joe Crayne <joe@jerkface.net> | 2019-07-01 02:37:20 -0400 |
| commit | bc0458ee540da677a04eeddf9b4e0fe8a8991e93 (patch) | |
| tree | 9b3f7ddce51a9ddbf2be725c78e79523fedee68e /lib/ScanningParser.hs | |
| parent | 7c2ee942309df7a484f3ab50b1b090ca5e606c03 (diff) | |
Attempted to merge 0bc53f99cfd70f3a18802604d7ef3174d004db4c.
I left lib/Kiki.hs out for later.
Diffstat (limited to 'lib/ScanningParser.hs')
| -rw-r--r-- | lib/ScanningParser.hs | 2 |
1 files changed, 2 insertions, 0 deletions
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 | |||
| 34 | first f (x,y) = (f x, y) | 34 | first f (x,y) = (f x, y) |
| 35 | 35 | ||
| 36 | 36 | ||
| 37 | instance Semigroup (ScanningParser a b) where | ||
| 38 | (<>) = mappend | ||
| 37 | instance Monoid (ScanningParser a b) where | 39 | instance Monoid (ScanningParser a b) where |
| 38 | mempty = ScanningParser (const Nothing) (const $ const (Nothing,[])) | 40 | mempty = ScanningParser (const Nothing) (const $ const (Nothing,[])) |
| 39 | mappend (ScanningParser ffstA pbdyA) | 41 | mappend (ScanningParser ffstA pbdyA) |