792f18a · typeable/pandoc

git.iko.soy/typeable/pandoc

Remove unused HasHeaderMap (#5175)

It is updated by some readers, but never actually used.

commit792f18a7fa64773f7d8466740f8da5e434c2da4f authorAlexander <ilabdsf@gmail.com> dateTue 1 Jan 2019, 08:41 (8 years ago) parentffc2192

7 files changed+4−50

compare with master

unifiedsplit

src/Text/Pandoc/Parsing.hs+1−16 src/Text/Pandoc/Readers/HTML.hs+1−6 src/Text/Pandoc/Readers/LaTeX/Parsing.hs−6 src/Text/Pandoc/Readers/MediaWiki.hs−7 src/Text/Pandoc/Readers/Muse.hs−6 src/Text/Pandoc/Readers/Org/ParserState.hs+2−8 src/Text/Pandoc/Readers/RST.hs−1

src/Text/Pandoc/Parsing.hs+1−16

@@ -93,7 +93,6 @@ module Text.Pandoc.Parsing ( takeWhileP,

9393 reportLogMessages,

9494 ParserState (..),

9595 HasReaderOptions (..),

96− HasHeaderMap (..),

9796 HasIdentifierList (..),

9897 HasMacros (..),

9998 HasLogMessages (..),

@@ -1079,7 +1078,6 @@ data ParserState = ParserState

10791078 stateMeta' :: F Meta, -- ^ Document metadata

10801079 stateCitations :: M.Map String String, -- ^ RST-style citations

10811080 stateHeaderTable :: [HeaderType], -- ^ Ordered list of header types used

1082− stateHeaders :: M.Map Inlines String, -- ^ List of headers and ids (used for implicit ref links)

10831081 stateIdentifiers :: Set.Set String, -- ^ Header identifiers used

10841082 stateNextExample :: Int, -- ^ Number of next example

10851083 stateExamples :: M.Map String Int, -- ^ Map from example labels to numbers

@@ -1129,15 +1127,6 @@ instance Monad m => HasQuoteContext ParserState m where

11291127 setState newState { stateQuoteContext = oldQuoteContext }

11301128 return result

11311129

1132−class HasHeaderMap st where

1133− extractHeaderMap :: st -> M.Map Inlines String

1134− updateHeaderMap :: (M.Map Inlines String -> M.Map Inlines String) ->

1135− st -> st

1136−

1137−instance HasHeaderMap ParserState where

1138− extractHeaderMap = stateHeaders

1139− updateHeaderMap f st = st{ stateHeaders = f $ stateHeaders st }

1140−

11411130class HasIdentifierList st where

11421131 extractIdentifierList :: st -> Set.Set String

11431132 updateIdentifierList :: (Set.Set String -> Set.Set String) -> st -> st

@@ -1198,7 +1187,6 @@ defaultParserState =

11981187 stateMeta' = return nullMeta,

11991188 stateCitations = M.empty,

12001189 stateHeaderTable = [],

1201− stateHeaders = M.empty,

12021190 stateIdentifiers = Set.empty,

12031191 stateNextExample = 1,

12041192 stateExamples = M.empty,

@@ -1283,12 +1271,11 @@ type SubstTable = M.Map Key Inlines

12831271-- is encountered that duplicates an earlier identifier

12841272-- (explicit or automatically generated).

12851273registerHeader :: (Stream s m a, HasReaderOptions st,

1286− HasHeaderMap st, HasLogMessages st, HasIdentifierList st)

1274+ HasLogMessages st, HasIdentifierList st)

12871275 => Attr -> Inlines -> ParserT s st m Attr

12881276registerHeader (ident,classes,kvs) header' = do

12891277 ids <- extractIdentifierList <$> getState

12901278 exts <- getOption readerExtensions

1291− let insert' = M.insertWith (\_new old -> old)

12921279 if null ident && Ext_auto_identifiers `extensionEnabled` exts

12931280 then do

12941281 let id' = uniqueIdent exts (B.toList header') ids

@@ -1297,7 +1284,6 @@ registerHeader (ident,classes,kvs) header' = do

12971284 else id'

12981285 updateState $ updateIdentifierList $ Set.insert id'

12991286 updateState $ updateIdentifierList $ Set.insert id''

1300− updateState $ updateHeaderMap $ insert' header' id'

13011287 return (id'',classes,kvs)

13021288 else do

13031289 unless (null ident) $ do

@@ -1305,7 +1291,6 @@ registerHeader (ident,classes,kvs) header' = do

13051291 pos <- getPosition

13061292 logMessage $ DuplicateIdentifier ident pos

13071293 updateState $ updateIdentifierList $ Set.insert ident

1308− updateState $ updateHeaderMap $ insert' header' ident

13091294 return (ident,classes,kvs)

