Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
gargantext-ihaskell
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gargantext
gargantext-ihaskell
Commits
717d650a
Commit
717d650a
authored
5 years ago
by
Vaibhav Sagar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ghc-parser: update
parent
8669a873
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
66 additions
and
6 deletions
+66
-6
Parser.hs
ghc-parser/generic-src/Language/Haskell/GHC/Parser.hs
+21
-4
ghc-parser.cabal
ghc-parser/ghc-parser.cabal
+5
-2
HappyParser.hs
ghc-parser/src-8.10/Language/Haskell/GHC/HappyParser.hs
+40
-0
No files found.
ghc-parser/generic-src/Language/Haskell/GHC/Parser.hs
View file @
717d650a
...
...
@@ -30,7 +30,10 @@ import Data.Char (isAlphaNum)
import
Bag
import
DynFlags
(
parseDynamicFilePragma
)
#
if
MIN_VERSION_ghc
(
8
,
10
,
0
)
#
else
import
ErrUtils
hiding
(
ErrMsg
)
#
endif
import
FastString
#
if
MIN_VERSION_ghc
(
8
,
4
,
0
)
import
GHC
hiding
(
Located
,
Parsed
,
parser
)
...
...
@@ -133,23 +136,37 @@ runParser flags (Parser parser) str =
toParseOut
$
unP
parser
parseState
where
toParseOut
::
ParseResult
a
->
ParseOutput
a
#
if
MIN_VERSION_ghc
(
8
,
4
,
0
)
#
if
MIN_VERSION_ghc
(
8
,
10
,
0
)
toParseOut
(
PFailed
pstate
)
=
let
realSpan
=
last_loc
pstate
errMsg
=
printErrorBag
$
snd
$
(
messages
pstate
)
flags
ln
=
srcLocLine
$
SrcLoc
.
realSrcSpanStart
realSpan
col
=
srcLocCol
$
SrcLoc
.
realSrcSpanStart
realSpan
in
Failure
errMsg
$
Loc
ln
col
#
elif
MIN_VERSION_ghc
(
8
,
4
,
0
)
toParseOut
(
PFailed
_
spn
@
(
RealSrcSpan
realSpan
)
err
)
=
let
errMsg
=
printErrorBag
$
unitBag
$
mkPlainErrMsg
flags
spn
err
ln
=
srcLocLine
$
SrcLoc
.
realSrcSpanStart
realSpan
col
=
srcLocCol
$
SrcLoc
.
realSrcSpanStart
realSpan
in
Failure
errMsg
$
Loc
ln
col
#
else
toParseOut
(
PFailed
spn
@
(
RealSrcSpan
realSpan
)
err
)
=
#
endif
let
errMsg
=
printErrorBag
$
unitBag
$
mkPlainErrMsg
flags
spn
err
ln
=
srcLocLine
$
SrcLoc
.
realSrcSpanStart
realSpan
col
=
srcLocCol
$
SrcLoc
.
realSrcSpanStart
realSpan
in
Failure
errMsg
$
Loc
ln
col
#
endif
#
if
MIN_VERSION_ghc
(
8
,
4
,
0
)
#
if
MIN_VERSION_ghc
(
8
,
10
,
0
)
#
elif
MIN_VERSION_ghc
(
8
,
4
,
0
)
toParseOut
(
PFailed
_
spn
err
)
=
let
errMsg
=
printErrorBag
$
unitBag
$
mkPlainErrMsg
flags
spn
err
in
Failure
errMsg
$
Loc
0
0
#
else
toParseOut
(
PFailed
spn
err
)
=
#
endif
let
errMsg
=
printErrorBag
$
unitBag
$
mkPlainErrMsg
flags
spn
err
in
Failure
errMsg
$
Loc
0
0
#
endif
toParseOut
(
POk
_parseState
result
)
=
Parsed
result
...
...
This diff is collapsed.
Click to expand it.
ghc-parser/ghc-parser.cabal
View file @
717d650a
...
...
@@ -24,12 +24,15 @@ library
-- other-modules:
-- other-extensions:
build-depends: base >=4.9 && < 5,
ghc >=8.0 && <8.
9
ghc >=8.0 && <8.
11
if impl(ghc >= 8.0) && impl(ghc < 8.4)
hs-source-dirs: generic-src src-8.0
else
hs-source-dirs: generic-src src-8.4
if impl(ghc >= 8.4) && impl(ghc < 8.10)
hs-source-dirs: generic-src src-8.4
else
hs-source-dirs: generic-src src-8.10
default-language: Haskell2010
This diff is collapsed.
Click to expand it.
ghc-parser/src-8.10/Language/Haskell/GHC/HappyParser.hs
0 → 100644
View file @
717d650a
module
Language.Haskell.GHC.HappyParser
(
fullStatement
,
fullImport
,
fullDeclaration
,
fullExpression
,
fullTypeSignature
,
fullModule
)
where
import
Parser
import
SrcLoc
-- compiler/hsSyn
import
GHC.Hs
-- compiler/utils
import
OrdList
-- compiler/parser
import
Lexer
import
RdrHsSyn
(
runECP_P
)
fullStatement
::
P
(
Maybe
(
LStmt
GhcPs
(
LHsExpr
GhcPs
)))
fullStatement
=
parseStmt
fullImport
::
P
(
LImportDecl
GhcPs
)
fullImport
=
parseImport
fullDeclaration
::
P
(
OrdList
(
LHsDecl
GhcPs
))
fullDeclaration
=
fmap
unitOL
parseDeclaration
fullExpression
::
P
(
LHsExpr
GhcPs
)
fullExpression
=
runECP_P
=<<
parseExpression
fullTypeSignature
::
P
(
Located
(
OrdList
(
LHsDecl
GhcPs
)))
fullTypeSignature
=
fmap
(
noLoc
.
unitOL
)
parseTypeSignature
fullModule
::
P
(
Located
(
HsModule
GhcPs
))
fullModule
=
parseModule
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment