diff options
| -rw-r--r-- | contrib/subtac/test/ListsTest.v | 1 | ||||
| -rw-r--r-- | contrib/subtac/test/euclid.v | 4 | ||||
| -rw-r--r-- | parsing/g_constr.ml4 | 4 | ||||
| -rw-r--r-- | parsing/g_vernac.ml4 | 4 |
4 files changed, 7 insertions, 6 deletions
diff --git a/contrib/subtac/test/ListsTest.v b/contrib/subtac/test/ListsTest.v index cc11c1513..b8d13fe6b 100644 --- a/contrib/subtac/test/ListsTest.v +++ b/contrib/subtac/test/ListsTest.v @@ -74,4 +74,3 @@ Section Nth. Defined. End Nth. -Section diff --git a/contrib/subtac/test/euclid.v b/contrib/subtac/test/euclid.v index e793e270d..a5a8b85f9 100644 --- a/contrib/subtac/test/euclid.v +++ b/contrib/subtac/test/euclid.v @@ -2,7 +2,7 @@ Require Import Coq.subtac.Utils. Require Import Coq.Arith.Compare_dec. Notation "( x & y )" := (existS _ x y) : core_scope. -Program Fixpoint euclid (a : nat) (b : { b : nat | b <> O }) {wf a lt} : +Program Fixpoint euclid (a : nat) (b : { b : nat | b <> O }) {wf lt a} : { q : nat & { r : nat | a = b * q + r /\ r < b } } := if le_lt_dec b a then let (q', r) := euclid (a - b) b in (S q' & r) @@ -23,3 +23,5 @@ Eval lazy beta zeta delta iota in test_euclid. Program Definition testsig (a : nat) : { x : nat & { y : nat | x < y } } := (a & S a). + +Check testsig. diff --git a/parsing/g_constr.ml4 b/parsing/g_constr.ml4 index 9a50eb897..b29b82607 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"; rel=constr; id=name; "}" -> (Some id, CWfRec rel) - | "{"; IDENT "measure"; rel=constr; id=name; "}" -> (Some id, CMeasureRec rel) + | "{"; IDENT "wf"; rel=constr; id=OPT name; "}" -> (id, CWfRec rel) + | "{"; IDENT "measure"; rel=constr; id=OPT name; "}" -> (id, CMeasureRec rel) | -> (None, CStructRec) ] ] ; diff --git a/parsing/g_vernac.ml4 b/parsing/g_vernac.ml4 index ad1e3abb7..8174271d9 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"; rel=constr; id=IDENT; "}" -> (Some (id_of_string id), CWfRec rel) - | "{"; IDENT "measure"; rel=constr; id=IDENT; "}" -> (Some (id_of_string id), CMeasureRec rel) + | "{"; IDENT "wf"; rel=constr; id=OPT IDENT; "}" -> (option_map id_of_string id, CWfRec rel) + | "{"; IDENT "measure"; rel=constr; id=OPT IDENT; "}" -> (option_map id_of_string id, CMeasureRec rel) | -> (None, CStructRec) ] ] ; |