[Pkg-ocaml-maint-commits] [type-conv] 07/09: Imported Upstream version 111.13.00
Lifeng Sun
lifengsun-guest at moszumanska.debian.org
Fri Jul 18 11:03:34 UTC 2014
This is an automated email from the git hooks/post-receive script.
lifengsun-guest pushed a commit to branch master
in repository type-conv.
commit 221396d9ca0d22de68017864f8e2989952583361
Author: Lifeng Sun <lifongsun at gmail.com>
Date: Tue Jul 15 12:27:16 2014 +0800
Imported Upstream version 111.13.00
---
INSTALL.txt | 4 ++--
README.md | 32 ++++++++++++++------------------
_oasis | 2 +-
lib/META | 4 ++--
lib/pa_type_conv.ml | 14 ++++++++++----
lib/type_conv.odocl | 4 ----
setup.ml | 24 +++++++++++++++---------
7 files changed, 44 insertions(+), 40 deletions(-)
diff --git a/INSTALL.txt b/INSTALL.txt
index bebbcfa..a53a70c 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -1,9 +1,9 @@
(* OASIS_START *)
-(* DO NOT EDIT (digest: a96fa91ff980298b21f837b144fee0d3) *)
+(* DO NOT EDIT (digest: a332b0d0572a054e00f4c318f478af84) *)
This is the INSTALL file for the type_conv distribution.
This package uses OASIS to generate its build system. See section OASIS for
-full information.
+full information.
Dependencies
============
diff --git a/README.md b/README.md
index 8a68077..2bb8a85 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,14 @@
-`Type_conv` - Support Library for Preprocessor Type Conversions
-===============================================================
+Type_conv
+=========
----------------------------------------------------------------------------
+Support Library for Preprocessor Type Conversions.
-What is `type_conv`?
---------------------
+What is type_conv?
+------------------
-The `type_conv` mini-library factors out functionality needed by different
-preprocessors that generate code from type specifications. Example libraries
-currently depending on `type_conv`:
+The `type_conv` mini-library factors out functionality needed by
+different preprocessors that generate code from type specifications.
+Example libraries currently depending on `type_conv`:
* `bin_prot`
* `comparelib`
@@ -19,26 +19,22 @@ currently depending on `type_conv`:
* `typehash`
* `variantslib`
-This functionality cannot otherwise be duplicated without losing the ability
-to use these preprocessors simultaneously.
+This functionality cannot otherwise be duplicated without losing the
+ability to use these preprocessors simultaneously.
Documentation
-------------
-API-documentation can be built during installation (`make doc`).
-The API-documentation of the latest release can also be found
-[online](http://mmottl.bitbucket.org/projects/type_conv/api/).
-
----------------------------------------------------------------------------
+The API-documentation of the latest release can be found
+[online](https://ocaml.janestreet.com/ocaml-core/latest/doc/type_conv/).
Contact Information and Contributing
------------------------------------
-In the case of bugs, feature requests, contributions and similar, please
-contact the maintainers:
+In the case of bugs, feature requests, contributions and similar,
+please contact the maintainers:
* Jane Street Capital, LLC <opensource at janestreet.com>
Up-to-date information should be available at:
* <https://github.com/janestreet/type_conv>
-* <https://bitbucket.org/janestreet/type_conv>
diff --git a/_oasis b/_oasis
index 3642682..03e5ab8 100644
--- a/_oasis
+++ b/_oasis
@@ -2,7 +2,7 @@ OASISFormat: 0.3
OCamlVersion: >= 4.00.0
FindlibVersion: >= 1.3.2
Name: type_conv
-Version: 109.60.01
+Version: 111.13.00
Synopsis: type_conv - support library for preprocessor type conversions
Authors: Jane Street Capital LLC <opensource at janestreet.com>
Copyrights: (C) 2005-2013 Jane Street Capital LLC <opensource at janestreet.com>
diff --git a/lib/META b/lib/META
index 867b938..f7e103a 100644
--- a/lib/META
+++ b/lib/META
@@ -1,6 +1,6 @@
# OASIS_START
-# DO NOT EDIT (digest: 3e10afe9a4cde0d152fc302c1251da40)
-version = "109.60.01"
+# DO NOT EDIT (digest: 561e7333a5d1fc6eee9ae8bbbbe1d037)
+version = "111.13.00"
description = "Syntax extension for type_conv"
requires = "camlp4"
archive(syntax, preprocessor) = "pa_type_conv.cma"
diff --git a/lib/pa_type_conv.ml b/lib/pa_type_conv.ml
index 0098607..2a2172e 100644
--- a/lib/pa_type_conv.ml
+++ b/lib/pa_type_conv.ml
@@ -921,11 +921,11 @@ let () =
module M : sig type t = [ `A ] with sexp end = ...
is likely to generate a warning 'unused value t_of_sexp__' in the signature (the same
warning in an implementation would be already removed).
- To work around that, for every 'val name : type' auto generated, we insert a
- 'val name : _no_unused_value_warning_' next to it.
+ To work around that, every auto generated 'val name : type' is replaced by
+ 'val name : type _no_unused_value_warning_'.
And in a second step (could probably be done in one step, but it would be complicated),
- we try to generate an expression that will use these name (which we recognize thanks to
- the '_no_unused_value_warning_' mark).
+ we try to generate an expression that will use these names (which we recognize because
+ of the mark), and whether we succeed or not, we remove the mark.
To use a 'val name : type' in a context like:
module M : sig val name : type end = ...
you simply need to do:
@@ -980,6 +980,12 @@ let ignore = object (self)
let warnings_removal = use_idents loc (qualify_idents loc m idents) in
<:str_item at loc< module $uid:m$ : $module_type$ = $module_expr$; $warnings_removal$ >>
+ | <:str_item at loc< include ($module_expr$ : $module_type$) >> ->
+ let module_expr = self#module_expr module_expr in
+ let idents, module_type = self#ignore_module_type module_type in
+ let warnings_removal = use_idents loc idents in
+ <:str_item at loc< include ($module_expr$ : $module_type$); $warnings_removal$ >>
+
| StMod _
| StSem _
| StInc _
diff --git a/lib/type_conv.odocl b/lib/type_conv.odocl
deleted file mode 100644
index 6ac4137..0000000
--- a/lib/type_conv.odocl
+++ /dev/null
@@ -1,4 +0,0 @@
-# OASIS_START
-# DO NOT EDIT (digest: 4688111c934ddd0f4ac3eded6942b27f)
-Pa_type_conv
-# OASIS_STOP
diff --git a/setup.ml b/setup.ml
index cbb55d9..5d6d9b6 100644
--- a/setup.ml
+++ b/setup.ml
@@ -1,5 +1,5 @@
(* OASIS_START *)
-(* DO NOT EDIT (digest: ffca4140a6f6ef4ddbf0e2253ffe3f3a) *)
+(* DO NOT EDIT (digest: 0cf4d7cc88f7f09e745394d1251a8eaf) *)
(*
Regenerated by OASIS v0.4.1
Visit http://oasis.forge.ocamlcore.org for more information and
@@ -1612,6 +1612,12 @@ module OASISFeatures = struct
create "section_object" beta
(fun () ->
s_ "Implement an object section.")
+
+
+ let dynrun_for_release =
+ create "dynrun_for_release" alpha
+ (fun () ->
+ s_ "Make '-setup-update dynamic' suitable for releasing project.")
end
module OASISUnixPath = struct
@@ -2755,7 +2761,7 @@ module OASISFileUtil = struct
end
-# 2760 "setup.ml"
+# 2766 "setup.ml"
module BaseEnvLight = struct
(* # 22 "src/base/BaseEnvLight.ml" *)
@@ -2859,7 +2865,7 @@ module BaseEnvLight = struct
end
-# 2864 "setup.ml"
+# 2870 "setup.ml"
module BaseContext = struct
(* # 22 "src/base/BaseContext.ml" *)
@@ -5266,7 +5272,7 @@ module BaseSetup = struct
end
-# 5271 "setup.ml"
+# 5277 "setup.ml"
module InternalConfigurePlugin = struct
(* # 22 "src/plugins/internal/InternalConfigurePlugin.ml" *)
@@ -6115,7 +6121,7 @@ module InternalInstallPlugin = struct
end
-# 6120 "setup.ml"
+# 6126 "setup.ml"
module OCamlbuildCommon = struct
(* # 22 "src/plugins/ocamlbuild/OCamlbuildCommon.ml" *)
@@ -6517,7 +6523,7 @@ module OCamlbuildDocPlugin = struct
end
-# 6522 "setup.ml"
+# 6528 "setup.ml"
open OASISTypes;;
let setup_t =
@@ -6544,7 +6550,7 @@ let setup_t =
alpha_features = [];
beta_features = [];
name = "type_conv";
- version = "109.60.01";
+ version = "111.13.00";
license =
OASISLicense.DEP5License
(OASISLicense.DEP5Unit
@@ -6649,7 +6655,7 @@ let setup_t =
};
oasis_fn = Some "_oasis";
oasis_version = "0.4.1";
- oasis_digest = Some "v4:'\1902\196u\237t\182\129E\248Jw";
+ oasis_digest = Some "\021\023\161R\129\132\133\253\151tt\159\231<J\180";
oasis_exec = None;
oasis_setup_args = [];
setup_update = false
@@ -6657,6 +6663,6 @@ let setup_t =
let setup () = BaseSetup.setup setup_t;;
-# 6663 "setup.ml"
+# 6669 "setup.ml"
(* OASIS_STOP *)
let () = setup ()
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/type-conv.git
More information about the Pkg-ocaml-maint-commits
mailing list