Added an implicit parameter to branch_tac to allow branching on a

[helm.git] / helm / software / components / grafite_engine / grafiteEngine.ml

diff --git a/helm/software/components/grafite_engine/grafiteEngine.ml b/helm/software/components/grafite_engine/grafiteEngine.ml
index 248c02fa50facd4ee613d89dd9e392e7bb5af269..239d30d2d1480ff0b0c354a757cacbf4105cc058 100644 (file)
--- a/helm/software/components/grafite_engine/grafiteEngine.ml
+++ b/helm/software/components/grafite_engine/grafiteEngine.ml
@@ -531,6 +531,7 @@ let record_index_obj =
 ;;
 
 let index_obj_for_auto status (uri, height, _, _, kind) = 
+ (*prerr_endline (string_of_int height);*)
  let mk_item orig_ty spec =
    let ty,_,_ = NCicMetaSubst.saturate ~delta:max_int [] [] [] orig_ty 0 in
    let keys = 
@@ -594,6 +595,36 @@ let index_obj_for_auto status (uri, height, _, _, kind) =
  status#set_dump dump
 ;; 
 
+let index_eq uri status =
+  let eq_status = status#eq_cache in
+  let eq_status1 = NCicParamod.index_obj eq_status uri in
+    status#set_eq_cache eq_status1
+;;
+
+let record_index_eq =
+ let basic_index_eq uri
+   ~refresh_uri_in_universe 
+   ~refresh_uri_in_term 
+   = index_eq (NCicLibrary.refresh_uri uri) 
+ in
+  NCicLibrary.Serializer.register#run "index_eq"
+   object(_ : 'a NCicLibrary.register_type)
+     method run = basic_index_eq
+   end
+;;
+
+let index_eq_for_auto status uri =
+ if NnAuto.is_a_fact_obj status uri then
+   let newstatus = index_eq uri status in
+     if newstatus#eq_cache == status#eq_cache then status 
+     else
+       ((*prerr_endline ("recording " ^ (NUri.string_of_uri uri));*)
+       let dump = record_index_eq uri :: newstatus#dump 
+       in newstatus#set_dump dump)
+ else 
+   ((*prerr_endline "Not a fact";*)
+   status)
+;; 
 
 let basic_eval_add_constraint (u1,u2) status =
  NCicLibrary.add_constraint status u1 u2
@@ -721,7 +752,7 @@ let eval_ng_punct (_text, _prefix_len, punct) =
   match punct with
   | GrafiteAst.Dot _ -> NTactics.dot_tac 
   | GrafiteAst.Semicolon _ -> fun x -> x
-  | GrafiteAst.Branch _ -> NTactics.branch_tac 
+  | GrafiteAst.Branch _ -> NTactics.branch_tac ~force:false
   | GrafiteAst.Shift _ -> NTactics.shift_tac 
   | GrafiteAst.Pos (_,l) -> NTactics.pos_tac l
   | GrafiteAst.Wildcard _ -> NTactics.wildcard_tac 
@@ -732,6 +763,8 @@ 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.NSmartApply (_loc, t) -> 
+      NnAuto.smart_apply_tac (text,prefix_len,t) 
   | GrafiteAst.NAssert (_loc, seqs) ->
      NTactics.assert_tac
       ((List.map
@@ -746,7 +779,7 @@ let eval_ng_tac tac =
   | GrafiteAst.NAuto (_loc, (l,a)) ->
       NAuto.auto_tac
        ~params:(List.map (fun x -> "",0,x) l,a)
-  | GrafiteAst.NBranch _ -> NTactics.branch_tac 
+  | GrafiteAst.NBranch _ -> NTactics.branch_tac ~force:false
   | GrafiteAst.NCases (_loc, what, where) ->
       NTactics.cases_tac 
         ~what:(text,prefix_len,what)
@@ -850,6 +883,12 @@ let rec eval_ncommand opts status (text,prefix_len,cmd) =
         let old_status = status in
         let status = NCicLibrary.add_obj status obj in
         let status = index_obj_for_auto status obj in
+        let status = index_eq_for_auto status uri in
+(*
+         try 
+           index_eq uri status
+         with _ -> prerr_endline "got an exception"; status
+       in *)
 (*         prerr_endline (NCicPp.ppobj obj); *)
         HLog.message ("New object: " ^ NUri.string_of_uri uri);
          (try