diff --git a/compiler/main/heptc.ml b/compiler/main/heptc.ml index 673439d..5032857 100644 --- a/compiler/main/heptc.ml +++ b/compiler/main/heptc.ml @@ -126,7 +126,7 @@ let main () = "-memalloc", Arg.Unit do_mem_alloc_and_typing, doc_memalloc; "-only-memalloc", Arg.Set do_mem_alloc, doc_memalloc_only; "-only-linear", Arg.Set do_linear_typing, doc_linear_only; - "-sch-interf", Arg.Set use_interf_scheduler, doc_interf_scheduler + "-old-scheduler", Arg.Set use_old_scheduler, doc_interf_scheduler ] compile errmsg; with diff --git a/compiler/minils/main/mls_compiler.ml b/compiler/minils/main/mls_compiler.ml index ff02acc..0e8fa70 100644 --- a/compiler/minils/main/mls_compiler.ml +++ b/compiler/minils/main/mls_compiler.ml @@ -47,7 +47,7 @@ let compile_program p = (* Scheduling *) let p = - if !Compiler_options.use_interf_scheduler then + if not !Compiler_options.use_old_scheduler then pass "Scheduling (with minimization of interferences)" true Schedule_interf.program p pp else pass "Scheduling" true Schedule.program p pp diff --git a/compiler/utilities/global/compiler_options.ml b/compiler/utilities/global/compiler_options.ml index d036020..686afaf 100644 --- a/compiler/utilities/global/compiler_options.ml +++ b/compiler/utilities/global/compiler_options.ml @@ -110,14 +110,14 @@ let do_mem_alloc_and_typing () = do_mem_alloc := true; do_linear_typing := true -let use_interf_scheduler = ref false +let use_old_scheduler = ref false let doc_verbose = "\t\t\tSet verbose mode" and doc_version = "\t\tThe version of the compiler" and doc_print_types = "\t\t\tPrint types" and doc_include = "\t\tAdd to the list of include directories" and doc_stdlib = "\t\tDirectory for the standard library" -and doc_object_file = "\t\tOnly generate a .epo object file" +and doc_object_file = "\t\t\tOnly generate a .epo object file" and doc_sim = "\t\tCreate simulation for node " and doc_hepts = "\t\tSimulation for hepts (graphical simulator)" and doc_locate_stdlib = "\t\tLocate standard libray" @@ -127,7 +127,7 @@ and doc_target = "\tGenerate code in language \n\t\t\t(with =c," ^ " java or z3z)" and doc_full_type_info = "\t\t\tPrint full type information" -and doc_full_name = "\t\t\tPrint full variable name information" +and doc_full_name = "\t\tPrint full variable name information" and doc_target_path = "\tGenerated files will be placed in \n\t\t\t(the directory is" ^ " cleaned)" @@ -135,11 +135,11 @@ and doc_boolean = "\t\tTranslate enumerated values towards boolean vectors" and doc_deadcode = "\t\tDeadcode removal" and doc_nocaus = "\t\tDisable causality analysis" and doc_noinit = "\t\tDisable initialization analysis" -and doc_assert = "\t\tInsert run-time assertions for boolean node " -and doc_inline = "\t\tInline node " +and doc_assert = "\tInsert run-time assertions for boolean node " +and doc_inline = "\tInline node " and doc_itfusion = "\t\tEnable iterator fusion." and doc_tomato = "\t\tEnable automata minimization." and doc_memalloc = "\t\tEnable memory allocation and linear annotations" -and doc_memalloc_only = "\t\tEnable memory allocation" +and doc_memalloc_only = "\tEnable memory allocation" and doc_linear_only = "\t\tEnable linear annotations" -and doc_interf_scheduler = "\t\tUse a scheduler that tries to minimise interferences" +and doc_interf_scheduler = "\tUse the old scheduler" diff --git a/test/check b/test/check index 219cd45..9bb2e3b 100755 --- a/test/check +++ b/test/check @@ -10,7 +10,7 @@ shopt -s nullglob # script de test compilo=../../heptc -coption=-memalloc +coption="-memalloc" # compilateurs utilises pour les tests de gen. de code