[Pkg-ocaml-maint-commits] [SCM] fieldslib packaging branch, upstream, updated. upstream/107.01-24-gf6cfb28
The following commit has been merged in the upstream branch: commit 232756b873a6264b803baa074d89cb3cfb9abf4c Author: Stephane Glondu st...@glondu.net Date: Sun Jun 23 22:12:35 2013 +0200 Imported Upstream version 109.03.00 diff --git a/_oasis b/_oasis index ab9ac34..2569ce1 100644 --- a/_oasis +++ b/_oasis @@ -2,7 +2,7 @@ OASISFormat: 0.3 OCamlVersion: = 3.12.1 Name: fieldslib -Version: 109.02.00 +Version: 109.03.00 Synopsis: OCaml record fields as first class values. Authors: Jane street capital Copyrights: (C) 2009-2011 Jane Street Capital LLC -- fieldslib packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] fieldslib packaging branch, upstream, updated. upstream/107.01-24-gf6cfb28
The following commit has been merged in the upstream branch: commit e73532dbb5d6d93c1880421197e13ea7e13b96db Author: Stephane Glondu st...@glondu.net Date: Sun Jun 23 22:12:33 2013 +0200 Imported Upstream version 109.02.00 diff --git a/_oasis b/_oasis index edda5a0..ab9ac34 100644 --- a/_oasis +++ b/_oasis @@ -2,7 +2,7 @@ OASISFormat: 0.3 OCamlVersion: = 3.12.1 Name: fieldslib -Version: 109.01.00 +Version: 109.02.00 Synopsis: OCaml record fields as first class values. Authors: Jane street capital Copyrights: (C) 2009-2011 Jane Street Capital LLC -- fieldslib packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] fieldslib packaging branch, upstream, updated. upstream/107.01-24-gf6cfb28
The following commit has been merged in the upstream branch: commit b9da67f0105c8abfec234a97429967b0cfcef9c5 Author: Stephane Glondu st...@glondu.net Date: Sun Jun 23 22:12:30 2013 +0200 Imported Upstream version 109.00.00 diff --git a/_oasis b/_oasis index 36cc911..eb6df86 100644 --- a/_oasis +++ b/_oasis @@ -2,7 +2,7 @@ OASISFormat: 0.3 OCamlVersion: = 3.12.1 Name: fieldslib -Version: 108.10.00 +Version: 109.00.00 Synopsis: OCaml record fields as first class values. Authors: Jane street capital Copyrights: (C) 2009-2011 Jane Street Capital LLC -- fieldslib packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] fieldslib packaging branch, upstream, updated. upstream/107.01-24-gf6cfb28
The following commit has been merged in the upstream branch: commit 6c5be61a129845bc4102a62718005f52567d7424 Author: Stephane Glondu st...@glondu.net Date: Sun Jun 23 22:04:27 2013 +0200 Imported Upstream version 108.10.00 diff --git a/_oasis b/_oasis index 59572b9..36cc911 100644 --- a/_oasis +++ b/_oasis @@ -2,7 +2,7 @@ OASISFormat: 0.3 OCamlVersion: = 3.12.1 Name: fieldslib -Version: 108.09.00 +Version: 108.10.00 Synopsis: OCaml record fields as first class values. Authors: Jane street capital Copyrights: (C) 2009-2011 Jane Street Capital LLC -- fieldslib packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] fieldslib packaging branch, upstream, updated. upstream/107.01-24-gf6cfb28
The following commit has been merged in the upstream branch: commit 7624b40449a824df7a393a32ee67d369cc8584c8 Author: Stephane Glondu st...@glondu.net Date: Sun Jun 23 22:03:56 2013 +0200 Imported Upstream version 108.07.01 diff --git a/_oasis b/_oasis index e920d4a..15fef14 100644 --- a/_oasis +++ b/_oasis @@ -2,7 +2,7 @@ OASISFormat: 0.3 OCamlVersion: = 3.12.1 Name: fieldslib -Version: 108.07.00 +Version: 108.07.01 Synopsis: OCaml record fields as first class values. Authors: Jane street capital Copyrights: (C) 2009-2011 Jane Street Capital LLC diff --git a/lib/META b/lib/META index 0565a72..da2aafc 100644 --- a/lib/META +++ b/lib/META @@ -1,6 +1,6 @@ # OASIS_START -# DO NOT EDIT (digest: 1c5fae1fd197461ceef16312c983cfa5) -version = 108.07.00 +# DO NOT EDIT (digest: ec5b3c3e184c81261a6490d6978d09f5) +version = 108.07.01 description = OCaml record fields as first class values. archive(byte) = fieldslib.cma archive(byte, plugin) = fieldslib.cma @@ -8,7 +8,7 @@ archive(native) = fieldslib.cmxa archive(native, plugin) = fieldslib.cmxs exists_if = fieldslib.cma package syntax ( - version = 108.07.00 + version = 108.07.01 description = Syntax extension for Fieldslib requires = camlp4 type_conv fieldslib archive(syntax, preprocessor) = pa_fields_conv.cma diff --git a/setup.ml b/setup.ml index 9b6dc39..161b1ab 100644 --- a/setup.ml +++ b/setup.ml @@ -1,7 +1,7 @@ (* setup.ml generated for the first time by OASIS v0.3.0 *) (* OASIS_START *) -(* DO NOT EDIT (digest: db2b0894d90ed4080b091edb46b8d3e1) *) +(* DO NOT EDIT (digest: e2d6031be1cd994bd4d2f0a007eed3f2) *) (* Regenerated by OASIS v0.3.0 Visit http://oasis.forge.ocamlcore.org for more information and @@ -5578,7 +5578,7 @@ let setup_t = ocaml_version = Some (OASISVersion.VGreaterEqual 3.12.1); findlib_version = None; name = fieldslib; - version = 108.07.00; + version = 108.07.01; license = OASISLicense.DEP5License (OASISLicense.DEP5Unit @@ -5738,7 +5738,7 @@ let setup_t = }; oasis_fn = Some _oasis; oasis_version = 0.3.0; - oasis_digest = Some G\028w\231Z\018*\249vm\017c!F\213:; + oasis_digest = Some \240\250n\218\140\1639\197W]\Bf\152\166|; oasis_exec = None; oasis_setup_args = []; setup_update = false; -- fieldslib packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] fieldslib packaging branch, upstream, updated. upstream/107.01-24-gf6cfb28
The following commit has been merged in the upstream branch: commit 9385de54cd135f69900ddbbb8976d1fb3d98e157 Author: Stephane Glondu st...@glondu.net Date: Sun Jun 23 22:12:32 2013 +0200 Imported Upstream version 109.01.00 diff --git a/_oasis b/_oasis index eb6df86..edda5a0 100644 --- a/_oasis +++ b/_oasis @@ -2,7 +2,7 @@ OASISFormat: 0.3 OCamlVersion: = 3.12.1 Name: fieldslib -Version: 109.00.00 +Version: 109.01.00 Synopsis: OCaml record fields as first class values. Authors: Jane street capital Copyrights: (C) 2009-2011 Jane Street Capital LLC -- fieldslib packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] fieldslib packaging branch, upstream, updated. upstream/107.01-24-gf6cfb28
The following commit has been merged in the upstream branch: commit c111a540f121f245eaf1591747a7ec34b794e0ce Author: Stephane Glondu st...@glondu.net Date: Sun Jun 23 22:12:54 2013 +0200 Imported Upstream version 109.15.00 diff --git a/_oasis b/_oasis index 6849781..2b1b9fa 100644 --- a/_oasis +++ b/_oasis @@ -2,7 +2,7 @@ OASISFormat: 0.3 OCamlVersion: = 4.00.0 FindlibVersion: = 1.3.2 Name: fieldslib -Version: 109.14.00 +Version: 109.15.00 Synopsis: OCaml record fields as first class values. Authors: Jane Street Capital LLC opensou...@janestreet.com Copyrights: (C) 2009-2013 Jane Street Capital LLC opensou...@janestreet.com diff --git a/lib/META b/lib/META index c67cde9..daa458b 100644 --- a/lib/META +++ b/lib/META @@ -1,6 +1,6 @@ # OASIS_START -# DO NOT EDIT (digest: ba64376e436524522f451e9c335ef6be) -version = 109.14.00 +# DO NOT EDIT (digest: 1af46c9ae2ec7fc26bcb968d5ec37100) +version = 109.15.00 description = OCaml record fields as first class values. archive(byte) = fieldslib.cma archive(byte, plugin) = fieldslib.cma @@ -8,7 +8,7 @@ archive(native) = fieldslib.cmxa archive(native, plugin) = fieldslib.cmxs exists_if = fieldslib.cma package syntax ( - version = 109.14.00 + version = 109.15.00 description = Syntax extension for Fieldslib requires = camlp4 type_conv fieldslib archive(syntax, preprocessor) = pa_fields_conv.cma diff --git a/setup.ml b/setup.ml index 438350f..9809f50 100644 --- a/setup.ml +++ b/setup.ml @@ -1,5 +1,5 @@ (* OASIS_START *) -(* DO NOT EDIT (digest: 35110c9a8a72ada9ab1448c21e348c48) *) +(* DO NOT EDIT (digest: 3599482522ead0215d5b8628c9fc37cc) *) (* Regenerated by OASIS v0.3.0 Visit http://oasis.forge.ocamlcore.org for more information and @@ -5576,7 +5576,7 @@ let setup_t = ocaml_version = Some (OASISVersion.VGreaterEqual 4.00.0); findlib_version = Some (OASISVersion.VGreaterEqual 1.3.2); name = fieldslib; - version = 109.14.00; + version = 109.15.00; license = OASISLicense.DEP5License (OASISLicense.DEP5Unit @@ -5746,7 +5746,7 @@ let setup_t = }; oasis_fn = Some _oasis; oasis_version = 0.3.0; - oasis_digest = Some 0\152+\1689N\133\170-%+\140\027pf\018; + oasis_digest = Some y\155\204\228\158\012J\1606,\\\1309\243\017\242; oasis_exec = None; oasis_setup_args = []; setup_update = false; -- fieldslib packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] fieldslib packaging branch, upstream, updated. upstream/107.01-24-gf6cfb28
The following commit has been merged in the upstream branch:
commit 9990799cd28f4f842cc5fa57568b8a8f95932df8
Author: Stephane Glondu st...@glondu.net
Date: Sun Jun 23 22:12:50 2013 +0200
Imported Upstream version 109.12.00
diff --git a/_oasis b/_oasis
index 57e3748..0b98751 100644
--- a/_oasis
+++ b/_oasis
@@ -2,7 +2,7 @@ OASISFormat: 0.3
OCamlVersion: = 4.00.0
FindlibVersion: = 1.3.2
Name: fieldslib
-Version: 109.11.00
+Version: 109.12.00
Synopsis: OCaml record fields as first class values.
Authors: Jane Street Capital LLC opensou...@janestreet.com
Copyrights: (C) 2009-2013 Jane Street Capital LLC
opensou...@janestreet.com
@@ -30,7 +30,6 @@ Library pa_fields_conv
BuildDepends: camlp4.lib,
camlp4.quotations,
type_conv (= 3.0.5)
- CompiledObject: byte
XMETAType: syntax
XMETARequires: camlp4,type_conv,fieldslib
XMETADescription: Syntax extension for Fieldslib
diff --git a/lib/META b/lib/META
index 55fb744..fe26d79 100644
--- a/lib/META
+++ b/lib/META
@@ -1,6 +1,6 @@
# OASIS_START
-# DO NOT EDIT (digest: 9ae32f6ca26ce00194d29ca8a6983741)
-version = 109.11.00
+# DO NOT EDIT (digest: 8809ed940b7d861b5058a9e6328c29fc)
+version = 109.12.00
description = OCaml record fields as first class values.
archive(byte) = fieldslib.cma
archive(byte, plugin) = fieldslib.cma
@@ -8,7 +8,7 @@ archive(native) = fieldslib.cmxa
archive(native, plugin) = fieldslib.cmxs
exists_if = fieldslib.cma
package syntax (
- version = 109.11.00
+ version = 109.12.00
description = Syntax extension for Fieldslib
requires = camlp4 type_conv fieldslib
archive(syntax, preprocessor) = pa_fields_conv.cma
diff --git a/lib_test/fields_test.ml b/lib_test/fields_test.ml
index e0e19b3..d63fcff 100644
--- a/lib_test/fields_test.ml
+++ b/lib_test/fields_test.ml
@@ -31,8 +31,13 @@ end
module Private : sig
type t = private { a : int; mutable b : int }
with fields
+ (* exporting the type u wouldn't work for now *)
end = struct
- type u = { a : int; mutable b : int }
- type t = u = private { a : int; mutable b : int }
+ type t = { a : int; mutable b : int }
with fields
+ module U = struct
+type u = t = private { a : int; mutable b : int }
+with fields
+ end
end
+let _ = Private.Fields.fold
diff --git a/myocamlbuild.ml b/myocamlbuild.ml
index b662ce1..015f5b5 100644
--- a/myocamlbuild.ml
+++ b/myocamlbuild.ml
@@ -1,7 +1,7 @@
(* OASIS_START *)
-(* DO NOT EDIT (digest: 1ba924f9ab03ba504be1c3b6c5424aa7) *)
+(* DO NOT EDIT (digest: 7b6df1a3044e5627553b5a7d6945d59f) *)
module OASISGettext = struct
-(* # 21
/mnt/local/sda1/jdimino/plop/4.01.0dev+short-paths/build/oasis.0.3.0/src/oasis/OASISGettext.ml
*)
+(* # 21
/mnt/local/sda1/jdimino/dot-opam/4.01.0dev+short-paths/build/oasis.0.3.0/src/oasis/OASISGettext.ml
*)
let ns_ str =
str
@@ -24,7 +24,7 @@ module OASISGettext = struct
end
module OASISExpr = struct
-(* # 21
/mnt/local/sda1/jdimino/plop/4.01.0dev+short-paths/build/oasis.0.3.0/src/oasis/OASISExpr.ml
*)
+(* # 21
/mnt/local/sda1/jdimino/dot-opam/4.01.0dev+short-paths/build/oasis.0.3.0/src/oasis/OASISExpr.ml
*)
@@ -116,7 +116,7 @@ end
# 117 myocamlbuild.ml
module BaseEnvLight = struct
-(* # 21
/mnt/local/sda1/jdimino/plop/4.01.0dev+short-paths/build/oasis.0.3.0/src/base/BaseEnvLight.ml
*)
+(* # 21
/mnt/local/sda1/jdimino/dot-opam/4.01.0dev+short-paths/build/oasis.0.3.0/src/base/BaseEnvLight.ml
*)
module MapString = Map.Make(String)
@@ -214,7 +214,7 @@ end
# 215 myocamlbuild.ml
module MyOCamlbuildFindlib = struct
-(* # 21
/mnt/local/sda1/jdimino/plop/4.01.0dev+short-paths/build/oasis.0.3.0/src/plugins/ocamlbuild/MyOCamlbuildFindlib.ml
*)
+(* # 21
/mnt/local/sda1/jdimino/dot-opam/4.01.0dev+short-paths/build/oasis.0.3.0/src/plugins/ocamlbuild/MyOCamlbuildFindlib.ml
*)
(** OCamlbuild extension, copied from
* http://brion.inria.fr/gallium/index.php/Using_ocamlfind_with_ocamlbuild
@@ -323,7 +323,7 @@ module MyOCamlbuildFindlib = struct
end
module MyOCamlbuildBase = struct
-(* # 21
/mnt/local/sda1/jdimino/plop/4.01.0dev+short-paths/build/oasis.0.3.0/src/plugins/ocamlbuild/MyOCamlbuildBase.ml
*)
+(* # 21
/mnt/local/sda1/jdimino/dot-opam/4.01.0dev+short-paths/build/oasis.0.3.0/src/plugins/ocamlbuild/MyOCamlbuildBase.ml
*)
(** Base functions for writing myocamlbuild.ml
@author Sylvain Le Gall
@@ -339,7 +339,7 @@ module MyOCamlbuildBase = struct
type name = string
type tag = string
-(* # 56
/mnt/local/sda1/jdimino/plop/4.01.0dev+short-paths/build/oasis.0.3.0/src/plugins/ocamlbuild/MyOCamlbuildBase.ml
*)
+(* # 56
/mnt/local/sda1/jdimino/dot-opam/4.01.0dev+short-paths/build/oasis.0.3.0/src/plugins/ocamlbuild/MyOCamlbuildBase.ml
*)
type t =
{
diff --git a/sample/test.ml b/sample/test.ml
index 3b63819..a0c391f 100644
--- a/sample/test.ml
+++ b/sample/test.ml
@@ -13,7 +13,7
[Pkg-ocaml-maint-commits] [SCM] fieldslib packaging branch, upstream, updated. upstream/107.01-24-gf6cfb28
The following commit has been merged in the upstream branch:
commit 76c5a197502abccc3c03b6f9fc3055dab1e8d4d1
Author: Stephane Glondu st...@glondu.net
Date: Sun Jun 23 22:04:02 2013 +0200
Imported Upstream version 108.08.00
diff --git a/_oasis b/_oasis
index 15fef14..d5023e2 100644
--- a/_oasis
+++ b/_oasis
@@ -2,7 +2,7 @@
OASISFormat: 0.3
OCamlVersion: = 3.12.1
Name: fieldslib
-Version: 108.07.01
+Version: 108.08.00
Synopsis: OCaml record fields as first class values.
Authors: Jane street capital
Copyrights: (C) 2009-2011 Jane Street Capital LLC
diff --git a/lib/META b/lib/META
index da2aafc..936c11e 100644
--- a/lib/META
+++ b/lib/META
@@ -1,6 +1,6 @@
# OASIS_START
-# DO NOT EDIT (digest: ec5b3c3e184c81261a6490d6978d09f5)
-version = 108.07.01
+# DO NOT EDIT (digest: 5e254d6ff571a0820a4abd14cae06cea)
+version = 108.08.00
description = OCaml record fields as first class values.
archive(byte) = fieldslib.cma
archive(byte, plugin) = fieldslib.cma
@@ -8,7 +8,7 @@ archive(native) = fieldslib.cmxa
archive(native, plugin) = fieldslib.cmxs
exists_if = fieldslib.cma
package syntax (
- version = 108.07.01
+ version = 108.08.00
description = Syntax extension for Fieldslib
requires = camlp4 type_conv fieldslib
archive(syntax, preprocessor) = pa_fields_conv.cma
diff --git a/myocamlbuild.ml b/myocamlbuild.ml
index 79fe327..91a8a59 100644
--- a/myocamlbuild.ml
+++ b/myocamlbuild.ml
@@ -1,7 +1,7 @@
(* OASIS_START *)
-(* DO NOT EDIT (digest: 14c30b8858baa68e5c490dd451e7c56b) *)
+(* DO NOT EDIT (digest: 8cb0bd7c9e0e2276efeffe40cb5a09bd) *)
module OASISGettext = struct
-(* # 21 /tmp/oasis-0.3.0/src/oasis/OASISGettext.ml *)
+(* # 21
/home/ysulsky/.opam/4.00.1/build/oasis.0.3.0/src/oasis/OASISGettext.ml *)
let ns_ str =
str
@@ -24,7 +24,7 @@ module OASISGettext = struct
end
module OASISExpr = struct
-(* # 21 /tmp/oasis-0.3.0/src/oasis/OASISExpr.ml *)
+(* # 21 /home/ysulsky/.opam/4.00.1/build/oasis.0.3.0/src/oasis/OASISExpr.ml
*)
@@ -116,7 +116,7 @@ end
# 117 myocamlbuild.ml
module BaseEnvLight = struct
-(* # 21 /tmp/oasis-0.3.0/src/base/BaseEnvLight.ml *)
+(* # 21
/home/ysulsky/.opam/4.00.1/build/oasis.0.3.0/src/base/BaseEnvLight.ml *)
module MapString = Map.Make(String)
@@ -214,7 +214,7 @@ end
# 215 myocamlbuild.ml
module MyOCamlbuildFindlib = struct
-(* # 21 /tmp/oasis-0.3.0/src/plugins/ocamlbuild/MyOCamlbuildFindlib.ml *)
+(* # 21
/home/ysulsky/.opam/4.00.1/build/oasis.0.3.0/src/plugins/ocamlbuild/MyOCamlbuildFindlib.ml
*)
(** OCamlbuild extension, copied from
* http://brion.inria.fr/gallium/index.php/Using_ocamlfind_with_ocamlbuild
@@ -323,7 +323,7 @@ module MyOCamlbuildFindlib = struct
end
module MyOCamlbuildBase = struct
-(* # 21 /tmp/oasis-0.3.0/src/plugins/ocamlbuild/MyOCamlbuildBase.ml *)
+(* # 21
/home/ysulsky/.opam/4.00.1/build/oasis.0.3.0/src/plugins/ocamlbuild/MyOCamlbuildBase.ml
*)
(** Base functions for writing myocamlbuild.ml
@author Sylvain Le Gall
@@ -339,7 +339,7 @@ module MyOCamlbuildBase = struct
type name = string
type tag = string
-(* # 56 /tmp/oasis-0.3.0/src/plugins/ocamlbuild/MyOCamlbuildBase.ml *)
+(* # 56
/home/ysulsky/.opam/4.00.1/build/oasis.0.3.0/src/plugins/ocamlbuild/MyOCamlbuildBase.ml
*)
type t =
{
diff --git a/setup.ml b/setup.ml
index 161b1ab..ffac186 100644
--- a/setup.ml
+++ b/setup.ml
@@ -1,14 +1,14 @@
(* setup.ml generated for the first time by OASIS v0.3.0 *)
(* OASIS_START *)
-(* DO NOT EDIT (digest: e2d6031be1cd994bd4d2f0a007eed3f2) *)
+(* DO NOT EDIT (digest: 79e699718c97f37d25ae5d386efc7b32) *)
(*
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 /tmp/oasis-0.3.0/src/oasis/OASISGettext.ml *)
+(* # 21
/home/ysulsky/.opam/4.00.1/build/oasis.0.3.0/src/oasis/OASISGettext.ml *)
let ns_ str =
str
@@ -31,7 +31,7 @@ module OASISGettext = struct
end
module OASISContext = struct
-(* # 21 /tmp/oasis-0.3.0/src/oasis/OASISContext.ml *)
+(* # 21
/home/ysulsky/.opam/4.00.1/build/oasis.0.3.0/src/oasis/OASISContext.ml *)
open OASISGettext
@@ -92,7 +92,7 @@ module OASISContext = struct
end
module OASISString = struct
-(* # 1 /tmp/oasis-0.3.0/src/oasis/OASISString.ml *)
+(* # 1 /home/ysulsky/.opam/4.00.1/build/oasis.0.3.0/src/oasis/OASISString.ml
*)
@@ -217,7 +217,7 @@ module OASISString = struct
end
module OASISUtils = struct
-(* # 21 /tmp/oasis-0.3.0/src/oasis/OASISUtils.ml *)
+(* # 21 /home/ysulsky/.opam/4.00.1/build/oasis.0.3.0/src/oasis/OASISUtils.ml
*)
open OASISGettext
@@ -312,7 +312,7 @@ module OASISUtils = struct
end
module PropList = struct
-(* # 21 /tmp/oasis-0.3.0/src/oasis/PropList.ml *)
+(* # 21 /home/ysulsky/.opam/4.00.1/build/oasis.0.3.0/src/oasis/PropList.ml *)
open OASISGettext
@@ -352,7 +352,7 @@ module PropList = struct
[Pkg-ocaml-maint-commits] [SCM] fieldslib packaging branch, upstream, updated. upstream/107.01-24-gf6cfb28
The following commit has been merged in the upstream branch:
commit 6eea43124cb83c13d37e1b9dd5ca1fab6598b3a7
Author: Stephane Glondu st...@glondu.net
Date: Sun Jun 23 22:12:43 2013 +0200
Imported Upstream version 109.09.00
diff --git a/.gitignore b/.gitignore
index 1c3ff23..8dac9f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,89 +1,7 @@
-
-*.cmx
-*.cmxa
-*.cma
-*.cmo
-*.cmi
-*.exe
-*.bc
-*.annot
-*.o
-*.so
-*.so.d
-*.s
-*.a
-*.depend
-_*
-*.sp?t
-config.status
-mycaml
-.DS_Store
-tmtags
-
-.git
-.transdeps
-/chroot_test_tmp
-
-/lib/packs
-/lib/**/deps
-/lib/**.mli
-/test-results*
-
-personal_compilation_ignores
-*.cp4c
-*~
-*.auto.mli
-*.aux
-*.digest
-*.fls
-*.haux
-*.htoc
-*.log
-*.omc
-*.orig
-*.rej
-*.spot
-*.toc
-*.cmp
-.*.sw[pabcdef]
-.mydeps
-inline_tests.ml
-inline_tests_runner.ml
-TAGS
-order_file_*_common.ml
-*_db_pnl_common.ml
-order_file_*_eval.ml
-_build
-
-# for new omake rules
-*.deps
-*.ml.d
-*.mli.d
-*.libdeps
-*.objdeps
-*.hg_version.c
-*.build_info.c
-hg_version.out
-stub.names
-
-# specific files
-.last_build_env
-.omakedb
-.omakedb.lock
-spec.hg
-libdeps.sexp
-libdeps.dot
-libdeps.ps
-libdeps.corrected
-ocaml_path
-.ocaml-3.10
-bisect{.itarget,.mlpack,.odocl,_pp.mlpack}
-bisect-1.1/Makefile.config
-\#*
-.\#*
-/_build
-/fieldslib.docdir
-/sample/generated_test.ml
-/sample/generated_test.mli
+_build/
/setup.data
/setup.log
+/*.exe
+/*.docdir
+/*.native
+/*.byte
diff --git a/_oasis b/_oasis
index 71e6dab..5261bdd 100644
--- a/_oasis
+++ b/_oasis
@@ -2,7 +2,7 @@ OASISFormat: 0.3
OCamlVersion: = 4.00.0
FindlibVersion: = 1.3.2
Name: fieldslib
-Version: 109.08.00
+Version: 109.09.00
Synopsis: OCaml record fields as first class values.
Authors: Jane Street Capital LLC opensou...@janestreet.com
Copyrights: (C) 2009-2013 Jane Street Capital LLC
opensou...@janestreet.com
diff --git a/lib/META b/lib/META
index abbdc98..eebae0a 100644
--- a/lib/META
+++ b/lib/META
@@ -1,6 +1,6 @@
# OASIS_START
-# DO NOT EDIT (digest: 5d23db41a5eca45dc9e756886c1c8a6e)
-version = 109.08.00
+# DO NOT EDIT (digest: 3489a6cc526ce23c7e04efbd37efc77a)
+version = 109.09.00
description = OCaml record fields as first class values.
archive(byte) = fieldslib.cma
archive(byte, plugin) = fieldslib.cma
@@ -8,7 +8,7 @@ archive(native) = fieldslib.cmxa
archive(native, plugin) = fieldslib.cmxs
exists_if = fieldslib.cma
package syntax (
- version = 109.08.00
+ version = 109.09.00
description = Syntax extension for Fieldslib
requires = camlp4 type_conv fieldslib
archive(syntax, preprocessor) = pa_fields_conv.cma
diff --git a/setup.ml b/setup.ml
index cf058b4..fa5c926 100644
--- a/setup.ml
+++ b/setup.ml
@@ -1,5 +1,5 @@
(* OASIS_START *)
-(* DO NOT EDIT (digest: 1bc208c8ae77c4fcd24b140d49348970) *)
+(* DO NOT EDIT (digest: 25a76d0205b43555bf81a80ccaf4445a) *)
(*
Regenerated by OASIS v0.3.0
Visit http://oasis.forge.ocamlcore.org for more information and
@@ -5576,7 +5576,7 @@ let setup_t =
ocaml_version = Some (OASISVersion.VGreaterEqual 4.00.0);
findlib_version = Some (OASISVersion.VGreaterEqual 1.3.2);
name = fieldslib;
- version = 109.08.00;
+ version = 109.09.00;
license =
OASISLicense.DEP5License
(OASISLicense.DEP5Unit
@@ -5746,8 +5746,7 @@ let setup_t =
};
oasis_fn = Some _oasis;
oasis_version = 0.3.0;
- oasis_digest =
- Some \1521\187\142\235\157\237C\128C\167S\166\138\212\136;
+ oasis_digest = Some w\129\219\031b\017\225ci\199\221\t\002y\172F;
oasis_exec = None;
oasis_setup_args = [];
setup_update = false;
@@ -5755,6 +5754,6 @@ let setup_t =
let setup () = BaseSetup.setup setup_t;;
-# 5761 setup.ml
+# 5760 setup.ml
(* OASIS_STOP *)
let () = setup ()
--
fieldslib packaging
___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] fieldslib packaging branch, upstream, updated. upstream/107.01-24-gf6cfb28
The following commit has been merged in the upstream branch: commit 4b27bb3267945b200835ef827d2daf72278866db Author: Stephane Glondu st...@glondu.net Date: Sun Jun 23 22:12:36 2013 +0200 Imported Upstream version 109.04.00 diff --git a/_oasis b/_oasis index 2569ce1..691f9c5 100644 --- a/_oasis +++ b/_oasis @@ -2,7 +2,7 @@ OASISFormat: 0.3 OCamlVersion: = 3.12.1 Name: fieldslib -Version: 109.03.00 +Version: 109.04.00 Synopsis: OCaml record fields as first class values. Authors: Jane street capital Copyrights: (C) 2009-2011 Jane Street Capital LLC -- fieldslib packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] fieldslib packaging branch, upstream, updated. upstream/107.01-24-gf6cfb28
The following commit has been merged in the upstream branch:
commit 4dbb6b79d18cf8a5d0f4be2be1fd48d202fae941
Author: Stephane Glondu st...@glondu.net
Date: Sun Jun 23 22:12:53 2013 +0200
Imported Upstream version 109.14.00
diff --git a/_oasis b/_oasis
index fd970f9..6849781 100644
--- a/_oasis
+++ b/_oasis
@@ -2,7 +2,7 @@ OASISFormat: 0.3
OCamlVersion: = 4.00.0
FindlibVersion: = 1.3.2
Name: fieldslib
-Version: 109.13.00
+Version: 109.14.00
Synopsis: OCaml record fields as first class values.
Authors: Jane Street Capital LLC opensou...@janestreet.com
Copyrights: (C) 2009-2013 Jane Street Capital LLC
opensou...@janestreet.com
diff --git a/lib/META b/lib/META
index 130e8dc..c67cde9 100644
--- a/lib/META
+++ b/lib/META
@@ -1,6 +1,6 @@
# OASIS_START
-# DO NOT EDIT (digest: 2bb4b08f801dcc4338744a6ecb3544db)
-version = 109.13.00
+# DO NOT EDIT (digest: ba64376e436524522f451e9c335ef6be)
+version = 109.14.00
description = OCaml record fields as first class values.
archive(byte) = fieldslib.cma
archive(byte, plugin) = fieldslib.cma
@@ -8,7 +8,7 @@ archive(native) = fieldslib.cmxa
archive(native, plugin) = fieldslib.cmxs
exists_if = fieldslib.cma
package syntax (
- version = 109.13.00
+ version = 109.14.00
description = Syntax extension for Fieldslib
requires = camlp4 type_conv fieldslib
archive(syntax, preprocessor) = pa_fields_conv.cma
diff --git a/lib/field.ml b/lib/field.ml
index 2c53860..0c7550a 100644
--- a/lib/field.ml
+++ b/lib/field.ml
@@ -1,17 +1,59 @@
-type ('record, 'field) t = {
- name : string;
- setter : ('record - 'field - unit) option;
- getter : ('record - 'field);
- fset : ('record - 'field - 'record);
-}
+(* The type [t] should be abstract to make the fset and set functions
unavailable
+ for private types at the level of types (and not by putting None in the
field).
+ Unfortunately, making the type abstract means that when creating fields
(through
+ a [create] function) value restriction kicks in. This is worked around by
instead
+ not making the type abstract, but forcing anyone breaking the abstraction
to use
+ the [For_generated_code] module, making it obvious to any reader that
something ugly
+ is going on.
+ t_with_perm (and derivatives) is the type that users really use. It is a
constructor
+ because:
+ 1. it makes type errors more readable (less aliasing)
+ 2. the typer in ocaml 4.01 allows this:
-let name f = f.name
+ module A = struct
+type t = {a : int}
+ end
+ type t = A.t
+ let f (x : t) = x.a
-let get f r = f.getter r
+ (although with Warning 40: a is used out of scope)
+ which means that if [t_with_perm] was really an alias on
[For_generated_code.t],
+ people could say [t.setter] and break the abstraction with no indication
that
+ something ugly is going on in the source code.
+ The warning is (I think) for people who want to make their code
compatible with
+ previous versions of ocaml, so we may very well turn it off.
-let fset (f : ('r, 'f) t) (r : 'r) (v : 'f) = f.fset r v
+ The type t_with_perm could also have been a [unit - For_generated_code.t]
to work
+ around value restriction and then [For_generated_code.t] would have been a
proper
+ abstract type, but it looks like it could impact performance (for example,
a fold on a
+ record type with 40 fields would actually allocate the 40
[For_generated_code.t]'s at
+ every single fold.)
+*)
-let setter f = f.setter
+module For_generated_code = struct
+ type ('perm, 'record, 'field) t = {
+force_variance : 'perm - unit;
+(* force [t] to be contravariant in ['perm], because phantom type
variables on
+ concrete types don't work that well otherwise (using : can remove them
easily) *)
+name : string;
+setter : ('record - 'field - unit) option;
+getter : ('record - 'field);
+fset : ('record - 'field - 'record);
+ }
+end
-type ('record,'result) user =
- {f : 'field. ('record,'field) t - 'result}
+type ('perm, 'record, 'field) t_with_perm =
+| Field of ('perm, 'record, 'field) For_generated_code.t
+type ('record, 'field) t = ([ `Read | `Set_and_create], 'record, 'field)
t_with_perm
+type ('record, 'field) readonly_t = ([ `Read ], 'record, 'field) t_with_perm
+
+let name (Field f) = f.For_generated_code.name
+
+let get (Field f) r = f.For_generated_code.getter r
+
+let fset (Field f) r v = f.For_generated_code.fset r v
+
+let setter (Field f) = f.For_generated_code.setter
+
+type ('perm, 'record, 'result) user =
+{ f : 'field. ('perm, 'record, 'field) t_with_perm - 'result }
diff --git a/lib/field.mli b/lib/field.mli
index d8468f9..a88722a 100644
--- a/lib/field.mli
+++ b/lib/field.mli
@@ -1,18 +1,34 @@
(** OCaml record field. *)
+(**/**)
+module For_generated_code : sig
+ (* don't use this by hand, it is only meant for pa_fields_conv *)
+ type ('perm, 'record, 'field) t = {
+
[Pkg-ocaml-maint-commits] [SCM] fieldslib packaging branch, upstream, updated. upstream/107.01-24-gf6cfb28
The following commit has been merged in the upstream branch: commit 185508c4f26d1bb65fe10e1bea8735da1de48eb2 Author: Stephane Glondu st...@glondu.net Date: Sun Jun 23 22:12:38 2013 +0200 Imported Upstream version 109.06.00 diff --git a/_oasis b/_oasis index 2c5858b..7e18fdd 100644 --- a/_oasis +++ b/_oasis @@ -2,7 +2,7 @@ OASISFormat: 0.3 OCamlVersion: = 3.12.1 Name: fieldslib -Version: 109.05.00 +Version: 109.06.00 Synopsis: OCaml record fields as first class values. Authors: Jane street capital Copyrights: (C) 2009-2011 Jane Street Capital LLC -- fieldslib packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] fieldslib packaging branch, upstream, updated. upstream/107.01-24-gf6cfb28
The following commit has been merged in the upstream branch: commit d3f8ad6140cd1d3ca5b968e55dd4d7ee6d408071 Author: Stephane Glondu st...@glondu.net Date: Sun Jun 23 22:12:37 2013 +0200 Imported Upstream version 109.05.00 diff --git a/_oasis b/_oasis index 691f9c5..2c5858b 100644 --- a/_oasis +++ b/_oasis @@ -2,7 +2,7 @@ OASISFormat: 0.3 OCamlVersion: = 3.12.1 Name: fieldslib -Version: 109.04.00 +Version: 109.05.00 Synopsis: OCaml record fields as first class values. Authors: Jane street capital Copyrights: (C) 2009-2011 Jane Street Capital LLC -- fieldslib packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] fieldslib packaging branch, upstream, updated. upstream/107.01-24-gf6cfb28
The following commit has been merged in the upstream branch:
commit 14aef22b000a8a386426a97d4086234c0e71458f
Author: Stephane Glondu st...@glondu.net
Date: Sun Jun 23 22:12:46 2013 +0200
Imported Upstream version 109.10.00
diff --git a/_oasis b/_oasis
index 5261bdd..6c05c08 100644
--- a/_oasis
+++ b/_oasis
@@ -2,7 +2,7 @@ OASISFormat: 0.3
OCamlVersion: = 4.00.0
FindlibVersion: = 1.3.2
Name: fieldslib
-Version: 109.09.00
+Version: 109.10.00
Synopsis: OCaml record fields as first class values.
Authors: Jane Street Capital LLC opensou...@janestreet.com
Copyrights: (C) 2009-2013 Jane Street Capital LLC
opensou...@janestreet.com
diff --git a/lib/META b/lib/META
index eebae0a..02aba77 100644
--- a/lib/META
+++ b/lib/META
@@ -1,6 +1,6 @@
# OASIS_START
-# DO NOT EDIT (digest: 3489a6cc526ce23c7e04efbd37efc77a)
-version = 109.09.00
+# DO NOT EDIT (digest: 3790065eaf29ddfe430fb3b01c1af42c)
+version = 109.10.00
description = OCaml record fields as first class values.
archive(byte) = fieldslib.cma
archive(byte, plugin) = fieldslib.cma
@@ -8,7 +8,7 @@ archive(native) = fieldslib.cmxa
archive(native, plugin) = fieldslib.cmxs
exists_if = fieldslib.cma
package syntax (
- version = 109.09.00
+ version = 109.10.00
description = Syntax extension for Fieldslib
requires = camlp4 type_conv fieldslib
archive(syntax, preprocessor) = pa_fields_conv.cma
diff --git a/lib_test/fields_test.ml b/lib_test/fields_test.ml
index f31da07..14a18a1 100644
--- a/lib_test/fields_test.ml
+++ b/lib_test/fields_test.ml
@@ -13,3 +13,12 @@ module Rec = struct
let _ = something1
end
+
+module Private : sig
+ type t = private { a : int; mutable b : int }
+ with fields
+end = struct
+ type u = { a : int; mutable b : int }
+ type t = u = private { a : int; mutable b : int }
+ with fields
+end
diff --git a/sample/test.ml b/sample/test.ml
index 501d62e..a03aae2 100644
--- a/sample/test.ml
+++ b/sample/test.ml
@@ -6,3 +6,13 @@ type ('a,'b) t = {
mutable cancelled : bool;
(* symbol : string; *)
} with fields
+
+module Private = struct
+ type ('a,'b) t = private {
+dir : 'a * 'b;
+quantity : ('a , 'b) t;
+price : int * 'a;
+mutable cancelled : bool;
+ (* symbol : string; *)
+ } with fields
+end
diff --git a/sample/test.mli b/sample/test.mli
index 5d69752..f3fdbe0 100644
--- a/sample/test.mli
+++ b/sample/test.mli
@@ -22,3 +22,13 @@ type ('a,'b) t = {
mutable cancelled : bool;
(* symbol : string; *)
} with fields
+
+module Private : sig
+ type ('a,'b) t = private {
+dir : 'a * 'b;
+quantity : ('a , 'b) t;
+price : int * 'a;
+mutable cancelled : bool;
+(* symbol : string; *)
+ } with fields
+end
diff --git a/setup.ml b/setup.ml
index fa5c926..9483114 100644
--- a/setup.ml
+++ b/setup.ml
@@ -1,5 +1,5 @@
(* OASIS_START *)
-(* DO NOT EDIT (digest: 25a76d0205b43555bf81a80ccaf4445a) *)
+(* DO NOT EDIT (digest: 74d4cbc90a4a30ee0733f256d371d338) *)
(*
Regenerated by OASIS v0.3.0
Visit http://oasis.forge.ocamlcore.org for more information and
@@ -5576,7 +5576,7 @@ let setup_t =
ocaml_version = Some (OASISVersion.VGreaterEqual 4.00.0);
findlib_version = Some (OASISVersion.VGreaterEqual 1.3.2);
name = fieldslib;
- version = 109.09.00;
+ version = 109.10.00;
license =
OASISLicense.DEP5License
(OASISLicense.DEP5Unit
@@ -5746,7 +5746,7 @@ let setup_t =
};
oasis_fn = Some _oasis;
oasis_version = 0.3.0;
- oasis_digest = Some w\129\219\031b\017\225ci\199\221\t\002y\172F;
+ oasis_digest = Some \167\190\209\011\229F\030\178 lM\234\206\140V\243;
oasis_exec = None;
oasis_setup_args = [];
setup_update = false;
diff --git a/syntax/pa_fields_conv.ml b/syntax/pa_fields_conv.ml
index 15f7e7c..236f384 100644
--- a/syntax/pa_fields_conv.ml
+++ b/syntax/pa_fields_conv.ml
@@ -211,7 +211,7 @@ module Gen_sig = struct
- let record ~ty_name ~tps _loc ty =
+ let record ~private_ ~ty_name ~tps _loc ty =
let fields = Inspect.fields ty in
let record_ty = apply_type _loc ~ty_name ~tps in
let conv_field (res_getset, res_fields) (name, m, ty) =
@@ -219,12 +219,13 @@ module Gen_sig = struct
let field =
:sig_item value $lid:name$ : Fieldslib.Field.t $record_ty$ $ty$
in
- match m with
- | `Immutable -
+ match m, private_ with
+ | `Immutable, _
+ | `Mutable, true -
( :sig_item $getter$ ; $res_getset$ ,
:sig_item $field$ ; $res_fields$
)
- | `Mutable -
+ | `Mutable, false -
let setter=
:sig_item value $lid:set_ ^ name$ : $record_ty$ - $ty$ -
unit in
( :sig_item $getter$ ; $setter$ ; $res_getset$ ,
@@ -249,39 +250,56 @@ module Gen_sig = struct
:sig_item $getters_and_setters$ ;
module Fields : sig
value
[Pkg-ocaml-maint-commits] [SCM] fieldslib packaging branch, upstream, updated. upstream/107.01-24-gf6cfb28
The following commit has been merged in the upstream branch: commit bb56dfb515b874f18f5e26ba7901d2db6a962fb9 Author: Stephane Glondu st...@glondu.net Date: Sun Jun 23 22:12:52 2013 +0200 Imported Upstream version 109.13.00 diff --git a/_oasis b/_oasis index 0b98751..fd970f9 100644 --- a/_oasis +++ b/_oasis @@ -2,7 +2,7 @@ OASISFormat: 0.3 OCamlVersion: = 4.00.0 FindlibVersion: = 1.3.2 Name: fieldslib -Version: 109.12.00 +Version: 109.13.00 Synopsis: OCaml record fields as first class values. Authors: Jane Street Capital LLC opensou...@janestreet.com Copyrights: (C) 2009-2013 Jane Street Capital LLC opensou...@janestreet.com diff --git a/lib/META b/lib/META index fe26d79..130e8dc 100644 --- a/lib/META +++ b/lib/META @@ -1,6 +1,6 @@ # OASIS_START -# DO NOT EDIT (digest: 8809ed940b7d861b5058a9e6328c29fc) -version = 109.12.00 +# DO NOT EDIT (digest: 2bb4b08f801dcc4338744a6ecb3544db) +version = 109.13.00 description = OCaml record fields as first class values. archive(byte) = fieldslib.cma archive(byte, plugin) = fieldslib.cma @@ -8,7 +8,7 @@ archive(native) = fieldslib.cmxa archive(native, plugin) = fieldslib.cmxs exists_if = fieldslib.cma package syntax ( - version = 109.12.00 + version = 109.13.00 description = Syntax extension for Fieldslib requires = camlp4 type_conv fieldslib archive(syntax, preprocessor) = pa_fields_conv.cma diff --git a/setup.ml b/setup.ml index da8c83e..af5bf6c 100644 --- a/setup.ml +++ b/setup.ml @@ -1,5 +1,5 @@ (* OASIS_START *) -(* DO NOT EDIT (digest: 285491b7a743393270b40c9ae3c7977d) *) +(* DO NOT EDIT (digest: 5c81a399294a6d4eab97e02003c9fd66) *) (* Regenerated by OASIS v0.3.0 Visit http://oasis.forge.ocamlcore.org for more information and @@ -5576,7 +5576,7 @@ let setup_t = ocaml_version = Some (OASISVersion.VGreaterEqual 4.00.0); findlib_version = Some (OASISVersion.VGreaterEqual 1.3.2); name = fieldslib; - version = 109.12.00; + version = 109.13.00; license = OASISLicense.DEP5License (OASISLicense.DEP5Unit @@ -5746,7 +5746,7 @@ let setup_t = }; oasis_fn = Some _oasis; oasis_version = 0.3.0; - oasis_digest = Some \b\129\022\1736(A\159\0169\248b5\006i\146; + oasis_digest = Some $\149-\022gO\160+\015\129T$\198\176\019; oasis_exec = None; oasis_setup_args = []; setup_update = false; -- fieldslib packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] fieldslib packaging branch, upstream, updated. upstream/107.01-24-gf6cfb28
The following commit has been merged in the upstream branch:
commit e8b28d80da697580fc7946a0ccc9a5f603acc103
Author: Stephane Glondu st...@glondu.net
Date: Sun Jun 23 22:03:39 2013 +0200
Imported Upstream version 108.07.00
diff --git a/README.txt b/README.txt
index c99578c..5d3ec57 100644
--- a/README.txt
+++ b/README.txt
@@ -107,7 +107,7 @@ price differences:
let use op = fun field -
op (Field.get field a) (Field.get field b)
in
- let price_equal p1 p2 = abs_float (p1 -. p2) 0.001 in
+ let price_equal p1 p2 = Float.abs (p1 -. p2) 0.001 in
Fields.for_all
~dir:(use (=)) ~quantity:(use (=))
~price:(use price_equal) ~cancelled:(use (=))
diff --git a/THIRD-PARTY.txt b/THIRD-PARTY.txt
index 2d00db2..da8a772 100644
--- a/THIRD-PARTY.txt
+++ b/THIRD-PARTY.txt
@@ -2,8 +2,8 @@ The repository contains 3rd-party code in the following
locations and
under the following licenses:
- type_conv, sexplib and bin_prot: based on Tywith, by Martin
- Sandin. License can be found in base/sexplib/LICENSE.Tywith,
- base/type_conv/LICENSE.Tywith, and base/bin_prot/LICENSE.Tywith.
+ Sandin. License can be found in base/sexplib/LICENSE-Tywith.txt,
+ base/type_conv/LICENSE-Tywith.txt, and base/bin_prot/LICENSE-Tywith.txt.
- Core's implementation of union-find: based on an implementation by
Henry Matthew Fluet, Suresh Jagannathan, and Stephen Weeks. License
diff --git a/_oasis b/_oasis
index c1260b3..e920d4a 100644
--- a/_oasis
+++ b/_oasis
@@ -2,7 +2,7 @@
OASISFormat: 0.3
OCamlVersion: = 3.12.1
Name: fieldslib
-Version: 108.00.02
+Version: 108.07.00
Synopsis: OCaml record fields as first class values.
Authors: Jane street capital
Copyrights: (C) 2009-2011 Jane Street Capital LLC
diff --git a/lib/META b/lib/META
index 6efa429..0565a72 100644
--- a/lib/META
+++ b/lib/META
@@ -1,6 +1,6 @@
# OASIS_START
-# DO NOT EDIT (digest: 6418aa3af91f18a74730d709ce8ea16b)
-version = 108.00.02
+# DO NOT EDIT (digest: 1c5fae1fd197461ceef16312c983cfa5)
+version = 108.07.00
description = OCaml record fields as first class values.
archive(byte) = fieldslib.cma
archive(byte, plugin) = fieldslib.cma
@@ -8,7 +8,7 @@ archive(native) = fieldslib.cmxa
archive(native, plugin) = fieldslib.cmxs
exists_if = fieldslib.cma
package syntax (
- version = 108.00.02
+ version = 108.07.00
description = Syntax extension for Fieldslib
requires = camlp4 type_conv fieldslib
archive(syntax, preprocessor) = pa_fields_conv.cma
diff --git a/lib_test/fields_test.ml b/lib_test/fields_test.ml
index 1f5daaa..f31da07 100644
--- a/lib_test/fields_test.ml
+++ b/lib_test/fields_test.ml
@@ -1 +1,15 @@
-type t = {x:int;w:int} with fields
+module Simple = struct
+ type t = {x:int;w:int} with fields
+ let _ = x
+ let _ = w
+end
+
+module Rec = struct
+ type a = {
+something1 : b;
+ }
+ and b = A of a
+ with fields
+
+ let _ = something1
+end
diff --git a/myocamlbuild.ml b/myocamlbuild.ml
index 4cb4364..79fe327 100644
--- a/myocamlbuild.ml
+++ b/myocamlbuild.ml
@@ -1,7 +1,7 @@
(* OASIS_START *)
-(* DO NOT EDIT (digest: 7068fb54fba0422d669e85990e116476) *)
+(* DO NOT EDIT (digest: 14c30b8858baa68e5c490dd451e7c56b) *)
module OASISGettext = struct
-(* # 21 /tmp/oasis-0.3.0~rc5/src/oasis/OASISGettext.ml *)
+(* # 21 /tmp/oasis-0.3.0/src/oasis/OASISGettext.ml *)
let ns_ str =
str
@@ -24,7 +24,7 @@ module OASISGettext = struct
end
module OASISExpr = struct
-(* # 21 /tmp/oasis-0.3.0~rc5/src/oasis/OASISExpr.ml *)
+(* # 21 /tmp/oasis-0.3.0/src/oasis/OASISExpr.ml *)
@@ -116,7 +116,7 @@ end
# 117 myocamlbuild.ml
module BaseEnvLight = struct
-(* # 21 /tmp/oasis-0.3.0~rc5/src/base/BaseEnvLight.ml *)
+(* # 21 /tmp/oasis-0.3.0/src/base/BaseEnvLight.ml *)
module MapString = Map.Make(String)
@@ -214,7 +214,7 @@ end
# 215 myocamlbuild.ml
module MyOCamlbuildFindlib = struct
-(* # 21 /tmp/oasis-0.3.0~rc5/src/plugins/ocamlbuild/MyOCamlbuildFindlib.ml *)
+(* # 21 /tmp/oasis-0.3.0/src/plugins/ocamlbuild/MyOCamlbuildFindlib.ml *)
(** OCamlbuild extension, copied from
* http://brion.inria.fr/gallium/index.php/Using_ocamlfind_with_ocamlbuild
@@ -323,7 +323,7 @@ module MyOCamlbuildFindlib = struct
end
module MyOCamlbuildBase = struct
-(* # 21 /tmp/oasis-0.3.0~rc5/src/plugins/ocamlbuild/MyOCamlbuildBase.ml *)
+(* # 21 /tmp/oasis-0.3.0/src/plugins/ocamlbuild/MyOCamlbuildBase.ml *)
(** Base functions for writing myocamlbuild.ml
@author Sylvain Le Gall
@@ -339,7 +339,7 @@ module MyOCamlbuildBase = struct
type name = string
type tag = string
-(* # 56 /tmp/oasis-0.3.0~rc5/src/plugins/ocamlbuild/MyOCamlbuildBase.ml *)
+(* # 56 /tmp/oasis-0.3.0/src/plugins/ocamlbuild/MyOCamlbuildBase.ml *)
type t =
{
@@ -395,78 +395,6 @@ module MyOCamlbuildBase = struct
Options.ext_dll, ext_dll;
]
-| Before_rules -
- (* TODO: move this into its own file and
[Pkg-ocaml-maint-commits] [SCM] fieldslib packaging branch, upstream, updated. upstream/107.01-24-gf6cfb28
The following commit has been merged in the upstream branch:
commit ec9d9f2efe106141c867e72a0656366aa183c572
Author: Stephane Glondu st...@glondu.net
Date: Sun Jun 23 22:12:48 2013 +0200
Imported Upstream version 109.11.00
diff --git a/_oasis b/_oasis
index 6c05c08..57e3748 100644
--- a/_oasis
+++ b/_oasis
@@ -2,7 +2,7 @@ OASISFormat: 0.3
OCamlVersion: = 4.00.0
FindlibVersion: = 1.3.2
Name: fieldslib
-Version: 109.10.00
+Version: 109.11.00
Synopsis: OCaml record fields as first class values.
Authors: Jane Street Capital LLC opensou...@janestreet.com
Copyrights: (C) 2009-2013 Jane Street Capital LLC
opensou...@janestreet.com
diff --git a/lib/META b/lib/META
index 02aba77..55fb744 100644
--- a/lib/META
+++ b/lib/META
@@ -1,6 +1,6 @@
# OASIS_START
-# DO NOT EDIT (digest: 3790065eaf29ddfe430fb3b01c1af42c)
-version = 109.10.00
+# DO NOT EDIT (digest: 9ae32f6ca26ce00194d29ca8a6983741)
+version = 109.11.00
description = OCaml record fields as first class values.
archive(byte) = fieldslib.cma
archive(byte, plugin) = fieldslib.cma
@@ -8,7 +8,7 @@ archive(native) = fieldslib.cmxa
archive(native, plugin) = fieldslib.cmxs
exists_if = fieldslib.cma
package syntax (
- version = 109.10.00
+ version = 109.11.00
description = Syntax extension for Fieldslib
requires = camlp4 type_conv fieldslib
archive(syntax, preprocessor) = pa_fields_conv.cma
diff --git a/lib_test/fields_test.ml b/lib_test/fields_test.ml
index 14a18a1..e0e19b3 100644
--- a/lib_test/fields_test.ml
+++ b/lib_test/fields_test.ml
@@ -14,6 +14,20 @@ module Rec = struct
let _ = something1
end
+module Multiple_names = struct
+ type a = {
+a : int;
+ }
+ and b = {
+b : int;
+ }
+ with fields
+ TEST = b { b = 1 } = 1
+ TEST = a { a = 1 } = 1
+ let _ = Fields_of_a.a
+ let _ = Fields_of_b.b
+end
+
module Private : sig
type t = private { a : int; mutable b : int }
with fields
diff --git a/myocamlbuild.ml b/myocamlbuild.ml
index 7f9bc75..b662ce1 100644
--- a/myocamlbuild.ml
+++ b/myocamlbuild.ml
@@ -1,7 +1,7 @@
(* OASIS_START *)
-(* DO NOT EDIT (digest: 78933093046b508770d9aa578f128f31) *)
+(* DO NOT EDIT (digest: 1ba924f9ab03ba504be1c3b6c5424aa7) *)
module OASISGettext = struct
-(* # 21
/home/jdimino/.opam/4.01.0dev+short-paths/build/oasis.0.3.0/src/oasis/OASISGettext.ml
*)
+(* # 21
/mnt/local/sda1/jdimino/plop/4.01.0dev+short-paths/build/oasis.0.3.0/src/oasis/OASISGettext.ml
*)
let ns_ str =
str
@@ -24,7 +24,7 @@ module OASISGettext = struct
end
module OASISExpr = struct
-(* # 21
/home/jdimino/.opam/4.01.0dev+short-paths/build/oasis.0.3.0/src/oasis/OASISExpr.ml
*)
+(* # 21
/mnt/local/sda1/jdimino/plop/4.01.0dev+short-paths/build/oasis.0.3.0/src/oasis/OASISExpr.ml
*)
@@ -116,7 +116,7 @@ end
# 117 myocamlbuild.ml
module BaseEnvLight = struct
-(* # 21
/home/jdimino/.opam/4.01.0dev+short-paths/build/oasis.0.3.0/src/base/BaseEnvLight.ml
*)
+(* # 21
/mnt/local/sda1/jdimino/plop/4.01.0dev+short-paths/build/oasis.0.3.0/src/base/BaseEnvLight.ml
*)
module MapString = Map.Make(String)
@@ -214,7 +214,7 @@ end
# 215 myocamlbuild.ml
module MyOCamlbuildFindlib = struct
-(* # 21
/home/jdimino/.opam/4.01.0dev+short-paths/build/oasis.0.3.0/src/plugins/ocamlbuild/MyOCamlbuildFindlib.ml
*)
+(* # 21
/mnt/local/sda1/jdimino/plop/4.01.0dev+short-paths/build/oasis.0.3.0/src/plugins/ocamlbuild/MyOCamlbuildFindlib.ml
*)
(** OCamlbuild extension, copied from
* http://brion.inria.fr/gallium/index.php/Using_ocamlfind_with_ocamlbuild
@@ -323,7 +323,7 @@ module MyOCamlbuildFindlib = struct
end
module MyOCamlbuildBase = struct
-(* # 21
/home/jdimino/.opam/4.01.0dev+short-paths/build/oasis.0.3.0/src/plugins/ocamlbuild/MyOCamlbuildBase.ml
*)
+(* # 21
/mnt/local/sda1/jdimino/plop/4.01.0dev+short-paths/build/oasis.0.3.0/src/plugins/ocamlbuild/MyOCamlbuildBase.ml
*)
(** Base functions for writing myocamlbuild.ml
@author Sylvain Le Gall
@@ -339,7 +339,7 @@ module MyOCamlbuildBase = struct
type name = string
type tag = string
-(* # 56
/home/jdimino/.opam/4.01.0dev+short-paths/build/oasis.0.3.0/src/plugins/ocamlbuild/MyOCamlbuildBase.ml
*)
+(* # 56
/mnt/local/sda1/jdimino/plop/4.01.0dev+short-paths/build/oasis.0.3.0/src/plugins/ocamlbuild/MyOCamlbuildBase.ml
*)
type t =
{
diff --git a/sample/test.ml b/sample/test.ml
index a03aae2..3b63819 100644
--- a/sample/test.ml
+++ b/sample/test.ml
@@ -7,6 +7,11 @@ type ('a,'b) t = {
(* symbol : string; *)
} with fields
+type foo = {
+ a : [`Bar | `Baz of string];
+ b : int;
+} with fields
+
module Private = struct
type ('a,'b) t = private {
dir : 'a * 'b;
diff --git a/sample/test.mli b/sample/test.mli
index f3fdbe0..a0a5d01 100644
--- a/sample/test.mli
+++ b/sample/test.mli
@@ -23,6 +23,11 @@ type ('a,'b) t = {
(* symbol : string; *)
} with fields
+type foo = {
+ a : [`Bar | `Baz of string];
+ b : int;
+}
[Pkg-ocaml-maint-commits] [SCM] fieldslib packaging branch, upstream, updated. upstream/107.01-24-gf6cfb28
The following commit has been merged in the upstream branch: commit c65fbf9c69af8e682163c5e4e87a947312ce8ceb Author: Stephane Glondu st...@glondu.net Date: Sun Jun 23 22:12:40 2013 +0200 Imported Upstream version 109.07.00 diff --git a/_oasis b/_oasis index 7e18fdd..989920e 100644 --- a/_oasis +++ b/_oasis @@ -2,7 +2,7 @@ OASISFormat: 0.3 OCamlVersion: = 3.12.1 Name: fieldslib -Version: 109.06.00 +Version: 109.07.00 Synopsis: OCaml record fields as first class values. Authors: Jane street capital Copyrights: (C) 2009-2011 Jane Street Capital LLC -- fieldslib packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] fieldslib packaging branch, upstream, updated. upstream/107.01-24-gf6cfb28
The following commit has been merged in the upstream branch: commit f6cfb28fe3170a4c2a3b89ffb4d3957cd1d58845 Author: Stephane Glondu st...@glondu.net Date: Sun Jun 23 22:12:56 2013 +0200 Imported Upstream version 109.19.00 diff --git a/INSTALL.txt b/INSTALL.txt index 1fe48d7..12e5301 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -1,5 +1,5 @@ (* OASIS_START *) -(* DO NOT EDIT (digest: 9aad93748969472dc519b44a70bd8b90) *) +(* DO NOT EDIT (digest: 68330d0f3574e8013210421e6ac4ba17) *) This is the INSTALL file for the fieldslib distribution. This package uses OASIS to generate its build system. See section OASIS for @@ -11,7 +11,7 @@ Dependencies In order to compile this package, you will need: * ocaml (= 4.00.0) for all, doc fieldslib * findlib (= 1.3.2) -* type_conv (= 3.0.5) for library pa_fields_conv +* type_conv (= 109.15.00) for library pa_fields_conv Installing == diff --git a/_oasis b/_oasis index 2b1b9fa..0388c9f 100644 --- a/_oasis +++ b/_oasis @@ -2,7 +2,7 @@ OASISFormat: 0.3 OCamlVersion: = 4.00.0 FindlibVersion: = 1.3.2 Name: fieldslib -Version: 109.15.00 +Version: 109.19.00 Synopsis: OCaml record fields as first class values. Authors: Jane Street Capital LLC opensou...@janestreet.com Copyrights: (C) 2009-2013 Jane Street Capital LLC opensou...@janestreet.com @@ -14,6 +14,12 @@ Plugins: StdFiles (0.3), DevFiles (0.3), META (0.3) XStdFilesAUTHORS: false XStdFilesREADME: false BuildTools: ocamlbuild, camlp4o +Description: + Part of Jane Street’s Core library. + . + The Core suite of libraries is an industrial strength alternative to + OCaml's standard library that was developed by Jane Street, the + largest industrial user of OCaml. Library fieldslib Path: lib @@ -29,7 +35,7 @@ Library pa_fields_conv FindlibName:syntax BuildDepends: camlp4.lib, camlp4.quotations, - type_conv (= 3.0.5) + type_conv (= 109.15.00) XMETAType: syntax XMETARequires: camlp4,type_conv,fieldslib XMETADescription: Syntax extension for Fieldslib diff --git a/lib/META b/lib/META index daa458b..7c39dfb 100644 --- a/lib/META +++ b/lib/META @@ -1,6 +1,6 @@ # OASIS_START -# DO NOT EDIT (digest: 1af46c9ae2ec7fc26bcb968d5ec37100) -version = 109.15.00 +# DO NOT EDIT (digest: ce7ccc07da9a2c181d0e607d13bcb856) +version = 109.19.00 description = OCaml record fields as first class values. archive(byte) = fieldslib.cma archive(byte, plugin) = fieldslib.cma @@ -8,7 +8,7 @@ archive(native) = fieldslib.cmxa archive(native, plugin) = fieldslib.cmxs exists_if = fieldslib.cma package syntax ( - version = 109.15.00 + version = 109.19.00 description = Syntax extension for Fieldslib requires = camlp4 type_conv fieldslib archive(syntax, preprocessor) = pa_fields_conv.cma diff --git a/setup.ml b/setup.ml index 9809f50..e66132d 100644 --- a/setup.ml +++ b/setup.ml @@ -1,5 +1,5 @@ (* OASIS_START *) -(* DO NOT EDIT (digest: 3599482522ead0215d5b8628c9fc37cc) *) +(* DO NOT EDIT (digest: 70726605df437f1673eb4d8566c43cfa) *) (* Regenerated by OASIS v0.3.0 Visit http://oasis.forge.ocamlcore.org for more information and @@ -5576,7 +5576,7 @@ let setup_t = ocaml_version = Some (OASISVersion.VGreaterEqual 4.00.0); findlib_version = Some (OASISVersion.VGreaterEqual 1.3.2); name = fieldslib; - version = 109.15.00; + version = 109.19.00; license = OASISLicense.DEP5License (OASISLicense.DEP5Unit @@ -5595,7 +5595,9 @@ let setup_t = authors = [Jane Street Capital LLC opensou...@janestreet.com]; homepage = Some https://github.com/janestreet/fieldslib;; synopsis = OCaml record fields as first class values.; - description = None; + description = +Some + Part of Jane Street\226\128\153s Core library.\n\nThe Core suite of libraries is an industrial strength alternative to\nOCaml's standard library that was developed by Jane Street, the\nlargest industrial user of OCaml.; categories = []; conf_type = (`Configure, internal, Some 0.3); conf_custom = @@ -5681,7 +5683,7 @@ let setup_t = FindlibPackage (camlp4.quotations, None); FindlibPackage (type_conv, - Some (OASISVersion.VGreaterEqual 3.0.5)) + Some (OASISVersion.VGreaterEqual 109.15.00)) ]; bs_build_tools = [ExternalTool ocamlbuild; ExternalTool camlp4o]; @@ -5746,7 +5748,7 @@ let setup_t = }; oasis_fn = Some _oasis; oasis_version = 0.3.0; - oasis_digest = Some y\155\204\228\158\012J\1606,\\\1309\243\017\242; +
