X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fgrafite_engine%2FgrafiteEngine.ml;h=49bd256388480b11e04c48a4dd701d09ccbce29f;hb=0a167625079fa376ab027004453e8d042cde5b85;hp=192e396af0f2838d0704a53226a9c41699504cf1;hpb=9a7c77e5c29d764109a104aa629761ba90cb511c;p=helm.git

diff --git a/helm/software/components/grafite_engine/grafiteEngine.ml b/helm/software/components/grafite_engine/grafiteEngine.ml
index 192e396af..49bd25638 100644
--- a/helm/software/components/grafite_engine/grafiteEngine.ml
+++ b/helm/software/components/grafite_engine/grafiteEngine.ml
@@ -475,24 +475,103 @@ let basic_eval_unification_hint (t,n) status =
 ;;
 
 let inject_unification_hint =
- let basic_eval_unification_hint (t,n) ~refresh_uri_in_term =
+ let basic_eval_unification_hint (t,n) 
+   ~refresh_uri_in_universe 
+   ~refresh_uri_in_term
+ =
   let t = refresh_uri_in_term t in basic_eval_unification_hint (t,n)
  in
   NRstatus.Serializer.register "unification_hints" basic_eval_unification_hint
 ;;
 
 let eval_unification_hint status t n = 
- let estatus = GrafiteTypes.get_estatus status in
- let metasenv,subst,estatus,t =
-  GrafiteDisambiguate.disambiguate_nterm None estatus [] [] [] ("",0,t) in
+ let metasenv,subst,status,t =
+  GrafiteDisambiguate.disambiguate_nterm None status [] [] [] ("",0,t) in
  assert (metasenv=[]);
  let t = NCicUntrusted.apply_subst subst [] t in
