Commit 02023d6c authored by Pietro Abate's avatar Pietro Abate
Browse files

[r2005-05-09 11:48:14 by afrisch] Empty log message

Original author: afrisch
Date: 2005-05-09 11:48:15+00:00
parent 224260ec
...@@ -142,7 +142,7 @@ OBJECTS = \ ...@@ -142,7 +142,7 @@ OBJECTS = \
driver/config.cmo \ driver/config.cmo \
misc/stats.cmo \ misc/stats.cmo \
misc/serialize.cmo misc/custom.cmo \ misc/serialize.cmo misc/custom.cmo \
misc/state.cmo misc/pool.cmo misc/encodings.cmo misc/myweak.cmo \ misc/state.cmo misc/pool.cmo misc/encodings.cmo \
misc/bool.cmo \ misc/bool.cmo \
misc/pretty.cmo misc/ns.cmo misc/inttbl.cmo misc/imap.cmo \ misc/pretty.cmo misc/ns.cmo misc/inttbl.cmo misc/imap.cmo \
misc/html.cmo \ misc/html.cmo \
......
...@@ -14,14 +14,8 @@ misc/pool.cmx: misc/state.cmx misc/serialize.cmx misc/custom.cmx \ ...@@ -14,14 +14,8 @@ misc/pool.cmx: misc/state.cmx misc/serialize.cmx misc/custom.cmx \
misc/pool.cmi misc/pool.cmi
misc/encodings.cmo: misc/serialize.cmi misc/custom.cmo misc/encodings.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/encodings.cmx: misc/serialize.cmx misc/custom.cmx misc/encodings.cmi
misc/myweak.cmo: misc/myweak.cmi misc/bool.cmo: misc/serialize.cmi misc/custom.cmo misc/bool.cmi
misc/myweak.cmx: misc/myweak.cmi misc/bool.cmx: misc/serialize.cmx misc/custom.cmx misc/bool.cmi
misc/memo.cmo: misc/memo.cmi
misc/memo.cmx: misc/memo.cmi
misc/bool.cmo: misc/serialize.cmi misc/myweak.cmi misc/memo.cmi \
misc/custom.cmo misc/bool.cmi
misc/bool.cmx: misc/serialize.cmx misc/myweak.cmx misc/memo.cmx \
misc/custom.cmx misc/bool.cmi
misc/pretty.cmo: misc/pretty.cmi misc/pretty.cmo: misc/pretty.cmi
misc/pretty.cmx: misc/pretty.cmi misc/pretty.cmx: misc/pretty.cmi
misc/ns.cmo: misc/state.cmi misc/serialize.cmi misc/pool.cmi \ misc/ns.cmo: misc/state.cmi misc/serialize.cmi misc/pool.cmi \
...@@ -276,10 +270,10 @@ runtime/system.cmx: runtime/value.cmx types/types.cmx types/sequence.cmx \ ...@@ -276,10 +270,10 @@ runtime/system.cmx: runtime/value.cmx types/types.cmx types/sequence.cmx \
types/builtin_defs.cmx types/builtin.cmx types/atoms.cmx types/builtin_defs.cmx types/builtin.cmx types/atoms.cmx
ocamliface/mltypes.cmo: types/types.cmi parser/location.cmi \ ocamliface/mltypes.cmo: types/types.cmi parser/location.cmi \
driver/librarian.cmi types/ident.cmo driver/config.cmi \ driver/librarian.cmi types/ident.cmo driver/config.cmi \
ocamliface/mltypes.cmi ocamliface/asttypes.cmi ocamliface/mltypes.cmi
ocamliface/mltypes.cmx: types/types.cmx parser/location.cmx \ ocamliface/mltypes.cmx: types/types.cmx parser/location.cmx \
driver/librarian.cmx types/ident.cmx driver/config.cmx \ driver/librarian.cmx types/ident.cmx driver/config.cmx \
ocamliface/mltypes.cmi ocamliface/asttypes.cmi ocamliface/mltypes.cmi
ocamliface/mlstub.cmo: types/types.cmi typing/typer.cmi types/sequence.cmi \ ocamliface/mlstub.cmo: types/types.cmi typing/typer.cmi types/sequence.cmi \
misc/ns.cmi ocamliface/mltypes.cmi parser/location.cmi \ misc/ns.cmi ocamliface/mltypes.cmi parser/location.cmi \
driver/librarian.cmi types/ident.cmo types/externals.cmi \ driver/librarian.cmi types/ident.cmo types/externals.cmi \
...@@ -290,6 +284,8 @@ ocamliface/mlstub.cmx: types/types.cmx typing/typer.cmx types/sequence.cmx \ ...@@ -290,6 +284,8 @@ ocamliface/mlstub.cmx: types/types.cmx typing/typer.cmx types/sequence.cmx \
driver/librarian.cmx types/ident.cmx types/externals.cmx \ driver/librarian.cmx types/ident.cmx types/externals.cmx \
driver/config.cmx compile/compile.cmx types/builtin_defs.cmx \ driver/config.cmx compile/compile.cmx types/builtin_defs.cmx \
types/atoms.cmx ocamliface/mlstub.cmi types/atoms.cmx ocamliface/mlstub.cmi
parser/cduce_curl.cmo: parser/url.cmi driver/config.cmi
parser/cduce_curl.cmx: parser/url.cmx driver/config.cmx
runtime/cduce_expat.cmo: parser/url.cmi schema/schema_xml.cmi \ runtime/cduce_expat.cmo: parser/url.cmi schema/schema_xml.cmi \
parser/location.cmi runtime/load_xml.cmi driver/config.cmi \ parser/location.cmi runtime/load_xml.cmi driver/config.cmi \
runtime/cduce_expat.cmi runtime/cduce_expat.cmi
...@@ -322,10 +318,10 @@ tools/validate.cmx: schema/schema_types.cmx schema/schema_parser.cmx \ ...@@ -322,10 +318,10 @@ tools/validate.cmx: schema/schema_types.cmx schema/schema_parser.cmx \
schema/schema_common.cmx schema/schema_common.cmx
ocamliface/mltypes.cmo: types/types.cmi parser/location.cmi \ ocamliface/mltypes.cmo: types/types.cmi parser/location.cmi \
driver/librarian.cmi types/ident.cmo driver/config.cmi \ driver/librarian.cmi types/ident.cmo driver/config.cmi \
ocamliface/mltypes.cmi ocamliface/asttypes.cmi ocamliface/mltypes.cmi
ocamliface/mltypes.cmx: types/types.cmx parser/location.cmx \ ocamliface/mltypes.cmx: types/types.cmx parser/location.cmx \
driver/librarian.cmx types/ident.cmx driver/config.cmx \ driver/librarian.cmx types/ident.cmx driver/config.cmx \
ocamliface/mltypes.cmi ocamliface/asttypes.cmi ocamliface/mltypes.cmi
ocamliface/mlstub.cmo: types/types.cmi typing/typer.cmi types/sequence.cmi \ ocamliface/mlstub.cmo: types/types.cmi typing/typer.cmi types/sequence.cmi \
misc/ns.cmi ocamliface/mltypes.cmi parser/location.cmi \ misc/ns.cmi ocamliface/mltypes.cmi parser/location.cmi \
driver/librarian.cmi types/ident.cmo types/externals.cmi \ driver/librarian.cmi types/ident.cmo types/externals.cmi \
...@@ -408,7 +404,7 @@ types/builtin.cmi: runtime/value.cmi typing/typer.cmi ...@@ -408,7 +404,7 @@ types/builtin.cmi: runtime/value.cmi typing/typer.cmi
driver/librarian.cmi: runtime/value.cmi types/types.cmi typing/typer.cmi \ driver/librarian.cmi: runtime/value.cmi types/types.cmi typing/typer.cmi \
types/ident.cmo compile/compile.cmi types/ident.cmo compile/compile.cmi
driver/cduce.cmi: runtime/value.cmi misc/ns.cmi driver/cduce.cmi: runtime/value.cmi misc/ns.cmi
ocamliface/mltypes.cmi: types/types.cmi ocamliface/mltypes.cmi: types/types.cmi ocamliface/asttypes.cmi
ocamliface/mltypes.cmi: types/types.cmi ocamliface/mltypes.cmi: types/types.cmi ocamliface/asttypes.cmi
schema/schema_types.cmi: runtime/value.cmi misc/ns.cmi misc/encodings.cmi \ schema/schema_types.cmi: runtime/value.cmi misc/ns.cmi misc/encodings.cmi \
types/atoms.cmi types/atoms.cmi
...@@ -423,7 +423,7 @@ struct ...@@ -423,7 +423,7 @@ struct
(* Internalization + detection of useless branching *) (* Internalization + detection of useless branching *)
let max_id = ref 2 (* Must be >= 2 *) let max_id = ref 2 (* Must be >= 2 *)
module W = Myweak.Make( module W = Weak(*Myweak*).Make(
struct struct
type t = node type t = node
...@@ -593,6 +593,7 @@ struct ...@@ -593,6 +593,7 @@ struct
| Zero -> False | One -> True | Branch (x,p,n,_,_) -> Br (x,p,n) | Zero -> False | One -> True | Branch (x,p,n,_,_) -> Br (x,p,n)
end end
(*
module Simplify(M : MAKE)(X : Custom.T) = struct module Simplify(M : MAKE)(X : Custom.T) = struct
module B = M(X) module B = M(X)
type elem = X.t type elem = X.t
...@@ -1095,3 +1096,4 @@ module Simplify(M : MAKE)(X : Custom.T) = struct ...@@ -1095,3 +1096,4 @@ module Simplify(M : MAKE)(X : Custom.T) = struct
mk vars subs mk vars subs
end end
*)
...@@ -38,7 +38,6 @@ end ...@@ -38,7 +38,6 @@ end
module MakeBdd(X : Custom.T) : S' with type elem = X.t module MakeBdd(X : Custom.T) : S' with type elem = X.t
(*
module Simplify(B : MAKE) : MAKE module Simplify(B : MAKE) : MAKE
*)
...@@ -484,7 +484,7 @@ end ...@@ -484,7 +484,7 @@ end
(* It is also possible to use Boolean instead of Bool here; (* It is also possible to use Boolean instead of Bool here;
need to analyze when each one is more efficient *) need to analyze when each one is more efficient *)
and BoolPair : Bool.S with type elem = Node.t * Node.t = 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 = and BoolRec : Bool.S with type elem = bool * Node.t label_map =
(*Bool.Simplify*)(Bool.Make)(Custom.Pair(Custom.Bool)(LabelSet.MakeMap(NodeT))) (*Bool.Simplify*)(Bool.Make)(Custom.Pair(Custom.Bool)(LabelSet.MakeMap(NodeT)))
......
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