Commits

camlspotter committed a5edb09

ported to meta_conv 1.1.0

Comments (0)

Files changed (9)

+1.3.0
+--------------
+
+* based on meta_conv 1.1.0
+
 1.2.0
 --------------
 
 OASISFormat: 0.2
 Name:        tiny_json_conv
-Version:     1.2.0
+Version:     1.3.0
 Synopsis:    Meta conv for Tiny Json
 Authors:     Jun FURUSE
 License:     LGPL-2.0 with OCaml linking exception
 name="tiny_json_conv"
-version="1.2.0"
+version="1.3.0"
 description="Meta conv for Tiny Json"
 requires="tiny_json, meta_conv"
 archive(byte)="tiny_json_conv.cma"
 open Tiny_json
 open Json
 open Meta_conv.Open
-open Meta_conv.Internal
 
 (* encoders ***************************************************************)
 
 let errorf fmt =
   Printf.ksprintf (fun s -> failwith (Printf.sprintf "Json_conv: %s" s)) fmt
 
-include Meta_conv.Internal.Make(struct 
+include Meta_conv.Coder.Make(struct 
     
   type target = Json.t
 
       | Bool b -> fprintf ppf "%b" b
       | Null -> fprintf ppf "()"
 
-  module Encode = struct
+  module Constr = struct
     let tuple ts       = Array ts
     let variant tag = function
       | [] -> String tag
     let object_ = record
   end
   
-  module Decode = struct
+  module Deconstr = struct
     let tuple = function 
       | Array ts -> ts
       | _ -> errorf "Array expected for tuple"
 
 let errorff fmt = kprintf (fun s -> raise (Failure s)) fmt
 
-let string_of_json = prim_decode (function
+let string_of_json = Helper.of_deconstr (function
   | String s -> s
   | _ -> errorf "string_of_json: String expected")
 
-let char_of_json = prim_decode (function
+let char_of_json = Helper.of_deconstr (function
   | String s when String.length s = 1 -> s.[0]
   | _ -> errorf "char_of_json: a char expected")
 
-let int_check name min max conv = prim_decode (function 
+let int_check name min max conv = Helper.of_deconstr (function 
   | Number n -> 
-      begin match integer_of_float min max conv n with
+      begin match Helper.integer_of_float min max conv n with
       | `Ok v -> v
       | `Error s -> errorff "%s_of_json: %s" name s
       end
   let open Nativeint in
   int_check "nativeint" (to_float min_int) (to_float max_int) of_float
       
-let float_of_json = prim_decode (function
+let float_of_json = Helper.of_deconstr (function
   | Number n -> n
   | _ -> errorf "float_of_json: Number expected")
 
-let bool_of_json = prim_decode (function
+let bool_of_json = Helper.of_deconstr (function
   | Bool b -> b
   | _ -> errorf "bool_of_json: Bool expected")
 
-let unit_of_json = prim_decode (function
+let unit_of_json = Helper.of_deconstr (function
   | Null -> ()
   | _ -> errorf "unit_of_json: Null expected")
   
 let list_of_json f = 
-  generic_list_of (function Array xs -> Some xs | _ -> None) f
+  Helper.list_of (function Array xs -> Some xs | _ -> None) f
 
 let array_of_json f = 
-  generic_array_of (function Array xs -> Some xs | _ -> None) f
+  Helper.array_of (function Array xs -> Some xs | _ -> None) f
 
-let option_of_json f = generic_option_of 
+let option_of_json f = Helper.option_of 
   (function Null -> Some None | v -> Some (Some v))
   f
 
-let lazy_t_of_json d = generic_lazy_t_of (fun e -> raise (Error e)) d
-let mc_lazy_t_of_json (d : 'a decoder) = (generic_mc_lazy_t_of d : ('a, Json.t) mc_lazy_t decoder)
+let lazy_t_of_json d = Helper.lazy_t_of (fun e -> raise (Error e)) d
+let mc_lazy_t_of_json (d : 'a decoder) = (Helper.mc_lazy_t_of d : ('a, Json.t) mc_lazy_t decoder)
 
 let json_of_mc_fields enc xs = Object (List.map (fun (name, a) -> (name, enc a)) xs)
-let mc_fields_of_json dec = generic_mc_fields_of (function Object js -> Some js | _ -> None) dec
+let mc_fields_of_json dec = Helper.mc_fields_of (function Object js -> Some js | _ -> None) dec
 ocaml-version: [>= "4.0.0"]
-depends: ["ocamlfind" "omake" "tiny_json" {>="1.0.0"} "meta_conv" {>="1.0.0"}]
+depends: ["ocamlfind" "omake" "tiny_json" {>="1.0.0"} "meta_conv" {>="1.1.0"}]

opam/tiny_json_conv.1.3.0/descr

+Meta conv for Tiny Json
+Converters for meta_conv + tiny_json

opam/tiny_json_conv.1.3.0/opam

+opam-version: "1"
+maintainer: "jun.furuse@gmail.com"
+build: [
+  ["ocaml" "setup.ml" "-configure" "--prefix" "%{prefix}%"]
+  ["ocaml" "setup.ml" "-build"]
+  ["ocaml" "setup.ml" "-install"]
+]
+remove: [
+  ["ocaml" "setup.ml" "-uninstall"]
+]
+ocaml-version: [>= "4.0.0"]
+depends: ["ocamlfind" "omake" "tiny_json" {>="1.0.0"} "meta_conv" {>="1.1.0"}]

opam/tiny_json_conv.1.3.0/url

+archive: "https://bitbucket.org/camlspotter/tiny_json_conv/get/1.3.0.tar.gz"
 (* setup.ml generated for the first time by OASIS v0.3.0 *)
 
 (* OASIS_START *)
-(* DO NOT EDIT (digest: 04506f32d63980d783cd8f075af01ccf) *)
+(* DO NOT EDIT (digest: 886ad4e73e79d568deefc1464811fc1a) *)
 (*
    Regenerated by OASIS v0.3.0
    Visit http://oasis.forge.ocamlcore.org for more information and
    documentation about functions used in this file.
 *)
 module OASISGettext = struct
-(* # 21 "/somewhere/.share/projects/externals/oasis/_build/src/oasis/OASISGettext.ml" *)
+# 21 "/somewhere/.opam/system/build/oasis.0.3.0/src/oasis/OASISGettext.ml"
 
   let ns_ str =
     str
 end
 
 module OASISContext = struct
-(* # 21 "/somewhere/.share/projects/externals/oasis/_build/src/oasis/OASISContext.ml" *)
+# 21 "/somewhere/.opam/system/build/oasis.0.3.0/src/oasis/OASISContext.ml"
 
   open OASISGettext
 
 end
 
 module OASISString = struct
-(* # 1 "/somewhere/.share/projects/externals/oasis/_build/src/oasis/OASISString.ml" *)
+# 1 "/somewhere/.opam/system/build/oasis.0.3.0/src/oasis/OASISString.ml"
 
 
 
 end
 
 module OASISUtils = struct
-(* # 21 "/somewhere/.share/projects/externals/oasis/_build/src/oasis/OASISUtils.ml" *)
+# 21 "/somewhere/.opam/system/build/oasis.0.3.0/src/oasis/OASISUtils.ml"
 
   open OASISGettext
 
 end
 
 module PropList = struct
-(* # 21 "/somewhere/.share/projects/externals/oasis/_build/src/oasis/PropList.ml" *)
+# 21 "/somewhere/.opam/system/build/oasis.0.3.0/src/oasis/PropList.ml"
 
   open OASISGettext
 
     let clear t =
       Hashtbl.clear t
 
-(* # 71 "/somewhere/.share/projects/externals/oasis/_build/src/oasis/PropList.ml" *)
+# 71 "/somewhere/.opam/system/build/oasis.0.3.0/src/oasis/PropList.ml"
   end
 
   module Schema =
 end
 
 module OASISMessage = struct
-(* # 21 "/somewhere/.share/projects/externals/oasis/_build/src/oasis/OASISMessage.ml" *)
+# 21 "/somewhere/.opam/system/build/oasis.0.3.0/src/oasis/OASISMessage.ml"
 
 
   open OASISGettext
 end
 
 module OASISVersion = struct
-(* # 21 "/somewhere/.share/projects/externals/oasis/_build/src/oasis/OASISVersion.ml" *)
+# 21 "/somewhere/.opam/system/build/oasis.0.3.0/src/oasis/OASISVersion.ml"
 
   open OASISGettext
 
 end
 
 module OASISLicense = struct
-(* # 21 "/somewhere/.share/projects/externals/oasis/_build/src/oasis/OASISLicense.ml" *)
+# 21 "/somewhere/.opam/system/build/oasis.0.3.0/src/oasis/OASISLicense.ml"
 
   (** License for _oasis fields
       @author Sylvain Le Gall
 end
 
 module OASISExpr = struct
-(* # 21 "/somewhere/.share/projects/externals/oasis/_build/src/oasis/OASISExpr.ml" *)
+# 21 "/somewhere/.opam/system/build/oasis.0.3.0/src/oasis/OASISExpr.ml"
 
 
 
 end
 
 module OASISTypes = struct
-(* # 21 "/somewhere/.share/projects/externals/oasis/_build/src/oasis/OASISTypes.ml" *)
+# 21 "/somewhere/.opam/system/build/oasis.0.3.0/src/oasis/OASISTypes.ml"
 
 
 
 
   type plugin_data = (all_plugin * plugin_data_purpose * (unit -> unit)) list
 
-(* # 102 "/somewhere/.share/projects/externals/oasis/_build/src/oasis/OASISTypes.ml" *)
+# 102 "/somewhere/.opam/system/build/oasis.0.3.0/src/oasis/OASISTypes.ml"
 
   type 'a conditional = 'a OASISExpr.choices 
 
 end
 
 module OASISUnixPath = struct
-(* # 21 "/somewhere/.share/projects/externals/oasis/_build/src/oasis/OASISUnixPath.ml" *)
+# 21 "/somewhere/.opam/system/build/oasis.0.3.0/src/oasis/OASISUnixPath.ml"
 
   type unix_filename = string
   type unix_dirname = string
 end
 
 module OASISHostPath = struct
-(* # 21 "/somewhere/.share/projects/externals/oasis/_build/src/oasis/OASISHostPath.ml" *)
+# 21 "/somewhere/.opam/system/build/oasis.0.3.0/src/oasis/OASISHostPath.ml"
 
 
   open Filename
 end
 
 module OASISSection = struct
-(* # 21 "/somewhere/.share/projects/externals/oasis/_build/src/oasis/OASISSection.ml" *)
+# 21 "/somewhere/.opam/system/build/oasis.0.3.0/src/oasis/OASISSection.ml"
 
   open OASISTypes
 
 end
 
 module OASISBuildSection = struct
-(* # 21 "/somewhere/.share/projects/externals/oasis/_build/src/oasis/OASISBuildSection.ml" *)
+# 21 "/somewhere/.opam/system/build/oasis.0.3.0/src/oasis/OASISBuildSection.ml"
 
 end
 
 module OASISExecutable = struct
-(* # 21 "/somewhere/.share/projects/externals/oasis/_build/src/oasis/OASISExecutable.ml" *)
+# 21 "/somewhere/.opam/system/build/oasis.0.3.0/src/oasis/OASISExecutable.ml"
 
   open OASISTypes
 
 end
 
 module OASISLibrary = struct
-(* # 21 "/somewhere/.share/projects/externals/oasis/_build/src/oasis/OASISLibrary.ml" *)
+# 21 "/somewhere/.opam/system/build/oasis.0.3.0/src/oasis/OASISLibrary.ml"
 
   open OASISTypes
   open OASISUtils
 end
 
 module OASISFlag = struct
-(* # 21 "/somewhere/.share/projects/externals/oasis/_build/src/oasis/OASISFlag.ml" *)
+# 21 "/somewhere/.opam/system/build/oasis.0.3.0/src/oasis/OASISFlag.ml"
 
 end
 
 module OASISPackage = struct
-(* # 21 "/somewhere/.share/projects/externals/oasis/_build/src/oasis/OASISPackage.ml" *)
+# 21 "/somewhere/.opam/system/build/oasis.0.3.0/src/oasis/OASISPackage.ml"
 
 end
 
 module OASISSourceRepository = struct
-(* # 21 "/somewhere/.share/projects/externals/oasis/_build/src/oasis/OASISSourceRepository.ml" *)
+# 21 "/somewhere/.opam/system/build/oasis.0.3.0/src/oasis/OASISSourceRepository.ml"
 
 end
 
 module OASISTest = struct
-(* # 21 "/somewhere/.share/projects/externals/oasis/_build/src/oasis/OASISTest.ml" *)
+# 21 "/somewhere/.opam/system/build/oasis.0.3.0/src/oasis/OASISTest.ml"
 
 end
 
 module OASISDocument = struct
-(* # 21 "/somewhere/.share/projects/externals/oasis/_build/src/oasis/OASISDocument.ml" *)
+# 21 "/somewhere/.opam/system/build/oasis.0.3.0/src/oasis/OASISDocument.ml"
 
 end
 
 module OASISExec = struct
-(* # 21 "/somewhere/.share/projects/externals/oasis/_build/src/oasis/OASISExec.ml" *)
+# 21 "/somewhere/.opam/system/build/oasis.0.3.0/src/oasis/OASISExec.ml"
 
   open OASISGettext
   open OASISUtils
 end
 
 module OASISFileUtil = struct
-(* # 21 "/somewhere/.share/projects/externals/oasis/_build/src/oasis/OASISFileUtil.ml" *)
+# 21 "/somewhere/.opam/system/build/oasis.0.3.0/src/oasis/OASISFileUtil.ml"
 
   open OASISGettext
 
 
 # 2142 "setup.ml"
 module BaseEnvLight = struct
-(* # 21 "/somewhere/.share/projects/externals/oasis/_build/src/base/BaseEnvLight.ml" *)
+# 21 "/somewhere/.opam/system/build/oasis.0.3.0/src/base/BaseEnvLight.ml"
 
   module MapString = Map.Make(String)
 
 
 # 2240 "setup.ml"
 module BaseContext = struct
-(* # 21 "/somewhere/.share/projects/externals/oasis/_build/src/base/BaseContext.ml" *)
+# 21 "/somewhere/.opam/system/build/oasis.0.3.0/src/base/BaseContext.ml"
 
   open OASISContext
 
 end
 
 module BaseMessage = struct
-(* # 21 "/somewhere/.share/projects/externals/oasis/_build/src/base/BaseMessage.ml" *)
+# 21 "/somewhere/.opam/system/build/oasis.0.3.0/src/base/BaseMessage.ml"
 
   (** Message to user, overrid for Base
       @author Sylvain Le Gall
 end
 
 module BaseEnv = struct
-(* # 21 "/somewhere/.share/projects/externals/oasis/_build/src/base/BaseEnv.ml" *)
+# 21 "/somewhere/.opam/system/build/oasis.0.3.0/src/base/BaseEnv.ml"
 
   open OASISGettext
   open OASISUtils
 end
 
 module BaseArgExt = struct
-(* # 21 "/somewhere/.share/projects/externals/oasis/_build/src/base/BaseArgExt.ml" *)
+# 21 "/somewhere/.opam/system/build/oasis.0.3.0/src/base/BaseArgExt.ml"
 
   open OASISUtils
   open OASISGettext
 end
 
 module BaseCheck = struct
-(* # 21 "/somewhere/.share/projects/externals/oasis/_build/src/base/BaseCheck.ml" *)
+# 21 "/somewhere/.opam/system/build/oasis.0.3.0/src/base/BaseCheck.ml"
 
   open BaseEnv
   open BaseMessage
 end
 
 module BaseOCamlcConfig = struct
-(* # 21 "/somewhere/.share/projects/externals/oasis/_build/src/base/BaseOCamlcConfig.ml" *)
+# 21 "/somewhere/.opam/system/build/oasis.0.3.0/src/base/BaseOCamlcConfig.ml"
 
 
   open BaseEnv
 end
 
 module BaseStandardVar = struct
-(* # 21 "/somewhere/.share/projects/externals/oasis/_build/src/base/BaseStandardVar.ml" *)
+# 21 "/somewhere/.opam/system/build/oasis.0.3.0/src/base/BaseStandardVar.ml"
 
 
   open OASISGettext
 end
 
 module BaseFileAB = struct
-(* # 21 "/somewhere/.share/projects/externals/oasis/_build/src/base/BaseFileAB.ml" *)
+# 21 "/somewhere/.opam/system/build/oasis.0.3.0/src/base/BaseFileAB.ml"
 
   open BaseEnv
   open OASISGettext
 end
 
 module BaseLog = struct
-(* # 21 "/somewhere/.share/projects/externals/oasis/_build/src/base/BaseLog.ml" *)
+# 21 "/somewhere/.opam/system/build/oasis.0.3.0/src/base/BaseLog.ml"
 
   open OASISUtils
 
 end
 
 module BaseBuilt = struct
-(* # 21 "/somewhere/.share/projects/externals/oasis/_build/src/base/BaseBuilt.ml" *)
+# 21 "/somewhere/.opam/system/build/oasis.0.3.0/src/base/BaseBuilt.ml"
 
   open OASISTypes
   open OASISGettext
 end
 
 module BaseCustom = struct
-(* # 21 "/somewhere/.share/projects/externals/oasis/_build/src/base/BaseCustom.ml" *)
+# 21 "/somewhere/.opam/system/build/oasis.0.3.0/src/base/BaseCustom.ml"
 
   open BaseEnv
   open BaseMessage
 end
 
 module BaseDynVar = struct
-(* # 21 "/somewhere/.share/projects/externals/oasis/_build/src/base/BaseDynVar.ml" *)
+# 21 "/somewhere/.opam/system/build/oasis.0.3.0/src/base/BaseDynVar.ml"
 
 
   open OASISTypes
 end
 
 module BaseTest = struct
-(* # 21 "/somewhere/.share/projects/externals/oasis/_build/src/base/BaseTest.ml" *)
+# 21 "/somewhere/.opam/system/build/oasis.0.3.0/src/base/BaseTest.ml"
 
   open BaseEnv
   open BaseMessage
 end
 
 module BaseDoc = struct
-(* # 21 "/somewhere/.share/projects/externals/oasis/_build/src/base/BaseDoc.ml" *)
+# 21 "/somewhere/.opam/system/build/oasis.0.3.0/src/base/BaseDoc.ml"
 
   open BaseEnv
   open BaseMessage
 end
 
 module BaseSetup = struct
-(* # 21 "/somewhere/.share/projects/externals/oasis/_build/src/base/BaseSetup.ml" *)
+# 21 "/somewhere/.opam/system/build/oasis.0.3.0/src/base/BaseSetup.ml"
 
   open BaseEnv
   open BaseMessage
 
 # 4480 "setup.ml"
 module InternalConfigurePlugin = struct
-(* # 21 "/somewhere/.share/projects/externals/oasis/_build/src/plugins/internal/InternalConfigurePlugin.ml" *)
+# 21 "/somewhere/.opam/system/build/oasis.0.3.0/src/plugins/internal/InternalConfigurePlugin.ml"
 
   (** Configure using internal scheme
       @author Sylvain Le Gall
 end
 
 module InternalInstallPlugin = struct
-(* # 21 "/somewhere/.share/projects/externals/oasis/_build/src/plugins/internal/InternalInstallPlugin.ml" *)
+# 21 "/somewhere/.opam/system/build/oasis.0.3.0/src/plugins/internal/InternalInstallPlugin.ml"
 
   (** Install using internal scheme
       @author Sylvain Le Gall
 
 # 5233 "setup.ml"
 module CustomPlugin = struct
-(* # 21 "/somewhere/.share/projects/externals/oasis/_build/src/plugins/custom/CustomPlugin.ml" *)
+# 21 "/somewhere/.opam/system/build/oasis.0.3.0/src/plugins/custom/CustomPlugin.ml"
 
   (** Generate custom configure/build/doc/test/install system
       @author
           ocaml_version = None;
           findlib_version = None;
           name = "tiny_json_conv";
-          version = "1.2.0";
+          version = "1.3.0";
           license =
             OASISLicense.DEP5License
               (OASISLicense.DEP5Unit
           };
      oasis_fn = Some "_oasis";
      oasis_version = "0.3.0";
-     oasis_digest = Some "\143Rm\004D\135\168\250^\031\241)\029\020\028\135";
+     oasis_digest = Some "(\015@\152i\151\131/x%L\237g\0316U";
      oasis_exec = None;
      oasis_setup_args = [];
      setup_update = false;