diff options
| author |  Ziv Scully <ziv@mit.edu> | 2015-10-31 23:35:42 -0400 |
|---|---|---|
| committer | Ziv Scully <ziv@mit.edu> | 2015-10-31 23:35:42 -0400 |
| commit | aec3d37bda5c0b7068e92e31bf903545f953adba (patch) | |
| tree | d148f39d7c005f24cffdf90dffa055bac9ba7b86 /src | |
| parent | 78acba6decb79af464805a1ad3d81de56ef16151 (diff) | |
| parent | 0746eb28c54cb2ba778150e9fd8d0c399f7dcd14 (diff) | |
Merge.
Diffstat (limited to 'src')
| -rw-r--r-- | src/c/urweb.c | 3 | ||||
| -rw-r--r-- | src/elaborate.sml | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/c/urweb.c b/src/c/urweb.c index cc0eab06..ef7eb9bb 100644 --- a/src/c/urweb.c +++ b/src/c/urweb.c @@ -818,9 +818,6 @@ static void uw_try_reconnecting(uw_context ctx) { ctx->db = NULL; } ctx->app->db_init(ctx); - - if (!ctx->db) - uw_error(ctx, FATAL, "Error reopening database connection"); } void uw_try_reconnecting_and_restarting(uw_context ctx) { diff --git a/src/elaborate.sml b/src/elaborate.sml index ca4e124c..1885345d 100644 --- a/src/elaborate.sml +++ b/src/elaborate.sml @@ -783,7 +783,8 @@ val sum = case c of - (L'.CRecord (_, xcs), _) => {fields = xcs, unifs = [], others = []} + (L'.CRecord (_, xcs), _) => {fields = map (fn (x, c) => (hnormCon env x, hnormCon env c)) xcs, + unifs = [], others = []} | (L'.CConcat (c1, c2), _) => let val s1 = recordSummary env c1 |