# HG changeset patch
# User wenzelm
# Date 1293627077 -3600
# Node ID 35f30e07fe0d395f9df17b52ed2b6b6363215294
# Parent  3bcc3b9e1020161988d91eabcf1e9729d9378e0c
check_file: secondary load path is legacy feature;

diff -r 3bcc3b9e1020 -r 35f30e07fe0d src/Pure/Thy/thy_load.ML
--- a/src/Pure/Thy/thy_load.ML	Wed Dec 29 12:37:15 2010 +0100
+++ b/src/Pure/Thy/thy_load.ML	Wed Dec 29 13:51:17 2010 +0100
@@ -165,13 +165,19 @@
       let val full_path = File.full_path (Path.append dir path) in
         (case file_ident full_path of
           NONE => NONE
-        | SOME id => SOME (full_path, id))
+        | SOME id => SOME (dir, (full_path, id)))
       end)
   end;
 
 fun check_file dirs file =
   (case get_file dirs file of
-    SOME path_id => path_id
+    SOME (_, path_id) =>
+     (if is_some (get_file [hd dirs] file) then ()
+      else
+        legacy_feature ("File " ^ quote (Path.implode file) ^
+          " located via secondary search path: " ^
+          quote (Path.implode (#1 (the (get_file (tl dirs) file)))));
+      path_id)
   | NONE => error ("Could not find file " ^ quote (Path.implode file) ^
       "\nin " ^ commas_quote (map Path.implode dirs)));
 
@@ -219,7 +225,7 @@
     fun current (src_path, (_, id)) =
       (case get_file [master_dir] src_path of
         NONE => false
-      | SOME (_, id') => id = id');
+      | SOME (_, (_, id')) => id = id');
   in can check_loaded thy andalso forall current provided end;
 
 val _ = Context.>> (Context.map_theory (Theory.at_end (fn thy => (check_loaded thy; NONE))));