@@ -49,7 +49,7 @@ import Data.Foldable (asum)
49import Data.Function
49import Data.Function
50import Data.Generics.Uniplate.Data (descendM)
50import Data.Generics.Uniplate.Data (descendM)
51import Data.List
51import Data.List
52−import Data.List.NonEmpty (NonEmpty(..))
52+import qualified Data.List.NonEmpty as NonEmpty
53import qualified Data.List.Split as Spl
53import qualified Data.List.Split as Spl
54import qualified Data.Map as M
54import qualified Data.Map as M
55import Data.Maybe
55import Data.Maybe
@@ -433,20 +433,20 @@ syntaxRule syn
433 reservedHL "syntax"
433 reservedHL "syntax"
434 return sty)
434 return sty)
435 syms <- some syntaxSym
435 syms <- some syntaxSym
436− when (all isExpr syms) $ P.unexpected . P.Label $ 'm' :| "issing keywords in syntax rule"
436+ when (all isExpr syms) $ P.unexpected . P.Label . NonEmpty.fromList $ "missing keywords in syntax rule"
437 let ns = mapMaybe getName syms
437 let ns = mapMaybe getName syms
438 when (length ns /= length (nub ns))
438 when (length ns /= length (nub ns))
439− $ P.unexpected . P.Label $ 'r' :| "epeated variable in syntax rule"
439+ $ P.unexpected . P.Label . NonEmpty.fromList $ "repeated variable in syntax rule"
440 lchar '='
440 lchar '='
441 tm <- typeExpr (allowImp syn) >>= uniquifyBinders [n | Binding n <- syms]
441 tm <- typeExpr (allowImp syn) >>= uniquifyBinders [n | Binding n <- syms]
442 terminator
442 terminator
443 return (Rule (mkSimple syms) tm sty)
443 return (Rule (mkSimple syms) tm sty)
444 <|> do reservedHL "decl"; reservedHL "syntax"
444 <|> do reservedHL "decl"; reservedHL "syntax"
445 syms <- some syntaxSym
445 syms <- some syntaxSym
446− when (all isExpr syms) $ P.unexpected . P.Label $ 'm' :| "issing keywords in syntax rule"
446+ when (all isExpr syms) $ P.unexpected . P.Label . NonEmpty.fromList $ "missing keywords in syntax rule"
447 let ns = mapMaybe getName syms
447 let ns = mapMaybe getName syms
448 when (length ns /= length (nub ns))
448 when (length ns /= length (nub ns))
449− $ P.unexpected . P.Label $ 'r' :| "epeated variable in syntax rule"
449+ $ P.unexpected . P.Label . NonEmpty.fromList $ "repeated variable in syntax rule"
450 lchar '='
450 lchar '='
451 openBlock
451 openBlock
452 dec <- some (decl syn)
452 dec <- some (decl syn)