Skip to content

Commit 30c4207

Browse files
Gabriella439Gabriella439
authored
Build against megaparsec-0.9 (#2030)
1 parent f23dab8 commit 30c4207

File tree

8 files changed

+29
-38
lines changed

8 files changed

+29
-38
lines changed

‎dhall-docs/dhall-docs.cabal‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ Library
7171
lens-family-core >= 1.0.0 && < 2.2 ,
7272
lucid >= 2.9.12 && < 2.10,
7373
mmark >= 0.0.7.0 && < 0.8 ,
74-
megaparsec >= 7 && < 8.1 ,
74+
megaparsec >= 7 && < 9.1 ,
7575
memory < 0.16,
7676
path >= 0.7.0 && < 0.9 ,
7777
path-io >= 1.6.0 && < 1.7 ,

‎dhall-docs/src/Dhall/Docs/Comment.hs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import qualified Data.Foldable
2727
import qualified Data.List.NonEmpty as NonEmpty
2828
import qualified Data.Maybe as Maybe
2929
import qualified Data.Text
30-
import qualified Dhall.Parser.Expression as Expression
3130
import qualified Dhall.Parser.Token as Token
3231
import qualified Text.Megaparsec
3332
import qualified Text.Megaparsec.Pos as Megaparsec.Pos
@@ -93,7 +92,7 @@ lineCommentParser = do
9392
| otherwise = (x :| [], ys)
9493

9594
singleLine = do
96-
sourcePos <- Expression.getSourcePos
95+
sourcePos <- Text.Megaparsec.getSourcePos
9796
commentLine <- Token.lineComment
9897
whitespace
9998
pure (sourcePos, commentLine)

‎dhall-lsp-server/dhall-lsp-server.cabal‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ library
5858
, hslogger >= 1.2.10 && < 1.4
5959
, lens >= 4.16.1 && < 4.20
6060
, lens-family-core >= 1.2.2 && < 2.2
61-
, megaparsec >= 7.0.2 && < 8.1
61+
, megaparsec >= 7.0.2 && < 9.1
6262
, mtl >= 2.2.2 && < 2.3
6363
, network-uri >= 2.6.1.0 && < 2.7
6464
, prettyprinter >= 1.5.1 && < 1.8

‎dhall-lsp-server/src/Dhall/LSP/Backend/Parsing.hs‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ import Dhall.Core
2222
)
2323
import Dhall.Parser
2424
import Dhall.Parser.Expression
25-
( getSourcePos
26-
, importHash_
25+
( importHash_
2726
, importType_
2827
, localOnly
2928
)
@@ -63,9 +62,9 @@ getLetInner (Src left _ text) = Megaparsec.parseMaybe (unParser parseLetInnerOff
6362
whitespace
6463
_ <- optional _in
6564
whitespace
66-
begin <- getSourcePos
65+
begin <- Megaparsec.getSourcePos
6766
tokens <- Megaparsec.takeRest
68-
end <- getSourcePos
67+
end <- Megaparsec.getSourcePos
6968
return (Src begin end tokens)
7069

7170
-- | Given an Src of a let expression return the Src containing the type
@@ -79,13 +78,13 @@ getLetAnnot (Src left _ text) = Megaparsec.parseMaybe (unParser parseLetAnnot) t
7978
nonemptyWhitespace
8079
_ <- label
8180
whitespace
82-
begin <- getSourcePos
81+
begin <- Megaparsec.getSourcePos
8382
(tokens, _) <- Megaparsec.match $ optional (do
8483
_ <- _colon
8584
nonemptyWhitespace
8685
_ <- expr
8786
whitespace)
88-
end <- getSourcePos
87+
end <- Megaparsec.getSourcePos
8988
_ <- Megaparsec.takeRest
9089
return (Src begin end tokens)
9190

@@ -101,9 +100,9 @@ getLetIdentifier src@(Src left _ text) =
101100
setSourcePos left
102101
_let
103102
nonemptyWhitespace
104-
begin <- getSourcePos
103+
begin <- Megaparsec.getSourcePos
105104
(tokens, _) <- Megaparsec.match label
106-
end <- getSourcePos
105+
end <- Megaparsec.getSourcePos
107106
_ <- Megaparsec.takeRest
108107
return (Src begin end tokens)
109108

@@ -117,9 +116,9 @@ getLamIdentifier (Src left _ text) =
117116
whitespace
118117
_openParens
119118
whitespace
120-
begin <- getSourcePos
119+
begin <- Megaparsec.getSourcePos
121120
(tokens, _) <- Megaparsec.match label
122-
end <- getSourcePos
121+
end <- Megaparsec.getSourcePos
123122
_ <- Megaparsec.takeRest
124123
return (Src begin end tokens)
125124

@@ -133,9 +132,9 @@ getForallIdentifier (Src left _ text) =
133132
whitespace
134133
_openParens
135134
whitespace
136-
begin <- getSourcePos
135+
begin <- Megaparsec.getSourcePos
137136
(tokens, _) <- Megaparsec.match label
138-
end <- getSourcePos
137+
end <- Megaparsec.getSourcePos
139138
_ <- Megaparsec.takeRest
140139
return (Src begin end tokens)
141140

@@ -149,9 +148,9 @@ getImportHash (Src left _ text) =
149148
setSourcePos left
150149
_ <- importType_
151150
whitespace
152-
begin <- getSourcePos
151+
begin <- Megaparsec.getSourcePos
153152
(tokens, _) <- Megaparsec.match $ optional importHash_
154-
end <- getSourcePos
153+
end <- Megaparsec.getSourcePos
155154
_ <- Megaparsec.takeRest
156155
return (Src begin end tokens)
157156

@@ -169,10 +168,10 @@ getImportLink src@(Src left _ text) =
169168
where
170169
parseImportLink = do
171170
setSourcePos left
172-
begin <- getSourcePos
171+
begin <- Megaparsec.getSourcePos
173172
(tokens, _) <-
174173
Megaparsec.match $ (localOnly *> return ()) <|> (httpRaw *> return ())
175-
end <- getSourcePos
174+
end <- Megaparsec.getSourcePos
176175
_ <- Megaparsec.takeRest
177176
return (Src begin end tokens)
178177

‎dhall-nixpkgs/dhall-nixpkgs.cabal‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Executable dhall-to-nixpkgs
2323
, foldl < 1.5
2424
, hnix >= 0.7 && < 0.10
2525
, lens-family-core >= 1.0.0 && < 2.2
26-
, megaparsec >= 7.0.0 && < 8.1
26+
, megaparsec >= 7.0.0 && < 9.1
2727
, mmorph < 1.2
2828
, neat-interpolation < 0.6
2929
, optparse-applicative >= 0.14.0.0 && < 0.17

‎dhall-openapi/dhall-openapi.cabal‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ executable openapi-to-dhall
2525
containers >= 0.5.0.0 && < 0.7 ,
2626
dhall >= 1.34.0 && < 1.35 ,
2727
dhall-openapi ,
28-
megaparsec >= 7.0 && < 8.1 ,
28+
megaparsec >= 7.0 && < 9.1 ,
2929
optparse-applicative >= 0.14.3.0 && < 0.17 ,
3030
parser-combinators >= 1.0.3 && < 1.3 ,
3131
prettyprinter >= 1.2.0.1 && < 1.8 ,
@@ -56,4 +56,4 @@ library
5656
text >= 0.11.1.0 && < 1.3 ,
5757
vector >= 0.11.0.0 && < 0.13 ,
5858
yaml >= 0.8.3 && < 0.12
59-
default-language: Haskell2010
59+
default-language: Haskell2010

‎dhall/dhall.cabal‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@ Library
492492
haskeline >= 0.7.2.1 && < 0.9 ,
493493
hashable >= 1.2 && < 1.4 ,
494494
lens-family-core >= 1.0.0 && < 2.2 ,
495-
megaparsec >= 7 && < 8.1 ,
495+
megaparsec >= 7 && < 9.1 ,
496496
memory >= 0.14 && < 0.16,
497497
mmorph < 1.2 ,
498498
mtl >= 2.2.1 && < 2.3 ,

‎dhall/src/Dhall/Parser/Expression.hs‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,6 @@ import qualified Text.Megaparsec
3434
import Dhall.Parser.Combinators
3535
import Dhall.Parser.Token
3636

37-
-- | Get the current source position
38-
getSourcePos :: Text.Megaparsec.MonadParsec e s m =>
39-
m Text.Megaparsec.SourcePos
40-
getSourcePos =
41-
Text.Megaparsec.getSourcePos
42-
{-# INLINE getSourcePos #-}
43-
4437
-- | Get the current source offset (in tokens)
4538
getOffset :: Text.Megaparsec.MonadParsec e s m => m Int
4639
getOffset = Text.Megaparsec.stateOffset <$> Text.Megaparsec.getParserState
@@ -58,27 +51,27 @@ setOffset o = Text.Megaparsec.updateParserState $ \state ->
5851
-}
5952
src :: Parser a -> Parser Src
6053
src parser = do
61-
before <- getSourcePos
54+
before <- Text.Megaparsec.getSourcePos
6255
(tokens, _) <- Text.Megaparsec.match parser
63-
after <- getSourcePos
56+
after <- Text.Megaparsec.getSourcePos
6457
return (Src before after tokens)
6558

6659
-- | Same as `src`, except also return the parsed value
6760
srcAnd :: Parser a -> Parser (Src, a)
6861
srcAnd parser = do
69-
before <- getSourcePos
62+
before <- Text.Megaparsec.getSourcePos
7063
(tokens, x) <- Text.Megaparsec.match parser
71-
after <- getSourcePos
64+
after <- Text.Megaparsec.getSourcePos
7265
return (Src before after tokens, x)
7366

7467
{-| Wrap a `Parser` to still match the same text, but to wrap the resulting
7568
`Expr` in a `Note` constructor containing the `Src` span
7669
-}
7770
noted :: Parser (Expr Src a) -> Parser (Expr Src a)
7871
noted parser = do
79-
before <- getSourcePos
72+
before <- Text.Megaparsec.getSourcePos
8073
(tokens, e) <- Text.Megaparsec.match parser
81-
after <- getSourcePos
74+
after <- Text.Megaparsec.getSourcePos
8275
let src₀ = Src before after tokens
8376
case e of
8477
Note src₁ _ | laxSrcEq src₀ src₁ -> return e
@@ -453,7 +446,7 @@ parsers embedded = Parsers {..}
453446
let fieldSelection = do
454447
src0 <- src whitespace
455448
l <- anyLabel
456-
pos <- getSourcePos
449+
pos <- Text.Megaparsec.getSourcePos
457450

458451
-- FIXME: Suffix whitespace can't be parsed given our limitation
459452
-- about whitespace treatment, but for @dhall-docs@ this

0 commit comments

Comments
 (0)