summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Adam Chlipala <adam@chlipala.net>2010-12-20 09:34:10 -0500
committerGravatar Adam Chlipala <adam@chlipala.net>2010-12-20 09:34:10 -0500
commit5f3771069b5e4c7e99b1c1bbe98de2e8e7b96161 (patch)
tree1814a154f0b0e2d29b92c9d2ea2d1480f987acec
parentd3789e023986953df75e8b6453b2a164bdc96e91 (diff)
Implement constrained type kinding properly; bump mono inline threshhold
-rw-r--r--src/elaborate.sml1
-rw-r--r--src/settings.sml2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/elaborate.sml b/src/elaborate.sml
index 76e22139..c791cff6 100644
--- a/src/elaborate.sml
+++ b/src/elaborate.sml
@@ -309,6 +309,7 @@
in
checkKind env c1' k1 (L'.KRecord ku1, loc);
checkKind env c2' k2 (L'.KRecord ku2, loc);
+ checkKind env c' k (L'.KType, loc);
((L'.TDisjoint (c1', c2', c'), loc), k, gs1 @ gs2 @ gs4)
end
diff --git a/src/settings.sml b/src/settings.sml
index 898b503f..4c611336 100644
--- a/src/settings.sml
+++ b/src/settings.sml
@@ -464,7 +464,7 @@ val coreInline = ref 20
fun setCoreInline n = coreInline := n
fun getCoreInline () = !coreInline
-val monoInline = ref 20
+val monoInline = ref 100
fun setMonoInline n = monoInline := n
fun getMonoInline () = !monoInline