X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2FmatitaInit.ml;h=72792a56d1d58399d5c93b58f5fd08d02bfd2b9c;hb=2041f4fefe300f77338f6aea598f025f84db1bbc;hp=5ca8ffc82a7f6f600303c41fe0d3c32afa6f6cbd;hpb=32e77480c65cbf23ae7dea38a519c83dfeaf3830;p=helm.git diff --git a/helm/software/matita/matitaInit.ml b/helm/software/matita/matitaInit.ml index 5ca8ffc82..72792a56d 100644 --- a/helm/software/matita/matitaInit.ml +++ b/helm/software/matita/matitaInit.ml @@ -25,10 +25,10 @@ (* $Id$ *) -type thingsToInitilaize = +type thingsToInitialize = ConfigurationFile | Db | Environment | Getter | CmdLine | Registry -exception FailedToInitialize of thingsToInitilaize +exception FailedToInitialize of thingsToInitialize let wants s l = List.iter ( @@ -192,6 +192,7 @@ let parse_cmdline init_status = (HExtlib.normalize_path (absolutize path)^" "^uri) | _ -> raise (Failure "bad baseuri, use -b 'path::uri'") in + let no_default_includes = ref false in let arg_spec = let std_arg_spec = [ "-b", Arg.String set_baseuri, " forces the baseuri of path"; @@ -217,10 +218,12 @@ let parse_cmdline init_status = Helm_registry.set_bool "matita.system" true), ("Act on the system library instead of the user one" ^ "\n WARNING: not for the casual user"); - "-v", + "-no-default-includes", Arg.Set no_default_includes, + "Do not include the default searched paths for the include command"; + "-v", Arg.Unit (fun () -> Helm_registry.set_bool "matita.verbose" true), "Verbose mode"; - "--version", Arg.Unit print_version, "Prints version"; + "--version", Arg.Unit print_version, "Prints version" ] in let debug_arg_spec = if BuildTimeConf.debug then @@ -229,7 +232,7 @@ let parse_cmdline init_status = ("Do not catch top-level exception " ^ "(useful for backtrace inspection)"); "-onepass", - Arg.Unit (fun () -> GrafiteDisambiguator.only_one_pass := true), + Arg.Unit (fun () -> MultiPassDisambiguator.only_one_pass := true), "Enable only one disambiguation pass"; ] else [] @@ -240,6 +243,7 @@ let parse_cmdline init_status = Helm_registry.set_list Helm_registry.of_string ~key ~value:l in Arg.parse arg_spec (add_l args) (usage ()); + let default_includes = if !no_default_includes then [] else default_includes in let includes = List.map (fun x -> HExtlib.normalize_path (absolutize x)) ((List.rev !includes) @ default_includes) @@ -271,7 +275,8 @@ let other_components = let initialize_all () = status := List.fold_left (fun s f -> f s) !status - (conf_components @ other_components) + (conf_components @ other_components); + NCicLibrary.init () let parse_cmdline_and_configuration_file () = status := List.fold_left (fun s f -> f s) !status conf_components @@ -280,4 +285,8 @@ let initialize_environment () = status := initialize_environment !status let _ = - Inversion_principle.init () + CicFix.init (); + Inversion_principle.init (); + CicRecord.init (); + CicElim.init () +;;