- let status = GrafiteTypes.set_estatus estatus status in
- let estatus =
-  basic_eval_unification_hint (t,n) (GrafiteTypes.get_estatus status) in
- let dump = inject_unification_hint (t,n)::estatus#dump in
- let estatus = estatus#set_dump dump in
- let status = GrafiteTypes.set_estatus estatus status in
+ let status = basic_eval_unification_hint (t,n) status in
+ let dump = inject_unification_hint (t,n)::status#dump in
+ let status = status#set_dump dump in
+  status,`New []
+;;
+
+let basic_eval_ncoercion (name,t,s,d,p,a) status =
+  NCicCoercion.index_coercion status t s d a p
+;;
+
+let inject_ncoercion =
+ let basic_eval_ncoercion x ~refresh_uri_in_universe ~refresh_uri_in_term =
+  basic_eval_ncoercion x
+ in
+  NRstatus.Serializer.register "ncoercion" basic_eval_ncoercion
+;;
+
+let eval_ncoercion status name t ty (id,src) tgt = 
+
+ let metasenv,subst,status,ty =
+  GrafiteDisambiguate.disambiguate_nterm None status [] [] [] ("",0,ty) in
+ assert (metasenv=[]);
+ let ty = NCicUntrusted.apply_subst subst [] ty in
+ let metasenv,subst,status,t =
+  GrafiteDisambiguate.disambiguate_nterm (Some ty) status [] [] [] ("",0,t) in
+ assert (metasenv=[]);
+ let t = NCicUntrusted.apply_subst subst [] t in
+
+ let src, cpos = 
+   let rec aux cpos ctx = function
+     | NCic.Prod (name,ty,bo) ->
+        if name <> id then aux (cpos+1) ((name,NCic.Decl ty)::ctx) bo
+        else
+          let metasenv,subst,status,src =
+            GrafiteDisambiguate.disambiguate_nterm 
+              None status ctx [] [] ("",0,src) in
+          let src = NCicUntrusted.apply_subst subst [] src in
+          (* HMM: ma tanto se ignori l'informazione, a che serve?? *)
+          let _ = NCicUnification.unify status metasenv subst ctx ty src in
+          src, cpos
+     | _ -> assert false
+   in
+     aux 0 [] ty
+ in
+ let tgt, arity = 
+   let metasenv,subst,status,tgt =
+     GrafiteDisambiguate.disambiguate_nterm 
+       None status [] [] [] ("",0,tgt) in
+   let tgt = NCicUntrusted.apply_subst subst [] tgt in
+   (* CHECK *)
+   let rec count_prod = function
+     | NCic.Prod (_,_,x) -> 1 + count_prod x
+     | _ -> 0
+   in
+    tgt, count_prod tgt
+ in
+
+ let status = basic_eval_ncoercion (name,t,src,tgt,cpos,arity) status in
+ let dump = inject_ncoercion (name,t,src,tgt,cpos,arity)::status#dump in
+ let status = status#set_dump dump in
+  status,`New []
+;;
+
+let basic_eval_add_constraint (s,u1,u2) status =
+ NCicLibrary.add_constraint status s u1 u2
+;;
+
+let inject_constraint =
+ let basic_eval_add_constraint (s,u1,u2) 
+       ~refresh_uri_in_universe 
+       ~refresh_uri_in_term
+ =
+  let u1 = refresh_uri_in_universe u1 in 
+  let u2 = refresh_uri_in_universe u2 in 
+  basic_eval_add_constraint (s,u1,u2)
+ in
+  NRstatus.Serializer.register "constraints" basic_eval_add_constraint
+;;
+
+let eval_add_constraint status s u1 u2 = 
+ let status = basic_eval_add_constraint (s,u1,u2) status in
+ let dump = inject_constraint (s,u1,u2)::status#dump in
+ let status = status#set_dump dump in
   status,`Old []
 ;;
 
@@ -603,7 +682,8 @@ let eval_ng_punct (_text, _prefix_len, punct) =
   | GrafiteAst.Merge _ -> NTactics.merge_tac 
 ;;
 
-let rec eval_ng_tac (text, prefix_len, tac) =
+let eval_ng_tac tac =
+ let rec aux f (text, prefix_len, tac) =
   match tac with
   | GrafiteAst.NApply (_loc, t) -> NTactics.apply_tac (text,prefix_len,t) 
   | GrafiteAst.NAssert (_loc, seqs) ->
@@ -655,91 +735,91 @@ let rec eval_ng_tac (text, prefix_len, tac) =
   | GrafiteAst.NUnfocus _ -> NTactics.unfocus_tac
   | GrafiteAst.NWildcard _ -> NTactics.wildcard_tac 
   | GrafiteAst.NTry (_,tac) -> NTactics.try_tac
-      (eval_ng_tac (text, prefix_len, tac))
+      (aux f (text, prefix_len, tac))
   | GrafiteAst.NAssumption _ -> NTactics.assumption_tac
+  | GrafiteAst.NBlock (_,l) -> 
+      NTactics.block_tac (List.map (fun x -> aux f (text,prefix_len,x)) l)
+  |GrafiteAst.NRepeat (_,tac) ->
+      NTactics.repeat_tac (f f (text, prefix_len, tac))
+ in
+  aux aux tac (* trick for non uniform recursion call *)
 ;;
       
-let subst_metasenv_and_fix_names s =
-  let u,h,metasenv, subst,o = s#obj in
+let subst_metasenv_and_fix_names status =
+  let u,h,metasenv, subst,o = status#obj in
   let o = 
     NCicUntrusted.map_obj_kind ~skip_body:true 
      (NCicUntrusted.apply_subst subst []) o
   in
-   s#set_obj (u,h,NCicUntrusted.apply_subst_metasenv subst metasenv,subst,o)
+   status#set_obj(u,h,NCicUntrusted.apply_subst_metasenv subst metasenv,subst,o)
 ;;
 
 let rec eval_ncommand opts status (text,prefix_len,cmd) =
   match cmd with
   | GrafiteAst.UnificationHint (loc, t, n) -> eval_unification_hint status t n
+  | GrafiteAst.NCoercion (loc, name, t, ty, source, target) ->
+      eval_ncoercion status name t ty source target
   | GrafiteAst.NQed loc ->
-      (match status#ng_status with
-       | GrafiteTypes.ProofMode estatus ->
-          let uri,height,menv,subst,obj_kind = estatus#obj in
-           if menv <> [] then
-            raise
-             (GrafiteTypes.Command_error"You can't Qed an incomplete theorem")
-           else
-            let obj_kind =
-             NCicUntrusted.map_obj_kind 
-              (NCicUntrusted.apply_subst subst []) obj_kind in
-            let height = NCicTypeChecker.height_of_obj_kind uri obj_kind in
-            (* fix the height inside the object *)
-            let rec fix () = function 
-              | NCic.Const (NReference.Ref (u,spec)) when NUri.eq u uri -> 
-                 NCic.Const (NReference.reference_of_spec u
-                  (match spec with
-                  | NReference.Def _ -> NReference.Def height
-                  | NReference.Fix (i,j,_) -> NReference.Fix(i,j,height)
-                  | NReference.CoFix _ -> NReference.CoFix height
-                  | NReference.Ind _ | NReference.Con _
-                  | NReference.Decl as s -> s))
-              | t -> NCicUtils.map (fun _ () -> ()) () fix t
-            in
-            let obj_kind = 
-              match obj_kind with
-              | NCic.Fixpoint _ -> 
-                  NCicUntrusted.map_obj_kind (fix ()) obj_kind 
-              | _ -> obj_kind
-            in
-            let obj = uri,height,[],[],obj_kind in
-             NCicTypeChecker.typecheck_obj obj;
-             let estatus = NCicLibrary.add_obj estatus uri obj in
-             let objs = NCicElim.mk_elims obj in
-             let timestamp,uris_rev =
-               List.fold_left
-                (fun (estatus,uris_rev) (uri,_,_,_,_) as obj ->
-                  NCicTypeChecker.typecheck_obj obj;
-                  let estatus = NCicLibrary.add_obj estatus uri obj in
-                   estatus,uri::uris_rev
-                ) (estatus,[]) objs in
-             let uris = uri::List.rev uris_rev in
-              status#set_ng_status
-               (GrafiteTypes.CommandMode (estatus :> NEstatus.status)),`New uris
-       | _ -> raise (GrafiteTypes.Command_error "Not in proof mode"))
+     if status#ng_mode <> `ProofMode then
+      raise (GrafiteTypes.Command_error "Not in proof mode")
+     else
+      let uri,height,menv,subst,obj_kind = status#obj in
+       if menv <> [] then
+        raise
+         (GrafiteTypes.Command_error"You can't Qed an incomplete theorem")
+       else
+        let obj_kind =
+         NCicUntrusted.map_obj_kind 
+          (NCicUntrusted.apply_subst subst []) obj_kind in
+        let height = NCicTypeChecker.height_of_obj_kind uri [] obj_kind in
+        (* fix the height inside the object *)
+        let rec fix () = function 
+          | NCic.Const (NReference.Ref (u,spec)) when NUri.eq u uri -> 
+             NCic.Const (NReference.reference_of_spec u
+              (match spec with
+              | NReference.Def _ -> NReference.Def height
+              | NReference.Fix (i,j,_) -> NReference.Fix(i,j,height)
+              | NReference.CoFix _ -> NReference.CoFix height
+              | NReference.Ind _ | NReference.Con _
+              | NReference.Decl as s -> s))
+          | t -> NCicUtils.map (fun _ () -> ()) () fix t
+        in
+        let obj_kind = 
+          match obj_kind with
+          | NCic.Fixpoint _ -> 
+              NCicUntrusted.map_obj_kind (fix ()) obj_kind 
+          | _ -> obj_kind
+        in
+        let obj = uri,height,[],[],obj_kind in
+         let status = NCicLibrary.add_obj status obj in
+         let objs = NCicElim.mk_elims obj in
+         let timestamp,uris_rev =
+           List.fold_left
+            (fun (status,uris_rev) (uri,_,_,_,_) as obj ->
+              let status = NCicLibrary.add_obj status obj in
+               status,uri::uris_rev
+            ) (status,[]) objs in
+         let uris = uri::List.rev uris_rev in
+          status#set_ng_mode `CommandMode,`New uris
   | GrafiteAst.NObj (loc,obj) ->
