X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FmatitaTypes.ml;h=1e5957ae8e91ae7862f84b78e026b209c2510210;hb=e6b28085c97ae7b9bd3f3262b105f6b84f42b047;hp=4e81148c34f817e492b12f6c7d472e1c9f131b53;hpb=481992ea591bf53cba758a96e7d42e9cdce7e129;p=helm.git

diff --git a/helm/matita/matitaTypes.ml b/helm/matita/matitaTypes.ml
index 4e81148c3..1e5957ae8 100644
--- a/helm/matita/matitaTypes.ml
+++ b/helm/matita/matitaTypes.ml
@@ -1,4 +1,4 @@
-(* Copyright (C) 2004, HELM Team.
+(* Copyright (C) 2004-2005, HELM Team.
  * 
  * This file is part of HELM, an Hypertextual, Electronic
  * Library of Mathematics, developed at the Computer Science
@@ -23,116 +23,165 @@
  * http://helm.cs.unibo.it/
  *)
 
-exception Not_implemented of string
-let not_implemented feature = raise (Not_implemented feature)
-
-  (** exceptions whose content should be presented to the user *)
-exception Failure of string
-let error s = raise (Failure s)
-let warning s = prerr_endline ("MATITA WARNING:\t" ^ s)
-let debug_print s =
-  if BuildTimeConf.debug then prerr_endline ("MATITA DEBUG:\t" ^ s)
-
-exception No_proof  (** no current proof is available *)
-
-let untitled_con_uri = UriManager.uri_of_string "cic:/untitled.con"
-let untitled_def_uri = UriManager.uri_of_string "cic:/untitled.def"
-
-class type observer =
-  (* "observer" pattern *)
-  object
-    method update: unit -> unit
-  end
-
-class subject =
-  (* "observer" pattern *)
-  object
-    val mutable observers = []
-    method attach (o: observer) = observers <- o :: observers
-    method detach (o: observer) =
-      observers <- List.filter (fun o' -> o' != o) observers
-    method notify () = List.iter (fun o -> o#update ()) observers
-  end
-
-class type command =
-  (* "command" pattern *)
-  object
-    method execute: unit -> unit
-    method undo: unit -> unit
-  end
-
-class type parserr =  (* "parser" is a keyword :-( *)
-  object
-    method parseTerm:     char Stream.t -> DisambiguateTypes.term
-    method parseTactic:   char Stream.t -> DisambiguateTypes.tactic
-    method parseTactical: char Stream.t -> DisambiguateTypes.tactical
-    method parseCommand:  char Stream.t -> DisambiguateTypes.command
-    method parseScript:   char Stream.t -> DisambiguateTypes.script
-  end
-
-class type disambiguator =
+open Printf
+
+  (** 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 proof_status =
+  | No_proof
+  | Incomplete_proof of ProofEngineTypes.status
+  | 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 status = {
+  aliases : DisambiguateTypes.environment;
+  moo_content_rev : string list;
+  proof_status : proof_status;
+  options : options;
+  objects : (UriManager.uri * string) list;
+  notation_ids: CicNotation.notation_id list;
+}
+
+let dump_status status = 
+  MatitaLog.message "status.aliases:\n";
+  MatitaLog.message
+  (DisambiguatePp.pp_environment 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 }
+
+  (* subset of MatitaConsole.console methods needed by MatitaInterpreter *)
+class type console =
   object
-    method parserr: parserr
-    method setParserr: parserr -> unit
-
-    method env: DisambiguateTypes.environment
-    method setEnv: DisambiguateTypes.environment -> unit
-
-      (* TODO Zack: as long as matita doesn't support MDI inteface,
-      * disambiguateTerm will return a single term *)
-      (** @param env defaults to self#env *)
-    method disambiguateTerm:
-      ?context:Cic.context -> ?metasenv:Cic.metasenv ->
-      ?env:DisambiguateTypes.environment ->
-        char Stream.t ->
-          (DisambiguateTypes.environment * Cic.metasenv * Cic.term)
-    method disambiguateTermAst:
-      ?context:Cic.context -> ?metasenv:Cic.metasenv ->
-      ?env:DisambiguateTypes.environment ->
-        DisambiguateTypes.term ->
-          (DisambiguateTypes.environment * Cic.metasenv * Cic.term)
+    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
 
-class type proofStatus =
+type abouts =
+  [ `Blank
+  | `Current_proof
+  | `Us
+  ]
+  
+type mathViewer_entry =
+  [ `About of abouts  (* current proof *)
+  | `Check of string (* term *)
+  | `Cic of Cic.term * Cic.metasenv
+  | `Dir of string (* "directory" in cic uris namespace *)
+  | `Uri of UriManager.uri (* cic object uri *)
+  | `Whelp of string * UriManager.uri list (* query and results *)
+  ]
+
+let string_of_entry = function
+  | `About `Blank -> "about:blank"
+  | `About `Current_proof -> "about:proof"
+  | `About `Us -> "about:us"
+  | `Check _ -> "check:"
+  | `Cic (_, _) -> "term:"
+  | `Dir uri -> uri
+  | `Uri uri -> UriManager.string_of_uri uri
+  | `Whelp (query, _) -> query
+
+let entry_of_string = function
+  | "about:blank" -> `About `Blank
+  | "about:proof" -> `About `Current_proof
+  | "about:us"    -> `About `Us
+  | _ ->  (* only about entries supported ATM *)
+      raise (Invalid_argument "entry_of_string")
+
+class type mathViewer =
   object
-    inherit subject
-
-      (** {3 properties} *)
-
-    method proof: ProofEngineTypes.proof
-    method setProof: ProofEngineTypes.proof -> unit
-
-    method goal: ProofEngineTypes.goal option
-    method setGoal: ProofEngineTypes.goal option -> unit
-
-      (** @raise MatitaTypes.No_proof *)
-    method status: ProofEngineTypes.status (* proof, goal *)
-    method setStatus: ProofEngineTypes.status -> unit
-
-      (** {3 actions} *)
-
-    (** return a pair of "xml" (as defined in Xml module) representing the *
-     * current proof type and body, respectively *)
-    method toXml: Xml.token Stream.t * Xml.token Stream.t
-    method toString: string
+    (** @param reuse if set reused last opened cic browser otherwise 
+     *  opens a new one. default is false
+     *)
+    method show_entry: ?reuse:bool -> mathViewer_entry -> unit
+    method show_uri_list:
+      ?reuse:bool -> entry:mathViewer_entry -> UriManager.uri list -> unit
   end
-
-class type proof =
-  object
-      (** {3 status} *)
-    method status: proofStatus
-    method setStatus: proofStatus -> unit
-  end
-
-(** {2 shorthands} *)
-
-type namer = ProofEngineTypes.mk_fresh_name_type
-
-type choose_uris_callback =
-  selection_mode:[`MULTIPLE|`SINGLE] ->
-  ?title:string -> ?msg:string -> ?nonvars_button:bool ->
-  string list ->
-    string list
-
-type choose_interp_callback = (string * string) list list -> int list
-
+