- moved command as sub-entries of tactical grammars (as per tactics)

[helm.git] / helm / ocaml / cic_disambiguation / disambiguateTypes.ml

diff --git a/helm/ocaml/cic_disambiguation/disambiguateTypes.ml b/helm/ocaml/cic_disambiguation/disambiguateTypes.ml
index 522a08dc0adf4140ae77f6a5826f0bcb1df34b87..a5e0f96f838b48b1e04cacc3aa2cae96ad11d8f8 100644 (file)
--- a/helm/ocaml/cic_disambiguation/disambiguateTypes.ml
+++ b/helm/ocaml/cic_disambiguation/disambiguateTypes.ml
@@ -1,3 +1,31 @@
+(* Copyright (C) 2004, HELM Team.
+ * 
+ * This file is part of HELM, an Hypertextual, Electronic
+ * Library of Mathematics, developed at the Computer Science
+ * Department, University of Bologna, Italy.
+ * 
+ * HELM is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * HELM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HELM; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+ * MA  02111-1307, USA.
+ * 
+ * For details, see the HELM World-Wide-Web page,
+ * http://helm.cs.unibo.it/
+ *)
+
+type term = CicAst.term
+type tactic = (term, string) TacticAst.tactic
+type tactical = (term, string) TacticAst.tactical
 
 type domain_item =
  | Id of string               (* literal *)
@@ -10,7 +38,7 @@ module OrderedDomain =
     let compare = Pervasives.compare
   end
 
-module Domain = Set.Make (OrderedDomain)
+(* module Domain = Set.Make (OrderedDomain) *)
 module Environment = Map.Make (OrderedDomain)
 
 type codomain_item =
@@ -22,15 +50,14 @@ and environment = codomain_item Environment.t
 
 module type Callbacks =
   sig
-    val output_html : ?append_NL:bool -> Ui_logger.html_msg -> unit
     val interactive_user_uri_choice :
       selection_mode:[`SINGLE | `MULTIPLE] ->
       ?ok:string ->
       ?enable_button_for_non_vars:bool ->
       title:string -> msg:string -> id:string -> string list -> string list
     val interactive_interpretation_choice :
-      (string * string) list list -> int
-    val input_or_locate_uri : title:string -> UriManager.uri
+      (string * string) list list -> int list
+    val input_or_locate_uri : title:string -> ?id:string -> UriManager.uri
   end
 
 let string_of_domain_item = function
@@ -38,54 +65,14 @@ let string_of_domain_item = function
   | Symbol (s, i) -> Printf.sprintf "SYMBOL(%s,%d)" s i
   | Num i -> Printf.sprintf "NUM(instance %d)" i
 
+let string_of_domain dom =
+  String.concat "; " (List.map string_of_domain_item dom)
+(*
 let string_of_domain dom =
   let buf = Buffer.create 1024 in
   Domain.iter
     (fun item -> Buffer.add_string buf (string_of_domain_item item ^ "; "))
     dom;
   Buffer.contents buf
-
-module EnvironmentP3 =
-  struct
-    type t = environment
-    let empty = ""
-
-    let to_string env =
-     Environment.fold
-      (fun i v s ->
-        match i with
-        | Id id ->s ^ Printf.sprintf "alias %s %s\n" id (fst v)
-        | _ -> "")
-      env ""
-
-    let of_string inputtext =
-     let regexpr =
-      let alfa = "[a-zA-Z_-]" in
-      let digit = "[0-9]" in
-      let ident = alfa ^ "\(" ^ alfa ^ "\|" ^ digit ^ "\)*" in
-      let blanks = "\( \|\t\|\n\)+" in
-      let nonblanks = "[^ \t\n]+" in
-      let uri = "/\(" ^ ident ^ "/\)*" ^ nonblanks in (* not very strict check *)
-       Str.regexp
-        ("alias" ^ blanks ^ "\(" ^ ident ^ "\)" ^ blanks ^ "\(" ^ uri ^ "\)")
-     in
-      let rec aux n =
-       try
-        let n' = Str.search_forward regexpr inputtext n in
-         let id = Id (Str.matched_group 2 inputtext) in
-         let uri = "cic:" ^ (Str.matched_group 5 inputtext) in
-          let resolve_id = aux (n' + 1) in
-           if Environment.mem id resolve_id then
-            resolve_id
-           else
-             let term =
-               HelmLibraryObjects.term_of_uri (UriManager.uri_of_string uri)
-             in
-             (Environment.add id (uri, (fun _ _ _ -> term))
-               resolve_id)
-       with
-        Not_found -> Environment.empty
-      in
-       aux 0
-  end
+*)