X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FmatitaTypes.ml;h=d956af009239ed6f4d0fa4defd7d98ca19f6353d;hb=6a149d262dfcb03a7d57f8ecabf23b0b59e99f85;hp=8bd32bb23eac45b32f53f8f88f818bc391222f02;hpb=59977ba4636f09f6b2c22c6af9adc5257f2d8a46;p=helm.git

diff --git a/helm/matita/matitaTypes.ml b/helm/matita/matitaTypes.ml
index 8bd32bb23..d956af009 100644
--- a/helm/matita/matitaTypes.ml
+++ b/helm/matita/matitaTypes.ml
@@ -24,185 +24,11 @@
  *)
 
 open Printf
+open GrafiteTypes
 
   (** user hit the cancel button *)
 exception Cancel
 
-  (** statement invoked in the wrong context (e.g. tactic with no ongoing proof)
-   *)
-exception Statement_error of string
-let statement_error msg = raise (Statement_error msg)
-
-exception Command_error of string
-let command_error msg = raise (Command_error msg)
-
-  (** parameters are: option name, error message *)
-exception Option_error of string * string
-
-exception Unbound_identifier of string
-
-type incomplete_proof = {
-  proof: ProofEngineTypes.proof;
-  stack: Continuationals.Stack.t;
-}
-
-type proof_status =
-  | No_proof
-  | Incomplete_proof of incomplete_proof
-  | Proof of ProofEngineTypes.proof
-  | Intermediate of Cic.metasenv
-      (* Status in which the proof could be while it is being processed by the
-      * engine. No status entering/exiting the engine could be in it. *)
-
-module StringMap = Map.Make (String)
-
-type option_value =
-  | String of string
-  | Int of int
-type options = option_value StringMap.t
-let no_options = StringMap.empty
-
-type ast_command = (CicNotationPt.term, GrafiteAst.obj) GrafiteAst.command
-type moo = ast_command list * GrafiteAst.metadata list
-
-type status = {
-  aliases: DisambiguateTypes.environment;
-  multi_aliases: DisambiguateTypes.multiple_environment;
-  moo_content_rev: moo;
-  proof_status: proof_status;
-  options: options;
-  objects: (UriManager.uri * string) list;
-  coercions: UriManager.uri list;
-  notation_ids: CicNotation.notation_id list;
-}
-
-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
-          { incomplete_proof with proof = (uri, metasenv, proof, ty) }
-    | Intermediate _ -> Intermediate metasenv 
-    | Proof _ -> assert false
-  in
-  { status with proof_status = proof_status }
-
-let dump_status status = 
-  MatitaLog.message "status.aliases:\n";
-  MatitaLog.message "status.proof_status:"; 
-  MatitaLog.message
-    (match status.proof_status with
-    | No_proof -> "no proof\n"
-    | Incomplete_proof _ -> "incomplete proof\n"
-    | Proof _ -> "proof\n"
-    | Intermediate _ -> "Intermediate\n");
-  MatitaLog.message "status.options\n";
-  StringMap.iter (fun k v -> 
-    let v = 
-      match v with
-      | String s -> s
-      | Int i -> string_of_int i
-    in
-    MatitaLog.message (k ^ "::=" ^ v)) status.options;
-  MatitaLog.message "status.coercions\n";
-  MatitaLog.message "status.objects:\n";
-  List.iter 
-    (fun (u,_) -> 
-      MatitaLog.message (UriManager.string_of_uri u)) status.objects 
-  
-let get_option status name =
-  try
-    StringMap.find name status.options
-  with Not_found -> raise (Option_error (name, "not found"))
-
-let get_string_option status name =
-  match get_option status name with
-  | String s -> s
-  | _ -> raise (Option_error (name, "not a string value"))
-
-let set_option status name value =
-  let mangle_dir s =
-    let s = Str.global_replace (Str.regexp "//+") "/" s in
-    let s = Str.global_replace (Str.regexp "/$") "" s in
-    s
-  in
-  let types =
-    [ "baseuri", (`String, mangle_dir);
-      "basedir", (`String, mangle_dir);
-    ]
-  in
-  let ty_and_mangler =
-    try
-      List.assoc name types
-    with Not_found -> command_error (sprintf "Unknown option \"%s\"" name)
-  in
-  let value =
-    match ty_and_mangler with
-    | `String, f -> String (f value)
-    | `Int, f ->
-        (try
-          Int (int_of_string (f value))
-        with Failure _ ->
-          command_error (sprintf "Not an integer value \"%s\"" value))
-  in
-  if StringMap.mem name status.options && name = "baseuri" then
-    command_error "Redefinition of 'baseuri' is forbidden."
-  else
-    { status with options = StringMap.add name value status.options }
-
-let add_moo_content cmds status =
-  let content, metadata = status.moo_content_rev in
-  let content' =
-    List.fold_right
-      (fun cmd acc ->
-(*         prerr_endline ("adding to moo command: " ^ GrafiteAstPp.pp_command cmd); *)
-        match cmd with
-        | GrafiteAst.Interpretation _
-        | GrafiteAst.Default _ ->
-            if List.mem cmd content then acc
-            else cmd :: acc
-        | GrafiteAst.Alias _ -> (* move Alias as the last inserted one *)
-            cmd :: (List.filter ((<>) cmd) acc)
-        | _ -> cmd :: acc)
-      cmds content
-  in
-(*   prerr_endline ("new moo content: " ^ String.concat " " (List.map
-    GrafiteAstPp.pp_command content')); *)
-  { status with moo_content_rev = content', metadata }
-
-let add_moo_metadata new_metadata status =
-  let content, metadata = status.moo_content_rev in
-  let metadata' =
-    List.fold_left
-      (fun acc m ->
-        match m with
-        | GrafiteAst.Dependency buri ->
-            let is_self = (* self dependency *)
-              try
-                get_string_option status "baseuri" = buri
-              with Option_error _ -> false  (* baseuri not yet set *)
-            in
-            if is_self
-              || List.exists (GrafiteAst.eq_metadata m) metadata (* duplicate *)
-            then acc
-            else m :: acc
-        | _ -> m :: acc)
-      metadata new_metadata
-  in
-  { status with moo_content_rev = content, metadata' }
-
-  (* subset of MatitaConsole.console methods needed by MatitaInterpreter *)
-class type console =
-  object
-    method clear : unit -> unit
-    method echo_error : string -> unit
-    method echo_message : string -> unit
-    method wrap_exn : 'a. (unit -> 'a) -> 'a option
-    method choose_uri : string list -> string
-    method show : ?msg:string -> unit -> unit
-  end
-
 type abouts =
   [ `Blank
   | `Current_proof
@@ -244,48 +70,3 @@ class type mathViewer =
     method show_uri_list:
       ?reuse:bool -> entry:mathViewer_entry -> UriManager.uri list -> unit
   end
-  
-let qualify status name = get_string_option status "baseuri" ^ "/" ^ name
-
-let get_current_proof status =
-  match status.proof_status with
-  | Incomplete_proof { proof = p } -> p
-  | _ -> statement_error "no ongoing proof"
-
-let get_proof_metasenv status =
-  match status.proof_status with
-  | No_proof -> []
-  | Proof (_, metasenv, _, _)
-  | Incomplete_proof { proof = (_, metasenv, _, _) }
-  | Intermediate metasenv ->
-      metasenv
-
-let get_proof_context status goal =
-  match status.proof_status with
-  | 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, _, _) } ->
-      let (_, _, conclusion) = CicUtil.lookup_meta goal metasenv in
-      conclusion
-  | _ -> statement_error "no ongoing proof"
-
-let get_stack status =
-  match status.proof_status with
-  | Incomplete_proof p -> p.stack
-  | Proof _ -> Continuationals.Stack.empty
-  | _ -> assert false
-
-let set_stack stack status =
-  match status.proof_status with
-  | Incomplete_proof p ->
-      { status with proof_status = Incomplete_proof { p with stack = stack } }
-  | Proof _ ->
-      assert (Continuationals.Stack.is_empty stack);
-      status
-  | _ -> assert false
-