diff options
| -rw-r--r-- | interp/topconstr.ml | 1 | ||||
| -rw-r--r-- | theories/Init/LogicSyntax.v | 10 | ||||
| -rw-r--r-- | theories/Init/Logic_TypeSyntax.v | 7 |
3 files changed, 1 insertions, 17 deletions
diff --git a/interp/topconstr.ml b/interp/topconstr.ml index c548d820db..2028d6de8e 100644 --- a/interp/topconstr.ml +++ b/interp/topconstr.ml @@ -202,6 +202,7 @@ let rec match_ alp metas sigma a1 a2 = match (a1,a2) with match_ alp metas (match_ alp metas sigma c1 c2) t1 t2 | RSort (_,s1), ASort s2 when s1 = s2 -> sigma | RHole _, a -> sigma + | RMeta _, AHole _ -> (*Don't hide Metas, they bind in ltac*) raise No_match | a, AHole _ -> sigma | (RDynamic _ | RRec _ | REvar _), _ | _,_ -> raise No_match diff --git a/theories/Init/LogicSyntax.v b/theories/Init/LogicSyntax.v index 0d8285fcc7..3a08dd529f 100644 --- a/theories/Init/LogicSyntax.v +++ b/theories/Init/LogicSyntax.v @@ -40,17 +40,7 @@ Notation "'EX' x | p & q" := (ex2 ? [x]p [x]q) Notation "'EX' x : t | p & q" := (ex2 t [x:t]p [x:t]q) (at level 10, p, q at level 8). - (** Parsing only of things in [Logic.v] *) Notation "< A > 'All' ( P )" := (all A P) (at level 1, only parsing). Notation "< A > x = y" := (eq A x y) (at level 1, x at level 0, only parsing). - -(** Pretty-printing only of things in [Logic.v] *) - -Syntax constr - level 1: - equal [ (eq $a $t1 $t2) ] -> - [ [<hov 0> (ANNOT $a) $t1:E [0 1] "=" $t2:E ] ] - | annotskip [ << (ANNOT $_) >> ] -> [ ] - | annotmeta [ << (ANNOT (META ($NUM $n))) >> ] -> [ "<" "?" $n ">" ]. diff --git a/theories/Init/Logic_TypeSyntax.v b/theories/Init/Logic_TypeSyntax.v index 25b67ad938..6593ca8bbd 100644 --- a/theories/Init/Logic_TypeSyntax.v +++ b/theories/Init/Logic_TypeSyntax.v @@ -38,10 +38,3 @@ Notation "< A > x == y" := (eqT A x y) Notation "< A > x === y" := (identityT A x y) (at level 1, x at level 0, only parsing). - -(** Pretty-printing only of things in [Logic_type.v] *) - -Syntax constr - level 1: - eqT [ (eqT $a $c1 $c2) ] -> [ [<hov 1> (ANNOT $a) $c1:E [0 0] "==" $c2:E ] ] -. |