X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Ftptp_grafite%2Ftptp2grafite.ml;h=2e1bb9bce2d93cfbdb1e0f964e5dd3214bc87f2d;hb=4a747f4352bd5961c60a7d75eaa95ac3ee4f54f9;hp=7950ca15d4e25e329ef2f3f331c6b2b082b5a7c0;hpb=0639dda9142d1cf047b07e61fb557e8877aba4d8;p=helm.git

diff --git a/helm/software/components/tptp_grafite/tptp2grafite.ml b/helm/software/components/tptp_grafite/tptp2grafite.ml
index 7950ca15d..2e1bb9bce 100644
--- a/helm/software/components/tptp_grafite/tptp2grafite.ml
+++ b/helm/software/components/tptp_grafite/tptp2grafite.ml
@@ -221,7 +221,8 @@ let ng_generate_tactics fv ueq_case context arities =
   (HExtlib.list_mapi
    (fun (name,_) _-> 
      GA.Executable(floc,GA.NTactic(floc, 
-      [GA.NIntro (floc,name);GA.NDot(floc)])))
+      [GA.NIntro (floc,(try List.assoc name kw with Not_found -> name));
+       GA.NDot(floc)])))
    arities)
   @
   (HExtlib.list_mapi
@@ -236,22 +237,23 @@ let ng_generate_tactics fv ueq_case context arities =
       (fun _ -> 
         [GA.Executable(floc,GA.NTactic(floc, 
           [GA.NApply (floc,
-            PT.Appl [mk_ident "ex_intro";PT.Implicit;PT.Implicit;
-              PT.Implicit;PT.Implicit]);GA.NBranch floc]));
+            PT.Appl
+             [mk_ident "ex_intro";PT.Implicit `JustOne;PT.Implicit `JustOne;
+              PT.Implicit `JustOne;PT.Implicit `JustOne]);GA.NBranch floc]));
          GA.Executable(floc,GA.NTactic(floc, 
           [GA.NPos (floc,[2])]))])
       fv)) 
  else [])@
   [GA.Executable(floc,GA.NTactic(floc, [
     if (*ueq_case*) true then
-        GA.NAuto (floc,(
+        GA.NAuto (floc,(Some 
           HExtlib.list_mapi 
             (fun _ i -> 
                mk_ident ("H" ^ string_of_int i)) 
             context    
                 ,[]))
     else
-        GA.NAuto (floc,([],[
+        GA.NAuto (floc,(None,[
                 "depth",string_of_int 5;
                 "width",string_of_int 5;
                 "size",string_of_int 20;
@@ -272,7 +274,9 @@ let ng_generate_tactics fv ueq_case context arities =
                GA.NSkip floc; GA.NMerge floc]))])
       fv)) 
  else [])@
-  [GA.Executable(floc,GA.Command(floc, GA.NQed(floc)))]
+    [GA.Executable(floc,GA.NTactic(floc,[GA.NTry(floc, GA.NAssumption(floc));
+					 GA.NSemicolon(floc)]))]@
+  [GA.Executable(floc,GA.NCommand(floc, GA.NQed(floc)))]
 ;;
 
 let generate_tactics fv ueq_case =
@@ -290,10 +294,10 @@ let generate_tactics fv ueq_case =
  else [])@
   [GA.Executable(floc,GA.Tactic(floc, Some (
     if true (*ueq_case*) then
-        GA.AutoBatch (floc,([],["paramodulation","";
+        GA.AutoBatch (floc,(None,["paramodulation","";
         "timeout",string_of_int !paramod_timeout]))
     else
-        GA.AutoBatch (floc,([],[
+        GA.AutoBatch (floc,(None,[
                 "depth",string_of_int 5;
                 "width",string_of_int 5;
                 "size",string_of_int 20;
@@ -350,7 +354,7 @@ let convert_ast ng statements context = function
                (mk_ident universe,Some (PT.Sort (`Type (CicUniv.fresh ())))), 
                convert_formula fv false context f)
           in
-          let o = PT.Theorem (`Theorem,name,f,None) in
+          let o = PT.Theorem (`Theorem,name,f,None,`Regular) in
           (statements @ 
           [ GA.Executable(floc,GA.Command(floc,
              (*if ng then GA.NObj (floc,o) else*) GA.Obj(floc,o))); ] @
@@ -437,8 +441,9 @@ let tptp2grafite ?(timeout=600) ?(def_depth=10) ?raw_preamble ~tptppath ~filenam
   let preamble = 
     match raw_preamble with
     | None -> 
-       pp (GA.Executable(floc,
-           GA.Command(floc,GA.Include(floc,true,"logic/equality.ma"))))
+      pp
+       (GA.Executable(floc,
+         GA.Command(floc,GA.Include(floc,true,`OldAndNew,"logic/equality.ma"))))
     | Some s -> s buri
   in
   let extra_statements_end = [] in