diff options
| author | Maxime Dénès | 2017-06-15 22:19:48 +0200 |
|---|---|---|
| committer | Maxime Dénès | 2017-06-15 22:19:48 +0200 |
| commit | 321876cea9406994f53fe9a35c0afd333fe6c074 (patch) | |
| tree | cc9b9948e30bfd38b7ca70bce4df9b45bc4e75d6 /interp/notation.ml | |
| parent | ce1e1dba837ad6e2c79ff7e531b5e3adea3cd327 (diff) | |
| parent | 849bf3600fe11fea876c9aeea69fe806b0c8c5d8 (diff) | |
Merge PR#747: Fix Bug #5568, no dup notation warnings on repeated module imports
Diffstat (limited to 'interp/notation.ml')
| -rw-r--r-- | interp/notation.ml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/interp/notation.ml b/interp/notation.ml index 389a1c9dff..ba80cf1d2c 100644 --- a/interp/notation.ml +++ b/interp/notation.ml @@ -561,11 +561,12 @@ let interpretation_eq (vars1, t1) (vars2, t2) = List.equal var_attributes_eq vars1 vars2 && Notation_ops.eq_notation_constr (List.map fst vars1, List.map fst vars2) t1 t2 -let exists_notation_in_scope scopt ntn r = +let exists_notation_in_scope scopt ntn onlyprint r = let scope = match scopt with Some s -> s | None -> default_scope in try let sc = String.Map.find scope !scope_map in let n = String.Map.find ntn sc.notations in + onlyprint = n.not_onlyprinting && interpretation_eq n.not_interp r with Not_found -> false |