diff options
| author | Pierre-Marie Pédrot | 2017-08-25 17:16:01 +0200 |
|---|---|---|
| committer | Pierre-Marie Pédrot | 2017-08-25 17:51:16 +0200 |
| commit | 6875b016b0a502b03296e5f97f26cf0f6699a7aa (patch) | |
| tree | 2802ed43b0a74af079acd05fd694a38938f94317 /theories | |
| parent | 47eb0278a3cdf93129b1742e314681d65bd6475a (diff) | |
Do not return STRING scopes in the tuple produced by "seq" scopes.
Diffstat (limited to 'theories')
| -rw-r--r-- | theories/Notations.v | 33 |
1 files changed, 3 insertions, 30 deletions
diff --git a/theories/Notations.v b/theories/Notations.v index 2d52904faf..bb27a34627 100644 --- a/theories/Notations.v +++ b/theories/Notations.v @@ -175,14 +175,7 @@ Ltac2 Notation econstructor := econstructor. Ltac2 Notation "econstructor" n(tactic) bnd(thunk(bindings)) := constructor0 true n bnd. Ltac2 elim0 ev c bnd use := - let f ev ((c, bnd, use)) := - let use := match use with - | None => None - | Some u => - let ((_, c, wth)) := u in Some (c, wth) - end in - Std.elim ev (c, bnd) use - in + let f ev ((c, bnd, use)) := Std.elim ev (c, bnd) use in enter_h ev f (fun () => c (), bnd (), use ()). Ltac2 Notation "elim" c(thunk(constr)) bnd(thunk(bindings)) @@ -219,14 +212,7 @@ Ltac2 Notation "apply" apply0 true false cb cl. Ltac2 induction0 ev ic use := - let f ev use := - let use := match use with - | None => None - | Some u => - let ((_, c, wth)) := u in Some (c, wth) - end in - Std.induction ev ic use - in + let f ev use := Std.induction ev ic use in enter_h ev f use. Ltac2 Notation "induction" @@ -240,14 +226,7 @@ Ltac2 Notation "einduction" induction0 true ic use. Ltac2 destruct0 ev ic use := - let f ev use := - let use := match use with - | None => None - | Some u => - let ((_, c, wth)) := u in Some (c, wth) - end in - Std.destruct ev ic use - in + let f ev use := Std.destruct ev ic use in enter_h ev f use. Ltac2 Notation "destruct" @@ -312,12 +291,6 @@ Ltac2 Notation "native_compute" pl(opt(seq(pattern, occurrences))) cl(opt(clause Ltac2 Notation native_compute := native_compute. Ltac2 rewrite0 ev rw cl tac := - let tac := match tac with - | None => None - | Some p => - let ((_, tac)) := p in - Some tac - end in let cl := default_on_concl cl in Std.rewrite ev rw cl tac. |