-     let estatus =
-       match status#ng_status with
-       | GrafiteTypes.ProofMode _ -> assert false
-       | GrafiteTypes.CommandMode es -> es 
-     in
-     let estatus,obj =
-      GrafiteDisambiguate.disambiguate_nobj estatus
-       ~baseuri:status#baseuri (text,prefix_len,obj) in
-     let uri,height,nmenv,nsubst,nobj = obj in
-     let ninitial_stack = Continuationals.Stack.of_nmetasenv nmenv in
-     let status =
-      status#set_ng_status
-       (GrafiteTypes.ProofMode
-         (subst_metasenv_and_fix_names
-           ((new NTacStatus.status obj ninitial_stack)#set_estatus estatus)))
-     in
-     (match nmenv with
-         [] ->
-          eval_ncommand opts status ("",0,GrafiteAst.NQed Stdpp.dummy_loc)
-       | _ -> status,`New [])
+     if status#ng_mode <> `CommandMode then
+      raise (GrafiteTypes.Command_error "Not in command mode")
+     else
+      let status,obj =
+       GrafiteDisambiguate.disambiguate_nobj status
+        ~baseuri:status#baseuri (text,prefix_len,obj) in
+      let uri,height,nmenv,nsubst,nobj = obj in
+      let ninitial_stack = Continuationals.Stack.of_nmetasenv nmenv in
+      let status = status#set_obj obj in
+      let status = status#set_stack ninitial_stack in
+      let status = subst_metasenv_and_fix_names status in
+      let status = status#set_ng_mode `ProofMode in
+      (match nmenv with
+          [] ->
+           eval_ncommand opts status ("",0,GrafiteAst.NQed Stdpp.dummy_loc)
+        | _ -> status,`New [])
   | GrafiteAst.NUnivConstraint (loc,strict,u1,u2) ->
-      NCicEnvironment.add_constraint strict [false,u1] [false,u2];
-      status, `New [u1;u2]
+      eval_add_constraint status strict [false,u1] [false,u2]
 ;;
 
 let rec eval_command = {ec_go = fun ~disambiguate_command opts status
@@ -806,39 +886,32 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status
      LibraryObjects.set_default what uris;
      GrafiteTypes.add_moo_content [cmd] status,`Old []
   | GrafiteAst.Drop loc -> raise Drop
-  | GrafiteAst.Include (loc, _, baseuri) ->
-     let moopath_rw, moopath_r = 
-       LibraryMisc.obj_file_of_baseuri 
-         ~must_exist:false ~baseuri ~writable:true,
-       LibraryMisc.obj_file_of_baseuri 
-         ~must_exist:false ~baseuri ~writable:false
-     in
-     let moopath = 
-       if Sys.file_exists moopath_r then moopath_r else
-         if Sys.file_exists moopath_rw then moopath_rw else
-           raise (IncludedFileNotCompiled (moopath_rw,baseuri))
+  | GrafiteAst.Include (loc, mode, new_or_old, baseuri) ->
+     (* Old Include command is not recursive; new one is *)
+     let status =
+      if new_or_old = `OldAndNew then
+       let moopath_rw, moopath_r = 
+        LibraryMisc.obj_file_of_baseuri 
+          ~must_exist:false ~baseuri ~writable:true,
+        LibraryMisc.obj_file_of_baseuri 
+          ~must_exist:false ~baseuri ~writable:false in
+       let moopath = 
+        if Sys.file_exists moopath_r then moopath_r else
+          if Sys.file_exists moopath_rw then moopath_rw else
+            raise (IncludedFileNotCompiled (moopath_rw,baseuri))
+       in
+        eval_from_moo.efm_go status moopath
+      else
+       status
      in
-     let status = eval_from_moo.efm_go status moopath in
-     let estatus = GrafiteTypes.get_estatus status in
-     let estatus =
+      let status =
        NRstatus.Serializer.require ~baseuri:(NUri.uri_of_string baseuri)
-        estatus in
-     let status = GrafiteTypes.set_estatus estatus status in
-(* debug
-     let lt_uri = UriManager.uri_of_string "cic:/matita/nat/orders/lt.con" in
-     let nat_uri = UriManager.uri_of_string "cic:/matita/nat/nat/nat.ind" in
-     let nat = Cic.MutInd(nat_uri,0,[]) in
-     let zero = Cic.MutConstruct(nat_uri,0,1,[]) in
-     let succ = Cic.MutConstruct(nat_uri,0,2,[]) in
-     let fake= Cic.Meta(-1,[]) in
-     let term= Cic.Appl [Cic.Const (lt_uri,[]);zero;Cic.Appl[succ;zero]] in     let msg =
-       let candidates = Universe.get_candidates status.GrafiteTypes.universe term in
-       ("candidates for " ^ (CicPp.ppterm term) ^ " = " ^ 
-	  (String.concat "\n" (List.map CicPp.ppterm candidates))) 
-     in
-     prerr_endline msg;
-*)
-     status,`Old []
+        status in
+      let status =
+       GrafiteTypes.add_moo_content
+        [GrafiteAst.Include (loc,mode,`New,baseuri)] status
+      in
+       status,`Old []
   | GrafiteAst.Print (_,"proofterm") ->
       let _,_,_,p,_, _ = GrafiteTypes.get_current_proof status in
       prerr_endline (Auto.pp_proofterm (Lazy.force p));
@@ -961,18 +1034,17 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status
       eval_tactical status
        (punctuation_tactical_of_ast (text,prefix_len,punct)),`Old []
   | GrafiteAst.NTactic (_(*loc*), tacl) ->
-      (match status#ng_status with
-      | GrafiteTypes.CommandMode _ -> assert false
-      | GrafiteTypes.ProofMode nstatus ->
-         let nstatus =
-          List.fold_left 
-            (fun nstatus tac ->
-              let nstatus = eval_ng_tac (text,prefix_len,tac) nstatus in
-              subst_metasenv_and_fix_names nstatus)
-            nstatus tacl
-         in
-          status#set_ng_status (GrafiteTypes.ProofMode nstatus),
-         `New [])
+      if status#ng_mode <> `ProofMode then
+       raise (GrafiteTypes.Command_error "Not in proof mode")
+      else
+       let status =
+        List.fold_left 
+          (fun status tac ->
+            let status = eval_ng_tac (text,prefix_len,tac) status in
+            subst_metasenv_and_fix_names status)
+          status tacl
+       in
+        status,`New []
   | GrafiteAst.NonPunctuationTactical (_, tac, punct) ->
      let status = 
       eval_tactical status