Mercurial > urweb
changeset 1664:a12186d99e4f
Finish function argument order-of-operations fix
| author | Adam Chlipala <adam@chlipala.net> |
|---|---|
| date | Sat, 07 Jan 2012 16:49:19 -0500 |
| parents | 0577be31a435 |
| children | f9ffe8497742 |
| files | src/cjr_print.sml src/monoize.sml |
| diffstat | 2 files changed, 46 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/cjr_print.sml Sat Jan 07 15:56:22 2012 -0500 +++ b/src/cjr_print.sml Sat Jan 07 16:49:19 2012 -0500 @@ -1693,13 +1693,7 @@ | EFfiApp (m, x, es) => pFuncall env (m, x, es, NONE) | EApp (f, args) => let - fun default () = parenIf par (box [p_exp' true false env f, - string "(ctx,", - space, - p_list_sep (box [string ",", space]) (p_exp' false false env) args, - string ")"]) - - fun isSelf n = + fun getSig n = let val (_, t) = E.lookupENamed env n @@ -1707,8 +1701,51 @@ case #1 t of TFun (dom, t) => getSig (t, dom :: args) | _ => (args, t) + in + getSig (t, []) + end - val (argts, ret) = getSig (t, []) + fun default () = + case (#1 f, args) of + (ENamed n, _ :: _ :: _) => + let + val (args', ret) = getSig n + val args = ListPair.zip (args, args') + in + parenIf par (box [string "({", + newline, + p_list_sepi newline + (fn i => fn (e, t) => + box [p_typ env t, + space, + string ("arg" ^ Int.toString i), + space, + string "=", + space, + p_exp' false false env e, + string ";"]) + args, + newline, + p_exp' false false env f, + string "(ctx,", + space, + p_list_sepi (box [string ",", space]) + (fn i => fn _ => + string ("arg" ^ Int.toString i)) args, + string ");", + newline, + string "})"]) + end + | _ => + parenIf par (box [p_exp' true false env f, + string "(ctx,", + space, + p_list_sep (box [string ",", space]) (p_exp' false false env) args, + string ")"]) + + fun isSelf n = + let + val (argts, ret) = getSig n in parenIf par (box [string "({", newline,
--- a/src/monoize.sml Sat Jan 07 15:56:22 2012 -0500 +++ b/src/monoize.sml Sat Jan 07 16:49:19 2012 -0500 @@ -1410,7 +1410,7 @@ [((L'.ERel 2, loc), (L'.TSource, loc)), ((L'.EJavaScript (L'.Source t, (L'.ERel 1, loc)), loc), - t)]), + (L'.TFfi ("Basis", "string"), loc))]), loc)), loc)), loc)), loc), fm) end