13101295

13111296smartPunctuation :: (HasReaderOptions st, HasLastStrPosition st, HasQuoteContext st m, Stream s m Char)

src/Text/Pandoc/Readers/HTML.hs+1−6

@@ -105,7 +105,7 @@ readHtml opts inp = do

105105 result <- flip runReaderT def $

106106 runParserT parseDoc

107107 (HTMLState def{ stateOptions = opts }

108− [] Nothing Set.empty M.empty [] M.empty)

108+ [] Nothing Set.empty [] M.empty)

109109 "source" tags

110110 case result of

111111 Right doc -> return doc

@@ -126,7 +126,6 @@ data HTMLState =

126126 noteTable :: [(String, Blocks)],

127127 baseHref :: Maybe URI,

128128 identifiers :: Set.Set String,

129− headerMap :: M.Map Inlines String,

130129 logMessages :: [LogMessage],

131130 macros :: M.Map Text Macro

132131 }

@@ -1295,10 +1294,6 @@ instance HasIdentifierList HTMLState where

12951294 extractIdentifierList = identifiers

12961295 updateIdentifierList f s = s{ identifiers = f (identifiers s) }

12971296

1298−instance HasHeaderMap HTMLState where

1299− extractHeaderMap = headerMap

1300− updateHeaderMap f s = s{ headerMap = f (headerMap s) }

1301−

13021297instance HasLogMessages HTMLState where

13031298 addLogMessage m s = s{ logMessages = m : logMessages s }

13041299 getLogMessages = reverse . logMessages

src/Text/Pandoc/Readers/LaTeX/Parsing.hs−6

