From 87dc76f1130778dce09ccc346bbfdc3e8ad155e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9onard=20G=C3=A9rard?= Date: Wed, 18 May 2011 09:41:06 +0200 Subject: [PATCH] Code formating fixes (typos, tabs, spaces at endofline,...) --- compiler/heptagon/heptagon.ml | 2 +- compiler/heptagon/transformations/automata.ml | 3 +- compiler/heptagon/transformations/switch.ml | 2 +- compiler/main/hepts.ml | 316 +++++++++--------- compiler/minils/main/mls_compiler.ml | 1 + compiler/obc/c/cmain.ml | 56 ++-- 6 files changed, 190 insertions(+), 190 deletions(-) diff --git a/compiler/heptagon/heptagon.ml b/compiler/heptagon/heptagon.ml index 4df0227..3a3f99b 100644 --- a/compiler/heptagon/heptagon.ml +++ b/compiler/heptagon/heptagon.ml @@ -30,7 +30,7 @@ type exp = { e_desc : desc; e_ty : ty; e_ct_annot : ct option; (* exists when a source annotation exists *) - e_level_ck : ck; (* set by the switch pass, represents the base activation of the expression *) + e_level_ck : ck; (* set by the switch pass, represents the activation base of the expression *) e_loc : location } and desc = diff --git a/compiler/heptagon/transformations/automata.ml b/compiler/heptagon/transformations/automata.ml index d678540..a4f9886 100644 --- a/compiler/heptagon/transformations/automata.ml +++ b/compiler/heptagon/transformations/automata.ml @@ -94,8 +94,7 @@ let translate_automaton v eq_list handlers = let pre_next_resetname = fresh PNR in let name n = NamesEnv.find n state_env in - let state n = - mk_exp (Econst (mk_constructor (name n) tstatetype)) tstatetype in + let state n = mk_exp (Econst (mk_constructor (name n) tstatetype)) tstatetype in let statevar n = mk_var_exp n tstatetype in let boolvar n = mk_var_exp n (Tid Initial.pbool) in diff --git a/compiler/heptagon/transformations/switch.ml b/compiler/heptagon/transformations/switch.ml index 3b12b70..ea6eaf5 100644 --- a/compiler/heptagon/transformations/switch.ml +++ b/compiler/heptagon/transformations/switch.ml @@ -33,7 +33,7 @@ with one defined var y ( defnames = {y} ) and used var x *) (* base_ck is used to have correct behavior for side effects : - it keep track of the fact that a call + it keep track of the fact that a cal without interaction with the dataflow was in a case of the switch *) diff --git a/compiler/main/hepts.ml b/compiler/main/hepts.ml index 44f623b..eacc261 100644 --- a/compiler/main/hepts.ml +++ b/compiler/main/hepts.ml @@ -53,25 +53,25 @@ class boolean_input (table:GPack.table) n : input = let click button_clicked () = if not !click_processed then begin - click_processed := true; - value := not !value; - begin match button_clicked with - | false -> - but_true#set_active !value - | true -> - but_false#set_active (not !value) - end; - begin match !autostep with - | None -> () - | Some f -> f () - end; - click_processed := false + click_processed := true; + value := not !value; + begin match button_clicked with + | false -> + but_true#set_active !value + | true -> + but_false#set_active (not !value) + end; + begin match !autostep with + | None -> () + | Some f -> f () + end; + click_processed := false end in let _ = (but_true#connect#clicked ~callback:(click true)) in let _ = (but_false#connect#clicked ~callback:(click false)) in object - method get_input = + method get_input = if !value then "1" else "0" method get_random_input = let v = Random.bool () in @@ -90,20 +90,20 @@ class enum_input mod_name value_list (table:GPack.table) n : input = let mod_name = modul_to_string mod_name in let value = ref ((List.hd value_list).name) in let click_processed = ref false in - + let nb_values = List.length value_list in let buttons_frame = GPack.table ~columns:nb_values ~rows:1 () in - let _ = table#attach + let _ = table#attach ~expand:`BOTH ~left:1 ~right:3 ~top:n buttons_frame#coerce in - + let rec create_buttons n first = function [] -> [] | { name = value } :: value_list -> - let but = GButton.toggle_button ~label:value ~active:first () in - let _ = buttons_frame#attach - ~expand:`BOTH ~left:n ~right:(n+1) ~top:0 but#coerce in - (value,but) :: (create_buttons (n+1) false value_list) in - + let but = GButton.toggle_button ~label:value ~active:first () in + let _ = buttons_frame#attach + ~expand:`BOTH ~left:n ~right:(n+1) ~top:0 but#coerce in + (value,but) :: (create_buttons (n+1) false value_list) in + let buttons = create_buttons 0 true value_list in let array_buttons = Array.of_list buttons in @@ -113,25 +113,25 @@ class enum_input mod_name value_list (table:GPack.table) n : input = (fun (v,b) -> let prefixed_value = mod_name ^ "_" ^ v in let click () = - if not !click_processed then - begin - click_processed := true; - value := prefixed_value; - !active_button#set_active false; - b#set_active true; - active_button := b; - begin match !autostep with - | None -> () - | Some f -> f () - end; - click_processed := false - end in + if not !click_processed then + begin + click_processed := true; + value := prefixed_value; + !active_button#set_active false; + b#set_active true; + active_button := b; + begin match !autostep with + | None -> () + | Some f -> f () + end; + click_processed := false + end in ignore(b#connect#clicked ~callback:click) ) buttons in object - method get_input = + method get_input = !value method get_random_input = let i = Random.int (Array.length array_buttons) in @@ -167,7 +167,7 @@ object method reset = () end -class scale_input default_value lower upper to_float from_float digits +class scale_input default_value lower upper to_float from_float digits (table:GPack.table) n : input = let adj = GData.adjustment @@ -175,8 +175,8 @@ class scale_input default_value lower upper to_float from_float digits ~lower:lower ~upper:upper () in - let scale = - GRange.scale + let scale = + GRange.scale `HORIZONTAL ~adjustment:adj ~digits:digits @@ -197,7 +197,7 @@ object adj#set_value (to_float v) method reset = () end - + class type output = object @@ -208,7 +208,7 @@ class label_output (table:GPack.table) n : output = let label = GMisc.label ~text:"" () in let _ = table#attach ~expand:`BOTH ~left:1 ~right:2 ~top:n label#coerce in object - method set_output s = + method set_output s = label#set_text s end @@ -225,25 +225,25 @@ let create_input v_name v_ty n (table:GPack.table) = table#attach ~expand:`BOTH ~left:0 ~right:1 ~top:n label#coerce; match v_ty with | Tid{ qual = Pervasives; name = "int" } -> - new scale_input - 0.0 0. 120.float_of_string - (fun v -> - string_of_int (int_of_float v)) - 0 - table n + new scale_input + 0.0 0. 120.float_of_string + (fun v -> + string_of_int (int_of_float v)) + 0 + table n | Tid{ qual = Pervasives; name = "float" } -> new scale_input 0. 0. 100. float_of_string string_of_float 1 table n | Tid{ qual = Pervasives; name = "bool" } -> new boolean_input table n | Tid(name) -> begin try - let ty = find_type name in - begin match ty with - | Tenum(clist) -> new enum_input name.qual clist table n - | _ -> new entry_input "" table n - end + let ty = find_type name in + begin match ty with + | Tenum(clist) -> new enum_input name.qual clist table n + | _ -> new entry_input "" table n + end with Not_found -> - new entry_input "" table n + new entry_input "" table n end | _ -> failwith("Arrays and tuples not yet implemented") @@ -277,7 +277,7 @@ let find_in_path filename = Only a minimal chronogram tool will be provided.\n" filename; raise Not_found -let usage_msg = "Usage: " ^ +let usage_msg = "Usage: " ^ Sys.executable_name ^ " -mod -node -exec \n" ^ " " ^ Sys.executable_name ^ " -sig .epci -node -exec " and doc_sig = ".epci\tCompiled interface containing node (for backward compatibility)" @@ -297,8 +297,8 @@ let main () = let mod_name_of_epci epci_name = if Filename.check_suffix epci_name ".epci" then begin - let filename = Filename.chop_suffix epci_name ".epci" in - mod_name := String.capitalize(Filename.basename filename) + let filename = Filename.chop_suffix epci_name ".epci" in + mod_name := String.capitalize(Filename.basename filename) end else raise (Arg.Bad("Invalid compiled interface: " ^ epci_name)) in @@ -314,20 +314,20 @@ let main () = arg_list (fun s -> raise (Arg.Bad ("Invalid argument: " ^ s))) usage_msg; - + if (!mod_name = "") or (!node_name = "") or (!exec_name = "") then begin - Arg.usage arg_list usage_msg; - raise Error + Arg.usage arg_list usage_msg; + raise Error end; - + open_module (Module !mod_name); let signature = find_value { qual = (Module !mod_name); - name = !node_name } in - + name = !node_name } in + let nb_inputs = List.length signature.node_inputs in let nb_outputs = List.length signature.node_outputs in @@ -351,7 +351,7 @@ let main () = let out_frame = GBin.frame ~label:"Outputs" ~packing:up_part#add () in (* let output_frame = GPack.table ~row_spacings:0 ~border_width:1 ~columns:2 ~rows:nb_outputs *) (* ~packing:out_frame#add () in *) - let output_frame = GPack.table ~columns:2 ~rows:nb_outputs + let output_frame = GPack.table ~columns:2 ~rows:nb_outputs ~packing:out_frame#add () in (* Step label *) @@ -359,7 +359,7 @@ let main () = (* Period scale *) let period_label = GMisc.label ~text:"Period" ~packing:period_part#add () in let running_period_adj = - GData.adjustment + GData.adjustment ~value:!running_period ~lower:0.001 ~upper:1.0 @@ -367,8 +367,8 @@ let main () = ~page_incr:0.1 ~page_size:0.1 () in ignore(running_period_adj#connect#value_changed - (fun () -> running_period := running_period_adj#value)); - let period_scale = + (fun () -> running_period := running_period_adj#value)); + let period_scale = GRange.scale `HORIZONTAL ~adjustment:running_period_adj @@ -379,27 +379,27 @@ let main () = () in (* Step, autostep, random, run, quit buttons *) let bstep = GButton.button ~label:"Step" ~packing:low_part#add () in - let bastep = + let bastep = GButton.toggle_button ~label:"Autostep" ~packing:low_part#add () in - let brun = + let brun = GButton.toggle_button ~label:"Run" ~packing:low_part#add () in - let brandom = + let brandom = GButton.toggle_button ~label:"Random" ~packing:low_part#add () in let bquit = GButton.button ~label:"Quit" ~packing:low_part#add () in (* chronogram windows *) let chrono = GWindow.window ~title:(!node_name ^ " - chronogram") () in let chrono_box = GPack.vbox ~packing:chrono#add () in - let chrono_chronos = + let chrono_chronos = GPack.table ~homogeneous:false ~col_spacings:10 ~columns:11 ~rows:(nb_inputs+nb_outputs) ~packing:chrono_box#add () in let packing_chrono = chrono_chronos#attach ~expand:`BOTH in - let chrono_buttons = + let chrono_buttons = GPack.button_box `HORIZONTAL ~packing:chrono_box#add () in let blatex = GButton.button ~label:"Export in LaTeX" ~packing:chrono_buttons#add () in - let bgnuplot = GButton.button ~label:"Export for Gnuplot" + let bgnuplot = GButton.button ~label:"Export for Gnuplot" ~packing:chrono_buttons#add () in let make_label () = GMisc.label ~text:" " () in @@ -417,27 +417,27 @@ let main () = output_string oc_sim2chro "#@inputs\n"; (* Adding inputs *) - + let inputs,_ = - List.fold_left + List.fold_left (fun (acc,n) { a_name = name; a_type = ty } -> - let name = - match name with - | None -> "Input " ^ (string_of_int n) - | Some name -> name in - let input = create_input name ty n input_frame in - let _chrono_label = - GMisc.label ~text:name ~packing:(packing_chrono ~left:0 ~top:n) () in - let chrono_data = Array.make 10 (make_label()) in - for i = 0 to 9 do - let lab = make_label () in - chrono_data.(i) <- lab; - packing_chrono ~left:(i+1) ~top:n lab#coerce - done; - let save = ref [] in - saves := (name, save)::!saves; - Printf.fprintf oc_sim2chro "\"%s\":%s\n" name (sim2chro_type ty); - ((input,chrono_data,save)::acc),(n+1)) + let name = + match name with + | None -> "Input " ^ (string_of_int n) + | Some name -> name in + let input = create_input name ty n input_frame in + let _chrono_label = + GMisc.label ~text:name ~packing:(packing_chrono ~left:0 ~top:n) () in + let chrono_data = Array.make 10 (make_label()) in + for i = 0 to 9 do + let lab = make_label () in + chrono_data.(i) <- lab; + packing_chrono ~left:(i+1) ~top:n lab#coerce + done; + let save = ref [] in + saves := (name, save)::!saves; + Printf.fprintf oc_sim2chro "\"%s\":%s\n" name (sim2chro_type ty); + ((input,chrono_data,save)::acc),(n+1)) ([],0) signature.node_inputs in @@ -451,24 +451,24 @@ let main () = let outputs,_ = List.fold_left (fun (acc,n) { a_name = name; a_type = ty } -> - let name = - match name with - | None -> "Output " ^ (string_of_int n) - | Some name -> name in - let output = create_output name ty n output_frame in - let n = n + nb_inputs in - let _chrono_label = - GMisc.label ~text:name ~packing:(packing_chrono ~left:0 ~top:n) () in - let chrono_data = Array.make 10 (make_label()) in - for i = 0 to 9 do - let lab = make_label () in - chrono_data.(i) <- lab; - packing_chrono ~left:(i+1) ~top:n lab#coerce - done; - let save = ref [] in - Printf.fprintf oc_sim2chro "\"%s\":%s\n" name (sim2chro_type ty); - saves := (name, save)::!saves; - ((output,chrono_data,save)::acc),(n+1)) + let name = + match name with + | None -> "Output " ^ (string_of_int n) + | Some name -> name in + let output = create_output name ty n output_frame in + let n = n + nb_inputs in + let _chrono_label = + GMisc.label ~text:name ~packing:(packing_chrono ~left:0 ~top:n) () in + let chrono_data = Array.make 10 (make_label()) in + for i = 0 to 9 do + let lab = make_label () in + chrono_data.(i) <- lab; + packing_chrono ~left:(i+1) ~top:n lab#coerce + done; + let save = ref [] in + Printf.fprintf oc_sim2chro "\"%s\":%s\n" name (sim2chro_type ty); + saves := (name, save)::!saves; + ((output,chrono_data,save)::acc),(n+1)) ([],0) signature.node_outputs in @@ -476,7 +476,7 @@ let main () = (* create simulating process *) let (ic_sim,oc_sim) = Unix.open_process !exec_name in - + let output_latex () = let oc = open_out (!node_name ^ ".tex") in output_string oc "\\[\n"; @@ -524,62 +524,62 @@ let main () = output_string oc_sim2chro "\n"; flush oc_sim2chro in - + let step () = incr nb_step; (* write inputs to simulating process *) let input_strings = List.fold_left - (fun acc (input,chrono,save) -> - let s = - if brandom#active - then input#get_random_input - else input#get_input in - input#reset; - Printf.fprintf oc_sim "%s\n" s; - save := s::!save; - if !nb_step <= 10 then - ignore + (fun acc (input,chrono,save) -> + let s = + if brandom#active + then input#get_random_input + else input#get_input in + input#reset; + Printf.fprintf oc_sim "%s\n" s; + save := s::!save; + if !nb_step <= 10 then + ignore (List.fold_right - (fun x i -> - (chrono.(i))#set_text x ; i+1) - !save 0) - else - begin - (chrono.(0))#set_text "..."; - for i = 1 to 9 do - (chrono.(i))#set_text (List.nth !save (9-i)) - done - end; - s::acc) - [] - inputs in + (fun x i -> + (chrono.(i))#set_text x ; i+1) + !save 0) + else + begin + (chrono.(0))#set_text "..."; + for i = 1 to 9 do + (chrono.(i))#set_text (List.nth !save (9-i)) + done + end; + s::acc) + [] + inputs in flush oc_sim; - + (* read outputs *) let output_strings = - List.fold_left - (fun acc (output,chrono,save) -> - let s = input_line ic_sim in - output#set_output s; - save := s::!save; - if !nb_step <= 10 then - ignore + List.fold_left + (fun acc (output,chrono,save) -> + let s = input_line ic_sim in + output#set_output s; + save := s::!save; + if !nb_step <= 10 then + ignore (List.fold_right - (fun x i -> - (chrono.(i))#set_text x ; i+1) - !save 0) - else - begin - (chrono.(0))#set_text "..."; - for i = 1 to 9 do - (chrono.(i))#set_text (List.nth !save (9-i)) - done - end; - s::acc) - [] - outputs in + (fun x i -> + (chrono.(i))#set_text x ; i+1) + !save 0) + else + begin + (chrono.(0))#set_text "..."; + for i = 1 to 9 do + (chrono.(i))#set_text (List.nth !save (9-i)) + done + end; + s::acc) + [] + outputs in step_sim2chro (input_strings,output_strings); @@ -602,9 +602,9 @@ let main () = let toggle_run () = match !running_thread with - | None -> - let t = Thread.create run () in - running_thread := Some t + | None -> + let t = Thread.create run () in + running_thread := Some t | Some t -> running_thread := None in diff --git a/compiler/minils/main/mls_compiler.ml b/compiler/minils/main/mls_compiler.ml index 6fe86f9..9bbfc40 100644 --- a/compiler/minils/main/mls_compiler.ml +++ b/compiler/minils/main/mls_compiler.ml @@ -18,6 +18,7 @@ let compile_program p = let p = try pass "Clocking" true Clocking.program p pp with Errors.Error -> + comment ~sep:"" "\nInfered clocks :\n"; pp p; comment ~sep:"*** " ("Clocking failed."); if !print_types then Global_printer.print_interface Format.std_formatter; diff --git a/compiler/obc/c/cmain.ml b/compiler/obc/c/cmain.ml index 37d1760..9dd0bdb 100644 --- a/compiler/obc/c/cmain.ml +++ b/compiler/obc/c/cmain.ml @@ -79,7 +79,7 @@ let assert_node_res cd = Cif (Cuop ("!", Clhs (Cfield (Cvar (fst out), local_qn outn))), [Csexpr (Cfun_call ("fprintf", [Clhs(Cvar "stderr"); - Cconst (Cstrlit ("Node \\\"" ^ name + Cconst (Cstrlit ("Node \\\"" ^ name ^ "\\\" failed at step" ^ " %d.\\n")); Clhs (Cvar step_counter)])); @@ -130,24 +130,24 @@ let main_def_of_class_def cd = let scan_exp = let printf_s = Format.sprintf "%s ? " prompt in let format_s = format_for_type ty in - let exp_scanf = Cfun_call ("scanf", + let exp_scanf = Cfun_call ("scanf", [Cconst (Cstrlit format_s); Caddrof lhs]) in - let body = - if !Compiler_options.hepts_simulation - then (* hepts: systematically test and quit when EOF *) - [Cif(Cbop("==",exp_scanf,Clhs(Cvar("EOF"))), - [Creturn(Cconst(Ccint(0)))],[])] - else - [Csexpr (exp_scanf);] in - let body = - if !Compiler_options.hepts_simulation then - body - else - Csexpr (Cfun_call ("printf", + let body = + if !Compiler_options.hepts_simulation + then (* hepts: systematically test and quit when EOF *) + [Cif(Cbop("==",exp_scanf,Clhs(Cvar("EOF"))), + [Creturn(Cconst(Ccint(0)))],[])] + else + [Csexpr (exp_scanf);] in + let body = + if !Compiler_options.hepts_simulation then + body + else + Csexpr (Cfun_call ("printf", Cconst (Cstrlit printf_s) :: args_format_s)) - :: body in + :: body in Csblock { var_decls = []; block_body = body; } in match need_buf_for_ty ty with @@ -166,21 +166,21 @@ let main_def_of_class_def cd = let iter_var = fresh "i" in let lhs = Carray (lhs, Clhs (Cvar iter_var)) in let (writes, bufs) = write_lhs_of_ty lhs ty in - let writes_loop = - Cfor (iter_var, Cconst (Ccint 0), cexpr_of_static_exp n, writes) in - if !Compiler_options.hepts_simulation then - ([writes_loop], bufs) - else + let writes_loop = + Cfor (iter_var, Cconst (Ccint 0), cexpr_of_static_exp n, writes) in + if !Compiler_options.hepts_simulation then + ([writes_loop], bufs) + else ([cprint_string "[ "; - writes_loop; + writes_loop; cprint_string "]"], bufs) | _ -> let varn = fresh "buf" in let format_s = format_for_type ty in - let format_s = - if !Compiler_options.hepts_simulation - then format_s ^ "\\n" - else format_s ^ " " in + let format_s = + if !Compiler_options.hepts_simulation + then format_s ^ "\\n" + else format_s ^ " " in let nbuf_opt = need_buf_for_ty ty in let ep = match nbuf_opt with | None -> [Clhs lhs] @@ -206,9 +206,9 @@ let main_def_of_class_def cd = write_lhs_of_ty (Cfield (Cvar "res", local_qn (name vd.v_ident))) vd.v_type in if !Compiler_options.hepts_simulation then - (stm, vars) + (stm, vars) else - (cprint_string "=> " :: stm, vars) + (cprint_string "=> " :: stm, vars) in split (map write_lhs_of_ty_for_vd stepm.m_outputs) in let printf_calls = List.concat printf_calls in @@ -237,7 +237,7 @@ let main_def_of_class_def cd = concat scanf_calls @ [Csexpr funcall] @ printf_calls - @ + @ (if !Compiler_options.hepts_simulation then [] else [Csexpr (Cfun_call ("puts", [Cconst (Cstrlit "")]))])