X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2Fcomponents%2Fcontent_pres%2Fcontent2presMatcher.ml;h=f6319c73581cd7a2f9ea0aef618b48c022336386;hb=59fd7b5ea24e71b47aee069440f140bcccf1292a;hp=8b613a524775a32bab105d8c59bc126e1d5c676a;hpb=894d518aa760c9f816ddb0dc2b3fa88e1fe20a94;p=helm.git diff --git a/matita/components/content_pres/content2presMatcher.ml b/matita/components/content_pres/content2presMatcher.ml index 8b613a524..f6319c735 100644 --- a/matita/components/content_pres/content2presMatcher.ml +++ b/matita/components/content_pres/content2presMatcher.ml @@ -25,11 +25,8 @@ (* $Id$ *) -open Printf - module Ast = NotationPt module Env = NotationEnv -module Pp = NotationPp module Util = NotationUtil let get_tag term0 = @@ -84,7 +81,7 @@ struct Ast.Variable (Ast.TermVar (name,Ast.Level 0)) in let rec aux = function - | Ast.AttributedTerm (_, t) -> assert false + | Ast.AttributedTerm (_, _t) -> assert false | Ast.Literal _ | Ast.Layout _ -> assert false | Ast.Variable v -> Ast.Variable v @@ -105,7 +102,7 @@ struct name, (Env.NumType, Env.NumValue s) | Ast.Variable (Ast.IdentVar name), (Ast.Ident (s, None)) -> name, (Env.StringType, Env.StringValue (Env.Ident s)) - | _ -> assert false) + | _ -> assert false (* activate the DEBUGGING CODE below *)) pl tl with Invalid_argument _ -> assert false @@ -157,10 +154,19 @@ struct in magichooser candidates in +(* DEBUGGING CODE +fun input -> +let (fst,_)::_ = rows in +prerr_endline ("RIGA: " ^ NotationPp.pp_term (new NCicPp.status) fst); +prerr_endline ("CONTRO: " ^ NotationPp.pp_term (new NCicPp.status) input); +*) M.compiler rows' match_cb (fun _ -> None) +(* DEBUGGING CODE +input +*) and compile_magic = function - | Ast.Fold (kind, p_base, names, p_rec) -> + | Ast.Fold (_kind, p_base, names, p_rec) -> let p_rec_decls = Env.declarations_of_term p_rec in (* LUCA: p_rec_decls should not contain "names" *) let acc_name = try List.hd names with Failure _ -> assert false in @@ -175,7 +181,7 @@ struct let rec aux term = match compiled_rec term with | None -> aux_base term - | Some (env', ctors', _) -> + | Some (env', _ctors', _) -> begin let acc = Env.lookup_term env' acc_name in let env'' = Env.remove_name env' acc_name in @@ -211,7 +217,7 @@ struct | Some (env', ctors', 0) -> let env' = List.map - (fun (name, (ty, v)) as binding -> + (fun (name, (_ty, _v)) as binding -> if List.exists (fun (name', _) -> name = name') p_opt_decls then Env.opt_binding_some binding else binding)