aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/mono_util.sml
diff options
context:
space:
mode:
authorGravatar Ziv Scully <ziv@mit.edu>2015-09-21 10:16:55 -0400
committerGravatar Ziv Scully <ziv@mit.edu>2015-09-21 10:16:55 -0400
commit3e42cccfaef1157ca14cd102959b867c996503a9 (patch)
treef6f9a9c57702517edc66c096a50efe0a6e7dca46 /src/mono_util.sml
parent68879bbb4bf58e4709c96ba6904071ce5d24a906 (diff)
Revert to revision 2222.
Diffstat (limited to 'src/mono_util.sml')
-rw-r--r--src/mono_util.sml16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/mono_util.sml b/src/mono_util.sml
index 64aeb318..ba10ad32 100644
--- a/src/mono_util.sml
+++ b/src/mono_util.sml
@@ -695,9 +695,9 @@ fun mapfoldB (all as {bind, ...}) =
let
val mfd = Decl.mapfoldB all
- fun mff ctx (file : file) =
- case #decls file of
- nil => S.return2 {decls = nil, sideInfo = #sideInfo file}
+ fun mff ctx (ds, ps) =
+ case ds of
+ nil => S.return2 (nil, ps)
| d :: ds' =>
S.bind2 (mfd ctx d,
fn d' =>
@@ -736,9 +736,9 @@ fun mapfoldB (all as {bind, ...}) =
| DPolicy _ => ctx
| DOnError _ => ctx
in
- S.map2 (mff ctx' {decls = ds', sideInfo = #sideInfo file},
- fn {decls = ds', ...} =>
- {decls = d' :: ds', sideInfo = #sideInfo file})
+ S.map2 (mff ctx' (ds', ps),
+ fn (ds', _) =>
+ (d' :: ds', ps))
end)
in
mff
@@ -791,7 +791,7 @@ fun maxName (f : file) =
| DStyle _ => count
| DTask _ => count
| DPolicy _ => count
- | DOnError _ => count) 0 (#decls f)
+ | DOnError _ => count) 0 (#1 f)
fun appLoc f (fl : file) =
let
@@ -822,7 +822,7 @@ fun appLoc f (fl : file) =
| PolUpdate e1 => eal e1
| PolSequence e1 => eal e1
in
- app appl (#decls fl)
+ app appl (#1 fl)
end
end