X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Flexicon%2FlexiconEngine.ml;h=805da25c8e53c18340649fcbd6ead78db3b6fdde;hb=9e7df95a820cb91d075f1a20d703175da874596c;hp=1966251ad066401aed61b52fb215c1a60dfe7def;hpb=111df95ac03f2ee21dfa2422a7f531f675b1c16d;p=helm.git diff --git a/helm/software/components/lexicon/lexiconEngine.ml b/helm/software/components/lexicon/lexiconEngine.ml index 1966251ad..805da25c8 100644 --- a/helm/software/components/lexicon/lexiconEngine.ml +++ b/helm/software/components/lexicon/lexiconEngine.ml @@ -25,21 +25,27 @@ (* $Id$ *) -let out = ref ignore +module L = LexiconAst -let set_callback f = out := f +let debug = ref false (* lexicon file name * ma file name *) exception IncludedFileNotCompiled of string * string exception MetadataNotFound of string (* file name *) type status = { - aliases: DisambiguateTypes.environment; (** disambiguation aliases *) - multi_aliases: DisambiguateTypes.multiple_environment; + aliases: L.alias_spec DisambiguateTypes.Environment.t; + multi_aliases: L.alias_spec list DisambiguateTypes.Environment.t; lexicon_content_rev: LexiconMarshal.lexicon; notation_ids: CicNotation.notation_id list; (** in-scope notation ids *) } +let dump_aliases out msg status = + out (if msg = "" then "aliases dump:" else msg ^ ": aliases dump:"); + DisambiguateTypes.Environment.iter + (fun _ x -> out (LexiconAstPp.pp_alias x)) + status.aliases + let initial_status = { aliases = DisambiguateTypes.Environment.empty; multi_aliases = DisambiguateTypes.Environment.empty; @@ -51,49 +57,95 @@ let add_lexicon_content cmds status = let content = status.lexicon_content_rev in let content' = List.fold_right - (fun cmd acc -> cmd :: (List.filter ((<>) cmd) acc)) + (fun cmd acc -> + match cmd with + | L.Alias _ + | L.Include _ + | L.Notation _ -> cmd :: (List.filter ((<>) cmd) acc) + | L.Interpretation _ -> if List.exists ((=) cmd) acc then acc else cmd::acc) cmds content in -(* prerr_endline ("new lexicon content: " ^ String.concat " " (List.map - LexiconAstPp.pp_command content')); *) +(* + prerr_endline ("new lexicon content: " ^ + String.concat "; " (List.map LexiconAstPp.pp_command content') + ); +*) { status with lexicon_content_rev = content' } let set_proof_aliases mode status new_aliases = - if mode = LexiconAst.WithoutPreferences then + if mode = L.WithoutPreferences then status else let commands_of_aliases = List.map - (fun alias -> LexiconAst.Alias (HExtlib.dummy_floc, alias)) + (fun _,alias -> L.Alias (HExtlib.dummy_floc, alias)) in let aliases = List.fold_left (fun acc (d,c) -> DisambiguateTypes.Environment.add d c acc) status.aliases new_aliases in let multi_aliases = - List.fold_left (fun acc (d,c) -> DisambiguateTypes.Environment.cons d c acc) - status.multi_aliases new_aliases in + List.fold_left (fun acc (d,c) -> + DisambiguateTypes.Environment.cons L.description_of_alias + d c acc) + status.multi_aliases new_aliases + in let new_status = { status with multi_aliases = multi_aliases ; aliases = aliases} in if new_aliases = [] then new_status else - let aliases = - DisambiguatePp.aliases_of_domain_and_codomain_items_list new_aliases - in let status = - add_lexicon_content (commands_of_aliases aliases) new_status + add_lexicon_content (commands_of_aliases new_aliases) new_status in status -let rec eval_command ?(mode=LexiconAst.WithPreferences) status cmd = - !out cmd; +let rec eval_command ?(mode=L.WithPreferences) status cmd = +(* + let bmode = match mode with L.WithPreferences -> true | _ -> false in + Printf.eprintf "Include preferences: %b\n" bmode; +*) + let cmd = + match cmd with + | L.Interpretation (loc, dsc, (symbol, args), cic_appl_pattern) -> + let rec disambiguate = + function + CicNotationPt.ApplPattern l -> + CicNotationPt.ApplPattern (List.map disambiguate l) + | CicNotationPt.VarPattern id + when not + (List.exists + (function (CicNotationPt.IdentArg (_,id')) -> id'=id) args) + -> + let item = DisambiguateTypes.Id id in + begin try + match DisambiguateTypes.Environment.find item status.aliases with + L.Ident_alias (_, uri) -> + (try + CicNotationPt.NRefPattern + (NReference.reference_of_string uri) + with + NReference.IllFormedReference _ -> + CicNotationPt.UriPattern (UriManager.uri_of_string uri)) + | _ -> assert false + with Not_found -> + prerr_endline ("LexiconEngine.eval_command: domain item not found: " ^ + (DisambiguateTypes.string_of_domain_item item)); + dump_aliases prerr_endline "" status; + assert false + end + | p -> p + in + L.Interpretation + (loc, dsc, (symbol, args), disambiguate cic_appl_pattern) + | _-> cmd + in let notation_ids' = CicNotation.process_notation cmd in let status = { status with notation_ids = notation_ids' @ status.notation_ids } in match cmd with - | LexiconAst.Include (loc, baseuri, mode, fullpath) -> + | L.Include (loc, baseuri, mode, fullpath) -> let lexiconpath_rw, lexiconpath_r = LibraryMisc.lexicon_file_of_baseuri ~must_exist:false ~writable:true ~baseuri, @@ -108,33 +160,43 @@ let rec eval_command ?(mode=LexiconAst.WithPreferences) status cmd = let lexicon = LexiconMarshal.load_lexicon lexiconpath in let status = List.fold_left (eval_command ~mode) status lexicon in status - | LexiconAst.Alias (loc, spec) -> + | L.Alias (loc, spec) -> let diff = (*CSC: Warning: this code should be factorized with the corresponding code in DisambiguatePp *) match spec with - | LexiconAst.Ident_alias (id,uri) -> - [DisambiguateTypes.Id id, - (uri,(fun _ _ _-> CicUtil.term_of_uri(UriManager.uri_of_string uri)))] - | LexiconAst.Symbol_alias (symb, instance, desc) -> - [DisambiguateTypes.Symbol (symb,instance), - DisambiguateChoices.lookup_symbol_by_dsc symb desc] - | LexiconAst.Number_alias (instance,desc) -> - [DisambiguateTypes.Num instance, - DisambiguateChoices.lookup_num_by_dsc desc] + | L.Ident_alias (id,uri) -> + [DisambiguateTypes.Id id,spec] + | L.Symbol_alias (symb, instance, desc) -> + [DisambiguateTypes.Symbol (symb,instance),spec] + | L.Number_alias (instance,desc) -> + [DisambiguateTypes.Num instance,spec] in set_proof_aliases mode status diff - | LexiconAst.Interpretation (_, dsc, (symbol, _), cic_appl_pattern) as stm -> + | L.Interpretation (_, dsc, (symbol, _), _) as stm -> let status = add_lexicon_content [stm] status in let diff = - [DisambiguateTypes.Symbol (symbol, 0), - DisambiguateChoices.lookup_symbol_by_dsc symbol dsc] + try + [DisambiguateTypes.Symbol (symbol, 0), + L.Symbol_alias (symbol,0,dsc)] + with + DisambiguateChoices.Choice_not_found msg -> + prerr_endline (Lazy.force msg); + assert false in let status = set_proof_aliases mode status diff in status - | LexiconAst.Notation _ as stm -> add_lexicon_content [stm] status + | L.Notation _ as stm -> + add_lexicon_content [stm] status -let eval_command = eval_command ?mode:None +let eval_command status cmd = + if !debug then dump_aliases prerr_endline "before eval_command" status; + let status = eval_command ?mode:None status cmd in + if !debug then dump_aliases prerr_endline "after eval_command" status; + status -let set_proof_aliases = set_proof_aliases LexiconAst.WithPreferences - +let set_proof_aliases status aliases = + if !debug then dump_aliases prerr_endline "before set_proof_aliases" status; + let status = set_proof_aliases L.WithPreferences status aliases in + if !debug then dump_aliases prerr_endline "after set_proof_aliases" status; + status