diff options
| author | msozeau | 2007-01-31 08:39:53 +0000 |
|---|---|---|
| committer | msozeau | 2007-01-31 08:39:53 +0000 |
| commit | 0b452cb010729f6e2d0f6400a8f823e5962407f0 (patch) | |
| tree | ab2f13592a117950f3614165b5cb6951d8e8c32d /parsing | |
| parent | 1f6887596563bfbf43af858bd951ee986d059aa8 (diff) | |
Fix order of wf and measure arguments, patch Program doc.
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@9561 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'parsing')
| -rw-r--r-- | parsing/g_constr.ml4 | 4 | ||||
| -rw-r--r-- | parsing/g_vernac.ml4 | 4 | ||||
| -rw-r--r-- | parsing/ppvernac.ml | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/parsing/g_constr.ml4 b/parsing/g_constr.ml4 index 0f097f7e6e..9a50eb897e 100644 --- a/parsing/g_constr.ml4 +++ b/parsing/g_constr.ml4 @@ -231,8 +231,8 @@ GEXTEND Gram ; fixannot: [ [ "{"; IDENT "struct"; id=name; "}" -> (Some id, CStructRec) - | "{"; IDENT "wf"; id=name; rel=lconstr; "}" -> (Some id, CWfRec rel) - | "{"; IDENT "measure"; id=name; rel=lconstr; "}" -> (Some id, CMeasureRec rel) + | "{"; IDENT "wf"; rel=constr; id=name; "}" -> (Some id, CWfRec rel) + | "{"; IDENT "measure"; rel=constr; id=name; "}" -> (Some id, CMeasureRec rel) | -> (None, CStructRec) ] ] ; diff --git a/parsing/g_vernac.ml4 b/parsing/g_vernac.ml4 index d08a9b06c0..ad1e3abb78 100644 --- a/parsing/g_vernac.ml4 +++ b/parsing/g_vernac.ml4 @@ -266,8 +266,8 @@ GEXTEND Gram ; rec_annotation: [ [ "{"; IDENT "struct"; id=IDENT; "}" -> (Some (id_of_string id), CStructRec) - | "{"; IDENT "wf"; id=IDENT; rel=lconstr; "}" -> (Some (id_of_string id), CWfRec rel) - | "{"; IDENT "measure"; id=IDENT; rel=lconstr; "}" -> (Some (id_of_string id), CMeasureRec rel) + | "{"; IDENT "wf"; rel=constr; id=IDENT; "}" -> (Some (id_of_string id), CWfRec rel) + | "{"; IDENT "measure"; rel=constr; id=IDENT; "}" -> (Some (id_of_string id), CMeasureRec rel) | -> (None, CStructRec) ] ] ; diff --git a/parsing/ppvernac.ml b/parsing/ppvernac.ml index 807a3168c0..1b8123695d 100644 --- a/parsing/ppvernac.ml +++ b/parsing/ppvernac.ml @@ -572,11 +572,11 @@ let rec pr_vernac = function spc() ++ str "{struct " ++ pr_name name ++ str"}" else mt() | CWfRec c -> - spc() ++ str "{wf " ++ pr_name name ++ spc() ++ - pr_lconstr_expr c ++ str"}" + spc() ++ str "{wf " ++ pr_lconstr_expr c ++ spc() ++ + pr_name name ++ str"}" | CMeasureRec c -> - spc() ++ str "{measure " ++ pr_name name ++ spc() ++ - pr_lconstr_expr c ++ str"}" + spc() ++ str "{measure " ++ pr_lconstr_expr c ++ spc() ++ + pr_name name ++ str"}" in pr_id id ++ pr_binders_arg bl ++ annot ++ spc() ++ pr_type_option (fun c -> spc() ++ pr_lconstr_expr c) type_ |