Changement des boi^tes hov
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@1308 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02master
parent
9d9b6d5023
commit
a1d1dedc40
|
@ -143,7 +143,7 @@ and find_label lbl env ty path tydesc pos = function
|
||||||
open Format
|
open Format
|
||||||
|
|
||||||
let report_error error =
|
let report_error error =
|
||||||
open_hovbox 0;
|
open_box 0;
|
||||||
begin match error with
|
begin match error with
|
||||||
Unbound_identifier id ->
|
Unbound_identifier id ->
|
||||||
print_string "Unbound identifier "; print_string (Ident.name id)
|
print_string "Unbound identifier "; print_string (Ident.name id)
|
||||||
|
|
|
@ -113,7 +113,7 @@ let remove_printer lid =
|
||||||
open Format
|
open Format
|
||||||
|
|
||||||
let report_error error =
|
let report_error error =
|
||||||
open_hovbox 0;
|
open_box 0;
|
||||||
begin match error with
|
begin match error with
|
||||||
Load_failure e ->
|
Load_failure e ->
|
||||||
print_string "Error during code loading:"; print_space();
|
print_string "Error during code loading:"; print_space();
|
||||||
|
|
|
@ -50,7 +50,7 @@ let print_exception obj =
|
||||||
(Debugcom.marshal_obj(Debugcom.get_field (Debugcom.get_field obj 0) 0));
|
(Debugcom.marshal_obj(Debugcom.get_field (Debugcom.get_field obj 0) 0));
|
||||||
let (tag, field) = Debugcom.get_obj obj in
|
let (tag, field) = Debugcom.get_obj obj in
|
||||||
if Array.length field > 1 then begin
|
if Array.length field > 1 then begin
|
||||||
open_hovbox 1;
|
open_box 1;
|
||||||
print_string "(";
|
print_string "(";
|
||||||
for i = 1 to Array.length field - 1 do
|
for i = 1 to Array.length field - 1 do
|
||||||
if i > 1 then begin print_string ","; print_space() end;
|
if i > 1 then begin print_string ","; print_space() end;
|
||||||
|
@ -149,8 +149,8 @@ let print_value max_depth obj ty env =
|
||||||
| Ttuple(ty_list) ->
|
| Ttuple(ty_list) ->
|
||||||
if check_depth depth obj ty then begin
|
if check_depth depth obj ty then begin
|
||||||
if prio > 0
|
if prio > 0
|
||||||
then begin open_hovbox 1; print_string "(" end
|
then begin open_box 1; print_string "(" end
|
||||||
else open_hovbox 0;
|
else open_box 0;
|
||||||
print_val_list 1 depth obj ty_list;
|
print_val_list 1 depth obj ty_list;
|
||||||
if prio > 0 then print_string ")";
|
if prio > 0 then print_string ")";
|
||||||
close_box()
|
close_box()
|
||||||
|
@ -158,8 +158,8 @@ let print_value max_depth obj ty env =
|
||||||
| Tconstr(path, [], _) when Path.same path Predef.path_exn ->
|
| Tconstr(path, [], _) when Path.same path Predef.path_exn ->
|
||||||
if check_depth depth obj ty then begin
|
if check_depth depth obj ty then begin
|
||||||
if prio > 1
|
if prio > 1
|
||||||
then begin open_hovbox 2; print_string "(" end
|
then begin open_box 2; print_string "(" end
|
||||||
else open_hovbox 1;
|
else open_box 1;
|
||||||
print_exception obj;
|
print_exception obj;
|
||||||
if prio > 1 then print_string ")";
|
if prio > 1 then print_string ")";
|
||||||
close_box()
|
close_box()
|
||||||
|
@ -175,7 +175,7 @@ let print_value max_depth obj ty env =
|
||||||
print_string ";"; print_space();
|
print_string ";"; print_space();
|
||||||
print_conses next_obj
|
print_conses next_obj
|
||||||
end in
|
end in
|
||||||
open_hovbox 1;
|
open_box 1;
|
||||||
print_string "[";
|
print_string "[";
|
||||||
cautious print_conses obj;
|
cautious print_conses obj;
|
||||||
print_string "]";
|
print_string "]";
|
||||||
|
@ -192,7 +192,7 @@ let print_value max_depth obj ty env =
|
||||||
print_val 0 (depth - 1) fields.(i) ty_arg;
|
print_val 0 (depth - 1) fields.(i) ty_arg;
|
||||||
print_items (i + 1)
|
print_items (i + 1)
|
||||||
end in
|
end in
|
||||||
open_hovbox 2;
|
open_box 2;
|
||||||
print_string "[|";
|
print_string "[|";
|
||||||
cautious print_items 0;
|
cautious print_items 0;
|
||||||
print_string "|]";
|
print_string "|]";
|
||||||
|
@ -225,8 +225,8 @@ let print_value max_depth obj ty env =
|
||||||
| [ty1] ->
|
| [ty1] ->
|
||||||
if check_depth depth obj ty then begin
|
if check_depth depth obj ty then begin
|
||||||
if prio > 1
|
if prio > 1
|
||||||
then begin open_hovbox 2; print_string "(" end
|
then begin open_box 2; print_string "(" end
|
||||||
else open_hovbox 1;
|
else open_box 1;
|
||||||
print_string constr_name;
|
print_string constr_name;
|
||||||
print_space();
|
print_space();
|
||||||
cautious
|
cautious
|
||||||
|
@ -238,11 +238,11 @@ let print_value max_depth obj ty env =
|
||||||
| tyl ->
|
| tyl ->
|
||||||
if check_depth depth obj ty then begin
|
if check_depth depth obj ty then begin
|
||||||
if prio > 1
|
if prio > 1
|
||||||
then begin open_hovbox 2; print_string "(" end
|
then begin open_box 2; print_string "(" end
|
||||||
else open_hovbox 1;
|
else open_box 1;
|
||||||
print_string constr_name;
|
print_string constr_name;
|
||||||
print_space();
|
print_space();
|
||||||
open_hovbox 1;
|
open_box 1;
|
||||||
print_string "(";
|
print_string "(";
|
||||||
print_val_list 1 depth obj tyl;
|
print_val_list 1 depth obj tyl;
|
||||||
print_string ")";
|
print_string ")";
|
||||||
|
@ -259,7 +259,7 @@ let print_value max_depth obj ty env =
|
||||||
if pos > 0 then begin
|
if pos > 0 then begin
|
||||||
print_string ";"; print_space()
|
print_string ";"; print_space()
|
||||||
end;
|
end;
|
||||||
open_hovbox 1;
|
open_box 1;
|
||||||
print_string lbl_name;
|
print_string lbl_name;
|
||||||
print_string "="; print_cut();
|
print_string "="; print_cut();
|
||||||
let ty_arg =
|
let ty_arg =
|
||||||
|
@ -270,7 +270,7 @@ let print_value max_depth obj ty env =
|
||||||
ty_arg;
|
ty_arg;
|
||||||
close_box();
|
close_box();
|
||||||
print_fields (pos + 1) remainder in
|
print_fields (pos + 1) remainder in
|
||||||
open_hovbox 1;
|
open_box 1;
|
||||||
print_string "{";
|
print_string "{";
|
||||||
cautious (print_fields 0) lbl_list;
|
cautious (print_fields 0) lbl_list;
|
||||||
print_string "}";
|
print_string "}";
|
||||||
|
@ -299,7 +299,7 @@ let print_value max_depth obj ty env =
|
||||||
in print_val 0 max_depth obj ty
|
in print_val 0 max_depth obj ty
|
||||||
|
|
||||||
let print_named_value max_depth exp obj ty env =
|
let print_named_value max_depth exp obj ty env =
|
||||||
open_hovbox 2;
|
open_box 2;
|
||||||
begin match exp with
|
begin match exp with
|
||||||
E_ident lid ->
|
E_ident lid ->
|
||||||
Printtyp.longident lid
|
Printtyp.longident lid
|
||||||
|
|
|
@ -59,7 +59,7 @@ let show_current_event () =
|
||||||
print_newline ();
|
print_newline ();
|
||||||
print_string "Program end.";
|
print_string "Program end.";
|
||||||
print_newline ();
|
print_newline ();
|
||||||
open_hovbox 0;
|
open_box 0;
|
||||||
print_string "Uncaught exception:"; print_space();
|
print_string "Uncaught exception:"; print_space();
|
||||||
(*print_value (get_accu ()) type_exn;*)
|
(*print_value (get_accu ()) type_exn;*)
|
||||||
close_box();
|
close_box();
|
||||||
|
|
Loading…
Reference in New Issue