@@ -1,5 +1,8 @@ 2009-08-31 Robert Virding <rv@stanislaw.local> + * lfe_io_pretty.erl (print1_list_max, print1_tail_max): Get it + right when depth = 0. + * lfe_comp.erl (passes, do_passes): Add an explicit pass driven style to compiler. src/ChangeLog @@ -33,8 +33,8 @@ %% -compile(export_all). --import(lists, [member/2,keysearch/3,filter/2, - all/2,map/2,foldl/3,foldr/3,mapfoldl/3,mapfoldr/3, +-import(lists, [member/2,keysearch/3,filter/2,foreach/2, + all/2,map/2,flatmap/2,foldl/3,foldr/3,mapfoldl/3,mapfoldr/3, concat/1]). -import(ordsets, [add_element/2,is_element/2,from_list/1,union/2]). -import(orddict, [store/3,find/2]). @@ -179,7 +179,8 @@ passes() -> {do,fun do_lfe_codegen/1}, {when_flag,to_core0,{done,fun core_pp/2,"core"}}, {do,fun do_erl_comp/1}, - %% to_core will make erl compiler return core erlang. + %% These options will have made erl compiler return internal form + %% after pass. {when_flag,to_core,{done,fun core_pp/2,"core"}}, {when_flag,to_kernel,{done,fun kernel_pp/2,"kernel"}}, {when_flag,to_asm,{done,fun asm_pp/2,"S"}}, @@ -246,8 +247,7 @@ beam_write(File, Beam) -> file:write(File, Beam). %% fix_erl_errors([{File,Errors}]) -> Errors. -fix_erl_errors([{_,Es}|Fes]) -> Es ++ fix_erl_errors(Fes); -fix_erl_errors([]) -> []. +fix_erl_errors(Fes) -> flatmap(fun ({_,Es}) -> Es end, Fes). %% erl_comp_opts(Options) -> Options. %% Strip out report options and make sure erlang compiler returns @@ -255,7 +255,7 @@ fix_erl_errors([]) -> []. %% strange behaviour. erl_comp_opts(Os) -> - filter(fun (report) -> false; + filter(fun (report) -> false; %No reporting! (report_warnings) -> false; (report_errors) -> false; ('S') -> false; @@ -289,21 +289,23 @@ do_error_return(#comp{lfile=Lfile,opts=Opts,errors=Es,warnings=Ws}) -> return_errors(_, []) -> []; return_errors(Lfile, Es) -> [{Lfile,Es}]. -list_warnings(F, [{Line,Mod,Warn}|Ws]) -> - lfe_io:format("~s:~w: Warning: ~s\n", [F,Line,Mod:format_error(Warn)]), - list_warnings(F, Ws); -list_warnings(F, [{Mod,Warn}|Ws]) -> - lfe_io:format("~s: Warning: ~s\n", [F,Mod:format_error(Warn)]), - list_warnings(F, Ws); -list_warnings(_, []) -> []. - -list_errors(F, [{Line,Mod,Error}|Ws]) -> - lfe_io:format("~s:~w: ~s\n", [F,Line,Mod:format_error(Error)]), - list_errors(F, Ws); -list_errors(F, [{Mod,Error}|Ws]) -> - lfe_io:format("~s: ~s\n", [F,Mod:format_error(Error)]), - list_errors(F, Ws); -list_errors(_, []) -> []. +list_warnings(F, Ws) -> + foreach(fun ({Line,Mod,Warn}) -> + Cs = Mod:format_error(Warn), + lfe_io:format("~s:~w: Warning: ~s\n", [F,Line,Cs]); + ({Mod,Warn}) -> + Cs = Mod:format_error(Warn), + lfe_io:format("~s: Warning: ~s\n", [F,Cs]) + end, Ws). + +list_errors(F, Es) -> + foreach(fun ({Line,Mod,Error}) -> + Cs = Mod:format_error(Error), + lfe_io:format("~s:~w: ~s\n", [F,Line,Cs]); + ({Mod,Error}) -> + Cs = Mod:format_error(Error), + lfe_io:format("~s: ~s\n", [F,Cs]) + end, Es). debug_print(Format, Args, St) -> when_opt(fun () -> lfe_io:format(Format, Args) end, src/lfe_comp.erl @@ -33,7 +33,7 @@ -compile(export_all). --import(lists, [reverse/1,flatlength/1]). +-import(lists, [reverse/1,reverse/2,flatlength/1]). %% print1(Sexpr) -> [char()]. %% print1(Sexpr, Depth) -> [char()]. @@ -85,7 +85,7 @@ print1([], _, _, _) -> "()"; print1({}, _, _, _) -> "#()"; print1(Tup, D, I, L) when is_tuple(Tup) -> Es = tuple_to_list(Tup), - case print1_list_max(Es, D, I+3, L) of + case print1_list_max(Es, D-1, I+3, L) of {yes,Print} -> ["#(",Print,")"]; no -> ["#(",print1_list(Es, D-1, I+2, L),")"] end; @@ -108,6 +108,7 @@ split(N, [H|T]) -> %% Maybe print a list on one line, but abort if it goes past %% LineLength. +print1_list_max(_, 0, _, _) -> {yes,"..."}; print1_list_max([Car|Cdr], D, I, L) -> Cs = print1(Car, D, 0, 99999), %Never break the line print1_tail_max(Cdr, D, I + flatlength(Cs), L, [Cs]); @@ -119,16 +120,18 @@ print1_list_max([], _, _, _) -> {yes,[]}. print1_tail_max(_, _, I, L, _) when I >= L -> no; %No more room print1_tail_max([], _, _, _, Acc) -> {yes,reverse(Acc)}; +print1_tail_max(_, 0, _, _, Acc) -> {yes,reverse(Acc)}; print1_tail_max([Car|Cdr], D, I, L, Acc) -> - Cs = print1(Car, D, 0, 99999), %Never break the line - print1_tail_max(Cdr, D, I + flatlength(Cs) + 1, L, [Cs," "|Acc]); + Cs = print1(Car, D-1, 0, 99999), %Never break the line + print1_tail_max(Cdr, D-1, I + flatlength(Cs) + 1, L, [Cs," "|Acc]); print1_tail_max(S, D, I, L, Acc) -> - Cs = print1(S, D, 0, 99999), %Never break the line + Cs = print1(S, D-1, 0, 99999), %Never break the line print1_tail_max([], D, I + flatlength(Cs) + 3, L, [Cs," . "|Acc]). %% print1_list(List, Depth, Indentation, LineLength) %% Print a list, one element per line. No leading/trailing (). +print1_list(_, 0, _, _) -> "..."; print1_list([Car|Cdr], D, I, L) -> [print1(Car, D, I, L),print1_tail(Cdr, D, I, L)]; print1_list([], _, _, _) -> []. @@ -137,7 +140,7 @@ print1_list([], _, _, _) -> []. %% Print the tail of a list. We know about dotted pairs. print1_tail([], _, _, _) -> ""; -print1_tail(_, 1, _, _) -> " ..."; +print1_tail(_, 0, _, _) -> ""; print1_tail([Car|Cdr], D, I, L) -> ["\n",blanks(I, []),print1(Car, D-1, I, L),print1_tail(Cdr, D-1, I, L)]; print1_tail(S, D, I, L) -> src/lfe_io_pretty.erl @@ -67,8 +67,9 @@ server_loop(Env0, BaseEnv) -> Env1 = update_vbinding('-', Form, Env0), %% Macro expand and evaluate it. {Value,Env2} = eval_form(Form, Env1, BaseEnv), - %% Print the result. - lfe_io:prettyprint(Value), io:nl(), + %% Print the result, but only to depth 30. + VS = lfe_io:prettyprint1(Value, 30), + io:requests([{put_chars,VS},nl]), %% Update bindings. Env3 = update_shell_vars(Form, Value, Env2), %% lfe_io:prettyprint({Env1,Env2}), io:nl(), src/lfe_shell.erl f866aed6f7923afbd2f04c2749797241f4e4c9df Robert Virding rvirding@gmail.com http://github.com/rvirding/lfe/commit/2b2e1db19f80fb8696a573c1afaec0d8cecabced 2b2e1db19f80fb8696a573c1afaec0d8cecabced 2009-08-31T13:40:03-07:00 2009-08-31T13:40:03-07:00 Mixed small improvements. b8f963d811dbd65a6f9f6f1dfa2fb1948c828295 Robert Virding rvirding@gmail.com