X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2Fcomponents%2Fcontent_pres%2FtermContentPres.ml;h=49d9241b96e8290ebef312443be7fa20811de9e3;hb=ae3e8f274a39b9ce5b551163f7fd76f3b8b4ed58;hp=12fbb07e17b4010b95d16bb809e33220fb60d82c;hpb=ec401f51799a051fe8935b36d589fca5a4728d81;p=helm.git diff --git a/matita/components/content_pres/termContentPres.ml b/matita/components/content_pres/termContentPres.ml index 12fbb07e1..49d9241b9 100644 --- a/matita/components/content_pres/termContentPres.ml +++ b/matita/components/content_pres/termContentPres.ml @@ -214,6 +214,7 @@ let pp_ast0 status t k = ]; break; k t ]) +(* | Ast.LetRec (rec_kind, funs, where) -> let rec_op = match rec_kind with `Inductive -> "rec" | `CoInductive -> "corec" @@ -261,6 +262,7 @@ let pp_ast0 status t k = ((hvbox false false (fst_row :: List.flatten tl_rows @ [ break; keyword "in"; break; k where ]))) +*) | Ast.Implicit `JustOne -> builtin_symbol "?" | Ast.Implicit `Vector -> builtin_symbol "…" | Ast.Meta (n, l) -> @@ -300,14 +302,14 @@ module IntMap = Map.Make(struct type t = int let compare = compare end);; type db = { level1_patterns21: NotationPt.term IntMap.t; - compiled21: ((NotationPt.term -> (NotationEnv.t * NotationPt.term list * int) option)) Lazy.t option; + compiled21: ((NotationPt.term -> (NotationEnv.t * NotationPt.term list * int) option)) Lazy.t; pattern21_matrix: (NotationPt.term * pattern_id) list; counter: pattern_id } let initial_db = { level1_patterns21 = IntMap.empty; - compiled21 = None; + compiled21 = lazy (Content2presMatcher.Matcher21.compiler []); pattern21_matrix = []; counter = ~-1 } @@ -329,13 +331,11 @@ class virtual status = end let get_compiled21 status = - match status#content_pres_db.compiled21 with - | None -> assert false - | Some f -> Lazy.force f + Lazy.force status#content_pres_db.compiled21 let set_compiled21 status f = status#set_content_pres_db - { status#content_pres_db with compiled21 = Some f } + { status#content_pres_db with compiled21 = f } let add_idrefs = List.fold_right (fun idref t -> Ast.AttributedTerm (`IdRef idref, t)) @@ -596,9 +596,11 @@ let instantiate_level2 status env term = List.map (aux_branch env) patterns) | Ast.LetIn (var, t1, t3) -> Ast.LetIn (aux_capture_var env var, aux env t1, aux env t3) +(* | Ast.LetRec (kind, definitions, body) -> Ast.LetRec (kind, List.map (aux_definition env) definitions, aux env body) +*) | Ast.Uri (name, None) -> Ast.Uri (name, None) | Ast.Uri (name, Some substs) -> Ast.Uri (name, Some (aux_substs env substs))