diff options
| author | Alan Zimmerman <alan.zimm@gmail.com> | 2015-01-15 13:11:21 -0600 |
|---|---|---|
| committer | Austin Seipp <austin@well-typed.com> | 2015-01-16 10:16:05 -0600 |
| commit | 11881ec6f8d4db881671173441df87c2457409f4 (patch) | |
| tree | a03777d178fc04dea082e7b12f2c7cf2dfa97ff3 /compiler/stranal/WorkWrap.hs | |
| parent | fffbf0627c2c2ee4bc49f9d26a226b39a066945e (diff) | |
| download | haskell-11881ec6f8d4db881671173441df87c2457409f4.tar.gz | |
API Annotations tweaks.
Summary:
HsTyLit now has SourceText
Update documentation of HsSyn to reflect which annotations are attached to which element.
Ensure that the parser always keeps HsSCC and HsTickPragma values, to
be ignored in the desugar phase if not needed
Bringing in SourceText for pragmas
Add Location in NPlusKPat
Add Location in FunDep
Make RecCon payload Located
Explicitly add AnnVal to RdrName where it is compound
Add Location in IPBind
Add Location to name in IEThingAbs
Add Maybe (Located id,Bool) to Match to track fun_id,infix
This includes converting Match into a record and adding a note about why
the fun_id needs to be replicated in the Match.
Add Location in KindedTyVar
Sort out semi-colons for parsing
- import statements
- stmts
- decls
- decls_cls
- decls_inst
This updates the haddock submodule.
Test Plan: ./validate
Reviewers: hvr, austin, goldfire, simonpj
Reviewed By: simonpj
Subscribers: thomie, carter
Differential Revision: https://phabricator.haskell.org/D538
Diffstat (limited to 'compiler/stranal/WorkWrap.hs')
| -rw-r--r-- | compiler/stranal/WorkWrap.hs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/compiler/stranal/WorkWrap.hs b/compiler/stranal/WorkWrap.hs index eedababb43..7a94c1b3f3 100644 --- a/compiler/stranal/WorkWrap.hs +++ b/compiler/stranal/WorkWrap.hs @@ -335,7 +335,8 @@ splitFun dflags fam_envs fn_id fn_info wrap_dmds res_info rhs Just (work_demands, wrap_fn, work_fn) -> do work_uniq <- getUniqueM let work_rhs = work_fn rhs - work_prag = InlinePragma { inl_inline = inl_inline inl_prag + work_prag = InlinePragma { inl_src = "{-# INLINE" + , inl_inline = inl_inline inl_prag , inl_sat = Nothing , inl_act = wrap_act , inl_rule = FunLike } @@ -365,7 +366,8 @@ splitFun dflags fam_envs fn_id fn_info wrap_dmds res_info rhs wrap_act = ActiveAfter 0 wrap_rhs = wrap_fn work_id - wrap_prag = InlinePragma { inl_inline = Inline + wrap_prag = InlinePragma { inl_src = "{-# INLINE" + , inl_inline = Inline , inl_sat = Nothing , inl_act = wrap_act , inl_rule = rule_match_info } |