diff options
author | 2014-01-18 18:26:24 -0500 | |
---|---|---|
committer | 2014-01-18 18:26:24 -0500 | |
commit | 60847feb3f33df27f0549538f92e46ad66acb71e (patch) | |
tree | 96e059e285d059c3c9373fdb081041a72121d767 /src/checknest.sml | |
parent | b4cfcafcfb6b95d6b12ca174b53bc946fcf9dd55 (diff) | |
parent | fa380103cc30d241964dcdffdb3cd766d1fce0a9 (diff) |
Merge in upstream changes.
Diffstat (limited to 'src/checknest.sml')
-rw-r--r-- | src/checknest.sml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/checknest.sml b/src/checknest.sml index 05ad8e9a..fa418d89 100644 --- a/src/checknest.sml +++ b/src/checknest.sml @@ -56,7 +56,8 @@ fun expUses globals = | ECase (e, pes, _) => foldl (fn ((_, e), s) => IS.union (eu e, s)) (eu e) pes | EError (e, _) => eu e - | EReturnBlob {blob, mimeType, ...} => IS.union (eu blob, eu mimeType) + | EReturnBlob {blob = NONE, mimeType, ...} => eu mimeType + | EReturnBlob {blob = SOME blob, mimeType, ...} => IS.union (eu blob, eu mimeType) | ERedirect (e, _) => eu e | EWrite e => eu e @@ -118,7 +119,8 @@ fun annotateExp globals = | ECase (e, pes, ts) => (ECase (ae e, map (fn (p, e) => (p, ae e)) pes, ts), loc) | EError (e, t) => (EError (ae e, t), loc) - | EReturnBlob {blob, mimeType, t} => (EReturnBlob {blob = ae blob, mimeType = ae mimeType, t = t}, loc) + | EReturnBlob {blob = NONE, mimeType, t} => (EReturnBlob {blob = NONE, mimeType = ae mimeType, t = t}, loc) + | EReturnBlob {blob = SOME blob, mimeType, t} => (EReturnBlob {blob = SOME (ae blob), mimeType = ae mimeType, t = t}, loc) | ERedirect (e, t) => (ERedirect (ae e, t), loc) | EWrite e => (EWrite (ae e), loc) |