aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core_util.sml
diff options
context:
space:
mode:
authorGravatar Adam Chlipala <adamc@hcoop.net>2008-11-11 19:20:37 -0500
committerGravatar Adam Chlipala <adamc@hcoop.net>2008-11-11 19:20:37 -0500
commit887af944c67e3395679a750a205ef114234c61a0 (patch)
tree99c1c46f59df9c378621aa8d05b072d50a81698e /src/core_util.sml
parentf3e4bff668d3be5fcc7a2f6d04b7d9efb8f10624 (diff)
Add CutMulti
Diffstat (limited to 'src/core_util.sml')
-rw-r--r--src/core_util.sml16
1 files changed, 15 insertions, 1 deletions
diff --git a/src/core_util.sml b/src/core_util.sml
index 38004f74..71efe16e 100644
--- a/src/core_util.sml
+++ b/src/core_util.sml
@@ -444,10 +444,16 @@ fun compare ((e1, _), (e2, _)) =
| (ECut (e1, c1, _), ECut (e2, c2, _)) =>
join (compare (e1, e2),
- fn () => Con.compare (c1, c2))
+ fn () => Con.compare (c1, c2))
| (ECut _, _) => LESS
| (_, ECut _) => GREATER
+ | (ECutMulti (e1, c1, _), ECutMulti (e2, c2, _)) =>
+ join (compare (e1, e2),
+ fn () => Con.compare (c1, c2))
+ | (ECutMulti _, _) => LESS
+ | (_, ECutMulti _) => GREATER
+
| (EFold _, EFold _) => EQUAL
| (EFold _, _) => LESS
| (_, EFold _) => GREATER
@@ -588,6 +594,14 @@ fun mapfoldB {kind = fk, con = fc, exp = fe, bind} =
S.map2 (mfc ctx rest,
fn rest' =>
(ECut (e', c', {field = field', rest = rest'}), loc)))))
+ | ECutMulti (e, c, {rest}) =>
+ S.bind2 (mfe ctx e,
+ fn e' =>
+ S.bind2 (mfc ctx c,
+ fn c' =>
+ S.map2 (mfc ctx rest,
+ fn rest' =>
+ (ECutMulti (e', c', {rest = rest'}), loc))))
| EFold k =>
S.map2 (mfk k,
fn k' =>