diff options
author | 2004-01-09 19:02:58 +0000 | |
---|---|---|
committer | 2004-01-09 19:02:58 +0000 | |
commit | b1bd8f2a50863a6ca77b6f05b3f1756648cfe936 (patch) | |
tree | f9ab63c12f45c28bcc9320712e401c6ef32f26a1 /parsing/g_tacticnew.ml4 | |
parent | c4bc84f02c7d22402824514d70c6d5e66f511bfc (diff) |
bugs avec Pose et Assert
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@5190 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'parsing/g_tacticnew.ml4')
-rw-r--r-- | parsing/g_tacticnew.ml4 | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/parsing/g_tacticnew.ml4 b/parsing/g_tacticnew.ml4 index ccac2ae73..b108ab4b4 100644 --- a/parsing/g_tacticnew.ml4 +++ b/parsing/g_tacticnew.ml4 @@ -55,7 +55,7 @@ let test_lpar_idnum_coloneq = (* idem for (x:t) *) let lpar_id_colon = - Gram.Entry.of_parser "test_lpar_id_colon" + Gram.Entry.of_parser "lpar_id_colon" (fun strm -> match Stream.npeek 1 strm with | [("","(")] -> @@ -333,18 +333,20 @@ GEXTEND Gram | IDENT "cut"; c = constr -> TacCut c | IDENT "assert"; id = lpar_id_colon; t = lconstr; ")" -> - TacTrueCut (Some id,t) + TacTrueCut (Names.Name id,t) | IDENT "assert"; id = lpar_id_coloneq; b = lconstr; ")" -> TacForward (false,Names.Name id,b) - | IDENT "assert"; c = constr -> TacTrueCut (None,c) + | IDENT "assert"; c = constr -> TacTrueCut (Names.Anonymous,c) | IDENT "pose"; id = lpar_id_coloneq; b = lconstr; ")" -> TacForward (true,Names.Name id,b) | IDENT "pose"; b = constr -> TacForward (true,Names.Anonymous,b) | IDENT "generalize"; lc = LIST1 constr -> TacGeneralize lc | IDENT "generalize"; IDENT "dependent"; c = constr -> TacGeneralizeDep c - | IDENT "set"; "("; id = base_ident; ":="; c = lconstr; ")"; - p = clause -> TacLetTac (id,c,p) + | IDENT "set"; id = lpar_id_coloneq; c = lconstr; ")"; + p = clause -> TacLetTac (Names.Name id,c,p) + | IDENT "set"; c = constr; p = clause -> + TacLetTac (Names.Anonymous,c,p) | IDENT "instantiate"; "("; n = natural; ":="; c = lconstr; ")"; cls = clause -> TacInstantiate (n,c,cls) |