summaryrefslogtreecommitdiff
path: root/src/termination.sml
diff options
context:
space:
mode:
authorGravatar Adam Chlipala <adamc@hcoop.net>2008-09-09 12:36:13 -0400
committerGravatar Adam Chlipala <adamc@hcoop.net>2008-09-09 12:36:13 -0400
commit9e804908dd69043c8a9942cdf6042b8dc0d76175 (patch)
tree4437f1d468859452358a91bf5ba7071b11a1a419 /src/termination.sml
parent4960cd8c2ec1e02c90e42d16db13f045427b4173 (diff)
Termination checking allows anything in links and actions
Diffstat (limited to 'src/termination.sml')
-rw-r--r--src/termination.sml39
1 files changed, 38 insertions, 1 deletions
diff --git a/src/termination.sml b/src/termination.sml
index 18ff0785..65c770df 100644
--- a/src/termination.sml
+++ b/src/termination.sml
@@ -126,7 +126,43 @@ fun declOk' env (d, loc) =
let
fun combiner calls e =
case #1 e of
- EApp (e1, e2) =>
+ EApp ((ECApp (
+ (ECApp (
+ (ECApp (
+ (ECApp (
+ (ECApp (
+ (ECApp (
+ (ECApp (
+ (ECApp (
+ (EModProj (m, [], "tag"), _),
+ _), _),
+ _), _),
+ _), _),
+ _), _),
+ _), _),
+ _), _),
+ _), _),
+ _), _),
+ (ERecord xets, _)) =>
+ let
+ val checkName =
+ case E.lookupStrNamed env m of
+ ("Basis", _) => (fn x : con => case #1 x of
+ CName s => s = "Link"
+ orelse s = "Action"
+ | _ => false)
+ | _ => (fn _ => false)
+
+ val calls = foldl (fn ((x, e, _), calls) =>
+ if checkName x then
+ calls
+ else
+ #2 (exp (penv, calls) e)) calls xets
+ in
+ (Rabble, [Rabble], calls)
+ end
+
+ | EApp (e1, e2) =>
let
val (p1, ps, calls) = combiner calls e1
val (p2, calls) = exp (penv, calls) e2
@@ -187,6 +223,7 @@ fun declOk' env (d, loc) =
(p, calls)
end
| EModProj _ => default
+
| EApp _ => apps ()
| EAbs (_, _, _, e) =>
let