Mercurial > urweb

comparison src/cjr_print.sml @ 1880:0354df1b6849

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove uw_cutErrorLocation() hijinks
author Adam Chlipala <adam@chlipala.net>
date Thu, 10 Oct 2013 18:31:10 -0400
parents 16b08de04f05
children 1a04b1edded2
comparison
equal deleted inserted replaced
1879:c1ee5dec9cff 1880:0354df1b6849
1615 p_typ env t, 1615 p_typ env t,
1616 space, 1616 space,
1617 string "tmp;", 1617 string "tmp;",
1618 newline, 1618 newline,
1619 string "uw_error(ctx, FATAL, \"", 1619 string "uw_error(ctx, FATAL, \"",
1620 string (ErrorMsg.spanToString loc), 1620 string (if Settings.getDebug () then
1621 string ": %s\", ", 1621 ErrorMsg.spanToString loc ^ ": "
1622 else
1623 ""),
1624 string "%s\", ",
1622 p_exp' false false env e, 1625 p_exp' false false env e,
1623 string ");", 1626 string ");",
1624 newline, 1627 newline,
1625 string "tmp;", 1628 string "tmp;",
1626 newline, 1629 newline,
3513 3516
3514 case onError of 3517 case onError of
3515 NONE => box [] 3518 NONE => box []
3516 | SOME n => box [string "static void uw_onError(uw_context ctx, char *msg) {", 3519 | SOME n => box [string "static void uw_onError(uw_context ctx, char *msg) {",
3517 newline, 3520 newline,
3518 if Settings.getDebug () then
3519 box []
3520 else
3521 box [string "uw_cutErrorLocation(msg);",
3522 newline],
3523 if !hasJs then 3521 if !hasJs then
3524 box [string "uw_set_script_header(ctx, \"", 3522 box [string "uw_set_script_header(ctx, \"",
3525 string allScripts, 3523 string allScripts,
3526 string "\");", 3524 string "\");",
3527 newline] 3525 newline]