aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgareuselesinge2013-06-21 08:58:47 +0000
committergareuselesinge2013-06-21 08:58:47 +0000
commit6b3e5b6b6ba281275d71829408408736300a056d (patch)
tree3634a728b2c654a2afe87444aaf23354b996b649
parent568a8fe47f83ab08257239ee098eaf83a32eabbe (diff)
Revert "parse "of" as KEYID "of""
This reverts commit edb2c43e152d40001616485fcf7fdde5d947f7a2. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@16598 85f007b7-540e-0410-9357-904b9bb8a0f7
-rw-r--r--parsing/g_ltac.ml42
-rw-r--r--parsing/g_tactic.ml44
-rw-r--r--plugins/decl_mode/g_decl_mode.ml42
3 files changed, 4 insertions, 4 deletions
diff --git a/parsing/g_ltac.ml4 b/parsing/g_ltac.ml4
index 0b25155546..482f0df721 100644
--- a/parsing/g_ltac.ml4
+++ b/parsing/g_ltac.ml4
@@ -135,7 +135,7 @@ GEXTEND Gram
ConstrEval (rtc,c)
| IDENT "context"; id = identref; "["; c = Constr.lconstr; "]" ->
ConstrContext (id,c)
- | IDENT "type"; KEYID "of" ; c = Constr.constr ->
+ | IDENT "type"; IDENT "of"; c = Constr.constr ->
ConstrTypeOf c ] ]
;
constr_may_eval: (* For extensions *)
diff --git a/parsing/g_tactic.ml4 b/parsing/g_tactic.ml4
index 10cfb7d830..5a5c07185c 100644
--- a/parsing/g_tactic.ml4
+++ b/parsing/g_tactic.ml4
@@ -370,9 +370,9 @@ GEXTEND Gram
hypident:
[ [ id = id_or_meta ->
id,InHyp
- | "("; IDENT "type"; KEYID "of"; id = id_or_meta; ")" ->
+ | "("; IDENT "type"; IDENT "of"; id = id_or_meta; ")" ->
id,InHypTypeOnly
- | "("; IDENT "value"; KEYID "of"; id = id_or_meta; ")" ->
+ | "("; IDENT "value"; IDENT "of"; id = id_or_meta; ")" ->
id,InHypValueOnly
] ]
;
diff --git a/plugins/decl_mode/g_decl_mode.ml4 b/plugins/decl_mode/g_decl_mode.ml4
index 7c63648633..a90c565f10 100644
--- a/plugins/decl_mode/g_decl_mode.ml4
+++ b/plugins/decl_mode/g_decl_mode.ml4
@@ -234,7 +234,7 @@ GLOBAL: proof_instr;
;
elim_obj:
[[ IDENT "on"; c=constr -> Real c
- | KEYID "of"; c=simple_cut -> Virtual c ]]
+ | IDENT "of"; c=simple_cut -> Virtual c ]]
;
elim_step:
[[ IDENT "consider" ;