git.iko.soy/typeable/pandoc
on master help sign in
Logging: added MacroAlreadyDefined.
commit1dd769e55897757812a1d8188b80c5df7fcb2971 authorJohn MacFarlane <jgm@berkeley.edu> dateMon 3 Jul 2017, 12:36 (9 years ago) parent8300b3f
1 file changed+9
src/Text/Pandoc/Logging.hs+9
src/Text/Pandoc/Logging.hs+9
@@ -77,6 +77,7 @@ data LogMessage =
7777 | CircularReference String SourcePos
7878 | ParsingUnescaped String SourcePos
7979 | CouldNotLoadIncludeFile String SourcePos
80+ | MacroAlreadyDefined String SourcePos
8081 | InlineNotRendered Inline
8182 | BlockNotRendered Block
8283 | DocxParserWarning String
@@ -150,6 +151,11 @@ instance ToJSON LogMessage where
150151 "source" .= Text.pack (sourceName pos),
151152 "line" .= toJSON (sourceLine pos),
152153 "column" .= toJSON (sourceColumn pos)]
154+ MacroAlreadyDefined name pos ->
155+ ["name" .= Text.pack name,
156+ "source" .= Text.pack (sourceName pos),
157+ "line" .= toJSON (sourceLine pos),
158+ "column" .= toJSON (sourceColumn pos)]
153159 InlineNotRendered il ->
154160 ["contents" .= toJSON il]
155161 BlockNotRendered bl ->
@@ -224,6 +230,8 @@ showLogMessage msg =
224230 "Parsing unescaped '" ++ s ++ "' at " ++ showPos pos
225231 CouldNotLoadIncludeFile fp pos ->
226232 "Could not load include file '" ++ fp ++ "' at " ++ showPos pos
233+ MacroAlreadyDefined name pos ->
234+ "Macro '" ++ name ++ "' already defined, ignoring at " ++ showPos pos
227235 InlineNotRendered il ->
228236 "Not rendering " ++ show il
229237 BlockNotRendered bl ->
@@ -277,6 +285,7 @@ messageVerbosity msg =
277285 ReferenceNotFound{} -> WARNING
278286 CircularReference{} -> WARNING
279287 CouldNotLoadIncludeFile{} -> WARNING
288+ MacroAlreadyDefined{} -> WARNING
280289 ParsingUnescaped{} -> INFO
281290 InlineNotRendered{} -> INFO
282291 BlockNotRendered{} -> INFO