diff options
| author | Pierre-Marie Pédrot | 2017-01-19 14:23:51 +0100 |
|---|---|---|
| committer | Pierre-Marie Pédrot | 2017-01-19 14:23:51 +0100 |
| commit | f22969902223ab54f56f25583b24dc27c4cd6f4e (patch) | |
| tree | 09c893b1dd14c9b2b38067a01486fc61452d0209 /toplevel | |
| parent | 34c19354c9997621a40ad053a2a12edcd8c5b5e4 (diff) | |
| parent | 8d783c10d9505cbc1beb1c8e3451ea5dd567f260 (diff) | |
Merge branch 'v8.6'
Diffstat (limited to 'toplevel')
| -rw-r--r-- | toplevel/vernacentries.ml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/toplevel/vernacentries.ml b/toplevel/vernacentries.ml index 8ce13c69af..a2f2ded327 100644 --- a/toplevel/vernacentries.ml +++ b/toplevel/vernacentries.ml @@ -571,10 +571,10 @@ let vernac_inductive poly lo finite indl = | _ -> () (* dumping is done by vernac_record (called below) *) ) indl; match indl with - | [ ( _ , _ , _ ,Record, Constructors _ ),_ ] -> - CErrors.error "The Record keyword cannot be used to define a variant type. Use Variant instead." + | [ ( _ , _ , _ ,(Record|Structure), Constructors _ ),_ ] -> + CErrors.error "The Record keyword is for types defined using the syntax { ... }." | [ (_ , _ , _ ,Variant, RecordDecl _),_ ] -> - CErrors.error "The Variant keyword cannot be used to define a record type. Use Record instead." + CErrors.error "The Variant keyword does not support syntax { ... }." | [ ( id , bl , c , b, RecordDecl (oc,fs) ), [] ] -> vernac_record (match b with Class _ -> Class false | _ -> b) poly finite id bl c oc fs |
