From 0a1bf493f55e6d16173dc12b611f5cabcdb0b62e Mon Sep 17 00:00:00 2001 From: Enrico Tassi Date: Sun, 26 Apr 2020 22:51:03 +0200 Subject: [PATCH] wip --- src/API.ml | 26 +++++++++++++++----------- src/API.mli | 4 ++++ src/builtin.ml | 4 ---- src/builtin.mli | 4 ---- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/API.ml b/src/API.ml index f4fc578e0..610358d13 100644 --- a/src/API.ml +++ b/src/API.ml @@ -1065,19 +1065,23 @@ module Doc = struct let show_ty_ast = ED.Conversion.show_ty_ast end - let readback_int ~depth _ c s x = BuiltInData.int.Conversion.readback ~depth (new Conversion.ctx []) c s x - let readback_float ~depth _ c s x = BuiltInData.float.Conversion.readback ~depth (new Conversion.ctx []) c s x - let readback_string ~depth _ c s x = BuiltInData.string.Conversion.readback ~depth (new Conversion.ctx []) c s x + let readback_int ~depth h c s x = BuiltInData.int.Conversion.readback ~depth (new Conversion.ctx h#raw) c s x + let readback_float ~depth h c s x = BuiltInData.float.Conversion.readback ~depth (new Conversion.ctx h#raw) c s x + let readback_string ~depth h c s x = BuiltInData.string.Conversion.readback ~depth (new Conversion.ctx h#raw) c s x let readback_list = BuiltInData.readback_list - let readback_loc ~depth _ c s x = BuiltInData.loc.Conversion.readback ~depth (new Conversion.ctx []) c s x - let readback_nominal ~depth _ c s x = BuiltInData.nominal.Conversion.readback ~depth (new Conversion.ctx []) c s x - - let embed_int ~depth _ c s x = BuiltInData.int.Conversion.embed ~depth (new Conversion.ctx []) c s x - let embed_float ~depth _ c s x = BuiltInData.float.Conversion.embed ~depth (new Conversion.ctx []) c s x - let embed_string ~depth _ c s x = BuiltInData.string.Conversion.embed ~depth (new Conversion.ctx []) c s x + let readback_loc ~depth h c s x = BuiltInData.loc.Conversion.readback ~depth (new Conversion.ctx h#raw) c s x + let readback_nominal ~depth h c s x = BuiltInData.nominal.Conversion.readback ~depth (new Conversion.ctx h#raw) c s x + let readback_bool ~depth h c s x = BuiltInData.bool.Conversion.readback ~depth (new Conversion.ctx h#raw) c s x + let readback_char ~depth h c s x = BuiltInData.char.Conversion.readback ~depth (new Conversion.ctx h#raw) c s x + + let embed_int ~depth h c s x = BuiltInData.int.Conversion.embed ~depth (new Conversion.ctx h#raw) c s x + let embed_float ~depth h c s x = BuiltInData.float.Conversion.embed ~depth (new Conversion.ctx h#raw) c s x + let embed_string ~depth h c s x = BuiltInData.string.Conversion.embed ~depth (new Conversion.ctx h#raw) c s x let embed_list = BuiltInData.embed_list - let embed_loc ~depth _ c s x = BuiltInData.loc.Conversion.embed ~depth (new Conversion.ctx []) c s x - let embed_nominal ~depth _ c s x = BuiltInData.nominal.Conversion.embed ~depth (new Conversion.ctx []) c s x + let embed_loc ~depth h c s x = BuiltInData.loc.Conversion.embed ~depth (new Conversion.ctx h#raw) c s x + let embed_nominal ~depth h c s x = BuiltInData.nominal.Conversion.embed ~depth (new Conversion.ctx h#raw) c s x + let embed_bool ~depth h c s x = BuiltInData.bool.Conversion.embed ~depth (new Conversion.ctx h#raw) c s x + let embed_char ~depth h c s x = BuiltInData.char.Conversion.embed ~depth (new Conversion.ctx h#raw) c s x type context_description = | C : ('a,'k,'c) Conversion.context -> context_description diff --git a/src/API.mli b/src/API.mli index 95358de32..1f8c770ea 100644 --- a/src/API.mli +++ b/src/API.mli @@ -1165,6 +1165,8 @@ module PPX : sig val readback_list : ('a, 'c) Conversion.readback -> ('a list,'c) Conversion.readback val readback_loc : (Ast.Loc.t, 'c) Conversion.readback val readback_nominal : (RawData.constant, 'c) Conversion.readback + val readback_bool : (bool, 'h) Conversion.readback + val readback_char : (char, 'h) Conversion.readback val embed_int : (int, 'c) Conversion.embedding val embed_float : (float, 'c) Conversion.embedding @@ -1172,6 +1174,8 @@ module PPX : sig val embed_list : ('a, 'c) Conversion.embedding -> ('a list, 'c) Conversion.embedding val embed_loc : (Ast.Loc.t, 'c) Conversion.embedding val embed_nominal : (RawData.constant, 'c) Conversion.embedding + val embed_bool : (bool, 'h) Conversion.embedding + val embed_char : (char, 'h) Conversion.embedding type context_description = | C : ('a,'k,'c) Conversion.context -> context_description diff --git a/src/builtin.ml b/src/builtin.ml index c67883100..0ea697441 100644 --- a/src/builtin.ml +++ b/src/builtin.ml @@ -1391,8 +1391,6 @@ module PPX = struct let readback_pair = readback_pair let readback_option = readback_option - let readback_bool ~depth _ c s x = bool.API.Conversion.readback ~depth (new Conversion.ctx []) c s x - let readback_char ~depth _ c s x = char.API.Conversion.readback ~depth (new Conversion.ctx []) c s x let readback_triple = readback_triple let readback_quadruple = readback_quadruple @@ -1400,8 +1398,6 @@ module PPX = struct let embed_pair = embed_pair let embed_option = embed_option - let embed_bool ~depth _ c s x = bool.API.Conversion.embed ~depth (new Conversion.ctx []) c s x - let embed_char ~depth _ c s x = char.API.Conversion.embed ~depth (new Conversion.ctx []) c s x let embed_triple = embed_triple let embed_quadruple = embed_quadruple diff --git a/src/builtin.mli b/src/builtin.mli index 329eaf31c..d298485da 100644 --- a/src/builtin.mli +++ b/src/builtin.mli @@ -60,8 +60,6 @@ module PPX : sig val readback_pair : ('a, 'h) API.Conversion.readback -> ('b, 'h) API.Conversion.readback -> ('a * 'b, 'h) API.Conversion.readback val readback_option : ('a, 'h) API.Conversion.readback -> ('a option, 'h) API.Conversion.readback - val readback_bool : (bool, 'h) API.Conversion.readback - val readback_char : (char, 'h) API.Conversion.readback val readback_triple : ('a, 'h) API.Conversion.readback -> ('b, 'h) API.Conversion.readback -> ('c, 'h) API.Conversion.readback -> ('a * 'b * 'c, 'h) API.Conversion.readback val readback_quadruple : ('a, 'h) API.Conversion.readback -> ('b, 'h) API.Conversion.readback -> ('c, 'h) API.Conversion.readback -> ('d, 'h) API.Conversion.readback -> ('a * 'b * 'c * 'd, 'h) API.Conversion.readback @@ -69,8 +67,6 @@ module PPX : sig val embed_pair : ('a, 'h) API.Conversion.embedding -> ('b, 'h) API.Conversion.embedding -> ('a * 'b, 'h) API.Conversion.embedding val embed_option : ('a, 'h) API.Conversion.embedding -> ('a option, 'h) API.Conversion.embedding - val embed_bool : (bool, 'h) API.Conversion.embedding - val embed_char : (char, 'h) API.Conversion.embedding val embed_triple : ('a, 'h) API.Conversion.embedding -> ('b, 'h) API.Conversion.embedding -> ('c, 'h) API.Conversion.embedding -> ('a * 'b * 'c, 'h) API.Conversion.embedding val embed_quadruple : ('a, 'h) API.Conversion.embedding -> ('b, 'h) API.Conversion.embedding -> ('c, 'h) API.Conversion.embedding -> ('d, 'h) API.Conversion.embedding -> ('a * 'b * 'c * 'd, 'h) API.Conversion.embedding