projects
/
coq-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rename weakTypeToType'' to weakTypeToTypeOfKind
[coq-hetmet.git]
/
src
/
HaskStrongTypes.v
diff --git
a/src/HaskStrongTypes.v
b/src/HaskStrongTypes.v
index
1bab8f5
..
e79927a
100644
(file)
--- a/
src/HaskStrongTypes.v
+++ b/
src/HaskStrongTypes.v
@@
-13,6
+13,7
@@
Require Import HaskCoreTypes.
Require Import HaskCoreVars.
Require Import HaskWeakTypes.
Require Import HaskWeakVars.
Require Import HaskCoreVars.
Require Import HaskWeakTypes.
Require Import HaskWeakVars.
+Require Import HaskWeak.
Require Import HaskCoreToWeak.
Variable dataConTyCon : CoreDataCon -> TyCon. Extract Inlined Constant dataConTyCon => "DataCon.dataConTyCon".
Require Import HaskCoreToWeak.
Variable dataConTyCon : CoreDataCon -> TyCon. Extract Inlined Constant dataConTyCon => "DataCon.dataConTyCon".
@@
-563,9
+564,9
@@
Fixpoint typeToString' (needparens:bool)(n:nat){κ}(t:RawHaskType (fun _ => nat)
end
| TArrow => "(->)"
| TAll k f => let alpha := "tv"+++n
end
| TArrow => "(->)"
| TAll k f => let alpha := "tv"+++n
- in "(forall "+++ alpha +++ "{:}"+++ k +++")"+++
+ in "(forall "+++ alpha +++ ":"+++ k +++")"+++
typeToString' false (S n) (f n)
typeToString' false (S n) (f n)
- | TCode ec t => "<["+++(typeToString' true n ec)+++"]>@"+++(typeToString' false n t)
+ | TCode ec t => "<["+++(typeToString' true n t)+++"]>@"+++(typeToString' false n ec)
| TyFunApp tfc lt => tfc+++"_"+++n+++" ["+++(fold_left (fun x y => " \ "+++x+++y) (typeList2string false n lt) "")+++"]"
end
with typeList2string (needparens:bool)(n:nat){κ}(t:RawHaskTypeList κ) {struct t} : list string :=
| TyFunApp tfc lt => tfc+++"_"+++n+++" ["+++(fold_left (fun x y => " \ "+++x+++y) (typeList2string false n lt) "")+++"]"
end
with typeList2string (needparens:bool)(n:nat){κ}(t:RawHaskTypeList κ) {struct t} : list string :=