@@ -131,7 +131,6 @@ data LaTeXState = LaTeXState{ sOptions :: ReaderOptions

131131 , sQuoteContext :: QuoteContext

132132 , sMacros :: M.Map Text Macro

133133 , sContainers :: [String]

134− , sHeaders :: M.Map Inlines String

135134 , sLogMessages :: [LogMessage]

136135 , sIdentifiers :: Set.Set String

137136 , sVerbatimMode :: Bool

@@ -153,7 +152,6 @@ defaultLaTeXState = LaTeXState{ sOptions = def

153152 , sQuoteContext = NoQuote

154153 , sMacros = M.empty

155154 , sContainers = []

156− , sHeaders = M.empty

157155 , sLogMessages = []

158156 , sIdentifiers = Set.empty

159157 , sVerbatimMode = False

@@ -192,10 +190,6 @@ instance HasIncludeFiles LaTeXState where

192190 addIncludeFile f s = s{ sContainers = f : sContainers s }

193191 dropLatestIncludeFile s = s { sContainers = drop 1 $ sContainers s }

194192

195−instance HasHeaderMap LaTeXState where

196− extractHeaderMap = sHeaders

197− updateHeaderMap f st = st{ sHeaders = f $ sHeaders st }

198−

199193instance HasMacros LaTeXState where

200194 extractMacros st = sMacros st

201195 updateMacros f st = st{ sMacros = f (sMacros st) }

src/Text/Pandoc/Readers/MediaWiki.hs−7

@@ -43,7 +43,6 @@ import Control.Monad.Except (throwError)

4343import Data.Char (isDigit, isSpace)

4444import qualified Data.Foldable as F

4545import Data.List (intercalate, intersperse, isPrefixOf)

46−import qualified Data.Map as M

4746import Data.Maybe (fromMaybe, maybeToList)

4847import Data.Sequence (ViewL (..), viewl, (<|))

4948import qualified Data.Set as Set

@@ -72,7 +71,6 @@ readMediaWiki opts s = do

7271 , mwMaxNestingLevel = 4

7372 , mwNextLinkNumber = 1

7473 , mwCategoryLinks = []

75− , mwHeaderMap = M.empty

7674 , mwIdentifierList = Set.empty

7775 , mwLogMessages = []

7876 , mwInTT = False

@@ -86,7 +84,6 @@ data MWState = MWState { mwOptions :: ReaderOptions

8684 , mwMaxNestingLevel :: Int

8785 , mwNextLinkNumber :: Int

8886 , mwCategoryLinks :: [Inlines]

89− , mwHeaderMap :: M.Map Inlines String

9087 , mwIdentifierList :: Set.Set String

9188 , mwLogMessages :: [LogMessage]

9289 , mwInTT :: Bool

@@ -97,10 +94,6 @@ type MWParser m = ParserT [Char] MWState m

9794instance HasReaderOptions MWState where

9895 extractReaderOptions = mwOptions

9996

100−instance HasHeaderMap MWState where

101− extractHeaderMap = mwHeaderMap

102− updateHeaderMap f st = st{ mwHeaderMap = f $ mwHeaderMap st }

103−

10497instance HasIdentifierList MWState where

10598 extractIdentifierList = mwIdentifierList

10699 updateIdentifierList f st = st{ mwIdentifierList = f $ mwIdentifierList st }

src/Text/Pandoc/Readers/Muse.hs−6

@@ -74,7 +74,6 @@ type F = Future MuseState

7474

7575data MuseState = MuseState { museMeta :: F Meta -- ^ Document metadata

7676 , museOptions :: ReaderOptions

77− , museHeaders :: M.Map Inlines String -- ^ List of headers and ids (used for implicit ref links)

7877 , museIdentifierList :: Set.Set String

7978 , museLastSpacePos :: Maybe SourcePos -- ^ Position after last space or newline parsed

8079 , museLastStrPos :: Maybe SourcePos -- ^ Position after last str parsed

@@ -85,7 +84,6 @@ data MuseState = MuseState { museMeta :: F Meta -- ^ Document metadata

8584instance Default MuseState where

8685 def = MuseState { museMeta = return nullMeta

8786 , museOptions = def

88− , museHeaders = M.empty

8987 , museIdentifierList = Set.empty

9088 , museLastStrPos = Nothing

9189 , museLastSpacePos = Nothing

@@ -108,10 +106,6 @@ type MuseParser m = ParserT Text MuseState (ReaderT MuseEnv m)

108106instance HasReaderOptions MuseState where

109107 extractReaderOptions = museOptions

110108

111−instance HasHeaderMap MuseState where

112− extractHeaderMap = museHeaders

113− updateHeaderMap f st = st{ museHeaders = f $ museHeaders st }

114−

115109instance HasIdentifierList MuseState where

116110 extractIdentifierList = museIdentifierList

117111 updateIdentifierList f st = st{ museIdentifierList = f $ museIdentifierList st }

src/Text/Pandoc/Readers/Org/ParserState.hs+2−8

@@ -64,11 +64,11 @@ import qualified Data.Map as M

6464import qualified Data.Set as Set

6565import Data.Text (Text)

6666

67−import Text.Pandoc.Builder (Blocks, Inlines)

67+import Text.Pandoc.Builder (Blocks)

6868import Text.Pandoc.Definition (Meta (..), nullMeta)

6969import Text.Pandoc.Logging

7070import Text.Pandoc.Options (ReaderOptions (..))

71−import Text.Pandoc.Parsing (Future, HasHeaderMap (..), HasIdentifierList (..),

71+import Text.Pandoc.Parsing (Future, HasIdentifierList (..),

7272 HasIncludeFiles (..), HasLastStrPosition (..),

7373 HasLogMessages (..), HasMacros (..),

7474 HasQuoteContext (..), HasReaderOptions (..),

@@ -120,7 +120,6 @@ data OrgParserState = OrgParserState

120120 , orgStateExcludedTags :: Set.Set Tag

121121 , orgStateExcludedTagsChanged :: Bool

122122 , orgStateExportSettings :: ExportSettings

123− , orgStateHeaderMap :: M.Map Inlines String

124123 , orgStateIdentifiers :: Set.Set String

125124 , orgStateIncludeFiles :: [String]

126125 , orgStateLastForbiddenCharPos :: Maybe SourcePos

@@ -160,10 +159,6 @@ instance HasIdentifierList OrgParserState where

160159 extractIdentifierList = orgStateIdentifiers

161160 updateIdentifierList f s = s{ orgStateIdentifiers = f (orgStateIdentifiers s) }

162161

163−instance HasHeaderMap OrgParserState where

164− extractHeaderMap = orgStateHeaderMap

165− updateHeaderMap f s = s{ orgStateHeaderMap = f (orgStateHeaderMap s) }

166−

167162instance HasLogMessages OrgParserState where

168163 addLogMessage msg st = st{ orgLogMessages = msg : orgLogMessages st }

169164 getLogMessages st = reverse $ orgLogMessages st

@@ -191,7 +186,6 @@ defaultOrgParserState = OrgParserState

191186 , orgStateExportSettings = def

192187 , orgStateExcludedTags = Set.singleton $ Tag "noexport"

193188 , orgStateExcludedTagsChanged = False

194− , orgStateHeaderMap = M.empty

195189 , orgStateIdentifiers = Set.empty

196190 , orgStateIncludeFiles = []

197191 , orgStateLastForbiddenCharPos = Nothing

src/Text/Pandoc/Readers/RST.hs−1

@@ -179,7 +179,6 @@ parseRST = do

179179 st' <- getState

180180 let reversedNotes = stateNotes st'

181181 updateState $ \s -> s { stateNotes = reverse reversedNotes

182− , stateHeaders = mempty

183182 , stateIdentifiers = mempty }

184183 -- now parse it for real...

185184 blocks <- B.toList <$> parseBlocks