nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-22 03:44:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve logging in type.ml, give it indentation and per-statement context.

Browse Source
This commit is contained in:
Graydon Hoare 2010-06-30 15:13:29 -07:00
parent b450838c46
commit 4cd49c0ab0
2 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/boot/fe/ast.ml
View File

@ -1346,11 +1346,13 @@ let sprintf_effect = sprintf_fmt fmt_effect;;
let sprintf_tag = sprintf_fmt fmt_tag;; let sprintf_tag = sprintf_fmt fmt_tag;;
let sprintf_carg = sprintf_fmt fmt_carg;; let sprintf_carg = sprintf_fmt fmt_carg;;
let sprintf_constr = sprintf_fmt fmt_constr;; let sprintf_constr = sprintf_fmt fmt_constr;;
let sprintf_stmt = sprintf_fmt fmt_stmt;;
let sprintf_mod_items = sprintf_fmt fmt_mod_items;; let sprintf_mod_items = sprintf_fmt fmt_mod_items;;
let sprintf_decl_params = sprintf_fmt fmt_decl_params;; let sprintf_decl_params = sprintf_fmt fmt_decl_params;;
let sprintf_app_args = sprintf_fmt fmt_app_args;; let sprintf_app_args = sprintf_fmt fmt_app_args;;
(* You probably want this one; stmt has a leading \n *)
let sprintf_stmt = sprintf_fmt fmt_stmt_body;;
(* (*
* Local Variables: * Local Variables:
* fill-column: 78; * fill-column: 78;

31
src/boot/me/type.ml
View File

@ -167,6 +167,9 @@ let rec resolve_tyvar (tv:tyvar) : tyvar =
;; ;;
let process_crate (cx:ctxt) (crate:Ast.crate) : unit = let process_crate (cx:ctxt) (crate:Ast.crate) : unit =
let depth = ref 0 in
let log cx = Session.log "type" let log cx = Session.log "type"
cx.ctxt_sess.Session.sess_log_type cx.ctxt_sess.Session.sess_log_type
cx.ctxt_sess.Session.sess_log_out cx.ctxt_sess.Session.sess_log_out
@ -221,20 +224,27 @@ let process_crate (cx:ctxt) (crate:Ast.crate) : unit =
| _ -> () | _ -> ()
and unify_tyvars (auto_deref:bool) (av:tyvar) (bv:tyvar) : unit = and unify_tyvars (auto_deref:bool) (av:tyvar) (bv:tyvar) : unit =
let dstr = if auto_deref then " w/ auto-deref" else "" in let indent = String.make (4 * (!depth)) ' ' in
iflog cx (fun _ -> iflog cx
log cx "unifying types%s:" dstr; (fun _ ->
log cx "input tyvar A: %s" (tyspec_to_str !av); log cx "%s> unifying types:" indent;
log cx "input tyvar B: %s" (tyspec_to_str !bv)); if auto_deref
then
log cx "%s> (w/ auto-deref)" indent;
log cx "%s> input tyvar A: %s" indent (tyspec_to_str !av);
log cx "%s> input tyvar B: %s" indent (tyspec_to_str !bv));
check_sane_tyvar av; check_sane_tyvar av;
check_sane_tyvar bv; check_sane_tyvar bv;
incr depth;
unify_tyvars' auto_deref av bv; unify_tyvars' auto_deref av bv;
decr depth;
iflog cx (fun _ -> iflog cx
log cx "unified types%s:" dstr; (fun _ ->
log cx "output tyvar A: %s" (tyspec_to_str !av); log cx "%s< unified types:" indent;
log cx "output tyvar B: %s" (tyspec_to_str !bv)); log cx "%s< output tyvar A: %s" indent (tyspec_to_str !av);
log cx "%s< output tyvar B: %s" indent (tyspec_to_str !bv));
check_sane_tyvar av; check_sane_tyvar av;
check_sane_tyvar bv; check_sane_tyvar bv;
@ -1207,6 +1217,9 @@ let process_crate (cx:ctxt) (crate:Ast.crate) : unit =
let visit_stmt_pre (stmt:Ast.stmt) : unit = let visit_stmt_pre (stmt:Ast.stmt) : unit =
try try
log cx "";
log cx "typechecking stmt: %a" Ast.sprintf_stmt stmt;
log cx "";
visit_stmt_pre_full stmt; visit_stmt_pre_full stmt;
(* (*
* Reset any item-parameters that were resolved to types * Reset any item-parameters that were resolved to types