diff options
| author | Simon Peyton Jones <simonpj@microsoft.com> | 2019-02-15 09:53:48 +0000 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-02-23 21:31:47 -0500 |
| commit | 6cce36f83aec33d33545e0ef2135894d22dff5ca (patch) | |
| tree | 3bfa83e7ba313f7a10b9219cb58eb18a8d368b2d /testsuite/tests/callarity/unittest | |
| parent | ac34e784775a0fa8b7284d42ff89571907afdc36 (diff) | |
| download | haskell-6cce36f83aec33d33545e0ef2135894d22dff5ca.tar.gz | |
Add AnonArgFlag to FunTy
The big payload of this patch is:
Add an AnonArgFlag to the FunTy constructor
of Type, so that
(FunTy VisArg t1 t2) means (t1 -> t2)
(FunTy InvisArg t1 t2) means (t1 => t2)
The big payoff is that we have a simple, local test to make
when decomposing a type, leading to many fewer calls to
isPredTy. To me the code seems a lot tidier, and probably
more efficient (isPredTy has to take the kind of the type).
See Note [Function types] in TyCoRep.
There are lots of consequences
* I made FunTy into a record, so that it'll be easier
when we add a linearity field, something that is coming
down the road.
* Lots of code gets touched in a routine way, simply because it
pattern matches on FunTy.
* I wanted to make a pattern synonym for (FunTy2 arg res), which
picks out just the argument and result type from the record. But
alas the pattern-match overlap checker has a heart attack, and
either reports false positives, or takes too long. In the end
I gave up on pattern synonyms.
There's some commented-out code in TyCoRep that shows what I
wanted to do.
* Much more clarity about predicate types, constraint types
and (in particular) equality constraints in kinds. See TyCoRep
Note [Types for coercions, predicates, and evidence]
and Note [Constraints in kinds].
This made me realise that we need an AnonArgFlag on
AnonTCB in a TyConBinder, something that was really plain
wrong before. See TyCon Note [AnonTCB InivsArg]
* When building function types we must know whether we
need VisArg (mkVisFunTy) or InvisArg (mkInvisFunTy).
This turned out to be pretty easy in practice.
* Pretty-printing of types, esp in IfaceType, gets
tidier, because we were already recording the (->)
vs (=>) distinction in an ad-hoc way. Death to
IfaceFunTy.
* mkLamType needs to keep track of whether it is building
(t1 -> t2) or (t1 => t2). See Type
Note [mkLamType: dictionary arguments]
Other minor stuff
* Some tidy-up in validity checking involving constraints;
Trac #16263
Diffstat (limited to 'testsuite/tests/callarity/unittest')
| -rw-r--r-- | testsuite/tests/callarity/unittest/CallArity1.hs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/testsuite/tests/callarity/unittest/CallArity1.hs b/testsuite/tests/callarity/unittest/CallArity1.hs index 1100ff6a8f..00583d0209 100644 --- a/testsuite/tests/callarity/unittest/CallArity1.hs +++ b/testsuite/tests/callarity/unittest/CallArity1.hs @@ -27,16 +27,16 @@ import FastString go, go2, x, d, n, y, z, scrutf, scruta :: Id [go, go2, x,d, n, y, z, scrutf, scruta, f] = mkTestIds (words "go go2 x d n y z scrutf scruta f") - [ mkFunTys [intTy, intTy] intTy - , mkFunTys [intTy, intTy] intTy + [ mkVisFunTys [intTy, intTy] intTy + , mkVisFunTys [intTy, intTy] intTy , intTy - , mkFunTys [intTy] intTy - , mkFunTys [intTy] intTy + , mkVisFunTys [intTy] intTy + , mkVisFunTys [intTy] intTy , intTy , intTy - , mkFunTys [boolTy] boolTy + , mkVisFunTys [boolTy] boolTy , boolTy - , mkFunTys [intTy, intTy] intTy -- protoypical external function + , mkVisFunTys [intTy, intTy] intTy -- protoypical external function ] exprs :: [(String, CoreExpr)] |