aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorherbelin2010-04-09 10:08:37 +0000
committerherbelin2010-04-09 10:08:37 +0000
commitb4e8d49f40d865490a13a000082cdef37424a77c (patch)
tree186c7ba607614584219b47708a8ebe2615d10c69
parent025720092d7a095478a5f4572a90d0c106175797 (diff)
Fixing part 1 of bug #2242 (-I -as and -R -as were supported for
coqtop but not coqc). git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@12911 85f007b7-540e-0410-9357-904b9bb8a0f7
-rw-r--r--scripts/coqc.ml16
1 files changed, 13 insertions, 3 deletions
diff --git a/scripts/coqc.ml b/scripts/coqc.ml
index 87205a744f..61f13d4d7f 100644
--- a/scripts/coqc.ml
+++ b/scripts/coqc.ml
@@ -127,8 +127,8 @@ let parse_args () =
parse (cfiles,args) rem
| ("-?"|"-h"|"-H"|"-help"|"--help") :: _ -> usage ()
- | ("-I"|"-include"|"-outputstate"
- |"-inputstate"|"-is"|"-load-vernac-source"|"-l"|"-load-vernac-object"
+ | ("-outputstate"|"-inputstate"|"-is"
+ |"-load-vernac-source"|"-l"|"-load-vernac-object"
|"-load-ml-source"|"-require"|"-load-ml-object"|"-user"
|"-init-file"|"-dump-glob"|"-compat"|"-coqlib" as o) :: rem ->
begin
@@ -136,7 +136,17 @@ let parse_args () =
| s :: rem' -> parse (cfiles,s::o::args) rem'
| [] -> usage ()
end
- | "-R" as o :: s :: t :: rem -> parse (cfiles,t::s::o::args) rem
+ | ("-I"|"-include" as o) :: rem ->
+ begin
+ match rem with
+ | s :: "-as" :: t :: rem' -> parse (cfiles,t::"-as"::s::o::args) rem'
+ | s :: "-as" :: [] -> usage ()
+ | s :: rem' -> parse (cfiles,s::o::args) rem'
+ | [] -> usage ()
+ end
+ | "-R" :: s :: "-as" :: t :: rem -> parse (cfiles,t::"-as"::s::"-R"::args) rem
+ | "-R" :: s :: "-as" :: [] -> usage ()
+ | "-R" :: s :: t :: rem -> parse (cfiles,t::s::"-R"::args) rem
| ("-notactics"|"-debug"|"-nolib"
|"-debugVM"|"-alltransp"|"-VMno"