Skip to content

Commit

Permalink
Be lenient on keywords until #1
Browse files Browse the repository at this point in the history
  • Loading branch information
srid committed Apr 22, 2021
1 parent eb94cfd commit fc3b330
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/Memoir/Data/Measure.hs
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ measureName = \case
Some (Measure_Rating5 s) -> s
Some (Measure_Extent s) -> s

parseMeasure :: Text -> Text -> DSum Measure Identity
parseMeasure name s = fromMaybe (error $ "Unknown measure: " <> name) $ do
parseMeasure :: Text -> Text -> Maybe (DSum Measure Identity)
parseMeasure name s = do
asum
[ (Measure_Rating5 name :=>) . Identity <$> M.parseMaybe ratings5P s,
(Measure_Extent name :=>) . Identity <$> M.parseMaybe extentP s
Expand All @@ -84,7 +84,7 @@ type Measures = DMap Measure Identity

parseMeasures :: Map Text Text -> Measures
parseMeasures =
DMap.fromList . fmap (uncurry parseMeasure) . Map.toList
DMap.fromList . mapMaybe (uncurry parseMeasure) . Map.toList

deriveGEq ''Measure
deriveGCompare ''Measure
Expand Down

0 comments on commit fc3b330

Please sign in to comment.