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 @@ type foo = {
} with fields
module Private = struct
- type ('a,'b) t = private {
+ type ('a,'b) t = {
dir : 'a * 'b;
quantity : ('a , 'b) t;
price : int * 'a;
diff --git a/setup.ml b/setup.ml
index 9677489..da8c83e 100644
--- a/setup.ml
+++ b/setup.ml
@@ -1,12 +1,12 @@
(* OASIS_START *)
-(* DO NOT EDIT (digest: 2b1486f8db6ba73497d7d3460d925936) *)
+(* DO NOT EDIT (digest: 285491b7a743393270b40c9ae3c7977d) *)
(*
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
"/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
@@ -29,7 +29,7 @@ module OASISGettext = struct
end
module OASISContext = struct
-(* # 21
"/mnt/local/sda1/jdimino/plop/4.01.0dev+short-paths/build/oasis.0.3.0/src/oasis/OASISContext.ml"
*)
+(* # 21
"/mnt/local/sda1/jdimino/dot-opam/4.01.0dev+short-paths/build/oasis.0.3.0/src/oasis/OASISContext.ml"
*)
open OASISGettext
@@ -90,7 +90,7 @@ module OASISContext = struct
end
module OASISString = struct
-(* # 1
"/mnt/local/sda1/jdimino/plop/4.01.0dev+short-paths/build/oasis.0.3.0/src/oasis/OASISString.ml"
*)
+(* # 1
"/mnt/local/sda1/jdimino/dot-opam/4.01.0dev+short-paths/build/oasis.0.3.0/src/oasis/OASISString.ml"
*)
@@ -215,7 +215,7 @@ module OASISString = struct
end
module OASISUtils = struct
-(* # 21
"/mnt/local/sda1/jdimino/plop/4.01.0dev+short-paths/build/oasis.0.3.0/src/oasis/OASISUtils.ml"
*)
+(* # 21
"/mnt/local/sda1/jdimino/dot-opam/4.01.0dev+short-paths/build/oasis.0.3.0/src/oasis/OASISUtils.ml"
*)
open OASISGettext
@@ -310,7 +310,7 @@ module OASISUtils = struct
end
module PropList = struct
-(* # 21
"/mnt/local/sda1/jdimino/plop/4.01.0dev+short-paths/build/oasis.0.3.0/src/oasis/PropList.ml"
*)
+(* # 21
"/mnt/local/sda1/jdimino/dot-opam/4.01.0dev+short-paths/build/oasis.0.3.0/src/oasis/PropList.ml"
*)
open OASISGettext
@@ -350,7 +350,7 @@ module PropList = struct
let clear t =
Hashtbl.clear t
-(* # 71
"/mnt/local/sda1/jdimino/plop/4.01.0dev+short-paths/build/oasis.0.3.0/src/oasis/PropList.ml"
*)
+(* # 71
"/mnt/local/sda1/jdimino/dot-opam/4.01.0dev+short-paths/build/oasis.0.3.0/src/oasis/PropList.ml"
*)
end
module Schema =
@@ -591,7 +591,7 @@ module PropList = struct
end
module OASISMessage = struct
-(* # 21
"/mnt/local/sda1/jdimino/plop/4.01.0dev+short-paths/build/oasis.0.3.0/src/oasis/OASISMessage.ml"
*)
+(* # 21
"/mnt/local/sda1/jdimino/dot-opam/4.01.0dev+short-paths/build/oasis.0.3.0/src/oasis/OASISMessage.ml"
*)
open OASISGettext
@@ -630,7 +630,7 @@ module OASISMessage = struct
end
module OASISVersion = struct
-(* # 21
"/mnt/local/sda1/jdimino/plop/4.01.0dev+short-paths/build/oasis.0.3.0/src/oasis/OASISVersion.ml"
*)
+(* # 21
"/mnt/local/sda1/jdimino/dot-opam/4.01.0dev+short-paths/build/oasis.0.3.0/src/oasis/OASISVersion.ml"
*)
open OASISGettext
@@ -809,7 +809,7 @@ module OASISVersion = struct
end
module OASISLicense = struct
-(* # 21
"/mnt/local/sda1/jdimino/plop/4.01.0dev+short-paths/build/oasis.0.3.0/src/oasis/OASISLicense.ml"
*)
+(* # 21
"/mnt/local/sda1/jdimino/dot-opam/4.01.0dev+short-paths/build/oasis.0.3.0/src/oasis/OASISLicense.ml"
*)
(** License for _oasis fields
@author Sylvain Le Gall
@@ -849,7 +849,7 @@ module OASISLicense = 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"
*)
@@ -939,7 +939,7 @@ module OASISExpr = struct
end
module OASISTypes = struct
-(* # 21
"/mnt/local/sda1/jdimino/plop/4.01.0dev+short-paths/build/oasis.0.3.0/src/oasis/OASISTypes.ml"
*)
+(* # 21
"/mnt/local/sda1/jdimino/dot-opam/4.01.0dev+short-paths/build/oasis.0.3.0/src/oasis/OASISTypes.ml"
*)
@@ -1016,7 +1016,7 @@ module OASISTypes = struct
type plugin_data = (all_plugin * plugin_data_purpose * (unit -> unit)) list
-(* # 102
"/mnt/local/sda1/jdimino/plop/4.01.0dev+short-paths/build/oasis.0.3.0/src/oasis/OASISTypes.ml"
*)
+(* # 102
"/mnt/local/sda1/jdimino/dot-opam/4.01.0dev+short-paths/build/oasis.0.3.0/src/oasis/OASISTypes.ml"
*)
type 'a conditional = 'a OASISExpr.choices
@@ -1174,7 +1174,7 @@ module OASISTypes = struct
end
module OASISUnixPath = struct
-(* # 21
"/mnt/local/sda1/jdimino/plop/4.01.0dev+short-paths/build/oasis.0.3.0/src/oasis/OASISUnixPath.ml"
*)
+(* # 21
"/mnt/local/sda1/jdimino/dot-opam/4.01.0dev+short-paths/build/oasis.0.3.0/src/oasis/OASISUnixPath.ml"
*)
type unix_filename = string
type unix_dirname = string
@@ -1258,7 +1258,7 @@ module OASISUnixPath = struct
end
module OASISHostPath = struct
-(* # 21
"/mnt/local/sda1/jdimino/plop/4.01.0dev+short-paths/build/oasis.0.3.0/src/oasis/OASISHostPath.ml"
*)
+(* # 21
"/mnt/local/sda1/jdimino/dot-opam/4.01.0dev+short-paths/build/oasis.0.3.0/src/oasis/OASISHostPath.ml"
*)
open Filename
@@ -1291,7 +1291,7 @@ module OASISHostPath = struct
end
module OASISSection = struct
-(* # 21
"/mnt/local/sda1/jdimino/plop/4.01.0dev+short-paths/build/oasis.0.3.0/src/oasis/OASISSection.ml"
*)
+(* # 21
"/mnt/local/sda1/jdimino/dot-opam/4.01.0dev+short-paths/build/oasis.0.3.0/src/oasis/OASISSection.ml"
*)
open OASISTypes
@@ -1370,12 +1370,12 @@ module OASISSection = struct
end
module OASISBuildSection = struct
-(* # 21
"/mnt/local/sda1/jdimino/plop/4.01.0dev+short-paths/build/oasis.0.3.0/src/oasis/OASISBuildSection.ml"
*)
+(* # 21
"/mnt/local/sda1/jdimino/dot-opam/4.01.0dev+short-paths/build/oasis.0.3.0/src/oasis/OASISBuildSection.ml"
*)
end
module OASISExecutable = struct
-(* # 21
"/mnt/local/sda1/jdimino/plop/4.01.0dev+short-paths/build/oasis.0.3.0/src/oasis/OASISExecutable.ml"
*)
+(* # 21
"/mnt/local/sda1/jdimino/dot-opam/4.01.0dev+short-paths/build/oasis.0.3.0/src/oasis/OASISExecutable.ml"
*)
open OASISTypes
@@ -1406,7 +1406,7 @@ module OASISExecutable = struct
end
module OASISLibrary = struct
-(* # 21
"/mnt/local/sda1/jdimino/plop/4.01.0dev+short-paths/build/oasis.0.3.0/src/oasis/OASISLibrary.ml"
*)
+(* # 21
"/mnt/local/sda1/jdimino/dot-opam/4.01.0dev+short-paths/build/oasis.0.3.0/src/oasis/OASISLibrary.ml"
*)
open OASISTypes
open OASISUtils
@@ -1839,32 +1839,32 @@ module OASISLibrary = struct
end
module OASISFlag = struct
-(* # 21
"/mnt/local/sda1/jdimino/plop/4.01.0dev+short-paths/build/oasis.0.3.0/src/oasis/OASISFlag.ml"
*)
+(* # 21
"/mnt/local/sda1/jdimino/dot-opam/4.01.0dev+short-paths/build/oasis.0.3.0/src/oasis/OASISFlag.ml"
*)
end
module OASISPackage = struct
-(* # 21
"/mnt/local/sda1/jdimino/plop/4.01.0dev+short-paths/build/oasis.0.3.0/src/oasis/OASISPackage.ml"
*)
+(* # 21
"/mnt/local/sda1/jdimino/dot-opam/4.01.0dev+short-paths/build/oasis.0.3.0/src/oasis/OASISPackage.ml"
*)
end
module OASISSourceRepository = struct
-(* # 21
"/mnt/local/sda1/jdimino/plop/4.01.0dev+short-paths/build/oasis.0.3.0/src/oasis/OASISSourceRepository.ml"
*)
+(* # 21
"/mnt/local/sda1/jdimino/dot-opam/4.01.0dev+short-paths/build/oasis.0.3.0/src/oasis/OASISSourceRepository.ml"
*)
end
module OASISTest = struct
-(* # 21
"/mnt/local/sda1/jdimino/plop/4.01.0dev+short-paths/build/oasis.0.3.0/src/oasis/OASISTest.ml"
*)
+(* # 21
"/mnt/local/sda1/jdimino/dot-opam/4.01.0dev+short-paths/build/oasis.0.3.0/src/oasis/OASISTest.ml"
*)
end
module OASISDocument = struct
-(* # 21
"/mnt/local/sda1/jdimino/plop/4.01.0dev+short-paths/build/oasis.0.3.0/src/oasis/OASISDocument.ml"
*)
+(* # 21
"/mnt/local/sda1/jdimino/dot-opam/4.01.0dev+short-paths/build/oasis.0.3.0/src/oasis/OASISDocument.ml"
*)
end
module OASISExec = struct
-(* # 21
"/mnt/local/sda1/jdimino/plop/4.01.0dev+short-paths/build/oasis.0.3.0/src/oasis/OASISExec.ml"
*)
+(* # 21
"/mnt/local/sda1/jdimino/dot-opam/4.01.0dev+short-paths/build/oasis.0.3.0/src/oasis/OASISExec.ml"
*)
open OASISGettext
open OASISUtils
@@ -1942,7 +1942,7 @@ module OASISExec = struct
end
module OASISFileUtil = struct
-(* # 21
"/mnt/local/sda1/jdimino/plop/4.01.0dev+short-paths/build/oasis.0.3.0/src/oasis/OASISFileUtil.ml"
*)
+(* # 21
"/mnt/local/sda1/jdimino/dot-opam/4.01.0dev+short-paths/build/oasis.0.3.0/src/oasis/OASISFileUtil.ml"
*)
open OASISGettext
@@ -2139,7 +2139,7 @@ end
# 2142 "setup.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)
@@ -2237,7 +2237,7 @@ end
# 2240 "setup.ml"
module BaseContext = struct
-(* # 21
"/mnt/local/sda1/jdimino/plop/4.01.0dev+short-paths/build/oasis.0.3.0/src/base/BaseContext.ml"
*)
+(* # 21
"/mnt/local/sda1/jdimino/dot-opam/4.01.0dev+short-paths/build/oasis.0.3.0/src/base/BaseContext.ml"
*)
open OASISContext
@@ -2248,7 +2248,7 @@ module BaseContext = struct
end
module BaseMessage = struct
-(* # 21
"/mnt/local/sda1/jdimino/plop/4.01.0dev+short-paths/build/oasis.0.3.0/src/base/BaseMessage.ml"
*)
+(* # 21
"/mnt/local/sda1/jdimino/dot-opam/4.01.0dev+short-paths/build/oasis.0.3.0/src/base/BaseMessage.ml"
*)
(** Message to user, overrid for Base
@author Sylvain Le Gall
@@ -2267,7 +2267,7 @@ module BaseMessage = struct
end
module BaseEnv = struct
-(* # 21
"/mnt/local/sda1/jdimino/plop/4.01.0dev+short-paths/build/oasis.0.3.0/src/base/BaseEnv.ml"
*)
+(* # 21
"/mnt/local/sda1/jdimino/dot-opam/4.01.0dev+short-paths/build/oasis.0.3.0/src/base/BaseEnv.ml"
*)
open OASISGettext
open OASISUtils
@@ -2727,7 +2727,7 @@ module BaseEnv = struct
end
module BaseArgExt = struct
-(* # 21
"/mnt/local/sda1/jdimino/plop/4.01.0dev+short-paths/build/oasis.0.3.0/src/base/BaseArgExt.ml"
*)
+(* # 21
"/mnt/local/sda1/jdimino/dot-opam/4.01.0dev+short-paths/build/oasis.0.3.0/src/base/BaseArgExt.ml"
*)
open OASISUtils
open OASISGettext
@@ -2755,7 +2755,7 @@ module BaseArgExt = struct
end
module BaseCheck = struct
-(* # 21
"/mnt/local/sda1/jdimino/plop/4.01.0dev+short-paths/build/oasis.0.3.0/src/base/BaseCheck.ml"
*)
+(* # 21
"/mnt/local/sda1/jdimino/dot-opam/4.01.0dev+short-paths/build/oasis.0.3.0/src/base/BaseCheck.ml"
*)
open BaseEnv
open BaseMessage
@@ -2881,7 +2881,7 @@ module BaseCheck = struct
end
module BaseOCamlcConfig = struct
-(* # 21
"/mnt/local/sda1/jdimino/plop/4.01.0dev+short-paths/build/oasis.0.3.0/src/base/BaseOCamlcConfig.ml"
*)
+(* # 21
"/mnt/local/sda1/jdimino/dot-opam/4.01.0dev+short-paths/build/oasis.0.3.0/src/base/BaseOCamlcConfig.ml"
*)
open BaseEnv
@@ -2997,7 +2997,7 @@ module BaseOCamlcConfig = struct
end
module BaseStandardVar = struct
-(* # 21
"/mnt/local/sda1/jdimino/plop/4.01.0dev+short-paths/build/oasis.0.3.0/src/base/BaseStandardVar.ml"
*)
+(* # 21
"/mnt/local/sda1/jdimino/dot-opam/4.01.0dev+short-paths/build/oasis.0.3.0/src/base/BaseStandardVar.ml"
*)
open OASISGettext
@@ -3361,7 +3361,7 @@ module BaseStandardVar = struct
end
module BaseFileAB = struct
-(* # 21
"/mnt/local/sda1/jdimino/plop/4.01.0dev+short-paths/build/oasis.0.3.0/src/base/BaseFileAB.ml"
*)
+(* # 21
"/mnt/local/sda1/jdimino/dot-opam/4.01.0dev+short-paths/build/oasis.0.3.0/src/base/BaseFileAB.ml"
*)
open BaseEnv
open OASISGettext
@@ -3409,7 +3409,7 @@ module BaseFileAB = struct
end
module BaseLog = struct
-(* # 21
"/mnt/local/sda1/jdimino/plop/4.01.0dev+short-paths/build/oasis.0.3.0/src/base/BaseLog.ml"
*)
+(* # 21
"/mnt/local/sda1/jdimino/dot-opam/4.01.0dev+short-paths/build/oasis.0.3.0/src/base/BaseLog.ml"
*)
open OASISUtils
@@ -3528,7 +3528,7 @@ module BaseLog = struct
end
module BaseBuilt = struct
-(* # 21
"/mnt/local/sda1/jdimino/plop/4.01.0dev+short-paths/build/oasis.0.3.0/src/base/BaseBuilt.ml"
*)
+(* # 21
"/mnt/local/sda1/jdimino/dot-opam/4.01.0dev+short-paths/build/oasis.0.3.0/src/base/BaseBuilt.ml"
*)
open OASISTypes
open OASISGettext
@@ -3675,7 +3675,7 @@ module BaseBuilt = struct
end
module BaseCustom = struct
-(* # 21
"/mnt/local/sda1/jdimino/plop/4.01.0dev+short-paths/build/oasis.0.3.0/src/base/BaseCustom.ml"
*)
+(* # 21
"/mnt/local/sda1/jdimino/dot-opam/4.01.0dev+short-paths/build/oasis.0.3.0/src/base/BaseCustom.ml"
*)
open BaseEnv
open BaseMessage
@@ -3725,7 +3725,7 @@ module BaseCustom = struct
end
module BaseDynVar = struct
-(* # 21
"/mnt/local/sda1/jdimino/plop/4.01.0dev+short-paths/build/oasis.0.3.0/src/base/BaseDynVar.ml"
*)
+(* # 21
"/mnt/local/sda1/jdimino/dot-opam/4.01.0dev+short-paths/build/oasis.0.3.0/src/base/BaseDynVar.ml"
*)
open OASISTypes
@@ -3772,7 +3772,7 @@ module BaseDynVar = struct
end
module BaseTest = struct
-(* # 21
"/mnt/local/sda1/jdimino/plop/4.01.0dev+short-paths/build/oasis.0.3.0/src/base/BaseTest.ml"
*)
+(* # 21
"/mnt/local/sda1/jdimino/dot-opam/4.01.0dev+short-paths/build/oasis.0.3.0/src/base/BaseTest.ml"
*)
open BaseEnv
open BaseMessage
@@ -3862,7 +3862,7 @@ module BaseTest = struct
end
module BaseDoc = struct
-(* # 21
"/mnt/local/sda1/jdimino/plop/4.01.0dev+short-paths/build/oasis.0.3.0/src/base/BaseDoc.ml"
*)
+(* # 21
"/mnt/local/sda1/jdimino/dot-opam/4.01.0dev+short-paths/build/oasis.0.3.0/src/base/BaseDoc.ml"
*)
open BaseEnv
open BaseMessage
@@ -3897,7 +3897,7 @@ module BaseDoc = struct
end
module BaseSetup = struct
-(* # 21
"/mnt/local/sda1/jdimino/plop/4.01.0dev+short-paths/build/oasis.0.3.0/src/base/BaseSetup.ml"
*)
+(* # 21
"/mnt/local/sda1/jdimino/dot-opam/4.01.0dev+short-paths/build/oasis.0.3.0/src/base/BaseSetup.ml"
*)
open BaseEnv
open BaseMessage
@@ -4477,7 +4477,7 @@ end
# 4480 "setup.ml"
module InternalConfigurePlugin = struct
-(* # 21
"/mnt/local/sda1/jdimino/plop/4.01.0dev+short-paths/build/oasis.0.3.0/src/plugins/internal/InternalConfigurePlugin.ml"
*)
+(* # 21
"/mnt/local/sda1/jdimino/dot-opam/4.01.0dev+short-paths/build/oasis.0.3.0/src/plugins/internal/InternalConfigurePlugin.ml"
*)
(** Configure using internal scheme
@author Sylvain Le Gall
@@ -4719,7 +4719,7 @@ module InternalConfigurePlugin = struct
end
module InternalInstallPlugin = struct
-(* # 21
"/mnt/local/sda1/jdimino/plop/4.01.0dev+short-paths/build/oasis.0.3.0/src/plugins/internal/InternalInstallPlugin.ml"
*)
+(* # 21
"/mnt/local/sda1/jdimino/dot-opam/4.01.0dev+short-paths/build/oasis.0.3.0/src/plugins/internal/InternalInstallPlugin.ml"
*)
(** Install using internal scheme
@author Sylvain Le Gall
@@ -5230,7 +5230,7 @@ end
# 5233 "setup.ml"
module OCamlbuildCommon = struct
-(* # 21
"/mnt/local/sda1/jdimino/plop/4.01.0dev+short-paths/build/oasis.0.3.0/src/plugins/ocamlbuild/OCamlbuildCommon.ml"
*)
+(* # 21
"/mnt/local/sda1/jdimino/dot-opam/4.01.0dev+short-paths/build/oasis.0.3.0/src/plugins/ocamlbuild/OCamlbuildCommon.ml"
*)
(** Functions common to OCamlbuild build and doc plugin
*)
@@ -5332,7 +5332,7 @@ module OCamlbuildCommon = struct
end
module OCamlbuildPlugin = struct
-(* # 21
"/mnt/local/sda1/jdimino/plop/4.01.0dev+short-paths/build/oasis.0.3.0/src/plugins/ocamlbuild/OCamlbuildPlugin.ml"
*)
+(* # 21
"/mnt/local/sda1/jdimino/dot-opam/4.01.0dev+short-paths/build/oasis.0.3.0/src/plugins/ocamlbuild/OCamlbuildPlugin.ml"
*)
(** Build using ocamlbuild
@author Sylvain Le Gall
@@ -5505,7 +5505,7 @@ module OCamlbuildPlugin = struct
end
module OCamlbuildDocPlugin = struct
-(* # 21
"/mnt/local/sda1/jdimino/plop/4.01.0dev+short-paths/build/oasis.0.3.0/src/plugins/ocamlbuild/OCamlbuildDocPlugin.ml"
*)
+(* # 21
"/mnt/local/sda1/jdimino/dot-opam/4.01.0dev+short-paths/build/oasis.0.3.0/src/plugins/ocamlbuild/OCamlbuildDocPlugin.ml"
*)
(* Create documentation using ocamlbuild .odocl files
@author Sylvain Le Gall
@@ -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.11.00";
+ version = "109.12.00";
license =
OASISLicense.DEP5License
(OASISLicense.DEP5Unit
@@ -5674,7 +5674,7 @@ let setup_t =
bs_build = [(OASISExpr.EBool true, true)];
bs_install = [(OASISExpr.EBool true, true)];
bs_path = "syntax";
- bs_compiled_object = Byte;
+ bs_compiled_object = Best;
bs_build_depends =
[
FindlibPackage ("camlp4.lib", None);
@@ -5746,8 +5746,7 @@ let setup_t =
};
oasis_fn = Some "_oasis";
oasis_version = "0.3.0";
- oasis_digest =
- Some "\153\174\199\245\197&\005\148\225M\255\183\237=$\196";
+ oasis_digest = Some "\b\129\022\1736(A\159\0169\248b5\006i\146";
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 ()
diff --git a/syntax/pa_fields_conv.ml b/syntax/pa_fields_conv.ml
index 7fb37d7..87d3834 100644
--- a/syntax/pa_fields_conv.ml
+++ b/syntax/pa_fields_conv.ml
@@ -263,7 +263,7 @@ module Gen_sig = struct
exposed and any function using them (ie everything in the
else branch
here) can't be exposed either.
*)
- then <:sig_item< >>
+ then <:sig_item< $fold$; >>
else <:sig_item<
$fields$ ;
$fold$ ;
--
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
