summaryrefslogtreecommitdiff
path: root/src/flat_util.sml
diff options
context:
space:
mode:
authorGravatar Adam Chlipala <adamc@hcoop.net>2008-06-22 10:17:34 -0400
committerGravatar Adam Chlipala <adamc@hcoop.net>2008-06-22 10:17:34 -0400
commitd60f854fc35ce30fb698f3d8e87b88938001fdaf (patch)
tree993aecf3c64b1e472749ccc4cc3d9ffa6dd2ed3e /src/flat_util.sml
parentf3ddf9922b90bdd45ca5b1c33c72ff316d5440eb (diff)
FFI through cloconv
Diffstat (limited to 'src/flat_util.sml')
-rw-r--r--src/flat_util.sml10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/flat_util.sml b/src/flat_util.sml
index 6bddd566..72020d44 100644
--- a/src/flat_util.sml
+++ b/src/flat_util.sml
@@ -61,6 +61,7 @@ fun compare ((t1, _), (t2, _)) =
joinL compareFields (xts1, xts2)
end
| (TNamed n1, TNamed n2) => Int.compare (n1, n2)
+ | (TFfi (m1, x1), TFfi (m2, x2)) => join (String.compare (m1, m2), fn () => String.compare (x1, x2))
| (TTop, _) => LESS
| (_, TTop) => GREATER
@@ -74,6 +75,9 @@ fun compare ((t1, _), (t2, _)) =
| (TRecord _, _) => LESS
| (_, TRecord _) => GREATER
+ | (TNamed _, _) => LESS
+ | (_, TNamed _) => GREATER
+
and compareFields ((x1, t1), (x2, t2)) =
join (String.compare (x1, x2),
fn () => compare (t1, t2))
@@ -108,6 +112,7 @@ fun mapfold fc =
xts,
fn xts' => (TRecord xts', loc))
| TNamed _ => S.return2 cAll
+ | TFfi _ => S.return2 cAll
in
mft
end
@@ -152,6 +157,11 @@ fun mapfoldB {typ = fc, exp = fe, bind} =
EPrim _ => S.return2 eAll
| ERel _ => S.return2 eAll
| ENamed _ => S.return2 eAll
+ | EFfi _ => S.return2 eAll
+ | EFfiApp (m, x, es) =>
+ S.map2 (ListUtil.mapfold (fn e => mfe ctx e) es,
+ fn es' =>
+ (EFfiApp (m, x, es'), loc))
| ECode _ => S.return2 eAll
| EApp (e1, e2) =>
S.bind2 (mfe ctx e1,