Mercurial > urweb
comparison src/cjrize.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 | 4d64af730e35 |
comparison
equal
deleted
inserted
replaced
1978:c5143edaf3c7 | 1979:81bc76aa4acd |
---|---|
370 val (e, sm) = cifyExp (e, sm) | 370 val (e, sm) = cifyExp (e, sm) |
371 val (t, sm) = cifyTyp (t, sm) | 371 val (t, sm) = cifyTyp (t, sm) |
372 in | 372 in |
373 ((L'.EError (e, t), loc), sm) | 373 ((L'.EError (e, t), loc), sm) |
374 end | 374 end |
375 | L.EReturnBlob {blob, mimeType, t} => | 375 | L.EReturnBlob {blob = NONE, mimeType, t} => |
376 let | |
377 val (mimeType, sm) = cifyExp (mimeType, sm) | |
378 val (t, sm) = cifyTyp (t, sm) | |
379 in | |
380 ((L'.EReturnBlob {blob = NONE, mimeType = mimeType, t = t}, loc), sm) | |
381 end | |
382 | L.EReturnBlob {blob = SOME blob, mimeType, t} => | |
376 let | 383 let |
377 val (blob, sm) = cifyExp (blob, sm) | 384 val (blob, sm) = cifyExp (blob, sm) |
378 val (mimeType, sm) = cifyExp (mimeType, sm) | 385 val (mimeType, sm) = cifyExp (mimeType, sm) |
379 val (t, sm) = cifyTyp (t, sm) | 386 val (t, sm) = cifyTyp (t, sm) |
380 in | 387 in |
381 ((L'.EReturnBlob {blob = blob, mimeType = mimeType, t = t}, loc), sm) | 388 ((L'.EReturnBlob {blob = SOME blob, mimeType = mimeType, t = t}, loc), sm) |
382 end | 389 end |
383 | L.ERedirect (e, t) => | 390 | L.ERedirect (e, t) => |
384 let | 391 let |
385 val (e, sm) = cifyExp (e, sm) | 392 val (e, sm) = cifyExp (e, sm) |
386 val (t, sm) = cifyTyp (t, sm) | 393 val (t, sm) = cifyTyp (t, sm) |