aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorherbelin2003-10-21 09:13:08 +0000
committerherbelin2003-10-21 09:13:08 +0000
commit47cedfcf24e9009d549aec279017695cb14a3c30 (patch)
tree61069ce45960e5e981785a4b0fb0bb8337ac748c
parent505df17983e546305278c6332e5976d751c01b9b (diff)
Bug Locate Notation
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@4684 85f007b7-540e-0410-9357-904b9bb8a0f7
-rw-r--r--interp/symbols.ml11
1 files changed, 6 insertions, 5 deletions
diff --git a/interp/symbols.ml b/interp/symbols.ml
index 148b65fd18..e6247c65a3 100644
--- a/interp/symbols.ml
+++ b/interp/symbols.ml
@@ -484,10 +484,11 @@ let pr_scopes prraw =
!scope_map (mt ())
let rec find_default ntn = function
- | Scope scope::_ when Stringmap.mem ntn (find_scope scope).notations -> scope
- | SingleNotation ntn'::_ when ntn = ntn' -> default_scope
+ | Scope scope::_ when Stringmap.mem ntn (find_scope scope).notations ->
+ Some scope
+ | SingleNotation ntn'::_ when ntn = ntn' -> Some default_scope
| _::scopes -> find_default ntn scopes
- | [] -> raise Not_found
+ | [] -> None
let factorize_entries = function
| [] -> []
@@ -534,8 +535,8 @@ let locate_notation prraw ntn =
pr_notation_info prraw df r ++ tbrk (1,2) ++
(if sc = default_scope then mt () else (str ": " ++ str sc)) ++
tbrk (1,2) ++
- (if sc = scope then str "(default interpretation)" else mt ()) ++
- fnl ()))
+ (if Some sc = scope then str "(default interpretation)" else mt ())
+ ++ fnl ()))
l) ntns)
(**********************************************************************)