X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2Fcomponents%2Fgrafite_engine%2FgrafiteEngine.ml;h=b471bece3e44ad26548f5e432ddb793232319490;hb=70aa6dc959dc1d49f751c183367c3b73393c938b;hp=b4a20c20259347bca72f16a95505fe989967664a;hpb=729e08f5fb86b3ffee460fda4577b024ab5888aa;p=helm.git diff --git a/matita/components/grafite_engine/grafiteEngine.ml b/matita/components/grafite_engine/grafiteEngine.ml index b4a20c202..b471bece3 100644 --- a/matita/components/grafite_engine/grafiteEngine.ml +++ b/matita/components/grafite_engine/grafiteEngine.ml @@ -25,9 +25,7 @@ (* $Id$ *) -exception Drop (* mo file name, ma file name *) -exception IncludedFileNotCompiled of string * string exception NMacro of GrafiteAst.loc * GrafiteAst.nmacro type 'a disambiguator_input = string * int * 'a @@ -36,65 +34,6 @@ type options = { do_heavy_checks: bool ; } -let concat_nuris uris nuris = - match uris,nuris with - | `New uris, `New nuris -> `New (nuris@uris) - | _ -> assert false -;; - -type eval_ast = - {ea_go: - 'term 'lazy_term 'reduction 'obj 'ident. - - disambiguate_command: - (GrafiteTypes.status -> - (GrafiteAst.command) disambiguator_input -> - GrafiteTypes.status * GrafiteAst.command) -> - - ?do_heavy_checks:bool -> - GrafiteTypes.status -> - (('term, 'lazy_term, 'reduction, 'obj, 'ident) GrafiteAst.statement) - disambiguator_input -> - GrafiteTypes.status * [`Old of UriManager.uri list | `New of NUri.uri list] - } - -type 'a eval_command = - {ec_go: 'term 'obj. - disambiguate_command: - (GrafiteTypes.status -> GrafiteAst.command disambiguator_input -> - GrafiteTypes.status * GrafiteAst.command) -> - options -> GrafiteTypes.status -> - GrafiteAst.command disambiguator_input -> - GrafiteTypes.status * [`Old of UriManager.uri list | `New of NUri.uri list] - } - -type 'a eval_comment = - {ecm_go: 'term 'lazy_term 'reduction_kind 'obj 'ident. - disambiguate_command: - (GrafiteTypes.status -> GrafiteAst.command disambiguator_input -> - GrafiteTypes.status * GrafiteAst.command) -> - options -> GrafiteTypes.status -> - (('term,'lazy_term,'reduction_kind,'obj,'ident) GrafiteAst.comment) disambiguator_input -> - GrafiteTypes.status * [`Old of UriManager.uri list | `New of NUri.uri list] - } - -type 'a eval_executable = - {ee_go: 'term 'lazy_term 'reduction 'obj 'ident. - - disambiguate_command: - (GrafiteTypes.status -> - GrafiteAst.command disambiguator_input -> - GrafiteTypes.status * GrafiteAst.command) -> - - options -> - GrafiteTypes.status -> - (('term, 'lazy_term, 'reduction, 'obj, 'ident) GrafiteAst.code) disambiguator_input -> - GrafiteTypes.status * [`Old of UriManager.uri list | `New of NUri.uri list] - } - -type 'a eval_from_moo = - { efm_go: GrafiteTypes.status -> string -> GrafiteTypes.status } - let basic_eval_unification_hint (t,n) status = NCicUnifHint.add_user_provided_hint status t n ;; @@ -106,10 +45,8 @@ let inject_unification_hint = = let t = refresh_uri_in_term t in basic_eval_unification_hint (t,n) in - NCicLibrary.Serializer.register#run "unification_hints" - object(_ : 'a NCicLibrary.register_type) - method run = basic_eval_unification_hint - end + GrafiteTypes.Serializer.register#run "unification_hints" + basic_eval_unification_hint ;; let eval_unification_hint status t n = @@ -120,7 +57,7 @@ let eval_unification_hint status t n = let status = basic_eval_unification_hint (t,n) status in let dump = inject_unification_hint (t,n)::status#dump in let status = status#set_dump dump in - status,`New [] + status ;; let basic_index_obj l status = @@ -143,10 +80,7 @@ let record_index_obj = (fun ks,v -> List.map refresh_uri_in_term ks, refresh_uri_in_term v) l) in - NCicLibrary.Serializer.register#run "index_obj" - object(_ : 'a NCicLibrary.register_type) - method run = aux - end + GrafiteTypes.Serializer.register#run "index_obj" aux ;; let compute_keys status uri height kind = @@ -227,10 +161,7 @@ let record_index_eq = ~refresh_uri_in_term = index_eq (NCicLibrary.refresh_uri uri) in - NCicLibrary.Serializer.register#run "index_eq" - object(_ : 'a NCicLibrary.register_type) - method run = basic_index_eq - end + GrafiteTypes.Serializer.register#run "index_eq" basic_index_eq ;; let index_eq_for_auto status uri = @@ -259,28 +190,14 @@ let inject_constraint = let u2 = refresh_uri_in_universe u2 in basic_eval_add_constraint (u1,u2) in - NCicLibrary.Serializer.register#run "constraints" - object(_:'a NCicLibrary.register_type) - method run = basic_eval_add_constraint - end + GrafiteTypes.Serializer.register#run "constraints" basic_eval_add_constraint ;; let eval_add_constraint status u1 u2 = let status = basic_eval_add_constraint (u1,u2) status in let dump = inject_constraint (u1,u2)::status#dump in let status = status#set_dump dump in - status,`New [] -;; - -let eval_ng_punct (_text, _prefix_len, punct) = - match punct with - | GrafiteAst.Dot _ -> NTactics.dot_tac - | GrafiteAst.Semicolon _ -> fun x -> x - | GrafiteAst.Branch _ -> NTactics.branch_tac ~force:false - | GrafiteAst.Shift _ -> NTactics.shift_tac - | GrafiteAst.Pos (_,l) -> NTactics.pos_tac l - | GrafiteAst.Wildcard _ -> NTactics.wildcard_tac - | GrafiteAst.Merge _ -> NTactics.merge_tac + status ;; let eval_ng_tac tac = @@ -374,11 +291,24 @@ let subst_metasenv_and_fix_names status = ;; -let rec eval_ncommand opts status (text,prefix_len,cmd) = +let rec eval_ncommand ~include_paths opts status (text,prefix_len,cmd) = match cmd with + | GrafiteAst.Include (loc, mode, fname) -> + let _root, baseuri, _fullpath, _rrelpath = + Librarian.baseuri_of_script ~include_paths fname in + let status,obj = + GrafiteTypes.Serializer.require ~baseuri:(NUri.uri_of_string baseuri) + status in + let status = status#set_dump (obj::status#dump) in + assert false; (* mode must be passed to GrafiteTypes.Serializer.require + somehow *) + status | GrafiteAst.UnificationHint (loc, t, n) -> eval_unification_hint status t n | GrafiteAst.NCoercion (loc, name, t, ty, source, target) -> + let status, composites = NCicCoercDeclaration.eval_ncoercion status name t ty source target + in + LexiconSync.add_aliases_for_objs status composites | GrafiteAst.NQed loc -> if status#ng_mode <> `ProofMode then raise (GrafiteTypes.Command_error "Not in proof mode") @@ -411,7 +341,6 @@ let rec eval_ncommand opts status (text,prefix_len,cmd) = | _ -> obj_kind in let obj = uri,height,[],[],obj_kind in - prerr_endline ("pp new obj \n"^NCicPp.ppobj obj); let old_status = status in let status = NCicLibrary.add_obj status obj in let index_obj = @@ -449,28 +378,29 @@ let rec eval_ncommand opts status (text,prefix_len,cmd) = let uris = uri::List.rev uris_rev in *) let status = status#set_ng_mode `CommandMode in - let status = LexiconSync.add_aliases_for_objs status (`New [uri]) in - let status,uris = + let status = LexiconSync.add_aliases_for_objs status [uri] in + let status = List.fold_left - (fun (status,uris) boxml -> + (fun status boxml -> try - let nstatus,nuris = - eval_ncommand opts status + let nstatus = + eval_ncommand ~include_paths opts status ("",0,GrafiteAst.NObj (HExtlib.dummy_floc,boxml)) in if nstatus#ng_mode <> `CommandMode then begin (*HLog.warn "error in generating projection/eliminator";*) - status, uris + assert(status#ng_mode = `CommandMode); + status end else - nstatus, concat_nuris uris nuris + nstatus with | MultiPassDisambiguator.DisambiguationError _ | NCicTypeChecker.TypeCheckerFailure _ -> (*HLog.warn "error in generating projection/eliminator";*) - status,uris - ) (status,`New [] (* uris *)) boxml in + status + ) status boxml in let _,_,_,_,nobj = obj in let status = match nobj with NCic.Inductive (is_ind,leftno,[it],_) -> @@ -485,9 +415,10 @@ let rec eval_ncommand opts status (text,prefix_len,cmd) = (snd (NCicElim.ast_of_sort outsort))) is_ind it leftno outsort status status#baseuri in let _,_,menv,_,_ = invobj in - fst (match menv with - [] -> eval_ncommand opts status ("",0,GrafiteAst.NQed Stdpp.dummy_loc) - | _ -> status,`New [])) + (match menv with + [] -> eval_ncommand ~include_paths opts status + ("",0,GrafiteAst.NQed Stdpp.dummy_loc) + | _ -> status)) (* XXX *) with _ -> (*HLog.warn "error in generating inversion principle"; *) let status = status#set_ng_mode `CommandMode in status) @@ -505,9 +436,9 @@ let rec eval_ncommand opts status (text,prefix_len,cmd) = (fun (name,is_coercion,arity) -> if is_coercion then Some(name,leftno,arity) else None) fields | _ -> [] in - let status,uris = + let status = List.fold_left - (fun (status,uris) (name,cpos,arity) -> + (fun status (name,cpos,arity) -> try let metasenv,subst,status,t = GrafiteDisambiguate.disambiguate_nterm None status [] [] [] @@ -518,14 +449,13 @@ let rec eval_ncommand opts status (text,prefix_len,cmd) = basic_eval_and_record_ncoercion_from_t_cpos_arity status (name,t,cpos,arity) in - let uris = concat_nuris nuris uris in - status, uris + LexiconSync.add_aliases_for_objs status nuris with MultiPassDisambiguator.DisambiguationError _-> HLog.warn ("error in generating coercion: "^name); - status, uris) - (status,uris) coercions + status) + status coercions in - status,uris + status with exn -> NCicLibrary.time_travel old_status; @@ -560,7 +490,7 @@ let rec eval_ncommand opts status (text,prefix_len,cmd) = let status = status#set_stack ninitial_stack in let status = subst_metasenv_and_fix_names status in let status = status#set_ng_mode `ProofMode in - eval_ncommand opts status ("",0,GrafiteAst.NQed Stdpp.dummy_loc) + eval_ncommand ~include_paths opts status ("",0,GrafiteAst.NQed Stdpp.dummy_loc) | GrafiteAst.NObj (loc,obj) -> if status#ng_mode <> `CommandMode then raise (GrafiteTypes.Command_error "Not in command mode") @@ -576,8 +506,8 @@ let rec eval_ncommand opts status (text,prefix_len,cmd) = let status = status#set_ng_mode `ProofMode in (match nmenv with [] -> - eval_ncommand opts status ("",0,GrafiteAst.NQed Stdpp.dummy_loc) - | _ -> status,`New []) + eval_ncommand ~include_paths opts status ("",0,GrafiteAst.NQed Stdpp.dummy_loc) + | _ -> status) | GrafiteAst.NDiscriminator (_,_) -> assert false (*(loc, indty) -> if status#ng_mode <> `CommandMode then raise (GrafiteTypes.Command_error "Not in command mode") @@ -593,9 +523,9 @@ let rec eval_ncommand opts status (text,prefix_len,cmd) = let status,obj = NDestructTac.mk_discriminator it status in let _,_,menv,_,_ = obj in (match menv with - [] -> eval_ncommand opts status ("",0,GrafiteAst.NQed Stdpp.dummy_loc) + [] -> eval_ncommand ~include_paths opts status ("",0,GrafiteAst.NQed Stdpp.dummy_loc) | _ -> prerr_endline ("Discriminator: non empty metasenv"); - status, `New []) *) + status, []) *) | GrafiteAst.NInverter (loc, name, indty, selection, sort) -> if status#ng_mode <> `CommandMode then raise (GrafiteTypes.Command_error "Not in command mode") @@ -625,51 +555,94 @@ let rec eval_ncommand opts status (text,prefix_len,cmd) = let _,_,menv,_,_ = obj in (match menv with [] -> - eval_ncommand opts status ("",0,GrafiteAst.NQed Stdpp.dummy_loc) + eval_ncommand ~include_paths opts status ("",0,GrafiteAst.NQed Stdpp.dummy_loc) | _ -> assert false) | GrafiteAst.NUnivConstraint (loc,u1,u2) -> eval_add_constraint status [`Type,u1] [`Type,u2] -;; - -let rec eval_command = {ec_go = fun ~disambiguate_command opts status -(text,prefix_len,cmd) -> - let status,cmd = disambiguate_command status (text,prefix_len,cmd) in - let status,uris = - match cmd with - | GrafiteAst.Drop loc -> raise Drop - | GrafiteAst.Include (loc, mode, new_or_old, baseuri) -> - (* Old Include command is not recursive; new one is *) + (* ex lexicon commands *) + | GrafiteAst.Interpretation (loc, dsc, (symbol, args), cic_appl_pattern) -> + let rec disambiguate = + function + NotationPt.ApplPattern l -> + NotationPt.ApplPattern (List.map disambiguate l) + | NotationPt.VarPattern id + when not + (List.exists + (function (NotationPt.IdentArg (_,id')) -> id'=id) args) + -> + let item = DisambiguateTypes.Id id in + begin try + match DisambiguateTypes.Environment.find item status#lstatus.LexiconTypes.aliases with + GrafiteAst.Ident_alias (_, uri) -> + NotationPt.NRefPattern (NReference.reference_of_string uri) + | _ -> assert false + with Not_found -> + prerr_endline + ("LexiconEngine.eval_command: domain item not found: " ^ + (DisambiguateTypes.string_of_domain_item item)); + LexiconEngine.dump_aliases prerr_endline "" status; + raise + (Failure + ((DisambiguateTypes.string_of_domain_item item) ^ " not found")) + end + | p -> p + in + let cic_appl_pattern = disambiguate cic_appl_pattern in let status = - if new_or_old = `OldAndNew then - let moopath_rw, moopath_r = - LibraryMisc.obj_file_of_baseuri - ~must_exist:false ~baseuri ~writable:true, - LibraryMisc.obj_file_of_baseuri - ~must_exist:false ~baseuri ~writable:false in - let moopath = - if Sys.file_exists moopath_r then moopath_r else - if Sys.file_exists moopath_rw then moopath_rw else - raise (IncludedFileNotCompiled (moopath_rw,baseuri)) - in - eval_from_moo.efm_go status moopath - else - status + Interpretations.add_interpretation status + dsc (symbol, args) cic_appl_pattern in + let mode = GrafiteAst.WithPreferences (*assert false*) in (* VEDI SOTTO *) + let diff = + [DisambiguateTypes.Symbol (symbol, 0), + GrafiteAst.Symbol_alias (symbol,0,dsc)] in + let status = + LexiconEngine.set_proof_aliases status ~implicit_aliases:false mode diff in + status + (*assert false*) (* MANCA SALVATAGGIO SU DISCO CHE DEVE TENERE IN CONTO + IL MODE WithPreference/WithOutPreferences*) + | GrafiteAst.Notation (loc, dir, l1, associativity, precedence, l2) -> + let l1 = + CicNotationParser.check_l1_pattern + l1 (dir = Some `RightToLeft) precedence associativity + in let status = - NCicLibrary.Serializer.require ~baseuri:(NUri.uri_of_string baseuri) - status in + if dir <> Some `RightToLeft then + GrafiteParser.extend status l1 + (fun env loc -> + NotationPt.AttributedTerm + (`Loc loc,TermContentPres.instantiate_level2 env l2)) + else status + in let status = - GrafiteTypes.add_moo_content - [GrafiteAst.Include (loc,mode,`New,baseuri)] status + if dir <> Some `LeftToRight then + let status = TermContentPres.add_pretty_printer status l2 l1 in + status + else + status in - status,`New [] - | GrafiteAst.Print (_,_) -> status,`New [] - | GrafiteAst.Set (loc, name, value) -> status, `New [] - in - status,uris +(* assert false (* MANCA SALVATAGGIO SU DISCO *) *) + status (* capire [] XX *) + | GrafiteAst.Alias (loc, spec) -> + let diff = + (*CSC: Warning: this code should be factorized with the corresponding + code in DisambiguatePp *) + match spec with + | GrafiteAst.Ident_alias (id,uri) -> + [DisambiguateTypes.Id id,spec] + | GrafiteAst.Symbol_alias (symb, instance, desc) -> + [DisambiguateTypes.Symbol (symb,instance),spec] + | GrafiteAst.Number_alias (instance,desc) -> + [DisambiguateTypes.Num instance,spec] + in + let mode = assert false in (* VEDI SOPRA *) + LexiconEngine.set_proof_aliases status ~implicit_aliases:false mode diff; + assert false (* MANCA SALVATAGGIO SU DISCO *) +;; -} and eval_executable = {ee_go = fun ~disambiguate_command - opts status (text,prefix_len,ex) -> +let eval_comment opts status (text,prefix_len,c) = status + +let rec eval_executable ~include_paths opts status (text,prefix_len,ex) = match ex with | GrafiteAst.NTactic (_(*loc*), tacl) -> if status#ng_mode <> `ProofMode then @@ -682,47 +655,18 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status subst_metasenv_and_fix_names status) status tacl in - status,`New [] - | GrafiteAst.Command (_, cmd) -> - eval_command.ec_go ~disambiguate_command opts status (text,prefix_len,cmd) + status | GrafiteAst.NCommand (_, cmd) -> - eval_ncommand opts status (text,prefix_len,cmd) + eval_ncommand ~include_paths opts status (text,prefix_len,cmd) | GrafiteAst.NMacro (loc, macro) -> raise (NMacro (loc,macro)) -} and eval_from_moo = {efm_go = fun status fname -> - let ast_of_cmd cmd = - ("",0,GrafiteAst.Executable (HExtlib.dummy_floc, - GrafiteAst.Command (HExtlib.dummy_floc, - cmd))) - in - let moo = GrafiteMarshal.load_moo fname in - List.fold_left - (fun status ast -> - let ast = ast_of_cmd ast in - let status,lemmas = - eval_ast.ea_go - ~disambiguate_command:(fun status (_,_,cmd) -> status,cmd) - status ast - in - assert (lemmas=`New []); - status) - status moo -} and eval_ast = {ea_go = fun ~disambiguate_command -?(do_heavy_checks=false) status -(text,prefix_len,st) --> +and eval_ast ~include_paths ?(do_heavy_checks=false) status (text,prefix_len,st) += let opts = { do_heavy_checks = do_heavy_checks ; } in match st with | GrafiteAst.Executable (_,ex) -> - eval_executable.ee_go ~disambiguate_command - opts status (text,prefix_len,ex) + eval_executable ~include_paths opts status (text,prefix_len,ex) | GrafiteAst.Comment (_,c) -> - eval_comment.ecm_go ~disambiguate_command opts status (text,prefix_len,c) -} and eval_comment = { ecm_go = fun ~disambiguate_command opts status (text,prefix_len,c) -> - status, `New [] -} + eval_comment opts status (text,prefix_len,c) ;; - - -let eval_ast = eval_ast.ea_go