- List.map fst compounds
-
-let eval_tactical ~disambiguate_tactic status tac =
- let apply_tactic = apply_tactic ~disambiguate_tactic in
- let module MatitaStatus =
- struct
- type input_status = GrafiteTypes.status * ProofEngineTypes.goal
-
- type output_status =
- GrafiteTypes.status * ProofEngineTypes.goal list * ProofEngineTypes.goal list
-
- type tactic = input_status -> output_status
-
- let id_tactic = apply_tactic ("",0,(GrafiteAst.IdTac HExtlib.dummy_floc))
- let mk_tactic tac = tac
- let apply_tactic tac = tac
- let goals (_, opened, closed) = opened, closed
- let set_goals (opened, closed) (status, _, _) = (status, opened, closed)
- let get_stack (status, _) = GrafiteTypes.get_stack status
-
- let get_status (status, goal) =
- match status.GrafiteTypes.proof_status with
- | GrafiteTypes.Incomplete_proof incomplete -> incomplete.GrafiteTypes.proof, goal
- | _ -> assert false
-
- let get_proof (status, _, _) =
- match status.GrafiteTypes.proof_status with
- | GrafiteTypes.Incomplete_proof incomplete -> incomplete.GrafiteTypes.proof
- | _ -> assert false
-
- let set_stack stack (status, opened, closed) =
- GrafiteTypes.set_stack stack status, opened, closed
-
- let inject (status, _) = (status, [], [])
- let focus goal (status, _, _) = (status, goal)
- end
- in
-(*
- let rec atomic_tactical_of_ast (text,prefix_len,tac) =
- match tac with
- | GrafiteAst.Tactic (loc, tactic) ->
- cic_tactic_of_ast ~disambiguate_tactic (text,prefix_len,tactic)
- (status,~-1)
- | GrafiteAst.Seq (loc,tacticals) ->
- Tacticals.seq
- (List.map atomic_tactical_of_ast
- (List.map (fun x -> text,prefix_len,x) tacticals))
- | _ -> assert false
- in
-*)
- let module MatitaTacticals = Continuationals.Make(MatitaStatus) in
- let tactical_of_ast l (text,prefix_len,tac) =
- let apply_tactic t = apply_tactic (text, prefix_len, t) in
- match tac with
- | GrafiteAst.Tactic (loc, tactic) ->
- MatitaTacticals.eval
- (MatitaTacticals.Tactical
- (MatitaTacticals.Tactic
- (MatitaStatus.mk_tactic (apply_tactic tactic))))
-(*
- | GrafiteAst.Seq (loc, tacticals) -> (* tac1; tac2; ... *)
- assert (l > 0);
- MatitaTacticals.seq ~tactics:(List.map (tactical_of_ast (l+1)) tacticals)
- | GrafiteAst.Do (loc, n, tactical) ->
- MatitaTacticals.do_tactic ~n ~tactic:(tactical_of_ast (l+1) tactical)
-*)
- | GrafiteAst.Repeat (loc, GrafiteAst.Tactic (_,tactical)) ->
- MatitaTacticals.eval
- (MatitaTacticals.Tactical
- (MatitaTacticals.Tactic
- (MatitaStatus.mk_tactic
- (apply_atomic_tactical ~disambiguate_tactic
- ~patch:(fun tactic -> Tacticals.repeat_tactic ~tactic)
- (text,prefix_len,tactical)))))
-(*
- | GrafiteAst.Then (loc, tactical, tacticals) -> (* tac; [ tac1 | ... ] *)
- assert (l > 0);
- MatitaTacticals.thens ~start:(tactical_of_ast (l+1) tactical)
- ~continuations:(List.map (tactical_of_ast (l+1)) tacticals)
-*)
- | GrafiteAst.First (loc, [GrafiteAst.Tactic (_,tacticals)]) ->
- MatitaTacticals.eval
- (MatitaTacticals.Tactical
- (MatitaTacticals.Tactic
- (MatitaStatus.mk_tactic
- (apply_atomic_tactical ~disambiguate_tactic
- ~patch:(fun tactic ->Tacticals.first ~tactics:["",tactic])
- (text,prefix_len,tacticals)))))
- | GrafiteAst.Try (loc, GrafiteAst.Tactic (_,tactical)) ->
- MatitaTacticals.eval
- (MatitaTacticals.Tactical
- (MatitaTacticals.Tactic
- (MatitaStatus.mk_tactic
- (apply_atomic_tactical ~disambiguate_tactic
- ~patch:(fun tactic -> Tacticals.try_tactic ~tactic)
- (text,prefix_len,tactical)))))
- | GrafiteAst.Solve (loc, [GrafiteAst.Tactic (_,tacticals)]) ->
- MatitaTacticals.eval
- (MatitaTacticals.Tactical
- (MatitaTacticals.Tactic
- (MatitaStatus.mk_tactic
- (apply_atomic_tactical ~disambiguate_tactic
- ~patch:(fun tactic ->Tacticals.solve_tactics ~tactics:["",tactic])
- (text,prefix_len,tacticals)))))
- | GrafiteAst.Progress (loc, GrafiteAst.Tactic (_,tactical)) ->
- MatitaTacticals.eval
- (MatitaTacticals.Tactical
- (MatitaTacticals.Tactic
- (MatitaStatus.mk_tactic
- (apply_atomic_tactical ~disambiguate_tactic
- ~patch:(fun tactic -> Tacticals.progress_tactic ~tactic)
- (text,prefix_len,tactical)))))
- | GrafiteAst.Skip _loc ->
- MatitaTacticals.eval (MatitaTacticals.Tactical MatitaTacticals.Skip)
- | GrafiteAst.Dot _loc ->
- MatitaTacticals.eval (MatitaTacticals.Dot)
- | GrafiteAst.Semicolon _loc ->
- MatitaTacticals.eval (MatitaTacticals.Semicolon)
- | GrafiteAst.Branch _loc ->
- MatitaTacticals.eval MatitaTacticals.Branch
- | GrafiteAst.Shift _loc ->
- MatitaTacticals.eval MatitaTacticals.Shift
- | GrafiteAst.Pos (_loc, i) ->
- MatitaTacticals.eval (MatitaTacticals.Pos i)
- | GrafiteAst.Merge _loc ->
- MatitaTacticals.eval MatitaTacticals.Merge
- | GrafiteAst.Focus (_loc, goals) ->
- MatitaTacticals.eval (MatitaTacticals.Focus goals)
- | GrafiteAst.Unfocus _loc ->
- MatitaTacticals.eval MatitaTacticals.Unfocus
- | GrafiteAst.Wildcard _loc ->
- MatitaTacticals.eval MatitaTacticals.Wildcard
- in
- let status, _, _ = tactical_of_ast 0 tac (status, ~-1) in
+ List.map (fun u,_,_ -> u) compounds
+
+module MatitaStatus =
+ struct
+ type input_status = GrafiteTypes.status * ProofEngineTypes.goal
+
+ type output_status =
+ GrafiteTypes.status * ProofEngineTypes.goal list * ProofEngineTypes.goal list
+
+ type tactic = input_status -> output_status
+
+ let mk_tactic tac = tac
+ let apply_tactic tac = tac
+ let goals (_, opened, closed) = opened, closed
+ let get_stack (status, _) = GrafiteTypes.get_stack status
+
+ let set_stack stack (status, opened, closed) =
+ GrafiteTypes.set_stack stack status, opened, closed
+
+ let inject (status, _) = (status, [], [])
+ let focus goal (status, _, _) = (status, goal)
+ end
+
+module MatitaTacticals = Continuationals.Make(MatitaStatus)
+
+let tactic_of_ast' tac =
+ MatitaTacticals.Tactical (MatitaTacticals.Tactic (MatitaStatus.mk_tactic tac))
+
+let punctuation_tactical_of_ast (text,prefix_len,punct) =
+ match punct with
+ | 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.Wildcard _loc -> MatitaTacticals.Wildcard
+
+let non_punctuation_tactical_of_ast (text,prefix_len,punct) =
+ match punct with
+ | GrafiteAst.Focus (_loc,goals) -> MatitaTacticals.Focus goals
+ | GrafiteAst.Unfocus _loc -> MatitaTacticals.Unfocus
+ | GrafiteAst.Skip _loc -> MatitaTacticals.Tactical MatitaTacticals.Skip
+
+let eval_tactical status tac =
+ let status, _, _ = MatitaTacticals.eval tac (status, ~-1) in