Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Glasgow Haskell Compiler
GHC
Commits
c1a31d0d
Commit
c1a31d0d
authored
Aug 09, 2006
by
Simon Marlow
Browse files
fixes to the stage2 build following removal of old FFI syntax
parent
d54ca9c5
Changes
2
Hide whitespace changes
Inline
Side-by-side
compiler/deSugar/DsMeta.hs
View file @
c1a31d0d
...
...
@@ -135,7 +135,7 @@ groupBinders (HsGroup { hs_valds = val_decls, hs_tyclds = tycl_decls,
-- Collect the binders of a Group
=
collectHsValBinders
val_decls
++
[
n
|
d
<-
tycl_decls
,
n
<-
tyClDeclNames
(
unLoc
d
)]
++
[
n
|
L
_
(
ForeignImport
n
_
_
_
)
<-
foreign_decls
]
[
n
|
L
_
(
ForeignImport
n
_
_
)
<-
foreign_decls
]
{- Note [Binders and occurrences]
...
...
@@ -251,7 +251,7 @@ repInstD' (L loc (InstDecl ty binds _)) -- Ignore user pragmas for now
(
tvs
,
cxt
,
cls
,
tys
)
=
splitHsInstDeclTy
(
unLoc
ty
)
repForD
::
Located
(
ForeignDecl
Name
)
->
DsM
(
SrcSpan
,
Core
TH
.
DecQ
)
repForD
(
L
loc
(
ForeignImport
name
typ
(
CImport
cc
s
ch
cn
cis
)
_
))
repForD
(
L
loc
(
ForeignImport
name
typ
(
CImport
cc
s
ch
cn
cis
)))
=
do
MkC
name'
<-
lookupLOcc
name
MkC
typ'
<-
repLTy
typ
MkC
cc'
<-
repCCallConv
cc
...
...
compiler/hsSyn/Convert.lhs
View file @
c1a31d0d
...
...
@@ -210,7 +210,7 @@ cvtForD (ImportF callconv safety from nm ty)
= do { nm' <- vNameL nm
; ty' <- cvtType ty
; let i = CImport (cvt_conv callconv) safety' c_header nilFS cis
; return $ ForeignImport nm' ty' i
False
}
; return $ ForeignImport nm' ty' i }
| otherwise
= failWith $ text (show from)<+> ptext SLIT("is not a valid ccall impent")
...
...
@@ -224,7 +224,7 @@ cvtForD (ExportF callconv as nm ty)
= do { nm' <- vNameL nm
; ty' <- cvtType ty
; let e = CExport (CExportStatic (mkFastString as) (cvt_conv callconv))
; return $ ForeignExport nm' ty' e
False
}
; return $ ForeignExport nm' ty' e }
cvt_conv CCall = CCallConv
cvt_conv StdCall = StdCallConv
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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