aboutsummaryrefslogtreecommitdiff
path: root/parsing
diff options
context:
space:
mode:
authormsozeau2009-03-29 10:26:26 +0000
committermsozeau2009-03-29 10:26:26 +0000
commit02699217340a08f9ac7e6cef8650246d730f9624 (patch)
tree7e027b2fa46362a98a22da1c2f75ff99b9371264 /parsing
parent2d8aa8a39eaa4e44d9ece9fdfbcbf4bc4a516dec (diff)
Avoid inadvertent declaration of "on" as a keyword. New syntax is
{measure ms [id] [(rel)]}. Fix script of bug #2083 and test-suite file accordingly. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@12032 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'parsing')
-rw-r--r--parsing/g_constr.ml42
1 files changed, 1 insertions, 1 deletions
diff --git a/parsing/g_constr.ml4 b/parsing/g_constr.ml4
index 9152083bf3..66fc4c2532 100644
--- a/parsing/g_constr.ml4
+++ b/parsing/g_constr.ml4
@@ -398,7 +398,7 @@ GEXTEND Gram
[ [ "{"; IDENT "struct"; id=identref; "}" -> (Some id, CStructRec)
| "{"; IDENT "wf"; rel=constr; id=OPT identref; "}" -> (id, CWfRec rel)
| "{"; IDENT "measure"; m=constr; id=OPT identref;
- rel = OPT [ "on"; r=constr -> r ]; "}" -> (id, CMeasureRec (m,rel))
+ rel=OPT constr; "}" -> (id, CMeasureRec (m,rel))
] ]
;
binders_let_fixannot: