Mercurial > urweb

comparison src/corify.sml @ 1254:935a981f4380

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Adam Chlipala <adamc@hcoop.net>
date Thu, 06 May 2010 13:57:01 -0400
parents c316ca3c9ec6
children b4480a56cab7
comparison
equal deleted inserted replaced
1198:b52929351402 1254:935a981f4380
1078 end 1078 end
1079 1079
1080 | L.DTask (e1, e2) => 1080 | L.DTask (e1, e2) =>
1081 ([(L'.DTask (corifyExp st e1, corifyExp st e2), loc)], st) 1081 ([(L'.DTask (corifyExp st e1, corifyExp st e2), loc)], st)
1082 1082
1083 | L.DPolicy e1 =>
1084 ([(L'.DPolicy (corifyExp st e1), loc)], st)
1085
1083 and corifyStr mods ((str, _), st) = 1086 and corifyStr mods ((str, _), st) =
1084 case str of 1087 case str of
1085 L.StrConst ds => 1088 L.StrConst ds =>
1086 let 1089 let
1087 val st = St.enter (st, mods) 1090 val st = St.enter (st, mods)
1135 | L.DSequence (_, _, n') => Int.max (n, n') 1138 | L.DSequence (_, _, n') => Int.max (n, n')
1136 | L.DView (_, _, n', _, _) => Int.max (n, n') 1139 | L.DView (_, _, n', _, _) => Int.max (n, n')
1137 | L.DDatabase _ => n 1140 | L.DDatabase _ => n
1138 | L.DCookie (_, _, n', _) => Int.max (n, n') 1141 | L.DCookie (_, _, n', _) => Int.max (n, n')
1139 | L.DStyle (_, _, n') => Int.max (n, n') 1142 | L.DStyle (_, _, n') => Int.max (n, n')
1140 | L.DTask _ => n) 1143 | L.DTask _ => n
1144 | L.DPolicy _ => n)
1141 0 ds 1145 0 ds
1142 1146
1143 and maxNameStr (str, _) = 1147 and maxNameStr (str, _) =
1144 case str of 1148 case str of
1145 L.StrConst ds => maxName ds 1149 L.StrConst ds => maxName ds