Comments improved.

[helm.git] / helm / gTopLevel / mQueryGenerator.ml

diff --git a/helm/gTopLevel/mQueryGenerator.ml b/helm/gTopLevel/mQueryGenerator.ml
index 4deaf8c7a23d8923828a75977f35c9a36b394b31..8616cf9d2c9d04ff6fac696fae466d67e1586d88 100644 (file)
--- a/helm/gTopLevel/mQueryGenerator.ml
+++ b/helm/gTopLevel/mQueryGenerator.ml
@@ -64,14 +64,22 @@ let levels_of_term metasenv context term =
       entry_in (Util.string_of_uriref (uri, tc), main, 2 * v + d - 1) l 
    in
    let rec inspect_term main l v term = match term with
-      | Cic.Rel _                        -> l 
-      | Cic.Meta (_, _)                  -> l
+        Cic.Rel _                        -> l
+      | Cic.Meta _                       -> l
       | Cic.Sort _                       -> l 
       | Cic.Implicit                     -> l 
-      | Cic.Var u                        -> inspect_uri main l u [] v term
-      | Cic.Const (u, _)                 -> inspect_uri main l u [] v term
-      | Cic.MutInd (u, _, t)             -> inspect_uri main l u [t] v term
-      | Cic.MutConstruct (u, _, t, c)    -> inspect_uri main l u [t; c] v term
+      | Cic.Var (u,exp_named_subst)      ->
+         let l' = inspect_uri main l u [] v term in
+          inspect_exp_named_subst l' (v+1) exp_named_subst
+      | Cic.Const (u,exp_named_subst)    ->
+         let l' = inspect_uri main l u [] v term in
+          inspect_exp_named_subst l' (v+1) exp_named_subst
+      | Cic.MutInd (u, t, exp_named_subst) ->
+         let l' = inspect_uri main l u [t] v term in
+          inspect_exp_named_subst l' (v+1) exp_named_subst
+      | Cic.MutConstruct (u, t, c, exp_named_subst)    ->
+         let l' = inspect_uri main l u [t; c] v term in
+          inspect_exp_named_subst l' (v+1) exp_named_subst
       | Cic.Cast (uu, _)                 -> 
          inspect_term main l v uu
       | Cic.Prod (_, uu, tt)             ->
@@ -84,7 +92,7 @@ let levels_of_term metasenv context term =
          let luu = inspect_term false l (v + 1) uu in
          inspect_term false luu (v + 1) tt
       | Cic.Appl m                       -> inspect_list main l true v m 
-      | Cic.MutCase (u, _, t, tt, uu, m) -> 
+      | Cic.MutCase (u, t, tt, uu, m) -> 
          let lu = inspect_uri main l u [t] (v + 1) term in
          let ltt = inspect_term false lu (v + 1) tt in
          let luu = inspect_term false ltt (v + 1) uu in
@@ -96,6 +104,11 @@ let levels_of_term metasenv context term =
       | tt :: m -> 
          let ltt = inspect_term main l (if head then v else v + 1) tt in
          inspect_list false ltt false v m
+   and inspect_exp_named_subst l v = function
+        []      -> l
+      | (_,t) :: tl -> 
+         let l' = inspect_term false l v t in
+          inspect_exp_named_subst l' v tl
    and inspect_ind l v = function
       | []                  -> l
       | (_, _, tt, uu) :: m ->  
@@ -167,8 +180,9 @@ let execute_query query =
    let log q r = 
       let och = open_out_gen mode perm ! log_file in
       if ! query_num = 1 then output_string och (time () ^ nl);
-      let str = "Query: " ^ string_of_int ! query_num ^ nl ^ Util.text_of_query q ^ nl ^ 
-                "Result:" ^ nl ^ Util.text_of_result r nl in
+      let str =
+       "Query: " ^ string_of_int ! query_num ^ nl ^ Util.text_of_query q ^ nl ^ 
+       "Result:" ^ nl ^ Util.text_of_result r nl in
       output_string och str; 
       flush och 
    in
@@ -185,10 +199,10 @@ let execute_query query =
 
 let locate s =
    let module M = MathQL in
-   let q = M.Ref (M.Fun "reference" (M.Const [s])) in
+   let q = M.Ref (M.Fun "objectName" (M.Const [s])) in
    execute_query q
 
-let backward e c t level =
+let searchPattern e c t level =
    let module M = MathQL in
    let v_pos = M.Const ["MainConclusion"; "InConclusion"] in
    let q_where = M.Sub (M.RefOf (
@@ -207,10 +221,11 @@ let backward e c t level =
    in
    let build_select (r, b, v) =
       let pos = if b then "MainConclusion" else "InConclusion" in
-      M.Select ("uri", 
-                M.Relation (M.ExactOp, ["backPointer"], M.Ref (M.Const [r]), ["pos"]),
-                M.Ex ["uri"] (M.Sub (M.Const [pos], M.Record ("uri", "pos")))
-               )
+      M.Select
+       ("uri", 
+        M.Relation (M.ExactOp, ["backPointer"], M.Ref (M.Const [r]), ["pos"]),
+        M.Ex ["uri"] (M.Sub (M.Const [pos], M.Record ("uri", "pos")))
+       )
    in 
    let rec build_intersect = function
       | []       -> M.Pattern (M.Const [".*"])