summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCsaba Hruska <csaba.hruska@gmail.com>2018-02-02 14:58:47 +0100
committerCsaba Hruska <csaba.hruska@gmail.com>2018-02-02 14:58:47 +0100
commitcf9ed24f56483af23f053a12c91b260163ebf31f (patch)
treecc9b7a9fb8cb7322b468bc02697269f96fafdf70
parentff6e3b136eede172f20ea8a0f7017ad1ecd029b8 (diff)
switch to megaparsec 6.4
-rw-r--r--lambdacube-compiler.cabal2
-rw-r--r--src/LambdaCube/Compiler/Lexer.hs4
-rw-r--r--stack.yaml2
3 files changed, 5 insertions, 3 deletions
diff --git a/lambdacube-compiler.cabal b/lambdacube-compiler.cabal
index 09a96589..9f3ff199 100644
--- a/lambdacube-compiler.cabal
+++ b/lambdacube-compiler.cabal
@@ -156,7 +156,7 @@ executable lambdacube-compiler-unit-tests
156 semigroups, 156 semigroups,
157 containers >=0.5 && <0.6, 157 containers >=0.5 && <0.6,
158 lambdacube-compiler, 158 lambdacube-compiler,
159 megaparsec >=5.3 && <5.4, 159 megaparsec >=6.4 && <7,
160 QuickCheck >= 2.8.2 && <2.10, 160 QuickCheck >= 2.8.2 && <2.10,
161 tasty >= 0.11 && <0.12, 161 tasty >= 0.11 && <0.12,
162 tasty-quickcheck >=0.8 && <0.9 162 tasty-quickcheck >=0.8 && <0.9
diff --git a/src/LambdaCube/Compiler/Lexer.hs b/src/LambdaCube/Compiler/Lexer.hs
index c3f4e285..29b88930 100644
--- a/src/LambdaCube/Compiler/Lexer.hs
+++ b/src/LambdaCube/Compiler/Lexer.hs
@@ -23,11 +23,11 @@ import Control.Monad.RWS
23import Control.Applicative 23import Control.Applicative
24import Control.Arrow 24import Control.Arrow
25 25
26import Text.Megaparsec hiding (State, ParseError) 26import Text.Megaparsec hiding (State, ParseError, many, some)
27import Text.Megaparsec.Char 27import Text.Megaparsec.Char
28import Text.Megaparsec.Char.Lexer hiding (lexeme, symbol) 28import Text.Megaparsec.Char.Lexer hiding (lexeme, symbol)
29import qualified Text.Megaparsec as P 29import qualified Text.Megaparsec as P
30import Text.Megaparsec as ParseUtils hiding (try, Message, State, ParseError, lexeme, symbol) 30import Text.Megaparsec as ParseUtils hiding (try, Message, State, ParseError, lexeme, symbol, many, some)
31 31
32import LambdaCube.Compiler.Pretty hiding (parens) 32import LambdaCube.Compiler.Pretty hiding (parens)
33import LambdaCube.Compiler.DesugaredSource 33import LambdaCube.Compiler.DesugaredSource
diff --git a/stack.yaml b/stack.yaml
index 2435b533..3fd3e586 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -9,5 +9,7 @@ packages:
9 extra-dep: true 9 extra-dep: true
10extra-deps: 10extra-deps:
11- vect-0.4.7 11- vect-0.4.7
12- megaparsec-6.4.0
13- parser-combinators-0.4.0
12flags: {} 14flags: {}
13extra-package-dbs: [] 15extra-package-dbs: []