X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fgrafite_engine%2FgrafiteTypes.ml;h=fe872c128283332a31d83037693e9e9027b89bda;hb=61a2faa2694907757dd617175e0144705e79d65a;hp=0c02e1b6c38d86fdfcfb69ca51283dab32c5c677;hpb=55b82bd235d82ff7f0a40d980effe1efde1f5073;p=helm.git diff --git a/helm/software/components/grafite_engine/grafiteTypes.ml b/helm/software/components/grafite_engine/grafiteTypes.ml index 0c02e1b6c..fe872c128 100644 --- a/helm/software/components/grafite_engine/grafiteTypes.ml +++ b/helm/software/components/grafite_engine/grafiteTypes.ml @@ -57,18 +57,20 @@ type status = { options: options; objects: UriManager.uri list; coercions: UriManager.uri list; + universe:Universe.universe; } let get_current_proof status = match status.proof_status with | Incomplete_proof { proof = p } -> p + | Proof p -> p | _ -> raise (Statement_error "no ongoing proof") let get_proof_metasenv status = match status.proof_status with | No_proof -> [] - | Proof (_, metasenv, _, _) - | Incomplete_proof { proof = (_, metasenv, _, _) } + | Proof (_, metasenv, _, _, _) + | Incomplete_proof { proof = (_, metasenv, _, _, _) } | Intermediate metasenv -> metasenv @@ -91,11 +93,11 @@ let set_metasenv metasenv status = let proof_status = match status.proof_status with | No_proof -> Intermediate metasenv - | Incomplete_proof ({ proof = (uri, _, proof, ty) } as incomplete_proof) -> + | Incomplete_proof ({ proof = (uri, _, proof, ty, attrs) } as incomplete_proof) -> Incomplete_proof - { incomplete_proof with proof = (uri, metasenv, proof, ty) } + { incomplete_proof with proof = (uri, metasenv, proof, ty, attrs) } | Intermediate _ -> Intermediate metasenv - | Proof (_, metasenv', _, _) -> + | Proof (_, metasenv', _, _, _) -> assert (metasenv = metasenv'); status.proof_status in @@ -103,14 +105,14 @@ let set_metasenv metasenv status = let get_proof_context status goal = match status.proof_status with - | Incomplete_proof { proof = (_, metasenv, _, _) } -> + | Incomplete_proof { proof = (_, metasenv, _, _, _) } -> let (_, context, _) = CicUtil.lookup_meta goal metasenv in context | _ -> [] let get_proof_conclusion status goal = match status.proof_status with - | Incomplete_proof { proof = (_, metasenv, _, _) } -> + | Incomplete_proof { proof = (_, metasenv, _, _, _) } -> let (_, _, conclusion) = CicUtil.lookup_meta goal metasenv in conclusion | _ -> raise (Statement_error "no ongoing proof") @@ -122,7 +124,9 @@ let add_moo_content cmds status = (fun cmd acc -> (* prerr_endline ("adding to moo command: " ^ GrafiteAstPp.pp_command cmd); *) match cmd with - | GrafiteAst.Default _ -> + | GrafiteAst.Default _ + | GrafiteAst.Index _ + | GrafiteAst.Coercion _ -> if List.mem cmd content then acc else cmd :: acc | _ -> cmd :: acc)