diff options
| author | Hugo Herbelin | 2018-02-23 14:12:12 +0100 |
|---|---|---|
| committer | Hugo Herbelin | 2018-02-23 14:12:12 +0100 |
| commit | 4e18be02a03ab478125aa6f08b30e738c3568572 (patch) | |
| tree | eb8d91e72cd3f0a8b4b95bccf1efb82c6f97a67a | |
| parent | 0c5f0afffd37582787f79267d9841259095b7edc (diff) | |
Fixes #6821 (bug in protecting notation printing from infinite eta-expansion).
More precisely when matching
"f t" with "(fun ?x => .. ((fun ?x' => ?y) ?z') ..) ?z"
do not allow expansion of f since otherwise, we recursively have to
match "f t" with the same pattern.
| -rw-r--r-- | interp/notation_ops.ml | 2 | ||||
| -rw-r--r-- | test-suite/output/bug6821.out | 2 | ||||
| -rw-r--r-- | test-suite/output/bug6821.v | 8 |
3 files changed, 11 insertions, 1 deletions
diff --git a/interp/notation_ops.ml b/interp/notation_ops.ml index c65f4785ef..9bc41a996b 100644 --- a/interp/notation_ops.ml +++ b/interp/notation_ops.ml @@ -1132,7 +1132,7 @@ let rec match_ inner u alp metas sigma a1 a2 = else f1,l1, f2, l2 in let may_use_eta = does_not_come_from_already_eta_expanded_var f1 in List.fold_left2 (match_ may_use_eta u alp metas) - (match_in u alp metas sigma f1 f2) l1 l2 + (match_hd u alp metas sigma f1 f2) l1 l2 | GLambda (na1,bk1,t1,b1), NLambda (na2,t2,b2) -> match_extended_binders false u alp metas na1 na2 bk1 t1 (match_in u alp metas sigma t1 t2) b1 b2 | GProd (na1,bk1,t1,b1), NProd (na2,t2,b2) -> diff --git a/test-suite/output/bug6821.out b/test-suite/output/bug6821.out new file mode 100644 index 0000000000..7b12b53200 --- /dev/null +++ b/test-suite/output/bug6821.out @@ -0,0 +1,2 @@ +forall f : nat -> Type, f x where x : nat := 1 + : Type diff --git a/test-suite/output/bug6821.v b/test-suite/output/bug6821.v new file mode 100644 index 0000000000..40627e331e --- /dev/null +++ b/test-suite/output/bug6821.v @@ -0,0 +1,8 @@ +(* Was failing at printing time with stack overflow due to an infinite + eta-expansion *) + +Notation "x 'where' y .. z := v " := + ((fun y => .. ((fun z => x) v) ..) v) + (at level 11, v at next level, y binder, z binder). + +Check forall f, f x where x := 1. |