Equality has one right parameter and thus it's elimination principle has two

[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 73905eef306be23960b89d239e2ff473f7ce4ff3..520289aa1f39d1f17886314c901991dc8ad4d843 100644 (file)
--- a/helm/software/components/grafite_engine/grafiteEngine.ml
+++ b/helm/software/components/grafite_engine/grafiteEngine.ml
@@ -616,7 +616,7 @@ 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));*)
        let dump = record_index_eq uri :: newstatus#dump 
@@ -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 
@@ -779,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)
@@ -805,6 +805,10 @@ let eval_ng_tac tac =
       NTactics.generalize_tac ~where:(text,prefix_len,where)
   | GrafiteAst.NId _ -> (fun x -> x)
   | GrafiteAst.NIntro (_loc,n) -> NTactics.intro_tac n
+  | GrafiteAst.NInversion (_loc, what, where) ->
+      NTactics.inversion_tac 
+        ~what:(text,prefix_len,what)
+        ~where:(text,prefix_len,where)
   | GrafiteAst.NLApply (_loc, t) -> NTactics.lapply_tac (text,prefix_len,t) 
   | GrafiteAst.NLetIn (_loc,where,what,name) ->
       NTactics.letin_tac ~where:(text,prefix_len,where) 
@@ -882,8 +886,18 @@ let rec eval_ncommand opts status (text,prefix_len,cmd) =
         let obj = uri,height,[],[],obj_kind in
         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
+        let index_obj =
+         match obj_kind with
+            NCic.Constant (_,_,_,_,(_,`Example,_))
+          | NCic.Fixpoint (_,_,(_,`Example,_)) -> false
+          | _ -> true
+        in
+        let status =
+         if index_obj then
+          let status = index_obj_for_auto status obj in
+           index_eq_for_auto status uri
+         else
+          status in
 (*
          try 
            index_eq uri status