From bb2a0b22a2c38b59ca664b550f34e5e40e6f04c7 Mon Sep 17 00:00:00 2001 From: Ferruccio Guidi Date: Fri, 6 Aug 2010 12:13:49 +0000 Subject: [PATCH] the refactoring continues ... --- helm/software/lambda-delta/.depend.opt | 124 +++++++++--------- .../lambda-delta/src/basic_rg/brgOutput.ml | 2 +- .../lambda-delta/src/basic_rg/brgOutput.mli | 2 +- helm/software/lambda-delta/src/common/Make | 2 +- .../software/lambda-delta/src/toplevel/top.ml | 12 +- helm/software/lambda-delta/src/xml/Make | 1 + .../src/xml/{XmlCrg.ml => xmlCrg.ml} | 2 +- .../src/xml/{XmlCrg.mli => xmlCrg.mli} | 2 +- .../src/xml/{XmlLibrary.ml => xmlLibrary.ml} | 0 .../xml/{XmlLibrary.mli => xmlLibrary.mli} | 0 10 files changed, 73 insertions(+), 74 deletions(-) create mode 100644 helm/software/lambda-delta/src/xml/Make rename helm/software/lambda-delta/src/xml/{XmlCrg.ml => xmlCrg.ml} (99%) rename helm/software/lambda-delta/src/xml/{XmlCrg.mli => xmlCrg.mli} (93%) rename helm/software/lambda-delta/src/xml/{XmlLibrary.ml => xmlLibrary.ml} (100%) rename helm/software/lambda-delta/src/xml/{XmlLibrary.mli => xmlLibrary.mli} (100%) diff --git a/helm/software/lambda-delta/.depend.opt b/helm/software/lambda-delta/.depend.opt index c6e6ac189..bc920f171 100644 --- a/helm/software/lambda-delta/.depend.opt +++ b/helm/software/lambda-delta/.depend.opt @@ -24,11 +24,6 @@ src/common/marks.cmx: src/common/entity.cmx src/common/alpha.cmi: src/common/entity.cmx src/common/alpha.cmo: src/common/entity.cmx src/common/alpha.cmi src/common/alpha.cmx: src/common/entity.cmx src/common/alpha.cmi -src/common/library.cmi: src/common/entity.cmx -src/common/library.cmo: src/common/hierarchy.cmi src/common/entity.cmx \ - src/lib/cps.cmx src/common/library.cmi -src/common/library.cmx: src/common/hierarchy.cmx src/common/entity.cmx \ - src/lib/cps.cmx src/common/library.cmi src/text/txt.cmo: src/text/txt.cmx: src/text/txtParser.cmi: src/text/txt.cmx @@ -110,15 +105,55 @@ src/basic_ag/bagUntrusted.cmo: src/lib/log.cmi src/common/entity.cmx \ src/basic_ag/bagUntrusted.cmx: src/lib/log.cmx src/common/entity.cmx \ src/basic_ag/bagType.cmx src/basic_ag/bagEnvironment.cmx \ src/basic_ag/bag.cmx src/basic_ag/bagUntrusted.cmi +src/complete_rg/crg.cmo: src/common/entity.cmx +src/complete_rg/crg.cmx: src/common/entity.cmx +src/complete_rg/crgOutput.cmi: src/complete_rg/crg.cmx +src/complete_rg/crgOutput.cmo: src/common/hierarchy.cmi src/common/entity.cmx \ + src/complete_rg/crg.cmx src/lib/cps.cmx src/complete_rg/crgOutput.cmi +src/complete_rg/crgOutput.cmx: src/common/hierarchy.cmx src/common/entity.cmx \ + src/complete_rg/crg.cmx src/lib/cps.cmx src/complete_rg/crgOutput.cmi +src/complete_rg/crgTxt.cmi: src/text/txt.cmx src/complete_rg/crg.cmx +src/complete_rg/crgTxt.cmo: src/text/txtTxt.cmi src/text/txt.cmx \ + src/common/options.cmx src/common/hierarchy.cmi src/common/entity.cmx \ + src/complete_rg/crg.cmx src/lib/cps.cmx src/complete_rg/crgTxt.cmi +src/complete_rg/crgTxt.cmx: src/text/txtTxt.cmx src/text/txt.cmx \ + src/common/options.cmx src/common/hierarchy.cmx src/common/entity.cmx \ + src/complete_rg/crg.cmx src/lib/cps.cmx src/complete_rg/crgTxt.cmi +src/complete_rg/crgAut.cmi: src/complete_rg/crg.cmx src/automath/aut.cmx +src/complete_rg/crgAut.cmo: src/common/options.cmx src/common/entity.cmx \ + src/complete_rg/crg.cmx src/lib/cps.cmx src/automath/aut.cmx \ + src/complete_rg/crgAut.cmi +src/complete_rg/crgAut.cmx: src/common/options.cmx src/common/entity.cmx \ + src/complete_rg/crg.cmx src/lib/cps.cmx src/automath/aut.cmx \ + src/complete_rg/crgAut.cmi +src/xml/xmlLibrary.cmi: src/common/entity.cmx +src/xml/xmlLibrary.cmo: src/common/hierarchy.cmi src/common/entity.cmx \ + src/lib/cps.cmx src/xml/xmlLibrary.cmi +src/xml/xmlLibrary.cmx: src/common/hierarchy.cmx src/common/entity.cmx \ + src/lib/cps.cmx src/xml/xmlLibrary.cmi +src/xml/xmlCrg.cmi: src/xml/xmlLibrary.cmi src/complete_rg/crg.cmx +src/xml/xmlCrg.cmo: src/xml/xmlLibrary.cmi src/common/hierarchy.cmi \ + src/common/entity.cmx src/complete_rg/crg.cmx src/lib/cps.cmx \ + src/common/alpha.cmi src/xml/xmlCrg.cmi +src/xml/xmlCrg.cmx: src/xml/xmlLibrary.cmx src/common/hierarchy.cmx \ + src/common/entity.cmx src/complete_rg/crg.cmx src/lib/cps.cmx \ + src/common/alpha.cmx src/xml/xmlCrg.cmi src/basic_rg/brg.cmo: src/common/entity.cmx src/basic_rg/brg.cmx: src/common/entity.cmx -src/basic_rg/brgOutput.cmi: src/lib/log.cmi src/common/library.cmi \ +src/basic_rg/brgCrg.cmi: src/complete_rg/crg.cmx src/basic_rg/brg.cmx +src/basic_rg/brgCrg.cmo: src/common/marks.cmx src/common/entity.cmx \ + src/complete_rg/crg.cmx src/lib/cps.cmx src/basic_rg/brg.cmx \ + src/basic_rg/brgCrg.cmi +src/basic_rg/brgCrg.cmx: src/common/marks.cmx src/common/entity.cmx \ + src/complete_rg/crg.cmx src/lib/cps.cmx src/basic_rg/brg.cmx \ + src/basic_rg/brgCrg.cmi +src/basic_rg/brgOutput.cmi: src/xml/xmlLibrary.cmi src/lib/log.cmi \ src/basic_rg/brg.cmx -src/basic_rg/brgOutput.cmo: src/common/options.cmx src/lib/log.cmi \ - src/common/library.cmi src/common/hierarchy.cmi src/common/entity.cmx \ +src/basic_rg/brgOutput.cmo: src/xml/xmlLibrary.cmi src/common/options.cmx \ + src/lib/log.cmi src/common/hierarchy.cmi src/common/entity.cmx \ src/lib/cps.cmx src/basic_rg/brg.cmx src/basic_rg/brgOutput.cmi -src/basic_rg/brgOutput.cmx: src/common/options.cmx src/lib/log.cmx \ - src/common/library.cmx src/common/hierarchy.cmx src/common/entity.cmx \ +src/basic_rg/brgOutput.cmx: src/xml/xmlLibrary.cmx src/common/options.cmx \ + src/lib/log.cmx src/common/hierarchy.cmx src/common/entity.cmx \ src/lib/cps.cmx src/basic_rg/brg.cmx src/basic_rg/brgOutput.cmi src/basic_rg/brgEnvironment.cmi: src/basic_rg/brg.cmx src/basic_rg/brgEnvironment.cmo: src/common/entity.cmx src/basic_rg/brg.cmx \ @@ -162,41 +197,6 @@ src/basic_rg/brgUntrusted.cmx: src/lib/log.cmx src/common/entity.cmx \ src/basic_rg/brgType.cmx src/basic_rg/brgReduction.cmx \ src/basic_rg/brgEnvironment.cmx src/basic_rg/brg.cmx \ src/basic_rg/brgUntrusted.cmi -src/complete_rg/crg.cmo: src/common/entity.cmx -src/complete_rg/crg.cmx: src/common/entity.cmx -src/complete_rg/crgOutput.cmi: src/complete_rg/crg.cmx -src/complete_rg/crgOutput.cmo: src/common/hierarchy.cmi src/common/entity.cmx \ - src/complete_rg/crg.cmx src/lib/cps.cmx src/complete_rg/crgOutput.cmi -src/complete_rg/crgOutput.cmx: src/common/hierarchy.cmx src/common/entity.cmx \ - src/complete_rg/crg.cmx src/lib/cps.cmx src/complete_rg/crgOutput.cmi -src/complete_rg/crgXml.cmi: src/common/library.cmi src/complete_rg/crg.cmx -src/complete_rg/crgXml.cmo: src/common/library.cmi src/common/hierarchy.cmi \ - src/common/entity.cmx src/complete_rg/crg.cmx src/lib/cps.cmx \ - src/common/alpha.cmi src/complete_rg/crgXml.cmi -src/complete_rg/crgXml.cmx: src/common/library.cmx src/common/hierarchy.cmx \ - src/common/entity.cmx src/complete_rg/crg.cmx src/lib/cps.cmx \ - src/common/alpha.cmx src/complete_rg/crgXml.cmi -src/complete_rg/crgTxt.cmi: src/text/txt.cmx src/complete_rg/crg.cmx -src/complete_rg/crgTxt.cmo: src/text/txtTxt.cmi src/text/txt.cmx \ - src/common/options.cmx src/common/hierarchy.cmi src/common/entity.cmx \ - src/complete_rg/crg.cmx src/lib/cps.cmx src/complete_rg/crgTxt.cmi -src/complete_rg/crgTxt.cmx: src/text/txtTxt.cmx src/text/txt.cmx \ - src/common/options.cmx src/common/hierarchy.cmx src/common/entity.cmx \ - src/complete_rg/crg.cmx src/lib/cps.cmx src/complete_rg/crgTxt.cmi -src/complete_rg/crgAut.cmi: src/complete_rg/crg.cmx src/automath/aut.cmx -src/complete_rg/crgAut.cmo: src/common/options.cmx src/common/entity.cmx \ - src/complete_rg/crg.cmx src/lib/cps.cmx src/automath/aut.cmx \ - src/complete_rg/crgAut.cmi -src/complete_rg/crgAut.cmx: src/common/options.cmx src/common/entity.cmx \ - src/complete_rg/crg.cmx src/lib/cps.cmx src/automath/aut.cmx \ - src/complete_rg/crgAut.cmi -src/complete_rg/crgBrg.cmi: src/complete_rg/crg.cmx src/basic_rg/brg.cmx -src/complete_rg/crgBrg.cmo: src/common/marks.cmx src/common/entity.cmx \ - src/complete_rg/crg.cmx src/lib/cps.cmx src/basic_rg/brg.cmx \ - src/complete_rg/crgBrg.cmi -src/complete_rg/crgBrg.cmx: src/common/marks.cmx src/common/entity.cmx \ - src/complete_rg/crg.cmx src/lib/cps.cmx src/basic_rg/brg.cmx \ - src/complete_rg/crgBrg.cmi src/toplevel/meta.cmo: src/common/entity.cmx src/toplevel/meta.cmx: src/common/entity.cmx src/toplevel/metaOutput.cmi: src/toplevel/meta.cmx @@ -226,32 +226,30 @@ src/toplevel/metaBrg.cmo: src/toplevel/meta.cmx src/common/entity.cmx \ src/lib/cps.cmx src/basic_rg/brg.cmx src/toplevel/metaBrg.cmi src/toplevel/metaBrg.cmx: src/toplevel/meta.cmx src/common/entity.cmx \ src/lib/cps.cmx src/basic_rg/brg.cmx src/toplevel/metaBrg.cmi -src/toplevel/top.cmo: src/text/txtParser.cmi src/text/txtLexer.cmx \ - src/text/txt.cmx src/lib/time.cmx src/common/output.cmi \ - src/common/options.cmx src/toplevel/metaOutput.cmi \ - src/toplevel/metaLibrary.cmi src/toplevel/metaBrg.cmi \ - src/toplevel/metaBag.cmi src/toplevel/metaAut.cmi src/toplevel/meta.cmx \ - src/lib/log.cmi src/common/library.cmi src/common/hierarchy.cmi \ - src/common/entity.cmx src/complete_rg/crgXml.cmi \ - src/complete_rg/crgTxt.cmi src/complete_rg/crgBrg.cmi \ +src/toplevel/top.cmo: src/xml/xmlLibrary.cmi src/xml/xmlCrg.cmi \ + src/text/txtParser.cmi src/text/txtLexer.cmx src/text/txt.cmx \ + src/lib/time.cmx src/common/output.cmi src/common/options.cmx \ + src/toplevel/metaOutput.cmi src/toplevel/metaLibrary.cmi \ + src/toplevel/metaBrg.cmi src/toplevel/metaBag.cmi \ + src/toplevel/metaAut.cmi src/toplevel/meta.cmx src/lib/log.cmi \ + src/common/hierarchy.cmi src/common/entity.cmx src/complete_rg/crgTxt.cmi \ src/complete_rg/crgAut.cmi src/complete_rg/crg.cmx src/lib/cps.cmx \ src/basic_rg/brgUntrusted.cmi src/basic_rg/brgReduction.cmi \ - src/basic_rg/brgOutput.cmi src/basic_rg/brg.cmx \ + src/basic_rg/brgOutput.cmi src/basic_rg/brgCrg.cmi src/basic_rg/brg.cmx \ src/basic_ag/bagUntrusted.cmi src/basic_ag/bagType.cmi \ src/basic_ag/bagOutput.cmi src/basic_ag/bag.cmx \ src/automath/autProcess.cmi src/automath/autParser.cmi \ src/automath/autOutput.cmi src/automath/autLexer.cmx src/automath/aut.cmx -src/toplevel/top.cmx: src/text/txtParser.cmx src/text/txtLexer.cmx \ - src/text/txt.cmx src/lib/time.cmx src/common/output.cmx \ - src/common/options.cmx src/toplevel/metaOutput.cmx \ - src/toplevel/metaLibrary.cmx src/toplevel/metaBrg.cmx \ - src/toplevel/metaBag.cmx src/toplevel/metaAut.cmx src/toplevel/meta.cmx \ - src/lib/log.cmx src/common/library.cmx src/common/hierarchy.cmx \ - src/common/entity.cmx src/complete_rg/crgXml.cmx \ - src/complete_rg/crgTxt.cmx src/complete_rg/crgBrg.cmx \ +src/toplevel/top.cmx: src/xml/xmlLibrary.cmx src/xml/xmlCrg.cmx \ + src/text/txtParser.cmx src/text/txtLexer.cmx src/text/txt.cmx \ + src/lib/time.cmx src/common/output.cmx src/common/options.cmx \ + src/toplevel/metaOutput.cmx src/toplevel/metaLibrary.cmx \ + src/toplevel/metaBrg.cmx src/toplevel/metaBag.cmx \ + src/toplevel/metaAut.cmx src/toplevel/meta.cmx src/lib/log.cmx \ + src/common/hierarchy.cmx src/common/entity.cmx src/complete_rg/crgTxt.cmx \ src/complete_rg/crgAut.cmx src/complete_rg/crg.cmx src/lib/cps.cmx \ src/basic_rg/brgUntrusted.cmx src/basic_rg/brgReduction.cmx \ - src/basic_rg/brgOutput.cmx src/basic_rg/brg.cmx \ + src/basic_rg/brgOutput.cmx src/basic_rg/brgCrg.cmx src/basic_rg/brg.cmx \ src/basic_ag/bagUntrusted.cmx src/basic_ag/bagType.cmx \ src/basic_ag/bagOutput.cmx src/basic_ag/bag.cmx \ src/automath/autProcess.cmx src/automath/autParser.cmx \ diff --git a/helm/software/lambda-delta/src/basic_rg/brgOutput.ml b/helm/software/lambda-delta/src/basic_rg/brgOutput.ml index 186349a1c..c70bbfec7 100644 --- a/helm/software/lambda-delta/src/basic_rg/brgOutput.ml +++ b/helm/software/lambda-delta/src/basic_rg/brgOutput.ml @@ -16,7 +16,7 @@ module U = NUri module L = Log module O = Options module Y = Entity -module X = Library +module X = XmlLibrary module H = Hierarchy module B = Brg diff --git a/helm/software/lambda-delta/src/basic_rg/brgOutput.mli b/helm/software/lambda-delta/src/basic_rg/brgOutput.mli index 772f43cad..556439a99 100644 --- a/helm/software/lambda-delta/src/basic_rg/brgOutput.mli +++ b/helm/software/lambda-delta/src/basic_rg/brgOutput.mli @@ -19,7 +19,7 @@ val print_counters: (unit -> 'a) -> counters -> 'a val specs: (Brg.lenv, Brg.term) Log.specs -val export_term: Brg.term -> Library.pp +val export_term: Brg.term -> XmlLibrary.pp (* val export_term: Format.formatter -> Brg.term -> unit *) diff --git a/helm/software/lambda-delta/src/common/Make b/helm/software/lambda-delta/src/common/Make index de13dd4c9..09f15792b 100644 --- a/helm/software/lambda-delta/src/common/Make +++ b/helm/software/lambda-delta/src/common/Make @@ -1 +1 @@ -options hierarchy output entity marks alpha library +options hierarchy output entity marks alpha diff --git a/helm/software/lambda-delta/src/toplevel/top.ml b/helm/software/lambda-delta/src/toplevel/top.ml index 40fcda5e1..d45bcf98e 100644 --- a/helm/software/lambda-delta/src/toplevel/top.ml +++ b/helm/software/lambda-delta/src/toplevel/top.ml @@ -19,7 +19,8 @@ module O = Options module H = Hierarchy module Op = Output module Y = Entity -module X = Library +module XL = XmlLibrary +module XCrg = XmlCrg module AL = AutLexer module AP = AutProcess module AO = AutOutput @@ -28,9 +29,8 @@ module DA = CrgAut module MA = MetaAut module MO = MetaOutput module ML = MetaLibrary -module DX = CrgXml -module DBrg = CrgBrg module MBrg = MetaBrg +module BrgC = BrgCrg module BrgO = BrgOutput module BrgR = BrgReduction module BrgU = BrgUntrusted @@ -95,7 +95,7 @@ let print_counters st = match !kernel with let xlate_entity entity = match !kernel, entity with | Brg, CrgEntity e -> - let f e = (BrgEntity e) in Y.xlate f DBrg.brg_of_crg e + let f e = (BrgEntity e) in Y.xlate f BrgC.brg_of_crg e | Brg, MetaEntity e -> let f e = (BrgEntity e) in Y.xlate f MBrg.brg_of_meta e | Bag, MetaEntity e -> @@ -122,8 +122,8 @@ let count_entity st = function | _ -> st let export_entity si xdir moch = function - | CrgEntity e -> X.export_entity DX.export_term si xdir e - | BrgEntity e -> X.export_entity BrgO.export_term si xdir e + | CrgEntity e -> XL.export_entity XCrg.export_term si xdir e + | BrgEntity e -> XL.export_entity BrgO.export_term si xdir e | MetaEntity e -> begin match moch with | None -> () diff --git a/helm/software/lambda-delta/src/xml/Make b/helm/software/lambda-delta/src/xml/Make new file mode 100644 index 000000000..3a626cece --- /dev/null +++ b/helm/software/lambda-delta/src/xml/Make @@ -0,0 +1 @@ +xmlLibrary xmlCrg diff --git a/helm/software/lambda-delta/src/xml/XmlCrg.ml b/helm/software/lambda-delta/src/xml/xmlCrg.ml similarity index 99% rename from helm/software/lambda-delta/src/xml/XmlCrg.ml rename to helm/software/lambda-delta/src/xml/xmlCrg.ml index 111cfed06..62f0654bd 100644 --- a/helm/software/lambda-delta/src/xml/XmlCrg.ml +++ b/helm/software/lambda-delta/src/xml/xmlCrg.ml @@ -14,7 +14,7 @@ module C = Cps module H = Hierarchy module Y = Entity module A = Alpha -module X = Library +module X = XmlLibrary module D = Crg (* internal functions *******************************************************) diff --git a/helm/software/lambda-delta/src/xml/XmlCrg.mli b/helm/software/lambda-delta/src/xml/xmlCrg.mli similarity index 93% rename from helm/software/lambda-delta/src/xml/XmlCrg.mli rename to helm/software/lambda-delta/src/xml/xmlCrg.mli index c326a9822..7e63c5c4a 100644 --- a/helm/software/lambda-delta/src/xml/XmlCrg.mli +++ b/helm/software/lambda-delta/src/xml/xmlCrg.mli @@ -9,4 +9,4 @@ \ / This software is distributed as is, NO WARRANTY. V_______________________________________________________________ *) -val export_term: Crg.term -> Library.pp +val export_term: Crg.term -> XmlLibrary.pp diff --git a/helm/software/lambda-delta/src/xml/XmlLibrary.ml b/helm/software/lambda-delta/src/xml/xmlLibrary.ml similarity index 100% rename from helm/software/lambda-delta/src/xml/XmlLibrary.ml rename to helm/software/lambda-delta/src/xml/xmlLibrary.ml diff --git a/helm/software/lambda-delta/src/xml/XmlLibrary.mli b/helm/software/lambda-delta/src/xml/xmlLibrary.mli similarity index 100% rename from helm/software/lambda-delta/src/xml/XmlLibrary.mli rename to helm/software/lambda-delta/src/xml/xmlLibrary.mli -- 2.39.2