diff options
| author |  Benjamin Barenblat <bbaren@mit.edu> | 2015-08-19 11:02:23 -0400 |
|---|---|---|
| committer | Benjamin Barenblat <bbaren@mit.edu> | 2015-08-19 11:02:23 -0400 |
| commit | 598756dc69f89cf2dd2b889cad63a7a690ae7ed7 (patch) | |
| tree | 5fc521225e717163c30ea494a5839c26725eec2e /src/core_util.sml | |
| parent | 7ea9d17bad72cf2829c75d8d241fafa70b2c9b94 (diff) | |
| parent | fb6e6599b35df9cfa05786772868b1a3d2e58ac3 (diff) | |
Merge branch 'upstream' into dfsg_clean20150819+dfsg
Conflicts:
doc/intro.ur
Diffstat (limited to 'src/core_util.sml')
| -rw-r--r-- | src/core_util.sml | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/src/core_util.sml b/src/core_util.sml index 152ba7ac..9ca85c37 100644 --- a/src/core_util.sml +++ b/src/core_util.sml @@ -203,7 +203,7 @@ fun compare ((c1, _), (c2, _)) = | (_, CConcat _) => GREATER | (CMap (d1, r1), CMap (d2, r2)) => - join (Kind.compare (d1, r2), + join (Kind.compare (d1, d2), fn () => Kind.compare (r1, r2)) | (CMap _, _) => LESS | (_, CMap _) => GREATER @@ -607,15 +607,19 @@ fun mapfoldB {kind = fk, con = fc, exp = fe, bind} = | ERel _ => S.return2 eAll | ENamed _ => S.return2 eAll | ECon (dk, pc, cs, NONE) => - S.map2 (ListUtil.mapfold (mfc ctx) cs, - fn cs' => - (ECon (dk, pc, cs', NONE), loc)) - | ECon (dk, n, cs, SOME e) => - S.bind2 (mfe ctx e, - fn e' => + S.bind2 (mfpc ctx pc, + fn pc' => S.map2 (ListUtil.mapfold (mfc ctx) cs, - fn cs' => - (ECon (dk, n, cs', SOME e'), loc))) + fn cs' => + (ECon (dk, pc', cs', NONE), loc))) + | ECon (dk, pc, cs, SOME e) => + S.bind2 (mfpc ctx pc, + fn pc' => + S.bind2 (mfe ctx e, + fn e' => + S.map2 (ListUtil.mapfold (mfc ctx) cs, + fn cs' => + (ECon (dk, pc', cs', SOME e'), loc)))) | EFfi _ => S.return2 eAll | EFfiApp (m, x, es) => S.map2 (ListUtil.mapfold (mfet ctx) es, |