From 9cafd8d97ddd7a366585efd29a203d993470c588 Mon Sep 17 00:00:00 2001 From: Eugen Wissner Date: Tue, 14 Jan 2025 20:00:11 +0100 Subject: Make compatible with GHC2025 --- lib/Graphics/Fountainhead/Dumper.hs | 2 ++ lib/Graphics/Fountainhead/Metrics.hs | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'lib/Graphics/Fountainhead') diff --git a/lib/Graphics/Fountainhead/Dumper.hs b/lib/Graphics/Fountainhead/Dumper.hs index 1e1491c..dc7a60d 100644 --- a/lib/Graphics/Fountainhead/Dumper.hs +++ b/lib/Graphics/Fountainhead/Dumper.hs @@ -96,6 +96,7 @@ import qualified Text.Megaparsec as Megaparsec import Graphics.Fountainhead.Parser ( ParseErrorBundle , ParseState + , Parser , parseTable , cmapTableP , headTableP @@ -831,6 +832,7 @@ parseRequired processedState fontDirectory = do , locaTable = requiredLoca } where + findRequired :: String -> Parser a -> Either DumpError a findRequired tableName parser = let missingError = Left $ DumpRequiredTableMissingError tableName parseFound tableEntry = parseTable tableEntry parser processedState diff --git a/lib/Graphics/Fountainhead/Metrics.hs b/lib/Graphics/Fountainhead/Metrics.hs index d298775..d67b090 100644 --- a/lib/Graphics/Fountainhead/Metrics.hs +++ b/lib/Graphics/Fountainhead/Metrics.hs @@ -133,7 +133,8 @@ collectMetrics fontFile ttfContents = (_processedState, Left initialResult) -> Left $ MetricsParseError initialResult (processedState, Right initialResult) -> do - let parseForMetrics' = parseForMetrics processedState initialResult + let parseForMetrics' :: String -> Parser a -> Either MetricsError a + parseForMetrics' = parseForMetrics processedState initialResult NameTable{ nameRecord, variable } <- parseForMetrics' "name" nameTableP psNameIndex <- maybeMetricsError (MetricsNameRecordNotFound 6) -- cgit v1.2.3