aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxime Dénès2016-11-03 09:45:49 +0100
committerMaxime Dénès2016-11-03 09:45:49 +0100
commit6b99de706e37c75407373e756e24f2256b848815 (patch)
tree0a01dcf51777033bacdc546e882cd1ed3ea143b3
parentc40331793c6397e6a4185d98a67543c4c1e2cb23 (diff)
Revert "Better Arguments compatibility."
This reverts commit 5358515f23d1cd47d4914c55dcf049df858b9dc7. The syntax is deprecated in 8.6, so we now remove it from trunk.
-rw-r--r--parsing/g_vernac.ml418
1 files changed, 4 insertions, 14 deletions
diff --git a/parsing/g_vernac.ml4 b/parsing/g_vernac.ml4
index 71d16d682a..7bc5bfca38 100644
--- a/parsing/g_vernac.ml4
+++ b/parsing/g_vernac.ml4
@@ -580,12 +580,6 @@ let warn_deprecated_implicit_arguments =
CWarnings.create ~name:"deprecated-implicit-arguments" ~category:"deprecated"
(fun () -> strbrk "Implicit Arguments is deprecated; use Arguments instead")
-let warn_deprecated_arguments_syntax =
- CWarnings.create ~name:"deprecated-arguments-syntax" ~category:"deprecated"
- (fun () -> strbrk "The \"/\" modifier has an effect only in the first "
- ++ strbrk "arguments list. The syntax allowing it to appear"
- ++ strbrk " in other lists is deprecated.")
-
(* Extensions: implicits, coercions, etc. *)
GEXTEND Gram
GLOBAL: gallina_ext instance_name;
@@ -660,10 +654,7 @@ GEXTEND Gram
args = LIST0 argument_spec_block;
more_implicits = OPT
[ ","; impl = LIST1
- [ impl = LIST0 more_implicits_block ->
- let warn_slash = List.exists fst impl in
- if warn_slash then warn_deprecated_arguments_syntax ~loc:!@loc ();
- List.flatten (List.map snd impl)]
+ [ impl = LIST0 more_implicits_block -> List.flatten impl]
SEP "," -> impl
];
mods = OPT [ ":"; l = LIST1 arguments_modifier SEP "," -> l ] ->
@@ -775,12 +766,11 @@ GEXTEND Gram
];
(* Same as [argument_spec_block], but with only implicit status and names *)
more_implicits_block: [
- [ name = name -> (false, [(snd name, Vernacexpr.NotImplicit)])
- | "/" -> (true (* Should warn about deprecated syntax *), [])
+ [ name = name -> [(snd name, Vernacexpr.NotImplicit)]
| "["; items = LIST1 name; "]" ->
- (false, List.map (fun name -> (snd name, Vernacexpr.Implicit)) items)
+ List.map (fun name -> (snd name, Vernacexpr.Implicit)) items
| "{"; items = LIST1 name; "}" ->
- (false, List.map (fun name -> (snd name, Vernacexpr.MaximallyImplicit)) items)
+ List.map (fun name -> (snd name, Vernacexpr.MaximallyImplicit)) items
]
];
strategy_level: