commented out portions of interfaces, updated _tags

tyl/_tags

@@ -2,4 +2,4 @@
 <src/tyl/mp.cmx>: for-pack(Tyl)
 <src/tyl/mp/{prog,util}.cmx>: for-pack(Tyl.Mp)
 <src/tyl/mp/util/{pos,id}.cmx>: for-pack(Tyl.Mp.Util)
-<src/tyl/mp/prog/syntax.cmx>: for-pack(Tyl.Mp.Prog)
+<src/tyl/mp/prog/{ast,vars}.cmx>: for-pack(Tyl.Mp.Prog)

tyl/src/tyl/mp/util/id.ml

@@ -3,6 +3,18 @@ type t = String of string | Marked of Pos.range * t
 let rec expose i : string = match i with String s -> s | Marked (_,j) -> expose j
  
 let equal i j = expose i = expose j
+
+type temp = t
+module IdOrd = struct 
+  type t = temp
+  let compare = compare 
+end
+
+(* module Map = Map.Make(IdOrd) *)
+module Set = Set.Make(IdOrd)
+
+
+(*
 let compare i j = String.compare (expose i) (expose j)
 let toString = expose
   
@@ -29,18 +41,10 @@ let concat is =
     | j::js' -> Pos.uniono (getMark j) (getMark (last js'))
   in match getPos is with None -> ans | Some r -> Marked(r,ans)
         
-type temp = t
-module IdOrd = struct 
-  type t = temp
-  let compare = compare 
-end
-
-module Map = Map.Make(IdOrd)
-module Set = Set.Make(IdOrd)
-
 let fresh _ _ = String ""
 let freshl _ _ _ = []
 let freshll _ _ _ = []
+*)
 
 (* 
 let fresh s root =

tyl/src/tyl/mp/util/id.mli

@@ -1,7 +1,11 @@
 type t
 
-val compare : t -> t -> int
 val equal : t -> t -> bool
+
+module Set : Set.S with type elt = t  
+
+(*
+val compare : t -> t -> int
 val toString : t -> string
 val shorter : t -> t -> t
 val shortest : t list -> t option
@@ -9,8 +13,8 @@ val getMark : t -> Pos.range option
 val concat : t list -> t
   
 module Map : Map.S with type key = t
-module Set : Set.S with type elt = t  
 
 val fresh : Set.t -> t -> t (* return an id not in set, using input id as root of returned it *)
 val freshl : Set.t -> t -> int -> t list (* return k id's not in given set *)
 val freshll : Set.t -> t list -> int -> t list list (* return k id's for each given id *)
+*)

tyl/src/tyl/mp/util/pos.ml

@@ -1,6 +1,7 @@
 type t = Pos of string * int * int | Eof of string
 type range = t * t
 
+(*
 let toString p = 
   match p with
     | Pos (f,l,c) ->
@@ -62,3 +63,4 @@ let uniono r s =
     | Some _  , None    -> r
     | None    , Some _  -> s
     | None    , None    -> None
+*)

tyl/src/tyl/mp/util/pos.mli

@@ -1,6 +1,7 @@
 type t
 type range
-      
+
+(*      
 val pos : string -> int -> int -> t  (* file name, line num, char pos *)
 val eof : string -> t
 val range : t -> t -> range (* from one position to another *)
@@ -12,3 +13,4 @@ val uniono : range option -> range option -> range option
     
 val toString : t -> string
 val toStringR : range -> string      
+*)