aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Pierre-Marie Pédrot <pierre-marie.pedrot@inria.fr>2015-03-31 19:41:47 +0200
committerGravatar Pierre-Marie Pédrot <pierre-marie.pedrot@inria.fr>2015-03-31 19:48:54 +0200
commitbfa91a895692f4f52e132c3814a472c5e2a24d7b (patch)
treea9da082b67ffc197b13a45f4847328836fac85ef
parent43a0a3147073b12b038c55c27fd6f0adcb900ac9 (diff)
Removing references to deprecated syntax -I/-R -as.
-rw-r--r--checker/checker.ml3
-rw-r--r--toplevel/coqtop.ml6
-rw-r--r--toplevel/usage.ml4
3 files changed, 6 insertions, 7 deletions
diff --git a/checker/checker.ml b/checker/checker.ml
index ffe155319..9a1007acb 100644
--- a/checker/checker.ml
+++ b/checker/checker.ml
@@ -181,8 +181,7 @@ let print_usage_channel co command =
" -I dir -as coqdir map physical dir to logical coqdir\
\n -I dir map directory dir to the empty logical path\
\n -include dir (idem)\
-\n -R dir -as coqdir recursively map physical dir to logical coqdir\
-\n -R dir coqdir (idem)\
+\n -R dir coqdir recursively map physical dir to logical coqdir\
\n\
\n -admit module load module and dependencies without checking\
\n -norec module check module but admit dependencies without checking\
diff --git a/toplevel/coqtop.ml b/toplevel/coqtop.ml
index 0b9bb2f2e..5795de885 100644
--- a/toplevel/coqtop.ml
+++ b/toplevel/coqtop.ml
@@ -414,8 +414,10 @@ let parse_args arglist =
end
|"-R" ->
begin match rem with
- | d :: "-as" :: [] -> error_missing_arg "-as"
- | d :: "-as" :: p :: rem
+ | d :: "-as" :: [] -> error_missing_arg opt
+ | d :: "-as" :: p :: rem ->
+ warning "option -R * -as * deprecated, remove the -as";
+ set_include d p true true; args := rem
| d :: p :: rem -> set_include d p true true; args := rem
| _ -> error_missing_arg opt
end
diff --git a/toplevel/usage.ml b/toplevel/usage.ml
index 4ee3bc474..f053839c7 100644
--- a/toplevel/usage.ml
+++ b/toplevel/usage.ml
@@ -23,9 +23,7 @@ let print_usage_channel co command =
output_string co
" -I dir look for ML files in dir\
\n -include dir (idem)\
-\n -I dir -as coqdir implicitly map physical dir to logical coqdir\
-\n -R dir -as coqdir recursively map physical dir to logical coqdir\
-\n -R dir coqdir (idem)\
+\n -R dir coqdir recursively map physical dir to logical coqdir\
\n -Q dir coqdir map physical dir to logical coqdir\
\n -top coqdir set the toplevel name to be coqdir instead of Top\
\n -notop set the toplevel name to be the empty logical path\