Mercurial > urweb
diff src/mono_reduce.sml @ 1979:81bc76aa4acd
Merge in upstream changes.
| author | Patrick Hurst <phurst@mit.edu> |
|---|---|
| date | Sat, 18 Jan 2014 18:26:24 -0500 |
| parents | 98895243b5b6 |
| children | 16c219c74426 |
line wrap: on
line diff
--- a/src/mono_reduce.sml Mon Dec 09 20:41:24 2013 -0500 +++ b/src/mono_reduce.sml Sat Jan 18 18:26:24 2014 -0500 @@ -101,7 +101,8 @@ | ECase (e, pes, _) => impure e orelse List.exists (fn (_, e) => impure e) pes | EError _ => true - | EReturnBlob {blob = e1, mimeType = e2, ...} => impure e1 orelse impure e2 + | EReturnBlob {blob = NONE, mimeType = e2, ...} => impure e2 + | EReturnBlob {blob = SOME e1, mimeType = e2, ...} => impure e1 orelse impure e2 | ERedirect (e, _) => impure e | EStrcat (e1, e2) => impure e1 orelse impure e2 @@ -492,7 +493,8 @@ | EStrcat (e1, e2) => summarize d e1 @ summarize d e2 | EError (e, _) => summarize d e @ [Abort] - | EReturnBlob {blob = e1, mimeType = e2, ...} => summarize d e1 @ summarize d e2 @ [Abort] + | EReturnBlob {blob = NONE, mimeType = e2, ...} => summarize d e2 @ [Abort] + | EReturnBlob {blob = SOME e1, mimeType = e2, ...} => summarize d e1 @ summarize d e2 @ [Abort] | ERedirect (e, _) => summarize d e @ [Abort] | EWrite e => summarize d e @ [WritePage]