diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright 2010-2013 Edward Kmett +Copyright 2010-2014 Edward Kmett Copyright 2008 Ross Patterson Copyright 2007 Paolo Martini Copyright 1999-2000 Daan Leijen diff --git a/src/Text/Trifecta.hs b/src/Text/Trifecta.hs --- a/src/Text/Trifecta.hs +++ b/src/Text/Trifecta.hs @@ -1,7 +1,7 @@ ----------------------------------------------------------------------------- -- | -- Module : Text.Trifecta --- Copyright : (C) 2011-2013 Edward Kmett, +-- Copyright : (C) 2011-2014 Edward Kmett, -- License : BSD-style (see the file LICENSE) -- -- Maintainer : Edward Kmett diff --git a/src/Text/Trifecta/Combinators.hs b/src/Text/Trifecta/Combinators.hs --- a/src/Text/Trifecta/Combinators.hs +++ b/src/Text/Trifecta/Combinators.hs @@ -6,7 +6,7 @@ ----------------------------------------------------------------------------- -- | -- Module : Text.Trifecta.Combinators --- Copyright : (c) Edward Kmett 2011-2013 +-- Copyright : (c) Edward Kmett 2011-2014 -- License : BSD3 -- -- Maintainer : ekmett@gmail.com diff --git a/src/Text/Trifecta/Delta.hs b/src/Text/Trifecta/Delta.hs --- a/src/Text/Trifecta/Delta.hs +++ b/src/Text/Trifecta/Delta.hs @@ -2,7 +2,7 @@ ----------------------------------------------------------------------------- -- | -- Module : Text.Trifecta.Delta --- Copyright : (C) 2011-2013 Edward Kmett +-- Copyright : (C) 2011-2014 Edward Kmett -- License : BSD-style (see the file LICENSE) -- -- Maintainer : Edward Kmett diff --git a/src/Text/Trifecta/Highlight.hs b/src/Text/Trifecta/Highlight.hs --- a/src/Text/Trifecta/Highlight.hs +++ b/src/Text/Trifecta/Highlight.hs @@ -3,7 +3,7 @@ ----------------------------------------------------------------------------- -- | -- Module : Text.Trifecta.Highlight --- Copyright : (C) 2011-2013 Edward Kmett +-- Copyright : (C) 2011-2014 Edward Kmett -- License : BSD-style (see the file LICENSE) -- -- Maintainer : Edward Kmett diff --git a/src/Text/Trifecta/Instances.hs b/src/Text/Trifecta/Instances.hs --- a/src/Text/Trifecta/Instances.hs +++ b/src/Text/Trifecta/Instances.hs @@ -2,7 +2,7 @@ ----------------------------------------------------------------------------- -- | -- Module : Text.Trifecta.Instances --- Copyright : (c) Edward Kmett 2013 +-- Copyright : (c) Edward Kmett 2013-2014 -- License : BSD3 -- -- Maintainer : ekmett@gmail.com diff --git a/src/Text/Trifecta/Parser.hs b/src/Text/Trifecta/Parser.hs --- a/src/Text/Trifecta/Parser.hs +++ b/src/Text/Trifecta/Parser.hs @@ -11,7 +11,7 @@ ----------------------------------------------------------------------------- -- | -- Module : Text.Trifecta.Parser --- Copyright : (c) Edward Kmett 2011-2013 +-- Copyright : (c) Edward Kmett 2011-2014 -- License : BSD3 -- -- Maintainer : ekmett@gmail.com diff --git a/src/Text/Trifecta/Rendering.hs b/src/Text/Trifecta/Rendering.hs --- a/src/Text/Trifecta/Rendering.hs +++ b/src/Text/Trifecta/Rendering.hs @@ -7,7 +7,7 @@ ----------------------------------------------------------------------------- -- | -- Module : Text.Trifecta.Rendering --- Copyright : (C) 2011-2013 Edward Kmett, +-- Copyright : (C) 2011-2014 Edward Kmett -- License : BSD-style (see the file LICENSE) -- -- Maintainer : Edward Kmett diff --git a/src/Text/Trifecta/Result.hs b/src/Text/Trifecta/Result.hs --- a/src/Text/Trifecta/Result.hs +++ b/src/Text/Trifecta/Result.hs @@ -12,7 +12,7 @@ ----------------------------------------------------------------------------- -- | -- Module : Text.Trifecta.Result --- Copyright : (c) Edward Kmett 2011-2013 +-- Copyright : (c) Edward Kmett 2011-2014 -- License : BSD3 -- -- Maintainer : ekmett@gmail.com diff --git a/src/Text/Trifecta/Rope.hs b/src/Text/Trifecta/Rope.hs --- a/src/Text/Trifecta/Rope.hs +++ b/src/Text/Trifecta/Rope.hs @@ -2,7 +2,7 @@ ----------------------------------------------------------------------------- -- | -- Module : Text.Trifecta.Rope --- Copyright : (C) 2011-2013 Edward Kmett, +-- Copyright : (C) 2011-2014 Edward Kmett -- License : BSD-style (see the file LICENSE) -- -- Maintainer : Edward Kmett diff --git a/src/Text/Trifecta/Util/Array.hs b/src/Text/Trifecta/Util/Array.hs --- a/src/Text/Trifecta/Util/Array.hs +++ b/src/Text/Trifecta/Util/Array.hs @@ -2,7 +2,7 @@ ----------------------------------------------------------------------------- -- | -- Module : Text.Trifecta.Util.Array --- Copyright : Edward Kmett 2011-2013 +-- Copyright : Edward Kmett 2011-2014 -- Johan Tibell 2011 -- License : BSD3 -- @@ -56,7 +56,20 @@ import Control.Applicative (Applicative) import Control.DeepSeq import Control.Monad.ST -import GHC.Exts +import GHC.Exts ( + Array#, + copyArray#, + copyMutableArray#, + indexArray#, + Int(I#), + MutableArray#, + newArray#, + readArray#, + sizeofArray#, + sizeofMutableArray#, + thawArray#, + unsafeFreezeArray#, + writeArray#) import GHC.ST (ST(..)) import Prelude hiding (filter, foldr, length, map, read) diff --git a/src/Text/Trifecta/Util/Combinators.hs b/src/Text/Trifecta/Util/Combinators.hs --- a/src/Text/Trifecta/Util/Combinators.hs +++ b/src/Text/Trifecta/Util/Combinators.hs @@ -1,7 +1,7 @@ ----------------------------------------------------------------------------- -- | -- Module : Text.Trifecta.Util.Combinators --- Copyright : (C) 2011-2013 Edward Kmett, +-- Copyright : (C) 2011-2014 Edward Kmett -- License : BSD-style (see the file LICENSE) -- -- Maintainer : Edward Kmett diff --git a/src/Text/Trifecta/Util/IntervalMap.hs b/src/Text/Trifecta/Util/IntervalMap.hs --- a/src/Text/Trifecta/Util/IntervalMap.hs +++ b/src/Text/Trifecta/Util/IntervalMap.hs @@ -4,7 +4,7 @@ ----------------------------------------------------------------------------- -- | -- Module : Text.Trifecta.Util.IntervalMap --- Copyright : (c) Edward Kmett 2011-2013 +-- Copyright : (c) Edward Kmett 2011-2014 -- (c) Ross Paterson 2008 -- License : BSD-style -- Maintainer : ekmett@gmail.com diff --git a/src/Text/Trifecta/Util/It.hs b/src/Text/Trifecta/Util/It.hs --- a/src/Text/Trifecta/Util/It.hs +++ b/src/Text/Trifecta/Util/It.hs @@ -6,7 +6,7 @@ ----------------------------------------------------------------------------- -- | -- Module : Text.Trifecta.Util.It --- Copyright : (C) 2011-2013 Edward Kmett +-- Copyright : (C) 2011-2014 Edward Kmett -- License : BSD-style (see the file LICENSE) -- -- Maintainer : Edward Kmett diff --git a/trifecta.cabal b/trifecta.cabal --- a/trifecta.cabal +++ b/trifecta.cabal @@ -1,6 +1,6 @@ name: trifecta category: Text, Parsing, Diagnostics, Pretty Printer, Logging -version: 1.4 +version: 1.4.1 license: BSD3 cabal-version: >= 1.10 license-file: LICENSE @@ -9,7 +9,7 @@ stability: experimental homepage: http://github.com/ekmett/trifecta/ bug-reports: http://github.com/ekmett/trifecta/issues -copyright: Copyright (C) 2010-2013 Edward A. Kmett +copyright: Copyright (C) 2010-2014 Edward A. Kmett synopsis: A modern parser combinator library with convenient diagnostics description: A modern parser combinator library with slicing and Clang-style colored diagnostics @@ -56,7 +56,7 @@ fingertree >= 0.1 && < 0.2, ghc-prim, hashable >= 1.2.1 && < 1.3, - lens >= 3.10 && < 5, + lens >= 4.0 && < 5, mtl >= 2.0.1 && < 2.2, parsers >= 0.10 && < 1, reducers >= 3.10 && < 4,