Mercurial > urweb

comparison src/jscomp.sml @ 1979:81bc76aa4acd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge in upstream changes.
author Patrick Hurst <phurst@mit.edu>
date Sat, 18 Jan 2014 18:26:24 -0500
parents 98895243b5b6
children 057b08253a75
comparison
equal deleted inserted replaced
1978:c5143edaf3c7 1979:81bc76aa4acd
1116 let 1116 let
1117 val (e, st) = exp outer (e, st) 1117 val (e, st) = exp outer (e, st)
1118 in 1118 in
1119 ((EError (e, t), loc), st) 1119 ((EError (e, t), loc), st)
1120 end 1120 end
1121 | EReturnBlob {blob, mimeType, t} => 1121 | EReturnBlob {blob = NONE, mimeType, t} =>
1122 let
1123 val (mimeType, st) = exp outer (mimeType, st)
1124 in
1125 ((EReturnBlob {blob = NONE, mimeType = mimeType, t = t}, loc), st)
1126 end
1127 | EReturnBlob {blob = SOME blob, mimeType, t} =>
1122 let 1128 let
1123 val (blob, st) = exp outer (blob, st) 1129 val (blob, st) = exp outer (blob, st)
1124 val (mimeType, st) = exp outer (mimeType, st) 1130 val (mimeType, st) = exp outer (mimeType, st)
1125 in 1131 in
1126 ((EReturnBlob {blob = blob, mimeType = mimeType, t = t}, loc), st) 1132 ((EReturnBlob {blob = SOME blob, mimeType = mimeType, t = t}, loc), st)
1127 end 1133 end
1128 | ERedirect (e, t) => 1134 | ERedirect (e, t) =>
1129 let 1135 let
1130 val (e, st) = exp outer (e, st) 1136 val (e, st) = exp outer (e, st)
1131 in 1137 in