diff --git a/src/data_io.ml b/src/data_io.ml index 3db4aff..53fdee6 100644 --- a/src/data_io.ml +++ b/src/data_io.ml @@ -27,7 +27,7 @@ open Utils open Algdt_types open Algdt_utils open Typing -open Cfg +open MyCfg let failwith str = failwith ("Data_io." ^ str) diff --git a/src/typing.ml b/src/typing.ml index 91173cf..7c3199d 100644 --- a/src/typing.ml +++ b/src/typing.ml @@ -103,10 +103,10 @@ module AlgDtCfgSpec = struct let compare_prod = compare end -module Cfg = Cfg_impl.Make (AlgDtCfgSpec) +module MyCfg = Cfg.Cfg_impl.Make (AlgDtCfgSpec) open AlgDtCfgSpec -open Cfg +open MyCfg let syms_of_prod_el pe = let acc_ref = ref [] in @@ -125,7 +125,7 @@ let cfg_coll_def nt_n cfg = function array_fold_lefti coll_sum cfg ss let cfg_of_pre_ispec_info (_, _, _, ispec) = - array_fold_lefti cfg_coll_def Cfg.empty ispec + array_fold_lefti cfg_coll_def MyCfg.empty ispec (* Compute ispec for some domain *) @@ -137,7 +137,7 @@ let map_prod_el f = loop let calc_ispec_info live_gr dtp (tp_tbl, cnstr_tbl, _, ispec) = - let gr_dom = grammar_contents (Cfg.grammar_of_live live_gr) in + let gr_dom = grammar_contents (MyCfg.grammar_of_live live_gr) in let tp_tbl_len = Array.length tp_tbl in let tp_cnv_tbl = Array.make tp_tbl_len 0 in let cnv_tp tp = tp_cnv_tbl.(tp) in diff --git a/src/typing.mli b/src/typing.mli index 8749567..4ad866a 100644 --- a/src/typing.mli +++ b/src/typing.mli @@ -37,10 +37,10 @@ module AlgDtCfgSpec : sig val compare_prod : prod -> prod -> int end -module Cfg : Cfg_intf.CFG with module Spec = AlgDtCfgSpec +module MyCfg : Cfg_intf.CFG with module Spec = AlgDtCfgSpec val calc_pre_ispec_info : (cnstr_name, tp_name) type_defs -> pre_ispec_info -val cfg_of_pre_ispec_info : pre_ispec_info -> Cfg.grammar -val calc_ispec_info : Cfg.live_grammar -> tp -> pre_ispec_info -> ispec_info +val cfg_of_pre_ispec_info : pre_ispec_info -> MyCfg.grammar +val calc_ispec_info : MyCfg.live_grammar -> tp -> pre_ispec_info -> ispec_info val flatten_ispec : ispec -> fspec * tps