Commit 51d2ccfe authored by Pietro Abate's avatar Pietro Abate

[r2005-05-24 12:26:59 by afrisch] Empty log message

Original author: afrisch
Date: 2005-05-24 12:26:59+00:00
parent 242b7f18
......@@ -141,6 +141,7 @@ SCHEMA_OBJS = \
OBJECTS = \
driver/config.cmo \
misc/stats.cmo \
misc/ptmap.cmo misc/hashset.cmo \
misc/serialize.cmo misc/custom.cmo \
misc/state.cmo misc/pool.cmo misc/encodings.cmo \
misc/pretty.cmo misc/ns.cmo misc/inttbl.cmo misc/imap.cmo \
......
......@@ -2,6 +2,10 @@ driver/config.cmo: driver/config.cmi
driver/config.cmx: driver/config.cmi
misc/stats.cmo: misc/stats.cmi
misc/stats.cmx: misc/stats.cmi
misc/ptmap.cmo: misc/ptmap.cmi
misc/ptmap.cmx: misc/ptmap.cmi
misc/hashset.cmo: misc/ptmap.cmi misc/hashset.cmi
misc/hashset.cmx: misc/ptmap.cmx misc/hashset.cmi
misc/serialize.cmo: misc/serialize.cmi
misc/serialize.cmx: misc/serialize.cmi
misc/custom.cmo: misc/serialize.cmi
......@@ -14,8 +18,6 @@ misc/pool.cmx: misc/state.cmx misc/serialize.cmx misc/custom.cmx \
misc/pool.cmi
misc/encodings.cmo: misc/serialize.cmi misc/custom.cmo misc/encodings.cmi
misc/encodings.cmx: misc/serialize.cmx misc/custom.cmx misc/encodings.cmi
misc/bool.cmo: misc/serialize.cmi misc/custom.cmo misc/bool.cmi
misc/bool.cmx: misc/serialize.cmx misc/custom.cmx misc/bool.cmi
misc/pretty.cmo: misc/pretty.cmi
misc/pretty.cmx: misc/pretty.cmi
misc/ns.cmo: misc/state.cmi misc/serialize.cmi misc/pool.cmi \
......@@ -30,6 +32,10 @@ misc/html.cmo: misc/html.cmi
misc/html.cmx: misc/html.cmi
types/sortedList.cmo: misc/serialize.cmi misc/custom.cmo types/sortedList.cmi
types/sortedList.cmx: misc/serialize.cmx misc/custom.cmx types/sortedList.cmi
misc/bool.cmo: types/sortedList.cmi misc/serialize.cmi misc/custom.cmo \
misc/bool.cmi
misc/bool.cmx: types/sortedList.cmx misc/serialize.cmx misc/custom.cmx \
misc/bool.cmi
types/boolean.cmo: types/sortedList.cmi misc/custom.cmo types/boolean.cmi
types/boolean.cmx: types/sortedList.cmx misc/custom.cmx types/boolean.cmi
types/ident.cmo: types/sortedList.cmi misc/pool.cmi misc/ns.cmi \
......@@ -49,13 +55,13 @@ types/normal.cmx: types/normal.cmi
types/types.cmo: misc/stats.cmi misc/state.cmi types/sortedList.cmi \
misc/serialize.cmi misc/pretty.cmi misc/pool.cmi misc/ns.cmi \
types/normal.cmi misc/inttbl.cmi types/intervals.cmi types/ident.cmo \
misc/encodings.cmi misc/custom.cmo types/chars.cmi misc/bool.cmi \
types/atoms.cmi types/types.cmi
misc/hashset.cmi misc/encodings.cmi misc/custom.cmo types/chars.cmi \
misc/bool.cmi types/atoms.cmi types/types.cmi
types/types.cmx: misc/stats.cmx misc/state.cmx types/sortedList.cmx \
misc/serialize.cmx misc/pretty.cmx misc/pool.cmx misc/ns.cmx \
types/normal.cmx misc/inttbl.cmx types/intervals.cmx types/ident.cmx \
misc/encodings.cmx misc/custom.cmx types/chars.cmx misc/bool.cmx \
types/atoms.cmx types/types.cmi
misc/hashset.cmx misc/encodings.cmx misc/custom.cmx types/chars.cmx \
misc/bool.cmx types/atoms.cmx types/types.cmi
types/sample.cmo: types/types.cmi types/intervals.cmi types/ident.cmo \
types/chars.cmi types/atoms.cmi types/sample.cmi
types/sample.cmx: types/types.cmx types/intervals.cmx types/ident.cmx \
......@@ -350,11 +356,12 @@ runtime/cduce_pxp.cmo: parser/url.cmi schema/schema_xml.cmi \
runtime/cduce_pxp.cmx: parser/url.cmx schema/schema_xml.cmx \
parser/location.cmx runtime/load_xml.cmx driver/config.cmx \
runtime/cduce_pxp.cmi
misc/hashset.cmi: misc/pretty.cmi
misc/pool.cmi: misc/custom.cmo
misc/encodings.cmi: misc/serialize.cmi misc/custom.cmo
misc/bool.cmi: misc/custom.cmo
misc/ns.cmi: misc/serialize.cmi misc/encodings.cmi misc/custom.cmo
types/sortedList.cmi: misc/serialize.cmi misc/custom.cmo
misc/bool.cmi: misc/custom.cmo
types/boolean.cmi: misc/custom.cmo
types/intervals.cmi: misc/custom.cmo
types/chars.cmi: misc/custom.cmo
......
This diff is collapsed.
......@@ -38,5 +38,13 @@ end
module MakeBdd(X : Custom.T) : S' with type elem = X.t
module Simplify : MAKE
module type S'' = sig
include S
type tree = Split of elem list * elem list * tree list option
val get_tree: t -> tree
end
module Simplify(X : Custom.T) : S'' with type elem = X.t
......@@ -150,7 +150,7 @@ struct
)
else if p <= 0xffff then (
(* Refuse writing surrogate pairs, and fffe, ffff *)
if (p >= 0xd800 & p < 0xe000) or (p >= 0xfffe) then
if (p >= 0xd800 && p < 0xe000) || (p >= 0xfffe) then
failwith "Encodings.Utf8.store";
Buffer.add_char b (Char.chr (0xe0 lor (p lsr 12)));
Buffer.add_char b (Char.chr (0x80 lor ((p lsr 6) land 0x3f)));
......
......@@ -7,7 +7,13 @@ type 'a regexp =
| Plus of 'a regexp
| Trans of 'a
module type TABLE = sig
type key
type 'a t
val create: int -> 'a t
val add: 'a t -> key -> 'a -> unit
val find: 'a t -> key -> 'a
end
module type S = sig
type t
......@@ -16,7 +22,7 @@ module type S = sig
val hash: t -> int
end
module Decompile(H : Hashtbl.S)(S : S) = struct
module Decompile(H : TABLE)(S : S) = struct
(* Now attempt to simplify regexp. Does not work.... disabled *)
module A = struct
......
......@@ -16,7 +16,15 @@ module type S = sig
val hash: t -> int
end
module Decompile(X : Hashtbl.S)(S : S)
module type TABLE = sig
type key
type 'a t
val create: int -> 'a t
val add: 'a t -> key -> 'a -> unit
val find: 'a t -> key -> 'a
end
module Decompile(X : TABLE)(S : S)
: sig
val decompile: (X.key -> (S.t * X.key) list * bool) -> X.key -> S.t regexp
end
......@@ -484,13 +484,13 @@ end
(* It is also possible to use Boolean instead of Bool here;
need to analyze when each one is more efficient *)
and BoolPair : Bool.S with type elem = Node.t * Node.t =
(*Bool.Simplify*)(Bool.Make)(Custom.Pair(NodeT)(NodeT))
Bool.Simplify(*(Bool.Make)*)(Custom.Pair(NodeT)(NodeT))
and BoolRec : Bool.S with type elem = bool * Node.t label_map =
(*Bool.Simplify*)(Bool.Make)(Custom.Pair(Custom.Bool)(LabelSet.MakeMap(NodeT)))
module DescrHash = Hashtbl.Make(Descr)
module DescrMap = Map.Make(Descr)
module DescrHash = (*Hashtbl.Make*)Hashset.MakeTable(Descr)
module DescrMap = (*Map.Make*)Hashset.Make(Descr)
module DescrSet = Set.Make(Descr)
module DescrSList = SortedList.Make(Descr)
......
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