X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fgrafite_parser%2FgrafiteDisambiguate.ml;h=516c4af20301e1a6946995cbe44c60fd05491448;hb=35e102fec6bad146fee425f299a93520e657e7c2;hp=97f0d5e85892df5b5933cf706d5b5e69d9ec2144;hpb=8ae990161006978a019f0afda4ff8d56a78d1fd0;p=helm.git

diff --git a/helm/software/components/grafite_parser/grafiteDisambiguate.ml b/helm/software/components/grafite_parser/grafiteDisambiguate.ml
index 97f0d5e85..516c4af20 100644
--- a/helm/software/components/grafite_parser/grafiteDisambiguate.ml
+++ b/helm/software/components/grafite_parser/grafiteDisambiguate.ml
@@ -36,16 +36,20 @@ type lazy_tactic =
   (Cic.term, Cic.lazy_term, Cic.lazy_term GrafiteAst.reduction, string) 
     GrafiteAst.tactic
 
-let singleton = function
+let singleton msg = function
   | [x], _ -> x
-  | _ -> assert false
-;;
+  | l, _   ->
+      let debug = 
+         Printf.sprintf "GrafiteDisambiguate.singleton (%s): %u interpretations"
+	 msg (List.length l)
+      in
+      HLog.debug debug; assert false
 
   (** @param term not meaningful when context is given *)
 let disambiguate_term text prefix_len lexicon_status_ref context metasenv term =
   let lexicon_status = !lexicon_status_ref in
   let (diff, metasenv, cic, _) =
-    singleton
+    singleton "first"
       (GrafiteDisambiguator.disambiguate_term ~dbd:(LibraryDb.instance ())
         ~aliases:lexicon_status.LexiconEngine.aliases
         ~universe:(Some lexicon_status.LexiconEngine.multi_aliases)
@@ -65,7 +69,7 @@ let disambiguate_lazy_term text prefix_len lexicon_status_ref term =
   (fun context metasenv ugraph ->
     let lexicon_status = !lexicon_status_ref in
     let (diff, metasenv, cic, ugraph) =
-      singleton
+      singleton "second"
         (GrafiteDisambiguator.disambiguate_term ~dbd:(LibraryDb.instance ())
           ~initial_ugraph:ugraph ~aliases:lexicon_status.LexiconEngine.aliases
           ~universe:(Some lexicon_status.LexiconEngine.multi_aliases)
@@ -99,13 +103,24 @@ let disambiguate_reduction_kind text prefix_len lexicon_status_ref = function
       let t = disambiguate_lazy_term text prefix_len lexicon_status_ref t in
       `Unfold (Some t)
   | `Normalize
-  | `Reduce
   | `Simpl
   | `Unfold None
   | `Whd as kind -> kind
 ;;
 
-let disambiguate_tactic 
+let disambiguate_auto_params 
+  disambiguate_term metasenv context (terms, params) 
+=
+    let metasenv, terms = 
+      List.fold_right 
+       (fun t (metasenv, terms) ->
+         let metasenv,t = disambiguate_term context metasenv t in
+         metasenv,t::terms) terms (metasenv, [])
+    in
+    metasenv, (terms, params)
+;;
+
+let rec disambiguate_tactic 
   lexicon_status_ref context metasenv (text,prefix_len,tactic) 
 =
   let disambiguate_term = 
@@ -116,7 +131,64 @@ let disambiguate_tactic
     disambiguate_reduction_kind text prefix_len lexicon_status_ref in
   let disambiguate_lazy_term = 
     disambiguate_lazy_term text prefix_len lexicon_status_ref in
+  let disambiguate_tactic metasenv tac =
+   disambiguate_tactic lexicon_status_ref context metasenv (text,prefix_len,tac)
+  in
+  let disambiguate_auto_params m p = 
+    disambiguate_auto_params disambiguate_term m context p
+  in
    match tactic with
+    (* Higher  order tactics *)
+    | GrafiteAst.Progress (loc,tac) ->
+        let metasenv,tac = disambiguate_tactic metasenv tac in
+        metasenv,GrafiteAst.Progress (loc,tac)
+    | GrafiteAst.Solve (loc,tacl) ->
+        let metasenv,tacl =
+         List.fold_right
+          (fun tac (metasenv,tacl) ->
+            let metasenv,tac = disambiguate_tactic metasenv tac in
+             metasenv,tac::tacl
+          ) tacl (metasenv,[])
+        in
+         metasenv,GrafiteAst.Solve (loc,tacl)
+    | GrafiteAst.Try (loc,tac) ->
+        let metasenv,tac = disambiguate_tactic metasenv tac in
+        metasenv,GrafiteAst.Try (loc,tac)
+    | GrafiteAst.First (loc,tacl) ->
+        let metasenv,tacl =
+         List.fold_right
+          (fun tac (metasenv,tacl) ->
+            let metasenv,tac = disambiguate_tactic metasenv tac in
+             metasenv,tac::tacl
+          ) tacl (metasenv,[])
+        in
+         metasenv,GrafiteAst.First (loc,tacl)
+    | GrafiteAst.Seq (loc,tacl) ->
+        let metasenv,tacl =
+         List.fold_right
+          (fun tac (metasenv,tacl) ->
+            let metasenv,tac = disambiguate_tactic metasenv tac in
+             metasenv,tac::tacl
+          ) tacl (metasenv,[])
+        in
+         metasenv,GrafiteAst.Seq (loc,tacl)
+    | GrafiteAst.Repeat (loc,tac) ->
+        let metasenv,tac = disambiguate_tactic metasenv tac in
+        metasenv,GrafiteAst.Repeat (loc,tac)
+    | GrafiteAst.Do (loc,n,tac) ->
+        let metasenv,tac = disambiguate_tactic metasenv tac in
+        metasenv,GrafiteAst.Do (loc,n,tac)
+    | GrafiteAst.Then (loc,tac,tacl) ->
+        let metasenv,tac = disambiguate_tactic metasenv tac in
+        let metasenv,tacl =
+         List.fold_right
+          (fun tac (metasenv,tacl) ->
+            let metasenv,tac = disambiguate_tactic metasenv tac in
+             metasenv,tac::tacl
+          ) tacl (metasenv,[])
+        in
+         metasenv,GrafiteAst.Then (loc,tac,tacl)
+    (* First order tactics *)
     | GrafiteAst.Absurd (loc, term) -> 
         let metasenv,cic = disambiguate_term context metasenv term in
         metasenv,GrafiteAst.Absurd (loc, cic)
@@ -124,12 +196,14 @@ let disambiguate_tactic
         let metasenv,cic = disambiguate_term context metasenv term in
         metasenv,GrafiteAst.Apply (loc, cic)
     | GrafiteAst.ApplyS (loc, term, params) ->
+        let metasenv, params = disambiguate_auto_params metasenv params in
         let metasenv,cic = disambiguate_term context metasenv term in
         metasenv,GrafiteAst.ApplyS (loc, cic, params)
     | GrafiteAst.Assumption loc ->
         metasenv,GrafiteAst.Assumption loc
-    | GrafiteAst.Auto (loc,params) ->
-        metasenv,GrafiteAst.Auto (loc,params)
+    | GrafiteAst.AutoBatch (loc,params) ->
+        let metasenv, params = disambiguate_auto_params metasenv params in
+        metasenv,GrafiteAst.AutoBatch (loc,params)
     | GrafiteAst.Cases (loc, what, idents) ->
         let metasenv,what = disambiguate_term context metasenv what in
         metasenv,GrafiteAst.Cases (loc, what, idents)
@@ -141,6 +215,16 @@ let disambiguate_tactic
         metasenv,GrafiteAst.Clear (loc,id)
     | GrafiteAst.ClearBody (loc,id) ->
        metasenv,GrafiteAst.ClearBody (loc,id)
+    | GrafiteAst.Compose (loc, t1, t2, times, spec) ->
+        let metasenv,t1 = disambiguate_term context metasenv t1 in
+        let metasenv,t2 = 
+          match t2 with
+          | None -> metasenv, None
+          | Some t2 -> 
+              let m, t2 = disambiguate_term context metasenv t2 in
+              m, Some t2
+        in
+        metasenv,   GrafiteAst.Compose (loc, t1, t2, times, spec)
     | GrafiteAst.Constructor (loc,n) ->
         metasenv,GrafiteAst.Constructor (loc,n)
     | GrafiteAst.Contradiction loc ->
@@ -150,28 +234,37 @@ let disambiguate_tactic
         metasenv,GrafiteAst.Cut (loc, ident, cic)
     | GrafiteAst.Decompose (loc, names) ->
          metasenv,GrafiteAst.Decompose (loc, names)
-    | GrafiteAst.Demodulate loc ->
-        metasenv,GrafiteAst.Demodulate loc
-    | GrafiteAst.Destruct (loc,term) ->
-        let metasenv,term = disambiguate_term context metasenv term in
-        metasenv,GrafiteAst.Destruct(loc,term)
+    | GrafiteAst.Demodulate (loc, params) ->
+        let metasenv, params = disambiguate_auto_params metasenv params in
+        metasenv,GrafiteAst.Demodulate (loc, params)
+    | GrafiteAst.Destruct (loc, Some terms) ->
+        let map term (metasenv, terms) =
+           let metasenv, term = disambiguate_term context metasenv term in
+           metasenv, term :: terms
+        in
+        let metasenv, terms = List.fold_right map terms (metasenv, []) in 
+	metasenv, GrafiteAst.Destruct(loc, Some terms)
+    | GrafiteAst.Destruct (loc, None) ->
+        metasenv,GrafiteAst.Destruct(loc,None)
     | GrafiteAst.Exact (loc, term) -> 
         let metasenv,cic = disambiguate_term context metasenv term in
         metasenv,GrafiteAst.Exact (loc, cic)
-    | GrafiteAst.Elim (loc, pattern, Some using, depth, idents) ->
-	let pattern = disambiguate_pattern pattern in
+    | GrafiteAst.Elim (loc, what, Some using, pattern, specs) ->
+	let metasenv,what = disambiguate_term context metasenv what in
         let metasenv,using = disambiguate_term context metasenv using in
-        metasenv,GrafiteAst.Elim (loc, pattern, Some using, depth, idents)
-    | GrafiteAst.Elim (loc, pattern, None, depth, idents) ->
 	let pattern = disambiguate_pattern pattern in
-        metasenv,GrafiteAst.Elim (loc, pattern, None, depth, idents)
-    | GrafiteAst.ElimType (loc, what, Some using, depth, idents) ->
+        metasenv,GrafiteAst.Elim (loc, what, Some using, pattern, specs)
+    | GrafiteAst.Elim (loc, what, None, pattern, specs) ->
+	let metasenv,what = disambiguate_term context metasenv what in
+	let pattern = disambiguate_pattern pattern in
+        metasenv,GrafiteAst.Elim (loc, what, None, pattern, specs)
+    | GrafiteAst.ElimType (loc, what, Some using, specs) ->
         let metasenv,what = disambiguate_term context metasenv what in
         let metasenv,using = disambiguate_term context metasenv using in
-        metasenv,GrafiteAst.ElimType (loc, what, Some using, depth, idents)
-    | GrafiteAst.ElimType (loc, what, None, depth, idents) ->
+        metasenv,GrafiteAst.ElimType (loc, what, Some using, specs)
+    | GrafiteAst.ElimType (loc, what, None, specs) ->
         let metasenv,what = disambiguate_term context metasenv what in
-        metasenv,GrafiteAst.ElimType (loc, what, None, depth, idents)
+        metasenv,GrafiteAst.ElimType (loc, what, None, specs)
     | GrafiteAst.Exists loc ->
         metasenv,GrafiteAst.Exists loc 
     | GrafiteAst.Fail loc ->
@@ -188,22 +281,20 @@ let disambiguate_tactic
     | GrafiteAst.Generalize (loc,pattern,ident) ->
         let pattern = disambiguate_pattern pattern in
         metasenv,GrafiteAst.Generalize (loc,pattern,ident)
-    | GrafiteAst.Goal (loc, g) ->
-        metasenv,GrafiteAst.Goal (loc, g)
     | GrafiteAst.IdTac loc ->
         metasenv,GrafiteAst.IdTac loc
-    | GrafiteAst.Intros (loc, num, names) ->
-        metasenv,GrafiteAst.Intros (loc, num, names)
+    | GrafiteAst.Intros (loc, specs) ->
+        metasenv,GrafiteAst.Intros (loc, specs)
     | GrafiteAst.Inversion (loc, term) ->
        let metasenv,term = disambiguate_term context metasenv term in
         metasenv,GrafiteAst.Inversion (loc, term)
     | GrafiteAst.LApply (loc, linear, depth, to_what, what, ident) ->
-       let f term to_what =
-          let metasenv,term = disambiguate_term context metasenv term in
-          term :: to_what
+       let f term (metasenv, to_what) =
+          let metasenv, term = disambiguate_term context metasenv term in
+          metasenv, term :: to_what
        in
-       let to_what = List.fold_right f to_what [] in 
-       let metasenv,what = disambiguate_term context metasenv what in
+       let metasenv, to_what = List.fold_right f to_what (metasenv, []) in 
+       let metasenv, what = disambiguate_term context metasenv what in
        metasenv,GrafiteAst.LApply (loc, linear, depth, to_what, what, ident)
     | GrafiteAst.Left loc ->
        metasenv,GrafiteAst.Left loc
@@ -230,8 +321,6 @@ let disambiguate_tactic
         metasenv,GrafiteAst.Ring loc
     | GrafiteAst.Split loc ->
         metasenv,GrafiteAst.Split loc
-    | GrafiteAst.Subst loc ->
-        metasenv, GrafiteAst.Subst loc
     | GrafiteAst.Symmetry loc ->
         metasenv,GrafiteAst.Symmetry loc
     | GrafiteAst.Transitivity (loc, term) -> 
@@ -330,14 +419,20 @@ let disambiguate_tactic
 	let metasenv,cic'= disambiguate_term context metasenv term2 in
         let metasenv,cic'' =
 	 match term3 with
-	    `Auto _ as t -> metasenv,t
+          | `SolveWith term ->
+	     let metasenv,term = disambiguate_term context metasenv term in
+             metasenv, `SolveWith term
+	  | `Auto params -> 
+              let metasenv, params = disambiguate_auto_params metasenv params in
+              metasenv,`Auto params
 	  | `Term t -> 
 	     let metasenv,t = disambiguate_term context metasenv t in
-	      metasenv,`Term t in
+	      metasenv,`Term t
+          | `Proof as t -> metasenv,t in
 	metasenv,GrafiteAst.RewritingStep (loc, cic, cic', cic'', cont)   
 
 
-let disambiguate_obj lexicon_status ~baseuri metasenv (text,prefix_len,obj) =
+let disambiguate_obj lexicon_status ?baseuri metasenv (text,prefix_len,obj) =
   let uri =
    match obj with
     | CicNotationPt.Inductive (_,(name,_,_,_)::_)
@@ -349,7 +444,7 @@ let disambiguate_obj lexicon_status ~baseuri metasenv (text,prefix_len,obj) =
     | CicNotationPt.Inductive _ -> assert false
     | CicNotationPt.Theorem _ -> None in
   let (diff, metasenv, cic, _) =
-    singleton
+    singleton "third"
       (GrafiteDisambiguator.disambiguate_obj ~dbd:(LibraryDb.instance ())
         ~aliases:lexicon_status.LexiconEngine.aliases
         ~universe:(Some lexicon_status.LexiconEngine.multi_aliases) ~uri 
@@ -357,7 +452,7 @@ let disambiguate_obj lexicon_status ~baseuri metasenv (text,prefix_len,obj) =
   let lexicon_status = LexiconEngine.set_proof_aliases lexicon_status diff in
   lexicon_status, metasenv, cic
   
-let disambiguate_command lexicon_status ~baseuri metasenv (text,prefix_len,cmd)=
+let disambiguate_command lexicon_status ?baseuri metasenv (text,prefix_len,cmd)=
   match cmd with
    | GrafiteAst.Index(loc,key,uri) ->
        let lexicon_status_ref = ref lexicon_status in 
@@ -382,7 +477,7 @@ let disambiguate_command lexicon_status ~baseuri metasenv (text,prefix_len,cmd)=
        lexicon_status,metasenv,cmd
    | GrafiteAst.Obj (loc,obj) ->
        let lexicon_status,metasenv,obj =
-        disambiguate_obj lexicon_status ~baseuri metasenv (text,prefix_len,obj)in
+        disambiguate_obj lexicon_status ?baseuri metasenv (text,prefix_len,obj)in
        lexicon_status, metasenv, GrafiteAst.Obj (loc,obj)
    | GrafiteAst.Relation (loc,id,a,aeq,refl,sym,trans) ->
       let lexicon_status_ref = ref lexicon_status in 
@@ -423,6 +518,10 @@ let disambiguate_macro
    | GrafiteAst.Check (loc,term) ->
       let metasenv,term = disambiguate_term context metasenv term in
        metasenv,GrafiteAst.Check (loc,term)
+   | GrafiteAst.AutoInteractive (loc, params) -> 
+      let metasenv, params = 
+        disambiguate_auto_params disambiguate_term metasenv context params in
+      metasenv, GrafiteAst.AutoInteractive (loc, params)
    | GrafiteAst.Hint _
    | GrafiteAst.WLocate _
    | GrafiteAst.Inline _ as macro ->