Commit 1db0d21a authored by Kim Nguyễn's avatar Kim Nguyễn

Rename the Bool* modules into Var* (which makes way more sense).

parent 062d5039
...@@ -349,8 +349,8 @@ binary_op_cst "dump_to_file_utf8" ...@@ -349,8 +349,8 @@ binary_op_cst "dump_to_file_utf8"
(* Integer operators *) (* Integer operators *)
let intop f x y = let intop f x y =
let s = Types.BoolIntervals.leafconj x in let s = Types.VarIntervals.leafconj x in
let t = Types.BoolIntervals.leafconj y in let t = Types.VarIntervals.leafconj y in
(f s t) (f s t)
;; ;;
......
...@@ -870,8 +870,8 @@ module Compile = struct ...@@ -870,8 +870,8 @@ module Compile = struct
let split_kind basic prod xml record = { let split_kind basic prod xml record = {
basic = basic; basic = basic;
atoms = Atoms.mk_map (List.map (fun (t,r) -> Types.BoolAtoms.leafconj (Types.Atom.get t), r) basic); atoms = Atoms.mk_map (List.map (fun (t,r) -> Types.VarAtoms.leafconj (Types.Atom.get t), r) basic);
chars = Chars.mk_map (List.map (fun (t,r) -> Types.BoolChars.leafconj (Types.Char.get t), r) basic); chars = Chars.mk_map (List.map (fun (t,r) -> Types.VarChars.leafconj (Types.Char.get t), r) basic);
prod = prod; prod = prod;
xml = xml; xml = xml;
record = record record = record
......
...@@ -55,9 +55,9 @@ let rec single memo t = ...@@ -55,9 +55,9 @@ let rec single memo t =
let memo = D.add t memo in let memo = D.add t memo in
let pair (t1,t2) = Types.Pair (single memo t1, single memo t2) in let pair (t1,t2) = Types.Pair (single memo t1, single memo t2) in
let xml (t1,t2) = Types.Xml (single memo t1, single memo t2) in let xml (t1,t2) = Types.Xml (single memo t1, single memo t2) in
let int t = Types.Integer (Intervals.single (Types.BoolIntervals.leafconj (Types.Int.get t))) in let int t = Types.Integer (Intervals.single (Types.VarIntervals.leafconj (Types.Int.get t))) in
let atom t = Types.Atom (Atoms.single (Types.BoolAtoms.leafconj (Types.Atom.get t))) in let atom t = Types.Atom (Atoms.single (Types.VarAtoms.leafconj (Types.Atom.get t))) in
let char t = Types.Char (Chars.single (Types.BoolChars.leafconj (Types.Char.get t))) in let char t = Types.Char (Chars.single (Types.VarChars.leafconj (Types.Char.get t))) in
let fields = function let fields = function
| (true,_) -> assert false | (true,_) -> assert false
| (false,t) -> single memo t in | (false,t) -> single memo t in
......
This diff is collapsed.
...@@ -69,13 +69,13 @@ end ...@@ -69,13 +69,13 @@ end
(** Algebra **) (** Algebra **)
module BoolAtoms : Bool.V with type Atom.t = Atoms.t module VarAtoms : Bool.V with type Atom.t = Atoms.t
module BoolIntervals : Bool.V with type Atom.t = Intervals.t module VarIntervals : Bool.V with type Atom.t = Intervals.t
module BoolChars : Bool.V with type Atom.t = Chars.t module VarChars : Bool.V with type Atom.t = Chars.t
module BoolAbstracts: Bool.V with type Atom.t = Abstracts.t module VarAbstracts: Bool.V with type Atom.t = Abstracts.t
include Custom.T include Custom.T
...@@ -274,26 +274,26 @@ end ...@@ -274,26 +274,26 @@ end
module Int : sig module Int : sig
val has_int : t -> Intervals.V.t -> bool val has_int : t -> Intervals.V.t -> bool
val get: t -> BoolIntervals.t val get: t -> VarIntervals.t
val any : t val any : t
end end
module Atom : sig module Atom : sig
val has_atom : t -> Atoms.V.t -> bool val has_atom : t -> Atoms.V.t -> bool
val get: t -> BoolAtoms.t val get: t -> VarAtoms.t
val any : t val any : t
end end
module Char : sig module Char : sig
val has_char : t -> Chars.V.t -> bool val has_char : t -> Chars.V.t -> bool
val is_empty : t -> bool val is_empty : t -> bool
val get: t -> BoolChars.t val get: t -> VarChars.t
val any : t val any : t
end end
module Abstract : sig module Abstract : sig
val has_abstract : t -> Abstracts.T.t -> bool val has_abstract : t -> Abstracts.T.t -> bool
val get: t -> BoolAbstracts.t val get: t -> VarAbstracts.t
val any : t val any : t
end end
(* (*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment