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 1a7c0a981ac91115cde3bb1f6ad61b75d54fc13f..239d30d2d1480ff0b0c354a757cacbf4105cc058 100644 (file)
--- a/helm/software/components/grafite_engine/grafiteEngine.ml
+++ b/helm/software/components/grafite_engine/grafiteEngine.ml
@@ -531,7 +531,7 @@ let record_index_obj =
 ;;
 
 let index_obj_for_auto status (uri, height, _, _, kind) = 
- prerr_endline (string_of_int height);
+ (*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 = 
@@ -605,7 +605,7 @@ let record_index_eq =
  let basic_index_eq uri
    ~refresh_uri_in_universe 
    ~refresh_uri_in_term 
-   = index_eq uri 
+   = index_eq (NCicLibrary.refresh_uri uri) 
  in
   NCicLibrary.Serializer.register#run "index_eq"
    object(_ : 'a NCicLibrary.register_type)
@@ -616,13 +616,13 @@ let record_index_eq =
 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 == status then status 
+     if newstatus#eq_cache == status#eq_cache then status 
      else
-       (prerr_endline ("recording " ^ (NUri.string_of_uri uri));
+       ((*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";
+   ((*prerr_endline "Not a fact";*)
    status)
 ;; 
 
@@ -752,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 
@@ -763,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
@@ -777,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)