diff options
| author |  Benjamin Barenblat <bbaren@mit.edu> | 2015-11-22 10:39:36 -0500 |
|---|---|---|
| committer | Benjamin Barenblat <bbaren@mit.edu> | 2015-11-22 10:39:36 -0500 |
| commit | bf037ce78c2c76a34ecca0fb8bafa5d5be38968a (patch) | |
| tree | 3e91b0d0e8e0fb704c7df444283b6c8c63351f95 /src/elab_util.sml | |
| parent | 7d861ea0debf944cb8e3e38d73a8c0197de574b3 (diff) | |
| parent | 638e838a81e1ccc6594fda1920df441eb21577ae (diff) | |
Merge branch 'upstream' into dfsg_clean20151122+dfsg
Diffstat (limited to 'src/elab_util.sml')
| -rw-r--r-- | src/elab_util.sml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/elab_util.sml b/src/elab_util.sml index fef55852..acc696dd 100644 --- a/src/elab_util.sml +++ b/src/elab_util.sml @@ -688,10 +688,10 @@ fun mapfoldB {kind, con, sgn_item, sgn, bind} = S.map2 (con ctx c, fn c' => (SgiVal (x, n, c'), loc)) - | SgiStr (x, n, s) => + | SgiStr (im, x, n, s) => S.map2 (sg ctx s, fn s' => - (SgiStr (x, n, s'), loc)) + (SgiStr (im, x, n, s'), loc)) | SgiSgn (x, n, s) => S.map2 (sg ctx s, fn s' => @@ -738,7 +738,7 @@ fun mapfoldB {kind, con, sgn_item, sgn, bind} = bind (ctx, NamedC (x, n, (KType, loc), SOME (CModProj (m1, ms, s), loc))) | SgiVal _ => ctx - | SgiStr (x, n, sgn) => + | SgiStr (_, x, n, sgn) => bind (ctx, Str (x, n, sgn)) | SgiSgn (x, n, sgn) => bind (ctx, Sgn (x, n, sgn)) @@ -1270,7 +1270,7 @@ and maxNameSgi (sgi, _) = foldl (fn ((_, n', _), m) => Int.max (n', m)) (Int.max (n1, n2)) ns | SgiVal (_, n, _) => n - | SgiStr (_, n, sgn) => Int.max (n, maxNameSgn sgn) + | SgiStr (_, _, n, sgn) => Int.max (n, maxNameSgn sgn) | SgiSgn (_, n, sgn) => Int.max (n, maxNameSgn sgn) | SgiConstraint _ => 0 | SgiClassAbs (_, n, _) => n |