Ur/Web: src/mono_util.sml comparison

Make Mono.file a record for readability upon extension.

comparison

equal deleted inserted replaced

-:c275bbc41194
+:25874084bf1f
 fun mapfoldB (all as {bind, ...}) =
 let
 val mfd = Decl.mapfoldB all
-fun mff ctx (ds, ps) =
+fun mff ctx (file : file) =
-case ds of
+case #decls file of
-nil => S.return2 (nil, ps)
+nil => S.return2 {decls = nil, sideInfo = #sideInfo file}
 | d :: ds' =>
 S.bind2 (mfd ctx d,
 fn d' =>
 let
 val ctx' =
 | DStyle _ => ctx
 | DTask _ => ctx
 | DPolicy _ => ctx
 | DOnError _ => ctx
 in
-S.map2 (mff ctx' (ds', ps),
+S.map2 (mff ctx' {decls = ds', sideInfo = #sideInfo file},
-fn (ds', _) =>
+fn {decls = ds', ...} =>
-(d' :: ds', ps))
+{decls = d' :: ds', sideInfo = #sideInfo file})
 end)
 in
 mff
 end
 | DJavaScript _ => count
 | DCookie _ => count
 | DStyle _ => count
 | DTask _ => count
 | DPolicy _ => count
-| DOnError _ => count) 0 (#1 f)
+| DOnError _ => count) 0 (#decls f)
 fun appLoc f (fl : file) =
 let
 val eal = Exp.appLoc f
 | PolInsert e1 => eal e1
 | PolDelete e1 => eal e1
 | PolUpdate e1 => eal e1
 | PolSequence e1 => eal e1
 in
-app appl (#1 fl)
+app appl (#decls fl)
 end
 end
 end

Mercurial > urweb