X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fgrafite_engine%2FgrafiteEngine.ml;h=ae497fc12cbdd25db29b319643cfbe444d421aa0;hb=3eec3be7243166d6a157a8e4e914cd4076c813e3;hp=8b83bcff0fcf3569af351757165b11b88cd3dfbc;hpb=8f9d476c32c48d14348a61889dc191c7696bd404;p=helm.git diff --git a/helm/software/components/grafite_engine/grafiteEngine.ml b/helm/software/components/grafite_engine/grafiteEngine.ml index 8b83bcff0..ae497fc12 100644 --- a/helm/software/components/grafite_engine/grafiteEngine.ml +++ b/helm/software/components/grafite_engine/grafiteEngine.ml @@ -60,10 +60,11 @@ let tactic_of_ast ast = match ast with | GrafiteAst.Absurd (_, term) -> Tactics.absurd term | GrafiteAst.Apply (_, term) -> Tactics.apply term + | GrafiteAst.ApplyS (_, term) -> + Tactics.applyS ~term ~dbd:(LibraryDb.instance ()) | GrafiteAst.Assumption _ -> Tactics.assumption - | GrafiteAst.Auto (_,depth,width,paramodulation,full) -> - AutoTactic.auto_tac ?depth ?width ?paramodulation ?full - ~dbd:(LibraryDb.instance ()) () + | GrafiteAst.Auto (_,params) -> + AutoTactic.auto_tac ~params ~dbd:(LibraryDb.instance ()) | GrafiteAst.Change (_, pattern, with_what) -> Tactics.change ~pattern with_what | GrafiteAst.Clear (_,id) -> Tactics.clear id @@ -480,15 +481,16 @@ let eval_tactical ~disambiguate_tactic status tac = MatitaTacticals.solve_tactics ~tactics:(List.map (fun t -> "", tactical_of_ast (l+1) t) tacticals) - | GrafiteAst.Skip loc -> MatitaTacticals.skip - | GrafiteAst.Dot loc -> MatitaTacticals.dot - | GrafiteAst.Semicolon loc -> MatitaTacticals.semicolon - | GrafiteAst.Branch loc -> MatitaTacticals.branch - | GrafiteAst.Shift loc -> MatitaTacticals.shift - | GrafiteAst.Pos (loc, i) -> MatitaTacticals.pos i - | GrafiteAst.Merge loc -> MatitaTacticals.merge - | GrafiteAst.Focus (loc, goals) -> MatitaTacticals.focus goals - | GrafiteAst.Unfocus loc -> MatitaTacticals.unfocus + | GrafiteAst.Skip _loc -> MatitaTacticals.skip + | GrafiteAst.Dot _loc -> MatitaTacticals.dot + | GrafiteAst.Semicolon _loc -> MatitaTacticals.semicolon + | GrafiteAst.Branch _loc -> MatitaTacticals.branch + | GrafiteAst.Shift _loc -> MatitaTacticals.shift + | GrafiteAst.Pos (_loc, i) -> MatitaTacticals.pos i + | GrafiteAst.Merge _loc -> MatitaTacticals.merge + | GrafiteAst.Focus (_loc, goals) -> MatitaTacticals.focus goals + | GrafiteAst.Unfocus _loc -> MatitaTacticals.unfocus + | GrafiteAst.Wildcard _loc -> MatitaTacticals.wildcard in let status, _, _ = tactical_of_ast 0 tac (status, ~-1) in let status = (* is proof completed? *)