diff options
| author | letouzey | 2013-08-22 14:29:58 +0000 |
|---|---|---|
| committer | letouzey | 2013-08-22 14:29:58 +0000 |
| commit | 08e7ec2c48c5ca666ad42b5f969576e6aa43d2ea (patch) | |
| tree | 9b47cee57c927b638d9cfdab49890f21ec05c8cf /tools/coqc.ml | |
| parent | c1159f736c8d8f5b95bc53af7614a63f2ab9a86b (diff) | |
Misc changes around coqtop.ml :
- Revised Coqtop.parse_args in a cleaner and lighter style
- Improved error message in case of argument parse failure:
* tell which option is expecting a related argument
* in case of unknown options, warn about them all at once
* do not hide the previous error messages by filling the
screen with usage(). Instead, suggest the use of --help.
- Specialized boolean config field Coq_config.arch_is_win32
- Faster Envars.coqlib, which is back to (unit->string), and
just access Flags.coqlib. Caveat: it must be initialized once
via Envars.set_coqlib
- Avoid keeping an opened channel to the "revision" file
- Direct load of theories/init/prelude.vo, no detour via Loadpath
Beware : ./configure must be runned after this commit
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@16726 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'tools/coqc.ml')
| -rw-r--r-- | tools/coqc.ml | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/tools/coqc.ml b/tools/coqc.ml index e15a1768c2..2d9c2fd333 100644 --- a/tools/coqc.ml +++ b/tools/coqc.ml @@ -117,9 +117,14 @@ let parse_args () = | ("-v"|"--version") :: _ -> Usage.version 0 | ("-where") :: _ -> - print_endline (Envars.coqlib (fun x -> x)); exit 0 + Envars.set_coqlib (fun x -> x); + print_endline (Envars.coqlib ()); + exit 0 - | ("-config" | "--config") :: _ -> Usage.print_config (); exit 0 + | ("-config" | "--config") :: _ -> + Envars.set_coqlib (fun x -> x); + Usage.print_config (); + exit 0 (* Options for coqtop : a) options with 0 argument *) @@ -132,7 +137,7 @@ let parse_args () = |"-verbose-compat-notations"|"-no-compat-notations" as o) :: rem -> parse (cfiles,o::args) rem -(* Options for coqtop : a) options with 1 argument *) +(* Options for coqtop : b) options with 1 argument *) | ("-outputstate"|"-inputstate"|"-is"|"-exclude-dir" |"-load-vernac-source"|"-l"|"-load-vernac-object" @@ -144,7 +149,7 @@ let parse_args () = | [] -> usage () end -(* Options for coqtop : a) options with 1 argument and possibly more *) +(* Options for coqtop : c) options with 1 argument and possibly more *) | ("-I"|"-include" as o) :: rem -> begin |