ImportVersion, WhatsImported(..),
RdrAvailInfo )
-import RdrName ( RdrName, mkRdrUnqual, mkSysQual, mkSysUnqual )
+import RdrName ( RdrName, mkRdrUnqual, mkIfaceOrig )
import Name ( OccName )
import OccName ( mkSysOccFS,
tcName, varName, ipName, dataName, clsName, tvName, uvName,
)
import Module ( ModuleName, PackageName, mkSysModuleNameFS, mkModule )
import SrcLoc ( SrcLoc )
-import CmdLineOpts ( opt_InPackage )
+import CmdLineOpts ( opt_InPackage, opt_IgnoreIfacePragmas )
import Outputable
import List ( insert )
import Class ( DefMeth (..) )
whats_imported :: { WhatsImported OccName }
whats_imported : { NothingAtAll }
| '::' version { Everything $2 }
- | '::' version version name_version_pairs version { Specifically $2 (Just $3) $4 $5 }
+ | '::' version version version name_version_pairs { Specifically $2 (Just $3) $5 $4 }
name_version_pairs :: { [(OccName, Version)] }
name_version_pairs : { [] }
entity : var_occ { Avail $1 }
| tc_occ { AvailTC $1 [$1] }
| tc_occ '|' stuff_inside { AvailTC $1 $3 }
- | tc_occ stuff_inside { AvailTC $1 (insert $1 $2) }
- -- The 'insert' is important. The stuff_inside is sorted, and
- -- insert keeps it that way. This is important when comparing
- -- against the new interface file, which has the stuff in sorted order
- -- If they differ, we'll bump the module number when it's unnecessary
+ | tc_occ stuff_inside { AvailTC $1 ($1:$2) }
+ -- Note that the "main name" comes at the beginning
stuff_inside :: { [OccName] }
stuff_inside : '{' val_occs '}' { $2 }
| csig ';' csigs1 { $1 : $3 }
csig :: { RdrNameSig }
-csig : src_loc var_name '::' type { mkClassOpSig NoDefMeth $2 $4 $1 }
- | src_loc var_name '=' '::' type { mkClassOpSig (DefMeth (error "DefMeth") )
+csig : src_loc qvar_name '::' type { mkClassOpSig NoDefMeth $2 $4 $1 }
+ | src_loc qvar_name '=' '::' type { mkClassOpSig (DefMeth (error "DefMeth") )
$2 $5 $1 }
- | src_loc var_name ';' '::' type { mkClassOpSig GenDefMeth $2 $5 $1 }
+ | src_loc qvar_name ';' '::' type { mkClassOpSig GenDefMeth $2 $5 $1 }
--------------------------------------------------------------------------
| instance_decl_part inst_decl { $2 : $1 }
inst_decl :: { RdrNameInstDecl }
-inst_decl : src_loc 'instance' type '=' var_name ';'
+inst_decl : src_loc 'instance' type '=' qvar_name ';'
{ InstDecl $3
EmptyMonoBinds {- No bindings -}
[] {- No user pragmas -}
--------------------------------------------------------------------------
-decls_part :: { [(Version, RdrNameHsDecl)] }
+decls_part :: { [(Version, RdrNameTyClDecl)] }
decls_part
: {- empty -} { [] }
| opt_version decl ';' decls_part { ($1,$2):$4 }
-decl :: { RdrNameHsDecl }
-decl : src_loc var_name '::' type maybe_idinfo
- { SigD (IfaceSig $2 $4 ($5 $2) $1) }
- | src_loc 'type' tc_name tv_bndrs '=' type
- { TyClD (TySynonym $3 $4 $6 $1) }
- | src_loc 'data' opt_decl_context tc_name tv_bndrs constrs
- { TyClD (mkTyData DataType $3 $4 $5 $6 (length $6) Nothing $1) }
- | src_loc 'newtype' opt_decl_context tc_name tv_bndrs newtype_constr
- { TyClD (mkTyData NewType $3 $4 $5 $6 1 Nothing $1) }
- | src_loc 'class' opt_decl_context tc_name tv_bndrs fds csigs
- { TyClD (mkClassDecl $3 $4 $5 $6 $7 EmptyMonoBinds $1) }
+decl :: { RdrNameTyClDecl }
+decl : src_loc qvar_name '::' type maybe_idinfo
+ { IfaceSig $2 $4 ($5 $2) $1 }
+ | src_loc 'type' qtc_name tv_bndrs '=' type
+ { TySynonym $3 $4 $6 $1 }
+ | src_loc 'data' opt_decl_context qtc_name tv_bndrs constrs
+ { mkTyData DataType $3 $4 $5 $6 (length $6) Nothing $1 }
+ | src_loc 'newtype' opt_decl_context qtc_name tv_bndrs newtype_constr
+ { mkTyData NewType $3 $4 $5 $6 1 Nothing $1 }
+ | src_loc 'class' opt_decl_context qtc_name tv_bndrs fds csigs
+ { mkClassDecl $3 $4 $5 $6 $7 EmptyMonoBinds $1 }
maybe_idinfo :: { RdrName -> [HsIdInfo RdrName] }
maybe_idinfo : {- empty -} { \_ -> [] }
- | pragma { \x -> case $1 of
- POk _ (PIdInfo id_info) -> id_info
- PFailed err ->
- pprPanic "IdInfo parse failed"
- (vcat [ppr x, err])
+ | pragma { \x -> if opt_IgnoreIfacePragmas then []
+ else case $1 of
+ POk _ (PIdInfo id_info) -> id_info
+ PFailed err -> pprPanic "IdInfo parse failed"
+ (vcat [ppr x, err])
}
+ {-
+ If a signature decl is being loaded, and opt_IgnoreIfacePragmas is on,
+ we toss away unfolding information.
+
+ Also, if the signature is loaded from a module we're importing from source,
+ we do the same. This is to avoid situations when compiling a pair of mutually
+ recursive modules, peering at unfolding info in the interface file of the other,
+ e.g., you compile A, it looks at B's interface file and may as a result change
+ its interface file. Hence, B is recompiled, maybe changing its interface file,
+ which will the unfolding info used in A to become invalid. Simple way out is to
+ just ignore unfolding info.
+
+ [Jan 99: I junked the second test above. If we're importing from an hi-boot
+ file there isn't going to *be* any pragma info. The above comment
+ dates from a time where we picked up a .hi file first if it existed.]
+ -}
pragma :: { ParseResult IfaceStuff }
pragma : src_loc PRAGMA { parseIface $2 PState{ bol = 0#, atbol = 1#,
deprec : deprec_name STRING { ($1, $2) }
deprec_name :: { RdrName }
- : var_name { $1 }
- | tc_name { $1 }
+ : qvar_name { $1 }
+ | qtc_name { $1 }
-----------------------------------------------------------------------------
| constr '|' constrs1 { $1 : $3 }
constr :: { RdrNameConDecl }
-constr : src_loc ex_stuff data_name batypes { mk_con_decl $3 $2 (VanillaCon $4) $1 }
- | src_loc ex_stuff data_name '{' fields1 '}' { mk_con_decl $3 $2 (RecCon $5) $1 }
+constr : src_loc ex_stuff qdata_name batypes { mk_con_decl $3 $2 (VanillaCon $4) $1 }
+ | src_loc ex_stuff qdata_name '{' fields1 '}' { mk_con_decl $3 $2 (RecCon $5) $1 }
-- We use "data_fs" so as to include ()
newtype_constr :: { [RdrNameConDecl] {- Not allowed to be empty -} }
-newtype_constr : src_loc '=' ex_stuff data_name atype { [mk_con_decl $4 $3 (VanillaCon [Unbanged $5]) $1] }
- | src_loc '=' ex_stuff data_name '{' var_name '::' atype '}'
+newtype_constr : src_loc '=' ex_stuff qdata_name atype { [mk_con_decl $4 $3 (VanillaCon [Unbanged $5]) $1] }
+ | src_loc '=' ex_stuff qdata_name '{' qvar_name '::' atype '}'
{ [mk_con_decl $4 $3 (RecCon [([$6], Unbanged $8)]) $1] }
ex_stuff :: { ([HsTyVarBndr RdrName], RdrNameContext) }
| field ',' fields1 { $1 : $3 }
field :: { ([RdrName], RdrNameBangType) }
-field : var_names1 '::' type { ($1, Unbanged $3) }
- | var_names1 '::' '!' type { ($1, Banged $4) }
- | var_names1 '::' '!' '!' type { ($1, Unpacked $5) }
+field : qvar_names1 '::' type { ($1, Unbanged $3) }
+ | qvar_names1 '::' '!' type { ($1, Banged $4) }
+ | qvar_names1 '::' '!' '!' type { ($1, Unpacked $5) }
--------------------------------------------------------------------------
type :: { RdrNameHsType }
qvar_name :: { RdrName }
qvar_name : var_name { $1 }
- | qvar_fs { mkSysQual varName $1 }
+ | qvar_fs { mkIfaceOrig varName $1 }
ipvar_name :: { RdrName }
- : IPVARID { mkSysUnqual ipName (tailFS $1) }
+ : IPVARID { mkRdrUnqual (mkSysOccFS ipName (tailFS $1)) }
+
+qvar_names1 :: { [RdrName] }
+qvar_names1 : qvar_name { [$1] }
+ | qvar_name qvar_names1 { $1 : $2 }
var_names :: { [RdrName] }
var_names : { [] }
qdata_name :: { RdrName }
qdata_name : data_name { $1 }
- | qdata_fs { mkSysQual dataName $1 }
+ | qdata_fs { mkIfaceOrig dataName $1 }
-qdata_names :: { [RdrName] }
-qdata_names : { [] }
- | qdata_name qdata_names { $1 : $2 }
-
var_or_data_name :: { RdrName }
- : var_name { $1 }
- | data_name { $1 }
+ : qvar_name { $1 }
+ | qdata_name { $1 }
---------------------------------------------------
-tc_fs :: { EncodedFS }
- : data_fs { $1 }
-
tc_occ :: { OccName }
- : tc_fs { mkSysOccFS tcName $1 }
+ : data_fs { mkSysOccFS tcName $1 }
tc_name :: { RdrName }
: tc_occ { mkRdrUnqual $1 }
qtc_name :: { RdrName }
: tc_name { $1 }
- | qdata_fs { mkSysQual tcName $1 }
+ | qdata_fs { mkIfaceOrig tcName $1 }
---------------------------------------------------
cls_name :: { RdrName }
- : data_fs { mkSysUnqual clsName $1 }
+ : data_fs { mkRdrUnqual (mkSysOccFS clsName $1) }
qcls_name :: { RdrName }
: cls_name { $1 }
- | qdata_fs { mkSysQual clsName $1 }
+ | qdata_fs { mkIfaceOrig clsName $1 }
---------------------------------------------------
uv_name :: { RdrName }
- : VARID { mkSysUnqual uvName $1 }
+ : VARID { mkRdrUnqual (mkSysOccFS uvName $1) }
uv_bndr :: { RdrName }
: uv_name { $1 }
---------------------------------------------------
tv_name :: { RdrName }
- : VARID { mkSysUnqual tvName $1 }
- | VARSYM { mkSysUnqual tvName $1 {- Allow t2 as a tyvar -} }
+ : VARID { mkRdrUnqual (mkSysOccFS tvName $1) }
+ | VARSYM { mkRdrUnqual (mkSysOccFS tvName $1) {- Allow t2 as a tyvar -} }
tv_bndr :: { HsTyVarBndr RdrName }
: tv_name '::' akind { IfaceTyVar $1 $3 }
--------------------------------------------------------------------------
id_info :: { [HsIdInfo RdrName] }
- : { [] }
+ : id_info_item { [$1] }
| id_info_item id_info { $1 : $2 }
id_info_item :: { HsIdInfo RdrName }
projects / ghc-hetmet.git / blobdiff