From d5478735145dd7a920ff1f7e0966b35f306bc3c7 Mon Sep 17 00:00:00 2001 From: Enrico Tassi Date: Fri, 17 Jun 2005 14:57:43 +0000 Subject: [PATCH] added support for patterns current goal --- helm/ocaml/cic_transformations/tacticAst.ml | 24 ++------- .../cic_transformations/tacticAst2Box.ml | 16 +++--- helm/ocaml/cic_transformations/tacticAstPp.ml | 50 ++++++++++++------- 3 files changed, 45 insertions(+), 45 deletions(-) diff --git a/helm/ocaml/cic_transformations/tacticAst.ml b/helm/ocaml/cic_transformations/tacticAst.ml index 76ce8994f..6ad30c794 100644 --- a/helm/ocaml/cic_transformations/tacticAst.ml +++ b/helm/ocaml/cic_transformations/tacticAst.ml @@ -25,24 +25,18 @@ type direction = [ `Left | `Right ] type reduction_kind = [ `Reduce | `Simpl | `Whd | `Normalize ] -(* type 'term pattern = Pattern of 'term *) - - (* everywhere includes goal and hypotheses *) -type 'term pattern = [ `Goal | `Everywhere ] - - (* when an 'ident option is None, the default is to apply the tactic - to the current goal *) type loc = CicAst.location +type ('term, 'ident) pattern = + ('ident * 'term) list * 'term option + type ('term, 'ident) tactic = | Absurd of loc * 'term | Apply of loc * 'term | Auto of loc * int option | Assumption of loc | Change of loc * 'term * 'term * 'ident option (* what, with what, where *) - | Change_pattern of loc * 'term pattern * 'term * 'ident option - (* what, with what, where *) | Contradiction of loc | Cut of loc * 'term | Decompose of loc * 'ident * 'ident list (* where, which principles *) @@ -58,18 +52,10 @@ type ('term, 'ident) tactic = | Intros of loc * int option * 'ident list | Left of loc | LetIn of loc * 'term * 'ident -(* | Named_intros of loc * 'ident list (* joined with Intros above *) *) -(* | Reduce of loc * reduction_kind * 'term pattern * 'ident option (* what, where *) *) - | ReduceAt of loc * reduction_kind * 'ident * 'term - | Reduce of loc * reduction_kind * ('term list * 'term pattern) option - (* kind, (what, where) - * if second argument is None, reduction is applied to the current goal, - * otherwise to each occurrence of loc * terms given in list occuring in term - * pattern *) + | Reduce of loc * reduction_kind * ('term, 'ident) pattern | Reflexivity of loc | Replace of loc * 'term * 'term (* what, with what *) - | Replace_pattern of loc * 'term pattern * 'term - | Rewrite of loc * direction * 'term * 'ident option + | Rewrite of loc * direction * 'term * ('term, 'ident) pattern | Right of loc | Ring of loc | Split of loc diff --git a/helm/ocaml/cic_transformations/tacticAst2Box.ml b/helm/ocaml/cic_transformations/tacticAst2Box.ml index 4f1c27f47..902a1d661 100644 --- a/helm/ocaml/cic_transformations/tacticAst2Box.ml +++ b/helm/ocaml/cic_transformations/tacticAst2Box.ml @@ -49,7 +49,7 @@ let rec count_tactic current_size tac = (match where with None -> size2 | Some ident -> size2 + 3 + String.length ident) - | Change_pattern _ -> assert false (* TODO *) +(* | Change_pattern _ -> assert false (* TODO *) *) | Contradiction _ -> current_size + 13 | Cut (_, term) -> countterm (current_size + 4) term | Decompose (_, ident, principles) -> @@ -77,13 +77,13 @@ let rec count_tactic current_size tac = | Left _ -> current_size + 4 | LetIn (_, term, ident) -> countterm (current_size + 5 + String.length ident) term - | Reduce _ - | ReduceAt _ -> assert false (* TODO *) +(* | Reduce _ *) + | Reduce _ -> assert false (* TODO *) | Reflexivity _ -> current_size + 11 | Replace (_, t1, t2) -> let size1 = countterm (current_size + 14) t1 in (* replace, with *) countterm size1 t2 - | Replace_pattern _ -> assert false (* TODO *) +(* | Replace_pattern _ -> assert false (* TODO *) *) | Rewrite _ -> assert false (* TODO *) | Right _ -> current_size + 5 | Ring _ -> current_size + 4 @@ -150,7 +150,7 @@ and big_tactic2box = function (pretty_append [Box.Text([],"with")] t2)@where) - | Change_pattern _ -> assert false (* TODO *) +(* | Change_pattern _ -> assert false (* TODO *) *) | Contradiction _ -> Box.Text([],"contradiction") | Cut (_, term) -> Box.V([],[Box.Text([],"cut"); @@ -213,8 +213,8 @@ and big_tactic2box = function Box.smallskip; Box.Text([],"=")]); Box.indent (ast2astBox term)]) - | Reduce _ - | ReduceAt _ -> assert false (* TODO *) +(* | Reduce _ *) + | Reduce _ -> assert false (* TODO *) | Reflexivity _ -> Box.Text([],"reflexivity") | Replace (_, t1, t2) -> Box.V([], @@ -224,7 +224,7 @@ and big_tactic2box = function (pretty_append [Box.Text([],"with")] t2)) - | Replace_pattern _ -> assert false (* TODO *) +(* | Replace_pattern _ -> assert false (* TODO *) *) | Rewrite _ -> assert false (* TODO *) | Right _ -> Box.Text([],"right") | Ring _ -> Box.Text([],"ring") diff --git a/helm/ocaml/cic_transformations/tacticAstPp.ml b/helm/ocaml/cic_transformations/tacticAstPp.ml index e86f77bd6..2cc4d0c65 100644 --- a/helm/ocaml/cic_transformations/tacticAstPp.ml +++ b/helm/ocaml/cic_transformations/tacticAstPp.ml @@ -42,7 +42,22 @@ let pp_reduction_kind = function | `Simpl -> "simplify" | `Whd -> "whd" | `Normalize -> "normalize" + +let pp_pattern (hyp, goal) = + let pp_hyp_pattern l = + String.concat "; " + (List.map (fun (name, p) -> sprintf "%s : %s" name (pp_term_ast p)) l) + in + let pp_goal_pattern p = + match p with + | None -> "" + | Some p -> pp_term_ast p + in + let separator = + if hyp <> [] then " \vdash " else " " + in + pp_hyp_pattern hyp ^ separator ^ pp_goal_pattern goal let rec pp_tactic = function | Absurd (_, term) -> "absurd" ^ pp_term_ast term | Apply (_, term) -> "apply " ^ pp_term_ast term @@ -51,7 +66,7 @@ let rec pp_tactic = function | Change (_, t1, t2, where) -> sprintf "change %s with %s%s" (pp_term_ast t1) (pp_term_ast t2) (match where with None -> "" | Some ident -> "in " ^ ident) - | Change_pattern (_, _, _, _) -> assert false (* TODO *) +(* | Change_pattern (_, _, _, _) -> assert false (* TODO *) *) | Contradiction _ -> "contradiction" | Cut (_, term) -> "cut " ^ pp_term_ast term | Decompose (_, ident, principles) -> @@ -75,27 +90,26 @@ let rec pp_tactic = function (match idents with [] -> "" | idents -> " " ^ pp_idents idents) | Left _ -> "left" | LetIn (_, term, ident) -> sprintf "let %s in %s" (pp_term_ast term) ident - | Reduce (_, kind, None) - | Reduce (_, kind, Some ([], `Goal)) -> pp_reduction_kind kind - | Reduce (_, kind, Some ([], `Everywhere)) -> - sprintf "%s in hyp" (pp_reduction_kind kind) - | Reduce (_, kind, Some (terms, `Goal)) -> - sprintf "%s %s" (pp_reduction_kind kind) - (String.concat ", " (List.map pp_term_ast terms)) - | Reduce (_, kind, Some (terms, `Everywhere)) -> - sprintf "%s in hyp %s" (pp_reduction_kind kind) - (String.concat ", " (List.map pp_term_ast terms)) - | ReduceAt (_, kind, id, term) -> - sprintf "%s %s at %s" (pp_reduction_kind kind) id - (pp_term_ast term) +(* | Reduce (_, kind, None) *) +(* | Reduce (_, kind, Some ([], `Goal)) -> pp_reduction_kind kind *) +(* | Reduce (_, kind, Some ([], `Everywhere)) -> *) +(* sprintf "%s in hyp" (pp_reduction_kind kind) *) +(* | Reduce (_, kind, Some (terms, `Goal)) -> *) +(* sprintf "%s %s" (pp_reduction_kind kind) *) +(* (String.concat ", " (List.map pp_term_ast terms)) *) +(* | Reduce (_, kind, Some (terms, `Everywhere)) -> *) +(* sprintf "%s in hyp %s" (pp_reduction_kind kind) *) +(* (String.concat ", " (List.map pp_term_ast terms)) *) + | Reduce (_, kind, pat) -> + sprintf "%s in %s" (pp_reduction_kind kind) (pp_pattern pat) | Reflexivity _ -> "reflexivity" | Replace (_, t1, t2) -> sprintf "replace %s with %s" (pp_term_ast t1) (pp_term_ast t2) - | Replace_pattern (_, _, _) -> assert false (* TODO *) - | Rewrite (_, pos, t, None) -> - sprintf "rewrite %s %s" +(* | Replace_pattern (_, _, _) -> assert false (* TODO *) *) + | Rewrite (_, pos, t, pattern) -> + sprintf "rewrite %s %s in %s" (if pos = `Left then "left" else "right") (pp_term_ast t) - | Rewrite _ -> assert false (* TODO *) + (pp_pattern pattern) | Right _ -> "right" | Ring _ -> "ring" | Split _ -> "split" -- 2.39.2