From fd39a2e844f93b314c2f0b78510f0573cfa1bef3 Mon Sep 17 00:00:00 2001
From: Théo Zimmermann
Date: Thu, 6 Oct 2016 19:34:28 +0200
Subject: Revert "Make the pretty printer resilient to incomplete nametab
 (progress on #4363)."

This reverts commit 11ccb7333c2a82d59736027838acaea2237e2402.

This fixes bug #4874. We fallback to the original error message of v8.4.
The fallback printer introduced in this commit only gave unqualified names,
which is what this bug reports.
---
 interp/constrextern.ml | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

(limited to 'interp')

diff --git a/interp/constrextern.ml b/interp/constrextern.ml
index 68a3cf0f4a..ae9b5bace2 100644
--- a/interp/constrextern.ml
+++ b/interp/constrextern.ml
@@ -147,17 +147,8 @@ let extern_evar loc n l = CEvar (loc,n,l)
     For instance, in the debugger the tables of global references
     may be inaccurate *)
 
-let safe_shortest_qualid_of_global vars r =
-  try shortest_qualid_of_global vars r
-  with Not_found ->
-    match r with
-    | VarRef v -> make_qualid DirPath.empty v
-    | ConstRef c -> make_qualid DirPath.empty Names.(Label.to_id (con_label c))
-    | IndRef (i,_) | ConstructRef ((i,_),_) ->
-        make_qualid DirPath.empty Names.(Label.to_id (mind_label i))
-
 let default_extern_reference loc vars r =
-  Qualid (loc,safe_shortest_qualid_of_global vars r)
+  Qualid (loc,shortest_qualid_of_global vars r)
 
 let my_extern_reference = ref default_extern_reference
 
-- 
cgit v1.2.3