ocaml-camlp5/0009-builds-versdep-trip-te...

1679 lines
69 KiB
Diff

From a8a59c60a5034b8b1d6fde8d5012f0bbbb5d4fdc Mon Sep 17 00:00:00 2001
From: Chet Murthy <chetsky@gmail.com>
Date: Wed, 29 Apr 2020 12:07:49 -0700
Subject: [PATCH 09/10] builds, versdep, trip-test
---
lib/versdep.ml | 6 +++---
ocaml_src/lib/plexer.ml | 14 ++++++++------
ocaml_src/lib/versdep/1.06.ml | 4 ++--
ocaml_src/lib/versdep/1.07.ml | 4 ++--
ocaml_src/lib/versdep/2.00.ml | 4 ++--
ocaml_src/lib/versdep/2.01.ml | 4 ++--
ocaml_src/lib/versdep/2.02.ml | 4 ++--
ocaml_src/lib/versdep/2.03.ml | 4 ++--
ocaml_src/lib/versdep/2.04.ml | 4 ++--
ocaml_src/lib/versdep/2.99.ml | 4 ++--
ocaml_src/lib/versdep/3.00.ml | 4 ++--
ocaml_src/lib/versdep/3.01.ml | 4 ++--
ocaml_src/lib/versdep/3.02.ml | 4 ++--
ocaml_src/lib/versdep/3.03.ml | 4 ++--
ocaml_src/lib/versdep/3.04.ml | 4 ++--
ocaml_src/lib/versdep/3.05.ml | 4 ++--
ocaml_src/lib/versdep/3.06.ml | 4 ++--
ocaml_src/lib/versdep/3.07.ml | 4 ++--
ocaml_src/lib/versdep/3.08.0.ml | 6 +++---
ocaml_src/lib/versdep/3.08.1.ml | 6 +++---
ocaml_src/lib/versdep/3.08.2.ml | 6 +++---
ocaml_src/lib/versdep/3.08.3.ml | 6 +++---
ocaml_src/lib/versdep/3.08.4.ml | 6 +++---
ocaml_src/lib/versdep/3.09.0.ml | 6 +++---
ocaml_src/lib/versdep/3.09.1.ml | 6 +++---
ocaml_src/lib/versdep/3.09.2.ml | 6 +++---
ocaml_src/lib/versdep/3.09.3.ml | 6 +++---
ocaml_src/lib/versdep/3.09.4.ml | 6 +++---
ocaml_src/lib/versdep/3.10.0.ml | 6 +++---
ocaml_src/lib/versdep/3.10.1.ml | 6 +++---
ocaml_src/lib/versdep/3.10.2.ml | 6 +++---
ocaml_src/lib/versdep/3.10.3.ml | 6 +++---
ocaml_src/lib/versdep/3.10.ml | 6 +++---
ocaml_src/lib/versdep/3.11.0.ml | 6 +++---
ocaml_src/lib/versdep/3.11.1.ml | 6 +++---
ocaml_src/lib/versdep/3.11.2.ml | 6 +++---
ocaml_src/lib/versdep/3.11.3.ml | 6 +++---
ocaml_src/lib/versdep/3.11.ml | 6 +++---
ocaml_src/lib/versdep/3.12.0.ml | 6 +++---
ocaml_src/lib/versdep/3.12.1.ml | 6 +++---
ocaml_src/lib/versdep/3.12.2.ml | 6 +++---
ocaml_src/lib/versdep/3.13.0-gadt.ml | 6 +++---
ocaml_src/lib/versdep/4.00.0.ml | 6 +++---
ocaml_src/lib/versdep/4.00.1.ml | 6 +++---
ocaml_src/lib/versdep/4.00.2.ml | 6 +++---
ocaml_src/lib/versdep/4.01.0.ml | 6 +++---
ocaml_src/lib/versdep/4.01.1.ml | 6 +++---
ocaml_src/lib/versdep/4.02.0.ml | 6 +++---
ocaml_src/lib/versdep/4.02.1.ml | 6 +++---
ocaml_src/lib/versdep/4.02.2.ml | 6 +++---
ocaml_src/lib/versdep/4.02.3.ml | 6 +++---
ocaml_src/lib/versdep/4.02.4.ml | 6 +++---
ocaml_src/lib/versdep/4.03.0.ml | 6 +++---
ocaml_src/lib/versdep/4.03.1.ml | 6 +++---
ocaml_src/lib/versdep/4.04.0.ml | 6 +++---
ocaml_src/lib/versdep/4.04.1.ml | 6 +++---
ocaml_src/lib/versdep/4.04.2.ml | 6 +++---
ocaml_src/lib/versdep/4.04.3.ml | 6 +++---
ocaml_src/lib/versdep/4.05.0.ml | 6 +++---
ocaml_src/lib/versdep/4.05.1.ml | 6 +++---
ocaml_src/lib/versdep/4.06.0.ml | 6 +++---
ocaml_src/lib/versdep/4.06.1.ml | 6 +++---
ocaml_src/lib/versdep/4.06.2.ml | 6 +++---
ocaml_src/lib/versdep/4.07.0.ml | 6 +++---
ocaml_src/lib/versdep/4.07.1.ml | 6 +++---
ocaml_src/lib/versdep/4.07.2.ml | 6 +++---
ocaml_src/lib/versdep/4.08.0.ml | 6 +++---
ocaml_src/lib/versdep/4.08.1.ml | 6 +++---
ocaml_src/lib/versdep/4.08.2.ml | 6 +++---
ocaml_src/lib/versdep/4.09.0.ml | 6 +++---
ocaml_src/lib/versdep/4.09.1.ml | 6 +++---
ocaml_src/lib/versdep/4.10.0.ml | 6 +++---
ocaml_src/lib/versdep/jocaml/3.12.0.ml | 6 +++---
ocaml_src/lib/versdep/jocaml/3.12.1.ml | 6 +++---
ocaml_src/lib/versdep/jocaml/3.13.0.ml | 6 +++---
ocaml_src/main/ast2pt.ml | 6 ++++--
ocaml_src/main/ast2pt.mli | 3 +++
77 files changed, 221 insertions(+), 214 deletions(-)
diff --git a/lib/versdep.ml b/lib/versdep.ml
index 1481e265..6cb9bd76 100644
--- a/lib/versdep.ml
+++ b/lib/versdep.ml
@@ -610,9 +610,9 @@ value pconst_of_const =
[ Const_int i -> ocaml_pconst_int i
| Const_char c -> ocaml_pconst_char c
| IFDEF OCAML_VERSION < OCAML_4_02 THEN
- Const_string s -> ocaml_pconst_string s None
+ Const_string s -> ocaml_pconst_string s loc_none None
ELSE
- Const_string s so -> ocaml_pconst_string s so
+ Const_string s so -> ocaml_pconst_string s loc_none so
END
| Const_float s -> ocaml_pconst_float s
| Const_int32 i32 -> Const_int32 i32
@@ -623,7 +623,7 @@ value pconst_of_const =
[ Const_int i -> ocaml_pconst_int i
| Const_char c -> ocaml_pconst_char c
| IFDEF OCAML_VERSION < OCAML_4_11_0 THEN
- Const_string s so -> ocaml_pconst_string s so
+ Const_string s so -> ocaml_pconst_string s loc_none so
ELSE
Const_string s loc so -> ocaml_pconst_string s loc so
END
diff --git a/ocaml_src/lib/plexer.ml b/ocaml_src/lib/plexer.ml
index 5681a4c2..2736426a 100644
--- a/ocaml_src/lib/plexer.ml
+++ b/ocaml_src/lib/plexer.ml
@@ -755,7 +755,9 @@ let rec rawstring1 (ofs, delim) ctx buf (strm__ : _ Stream.t) =
let strm = strm__ in
ctx.line_cnt bp c;
let buf = Plexing.Lexbuf.add c buf in
- if String.get delim ofs <> c then rawstring1 (0, delim) ctx buf strm
+ if String.get delim ofs <> c then
+ if String.get delim 0 = c then rawstring1 (1, delim) ctx buf strm
+ else rawstring1 (0, delim) ctx buf strm
else if ofs + 1 < String.length delim then
rawstring1 (ofs + 1, delim) ctx buf strm
else
@@ -1498,15 +1500,15 @@ let gmake () =
let glexr =
ref
{Plexing.tok_func =
- (fun _ -> raise (Match_failure ("plexer.ml", 797, 25)));
+ (fun _ -> raise (Match_failure ("plexer.ml", 800, 25)));
Plexing.tok_using =
- (fun _ -> raise (Match_failure ("plexer.ml", 797, 45)));
+ (fun _ -> raise (Match_failure ("plexer.ml", 800, 45)));
Plexing.tok_removing =
- (fun _ -> raise (Match_failure ("plexer.ml", 797, 68)));
+ (fun _ -> raise (Match_failure ("plexer.ml", 800, 68)));
Plexing.tok_match =
- (fun _ -> raise (Match_failure ("plexer.ml", 798, 18)));
+ (fun _ -> raise (Match_failure ("plexer.ml", 801, 18)));
Plexing.tok_text =
- (fun _ -> raise (Match_failure ("plexer.ml", 798, 37)));
+ (fun _ -> raise (Match_failure ("plexer.ml", 801, 37)));
Plexing.tok_comm = None}
in
let glex =
diff --git a/ocaml_src/lib/versdep/1.06.ml b/ocaml_src/lib/versdep/1.06.ml
index a8aa0cd5..f264e54d 100644
--- a/ocaml_src/lib/versdep/1.06.ml
+++ b/ocaml_src/lib/versdep/1.06.ml
@@ -157,8 +157,8 @@ let ocaml_pconst_char c = Const_char c;;
let ocaml_pconst_int i = Const_int i;;
let ocaml_pconst_float s = Const_float s;;
-let ocaml_const_string s = Const_string s;;
-let ocaml_pconst_string s so = Const_string s;;
+let ocaml_const_string s loc = Const_string s;;
+let ocaml_pconst_string s loc so = Const_string s;;
let pconst_of_const =
function
diff --git a/ocaml_src/lib/versdep/1.07.ml b/ocaml_src/lib/versdep/1.07.ml
index 3be8a620..4c9eacf3 100644
--- a/ocaml_src/lib/versdep/1.07.ml
+++ b/ocaml_src/lib/versdep/1.07.ml
@@ -157,8 +157,8 @@ let ocaml_pconst_char c = Const_char c;;
let ocaml_pconst_int i = Const_int i;;
let ocaml_pconst_float s = Const_float s;;
-let ocaml_const_string s = Const_string s;;
-let ocaml_pconst_string s so = Const_string s;;
+let ocaml_const_string s loc = Const_string s;;
+let ocaml_pconst_string s loc so = Const_string s;;
let pconst_of_const =
function
diff --git a/ocaml_src/lib/versdep/2.00.ml b/ocaml_src/lib/versdep/2.00.ml
index 0d5f0600..0d05c466 100644
--- a/ocaml_src/lib/versdep/2.00.ml
+++ b/ocaml_src/lib/versdep/2.00.ml
@@ -145,8 +145,8 @@ let ocaml_pconst_char c = Const_char c;;
let ocaml_pconst_int i = Const_int i;;
let ocaml_pconst_float s = Const_float s;;
-let ocaml_const_string s = Const_string s;;
-let ocaml_pconst_string s so = Const_string s;;
+let ocaml_const_string s loc = Const_string s;;
+let ocaml_pconst_string s loc so = Const_string s;;
let pconst_of_const =
function
diff --git a/ocaml_src/lib/versdep/2.01.ml b/ocaml_src/lib/versdep/2.01.ml
index a0aab302..5cb311a4 100644
--- a/ocaml_src/lib/versdep/2.01.ml
+++ b/ocaml_src/lib/versdep/2.01.ml
@@ -145,8 +145,8 @@ let ocaml_pconst_char c = Const_char c;;
let ocaml_pconst_int i = Const_int i;;
let ocaml_pconst_float s = Const_float s;;
-let ocaml_const_string s = Const_string s;;
-let ocaml_pconst_string s so = Const_string s;;
+let ocaml_const_string s loc = Const_string s;;
+let ocaml_pconst_string s loc so = Const_string s;;
let pconst_of_const =
function
diff --git a/ocaml_src/lib/versdep/2.02.ml b/ocaml_src/lib/versdep/2.02.ml
index faed002a..8f5a2ba3 100644
--- a/ocaml_src/lib/versdep/2.02.ml
+++ b/ocaml_src/lib/versdep/2.02.ml
@@ -145,8 +145,8 @@ let ocaml_pconst_char c = Const_char c;;
let ocaml_pconst_int i = Const_int i;;
let ocaml_pconst_float s = Const_float s;;
-let ocaml_const_string s = Const_string s;;
-let ocaml_pconst_string s so = Const_string s;;
+let ocaml_const_string s loc = Const_string s;;
+let ocaml_pconst_string s loc so = Const_string s;;
let pconst_of_const =
function
diff --git a/ocaml_src/lib/versdep/2.03.ml b/ocaml_src/lib/versdep/2.03.ml
index 857c86a6..89629351 100644
--- a/ocaml_src/lib/versdep/2.03.ml
+++ b/ocaml_src/lib/versdep/2.03.ml
@@ -146,8 +146,8 @@ let ocaml_pconst_char c = Const_char c;;
let ocaml_pconst_int i = Const_int i;;
let ocaml_pconst_float s = Const_float s;;
-let ocaml_const_string s = Const_string s;;
-let ocaml_pconst_string s so = Const_string s;;
+let ocaml_const_string s loc = Const_string s;;
+let ocaml_pconst_string s loc so = Const_string s;;
let pconst_of_const =
function
diff --git a/ocaml_src/lib/versdep/2.04.ml b/ocaml_src/lib/versdep/2.04.ml
index cec4d308..ca180192 100644
--- a/ocaml_src/lib/versdep/2.04.ml
+++ b/ocaml_src/lib/versdep/2.04.ml
@@ -146,8 +146,8 @@ let ocaml_pconst_char c = Const_char c;;
let ocaml_pconst_int i = Const_int i;;
let ocaml_pconst_float s = Const_float s;;
-let ocaml_const_string s = Const_string s;;
-let ocaml_pconst_string s so = Const_string s;;
+let ocaml_const_string s loc = Const_string s;;
+let ocaml_pconst_string s loc so = Const_string s;;
let pconst_of_const =
function
diff --git a/ocaml_src/lib/versdep/2.99.ml b/ocaml_src/lib/versdep/2.99.ml
index 1bf3eabc..77d3b4de 100644
--- a/ocaml_src/lib/versdep/2.99.ml
+++ b/ocaml_src/lib/versdep/2.99.ml
@@ -162,8 +162,8 @@ let ocaml_pconst_char c = Const_char c;;
let ocaml_pconst_int i = Const_int i;;
let ocaml_pconst_float s = Const_float s;;
-let ocaml_const_string s = Const_string s;;
-let ocaml_pconst_string s so = Const_string s;;
+let ocaml_const_string s loc = Const_string s;;
+let ocaml_pconst_string s loc so = Const_string s;;
let pconst_of_const =
function
diff --git a/ocaml_src/lib/versdep/3.00.ml b/ocaml_src/lib/versdep/3.00.ml
index 2cec8c87..930046af 100644
--- a/ocaml_src/lib/versdep/3.00.ml
+++ b/ocaml_src/lib/versdep/3.00.ml
@@ -162,8 +162,8 @@ let ocaml_pconst_char c = Const_char c;;
let ocaml_pconst_int i = Const_int i;;
let ocaml_pconst_float s = Const_float s;;
-let ocaml_const_string s = Const_string s;;
-let ocaml_pconst_string s so = Const_string s;;
+let ocaml_const_string s loc = Const_string s;;
+let ocaml_pconst_string s loc so = Const_string s;;
let pconst_of_const =
function
diff --git a/ocaml_src/lib/versdep/3.01.ml b/ocaml_src/lib/versdep/3.01.ml
index e2eca1e9..8dcba0a3 100644
--- a/ocaml_src/lib/versdep/3.01.ml
+++ b/ocaml_src/lib/versdep/3.01.ml
@@ -162,8 +162,8 @@ let ocaml_pconst_char c = Const_char c;;
let ocaml_pconst_int i = Const_int i;;
let ocaml_pconst_float s = Const_float s;;
-let ocaml_const_string s = Const_string s;;
-let ocaml_pconst_string s so = Const_string s;;
+let ocaml_const_string s loc = Const_string s;;
+let ocaml_pconst_string s loc so = Const_string s;;
let pconst_of_const =
function
diff --git a/ocaml_src/lib/versdep/3.02.ml b/ocaml_src/lib/versdep/3.02.ml
index c700e468..ea0fa5c6 100644
--- a/ocaml_src/lib/versdep/3.02.ml
+++ b/ocaml_src/lib/versdep/3.02.ml
@@ -175,8 +175,8 @@ let ocaml_pconst_char c = Const_char c;;
let ocaml_pconst_int i = Const_int i;;
let ocaml_pconst_float s = Const_float s;;
-let ocaml_const_string s = Const_string s;;
-let ocaml_pconst_string s so = Const_string s;;
+let ocaml_const_string s loc = Const_string s;;
+let ocaml_pconst_string s loc so = Const_string s;;
let pconst_of_const =
function
diff --git a/ocaml_src/lib/versdep/3.03.ml b/ocaml_src/lib/versdep/3.03.ml
index 2a5f0642..7bc512f5 100644
--- a/ocaml_src/lib/versdep/3.03.ml
+++ b/ocaml_src/lib/versdep/3.03.ml
@@ -168,8 +168,8 @@ let ocaml_pconst_char c = Const_char c;;
let ocaml_pconst_int i = Const_int i;;
let ocaml_pconst_float s = Const_float s;;
-let ocaml_const_string s = Const_string s;;
-let ocaml_pconst_string s so = Const_string s;;
+let ocaml_const_string s loc = Const_string s;;
+let ocaml_pconst_string s loc so = Const_string s;;
let pconst_of_const =
function
diff --git a/ocaml_src/lib/versdep/3.04.ml b/ocaml_src/lib/versdep/3.04.ml
index f777880b..b547d759 100644
--- a/ocaml_src/lib/versdep/3.04.ml
+++ b/ocaml_src/lib/versdep/3.04.ml
@@ -168,8 +168,8 @@ let ocaml_pconst_char c = Const_char c;;
let ocaml_pconst_int i = Const_int i;;
let ocaml_pconst_float s = Const_float s;;
-let ocaml_const_string s = Const_string s;;
-let ocaml_pconst_string s so = Const_string s;;
+let ocaml_const_string s loc = Const_string s;;
+let ocaml_pconst_string s loc so = Const_string s;;
let pconst_of_const =
function
diff --git a/ocaml_src/lib/versdep/3.05.ml b/ocaml_src/lib/versdep/3.05.ml
index e3fb161d..2646b76d 100644
--- a/ocaml_src/lib/versdep/3.05.ml
+++ b/ocaml_src/lib/versdep/3.05.ml
@@ -168,8 +168,8 @@ let ocaml_pconst_char c = Const_char c;;
let ocaml_pconst_int i = Const_int i;;
let ocaml_pconst_float s = Const_float s;;
-let ocaml_const_string s = Const_string s;;
-let ocaml_pconst_string s so = Const_string s;;
+let ocaml_const_string s loc = Const_string s;;
+let ocaml_pconst_string s loc so = Const_string s;;
let pconst_of_const =
function
diff --git a/ocaml_src/lib/versdep/3.06.ml b/ocaml_src/lib/versdep/3.06.ml
index e3fb161d..2646b76d 100644
--- a/ocaml_src/lib/versdep/3.06.ml
+++ b/ocaml_src/lib/versdep/3.06.ml
@@ -168,8 +168,8 @@ let ocaml_pconst_char c = Const_char c;;
let ocaml_pconst_int i = Const_int i;;
let ocaml_pconst_float s = Const_float s;;
-let ocaml_const_string s = Const_string s;;
-let ocaml_pconst_string s so = Const_string s;;
+let ocaml_const_string s loc = Const_string s;;
+let ocaml_pconst_string s loc so = Const_string s;;
let pconst_of_const =
function
diff --git a/ocaml_src/lib/versdep/3.07.ml b/ocaml_src/lib/versdep/3.07.ml
index f188c776..1d04886c 100644
--- a/ocaml_src/lib/versdep/3.07.ml
+++ b/ocaml_src/lib/versdep/3.07.ml
@@ -175,8 +175,8 @@ let ocaml_pconst_char c = Const_char c;;
let ocaml_pconst_int i = Const_int i;;
let ocaml_pconst_float s = Const_float s;;
-let ocaml_const_string s = Const_string s;;
-let ocaml_pconst_string s so = Const_string s;;
+let ocaml_const_string s loc = Const_string s;;
+let ocaml_pconst_string s loc so = Const_string s;;
let pconst_of_const =
function
diff --git a/ocaml_src/lib/versdep/3.08.0.ml b/ocaml_src/lib/versdep/3.08.0.ml
index 92966c81..4fd81aba 100644
--- a/ocaml_src/lib/versdep/3.08.0.ml
+++ b/ocaml_src/lib/versdep/3.08.0.ml
@@ -175,14 +175,14 @@ let ocaml_pconst_char c = Const_char c;;
let ocaml_pconst_int i = Const_int i;;
let ocaml_pconst_float s = Const_float s;;
-let ocaml_const_string s = Const_string s;;
-let ocaml_pconst_string s so = Const_string s;;
+let ocaml_const_string s loc = Const_string s;;
+let ocaml_pconst_string s loc so = Const_string s;;
let pconst_of_const =
function
Const_int i -> ocaml_pconst_int i
| Const_char c -> ocaml_pconst_char c
- | Const_string s -> ocaml_pconst_string s None
+ | Const_string s -> ocaml_pconst_string s loc_none None
| Const_float s -> ocaml_pconst_float s
| Const_int32 i32 -> Const_int32 i32
| Const_int64 i64 -> Const_int64 i64
diff --git a/ocaml_src/lib/versdep/3.08.1.ml b/ocaml_src/lib/versdep/3.08.1.ml
index 92966c81..4fd81aba 100644
--- a/ocaml_src/lib/versdep/3.08.1.ml
+++ b/ocaml_src/lib/versdep/3.08.1.ml
@@ -175,14 +175,14 @@ let ocaml_pconst_char c = Const_char c;;
let ocaml_pconst_int i = Const_int i;;
let ocaml_pconst_float s = Const_float s;;
-let ocaml_const_string s = Const_string s;;
-let ocaml_pconst_string s so = Const_string s;;
+let ocaml_const_string s loc = Const_string s;;
+let ocaml_pconst_string s loc so = Const_string s;;
let pconst_of_const =
function
Const_int i -> ocaml_pconst_int i
| Const_char c -> ocaml_pconst_char c
- | Const_string s -> ocaml_pconst_string s None
+ | Const_string s -> ocaml_pconst_string s loc_none None
| Const_float s -> ocaml_pconst_float s
| Const_int32 i32 -> Const_int32 i32
| Const_int64 i64 -> Const_int64 i64
diff --git a/ocaml_src/lib/versdep/3.08.2.ml b/ocaml_src/lib/versdep/3.08.2.ml
index 92966c81..4fd81aba 100644
--- a/ocaml_src/lib/versdep/3.08.2.ml
+++ b/ocaml_src/lib/versdep/3.08.2.ml
@@ -175,14 +175,14 @@ let ocaml_pconst_char c = Const_char c;;
let ocaml_pconst_int i = Const_int i;;
let ocaml_pconst_float s = Const_float s;;
-let ocaml_const_string s = Const_string s;;
-let ocaml_pconst_string s so = Const_string s;;
+let ocaml_const_string s loc = Const_string s;;
+let ocaml_pconst_string s loc so = Const_string s;;
let pconst_of_const =
function
Const_int i -> ocaml_pconst_int i
| Const_char c -> ocaml_pconst_char c
- | Const_string s -> ocaml_pconst_string s None
+ | Const_string s -> ocaml_pconst_string s loc_none None
| Const_float s -> ocaml_pconst_float s
| Const_int32 i32 -> Const_int32 i32
| Const_int64 i64 -> Const_int64 i64
diff --git a/ocaml_src/lib/versdep/3.08.3.ml b/ocaml_src/lib/versdep/3.08.3.ml
index 92966c81..4fd81aba 100644
--- a/ocaml_src/lib/versdep/3.08.3.ml
+++ b/ocaml_src/lib/versdep/3.08.3.ml
@@ -175,14 +175,14 @@ let ocaml_pconst_char c = Const_char c;;
let ocaml_pconst_int i = Const_int i;;
let ocaml_pconst_float s = Const_float s;;
-let ocaml_const_string s = Const_string s;;
-let ocaml_pconst_string s so = Const_string s;;
+let ocaml_const_string s loc = Const_string s;;
+let ocaml_pconst_string s loc so = Const_string s;;
let pconst_of_const =
function
Const_int i -> ocaml_pconst_int i
| Const_char c -> ocaml_pconst_char c
- | Const_string s -> ocaml_pconst_string s None
+ | Const_string s -> ocaml_pconst_string s loc_none None
| Const_float s -> ocaml_pconst_float s
| Const_int32 i32 -> Const_int32 i32
| Const_int64 i64 -> Const_int64 i64
diff --git a/ocaml_src/lib/versdep/3.08.4.ml b/ocaml_src/lib/versdep/3.08.4.ml
index 92966c81..4fd81aba 100644
--- a/ocaml_src/lib/versdep/3.08.4.ml
+++ b/ocaml_src/lib/versdep/3.08.4.ml
@@ -175,14 +175,14 @@ let ocaml_pconst_char c = Const_char c;;
let ocaml_pconst_int i = Const_int i;;
let ocaml_pconst_float s = Const_float s;;
-let ocaml_const_string s = Const_string s;;
-let ocaml_pconst_string s so = Const_string s;;
+let ocaml_const_string s loc = Const_string s;;
+let ocaml_pconst_string s loc so = Const_string s;;
let pconst_of_const =
function
Const_int i -> ocaml_pconst_int i
| Const_char c -> ocaml_pconst_char c
- | Const_string s -> ocaml_pconst_string s None
+ | Const_string s -> ocaml_pconst_string s loc_none None
| Const_float s -> ocaml_pconst_float s
| Const_int32 i32 -> Const_int32 i32
| Const_int64 i64 -> Const_int64 i64
diff --git a/ocaml_src/lib/versdep/3.09.0.ml b/ocaml_src/lib/versdep/3.09.0.ml
index 1886c478..0e674436 100644
--- a/ocaml_src/lib/versdep/3.09.0.ml
+++ b/ocaml_src/lib/versdep/3.09.0.ml
@@ -175,14 +175,14 @@ let ocaml_pconst_char c = Const_char c;;
let ocaml_pconst_int i = Const_int i;;
let ocaml_pconst_float s = Const_float s;;
-let ocaml_const_string s = Const_string s;;
-let ocaml_pconst_string s so = Const_string s;;
+let ocaml_const_string s loc = Const_string s;;
+let ocaml_pconst_string s loc so = Const_string s;;
let pconst_of_const =
function
Const_int i -> ocaml_pconst_int i
| Const_char c -> ocaml_pconst_char c
- | Const_string s -> ocaml_pconst_string s None
+ | Const_string s -> ocaml_pconst_string s loc_none None
| Const_float s -> ocaml_pconst_float s
| Const_int32 i32 -> Const_int32 i32
| Const_int64 i64 -> Const_int64 i64
diff --git a/ocaml_src/lib/versdep/3.09.1.ml b/ocaml_src/lib/versdep/3.09.1.ml
index 1886c478..0e674436 100644
--- a/ocaml_src/lib/versdep/3.09.1.ml
+++ b/ocaml_src/lib/versdep/3.09.1.ml
@@ -175,14 +175,14 @@ let ocaml_pconst_char c = Const_char c;;
let ocaml_pconst_int i = Const_int i;;
let ocaml_pconst_float s = Const_float s;;
-let ocaml_const_string s = Const_string s;;
-let ocaml_pconst_string s so = Const_string s;;
+let ocaml_const_string s loc = Const_string s;;
+let ocaml_pconst_string s loc so = Const_string s;;
let pconst_of_const =
function
Const_int i -> ocaml_pconst_int i
| Const_char c -> ocaml_pconst_char c
- | Const_string s -> ocaml_pconst_string s None
+ | Const_string s -> ocaml_pconst_string s loc_none None
| Const_float s -> ocaml_pconst_float s
| Const_int32 i32 -> Const_int32 i32
| Const_int64 i64 -> Const_int64 i64
diff --git a/ocaml_src/lib/versdep/3.09.2.ml b/ocaml_src/lib/versdep/3.09.2.ml
index 1886c478..0e674436 100644
--- a/ocaml_src/lib/versdep/3.09.2.ml
+++ b/ocaml_src/lib/versdep/3.09.2.ml
@@ -175,14 +175,14 @@ let ocaml_pconst_char c = Const_char c;;
let ocaml_pconst_int i = Const_int i;;
let ocaml_pconst_float s = Const_float s;;
-let ocaml_const_string s = Const_string s;;
-let ocaml_pconst_string s so = Const_string s;;
+let ocaml_const_string s loc = Const_string s;;
+let ocaml_pconst_string s loc so = Const_string s;;
let pconst_of_const =
function
Const_int i -> ocaml_pconst_int i
| Const_char c -> ocaml_pconst_char c
- | Const_string s -> ocaml_pconst_string s None
+ | Const_string s -> ocaml_pconst_string s loc_none None
| Const_float s -> ocaml_pconst_float s
| Const_int32 i32 -> Const_int32 i32
| Const_int64 i64 -> Const_int64 i64
diff --git a/ocaml_src/lib/versdep/3.09.3.ml b/ocaml_src/lib/versdep/3.09.3.ml
index 1886c478..0e674436 100644
--- a/ocaml_src/lib/versdep/3.09.3.ml
+++ b/ocaml_src/lib/versdep/3.09.3.ml
@@ -175,14 +175,14 @@ let ocaml_pconst_char c = Const_char c;;
let ocaml_pconst_int i = Const_int i;;
let ocaml_pconst_float s = Const_float s;;
-let ocaml_const_string s = Const_string s;;
-let ocaml_pconst_string s so = Const_string s;;
+let ocaml_const_string s loc = Const_string s;;
+let ocaml_pconst_string s loc so = Const_string s;;
let pconst_of_const =
function
Const_int i -> ocaml_pconst_int i
| Const_char c -> ocaml_pconst_char c
- | Const_string s -> ocaml_pconst_string s None
+ | Const_string s -> ocaml_pconst_string s loc_none None
| Const_float s -> ocaml_pconst_float s
| Const_int32 i32 -> Const_int32 i32
| Const_int64 i64 -> Const_int64 i64
diff --git a/ocaml_src/lib/versdep/3.09.4.ml b/ocaml_src/lib/versdep/3.09.4.ml
index 1886c478..0e674436 100644
--- a/ocaml_src/lib/versdep/3.09.4.ml
+++ b/ocaml_src/lib/versdep/3.09.4.ml
@@ -175,14 +175,14 @@ let ocaml_pconst_char c = Const_char c;;
let ocaml_pconst_int i = Const_int i;;
let ocaml_pconst_float s = Const_float s;;
-let ocaml_const_string s = Const_string s;;
-let ocaml_pconst_string s so = Const_string s;;
+let ocaml_const_string s loc = Const_string s;;
+let ocaml_pconst_string s loc so = Const_string s;;
let pconst_of_const =
function
Const_int i -> ocaml_pconst_int i
| Const_char c -> ocaml_pconst_char c
- | Const_string s -> ocaml_pconst_string s None
+ | Const_string s -> ocaml_pconst_string s loc_none None
| Const_float s -> ocaml_pconst_float s
| Const_int32 i32 -> Const_int32 i32
| Const_int64 i64 -> Const_int64 i64
diff --git a/ocaml_src/lib/versdep/3.10.0.ml b/ocaml_src/lib/versdep/3.10.0.ml
index 9683145d..ccb6cf00 100644
--- a/ocaml_src/lib/versdep/3.10.0.ml
+++ b/ocaml_src/lib/versdep/3.10.0.ml
@@ -175,14 +175,14 @@ let ocaml_pconst_char c = Const_char c;;
let ocaml_pconst_int i = Const_int i;;
let ocaml_pconst_float s = Const_float s;;
-let ocaml_const_string s = Const_string s;;
-let ocaml_pconst_string s so = Const_string s;;
+let ocaml_const_string s loc = Const_string s;;
+let ocaml_pconst_string s loc so = Const_string s;;
let pconst_of_const =
function
Const_int i -> ocaml_pconst_int i
| Const_char c -> ocaml_pconst_char c
- | Const_string s -> ocaml_pconst_string s None
+ | Const_string s -> ocaml_pconst_string s loc_none None
| Const_float s -> ocaml_pconst_float s
| Const_int32 i32 -> Const_int32 i32
| Const_int64 i64 -> Const_int64 i64
diff --git a/ocaml_src/lib/versdep/3.10.1.ml b/ocaml_src/lib/versdep/3.10.1.ml
index 9683145d..ccb6cf00 100644
--- a/ocaml_src/lib/versdep/3.10.1.ml
+++ b/ocaml_src/lib/versdep/3.10.1.ml
@@ -175,14 +175,14 @@ let ocaml_pconst_char c = Const_char c;;
let ocaml_pconst_int i = Const_int i;;
let ocaml_pconst_float s = Const_float s;;
-let ocaml_const_string s = Const_string s;;
-let ocaml_pconst_string s so = Const_string s;;
+let ocaml_const_string s loc = Const_string s;;
+let ocaml_pconst_string s loc so = Const_string s;;
let pconst_of_const =
function
Const_int i -> ocaml_pconst_int i
| Const_char c -> ocaml_pconst_char c
- | Const_string s -> ocaml_pconst_string s None
+ | Const_string s -> ocaml_pconst_string s loc_none None
| Const_float s -> ocaml_pconst_float s
| Const_int32 i32 -> Const_int32 i32
| Const_int64 i64 -> Const_int64 i64
diff --git a/ocaml_src/lib/versdep/3.10.2.ml b/ocaml_src/lib/versdep/3.10.2.ml
index 9683145d..ccb6cf00 100644
--- a/ocaml_src/lib/versdep/3.10.2.ml
+++ b/ocaml_src/lib/versdep/3.10.2.ml
@@ -175,14 +175,14 @@ let ocaml_pconst_char c = Const_char c;;
let ocaml_pconst_int i = Const_int i;;
let ocaml_pconst_float s = Const_float s;;
-let ocaml_const_string s = Const_string s;;
-let ocaml_pconst_string s so = Const_string s;;
+let ocaml_const_string s loc = Const_string s;;
+let ocaml_pconst_string s loc so = Const_string s;;
let pconst_of_const =
function
Const_int i -> ocaml_pconst_int i
| Const_char c -> ocaml_pconst_char c
- | Const_string s -> ocaml_pconst_string s None
+ | Const_string s -> ocaml_pconst_string s loc_none None
| Const_float s -> ocaml_pconst_float s
| Const_int32 i32 -> Const_int32 i32
| Const_int64 i64 -> Const_int64 i64
diff --git a/ocaml_src/lib/versdep/3.10.3.ml b/ocaml_src/lib/versdep/3.10.3.ml
index 9683145d..ccb6cf00 100644
--- a/ocaml_src/lib/versdep/3.10.3.ml
+++ b/ocaml_src/lib/versdep/3.10.3.ml
@@ -175,14 +175,14 @@ let ocaml_pconst_char c = Const_char c;;
let ocaml_pconst_int i = Const_int i;;
let ocaml_pconst_float s = Const_float s;;
-let ocaml_const_string s = Const_string s;;
-let ocaml_pconst_string s so = Const_string s;;
+let ocaml_const_string s loc = Const_string s;;
+let ocaml_pconst_string s loc so = Const_string s;;
let pconst_of_const =
function
Const_int i -> ocaml_pconst_int i
| Const_char c -> ocaml_pconst_char c
- | Const_string s -> ocaml_pconst_string s None
+ | Const_string s -> ocaml_pconst_string s loc_none None
| Const_float s -> ocaml_pconst_float s
| Const_int32 i32 -> Const_int32 i32
| Const_int64 i64 -> Const_int64 i64
diff --git a/ocaml_src/lib/versdep/3.10.ml b/ocaml_src/lib/versdep/3.10.ml
index d6aa1c5e..fa118851 100644
--- a/ocaml_src/lib/versdep/3.10.ml
+++ b/ocaml_src/lib/versdep/3.10.ml
@@ -175,14 +175,14 @@ let ocaml_pconst_char c = Const_char c;;
let ocaml_pconst_int i = Const_int i;;
let ocaml_pconst_float s = Const_float s;;
-let ocaml_const_string s = Const_string s;;
-let ocaml_pconst_string s so = Const_string s;;
+let ocaml_const_string s loc = Const_string s;;
+let ocaml_pconst_string s loc so = Const_string s;;
let pconst_of_const =
function
Const_int i -> ocaml_pconst_int i
| Const_char c -> ocaml_pconst_char c
- | Const_string s -> ocaml_pconst_string s None
+ | Const_string s -> ocaml_pconst_string s loc_none None
| Const_float s -> ocaml_pconst_float s
| Const_int32 i32 -> Const_int32 i32
| Const_int64 i64 -> Const_int64 i64
diff --git a/ocaml_src/lib/versdep/3.11.0.ml b/ocaml_src/lib/versdep/3.11.0.ml
index 3df7b68c..424a3635 100644
--- a/ocaml_src/lib/versdep/3.11.0.ml
+++ b/ocaml_src/lib/versdep/3.11.0.ml
@@ -174,14 +174,14 @@ let ocaml_pconst_char c = Const_char c;;
let ocaml_pconst_int i = Const_int i;;
let ocaml_pconst_float s = Const_float s;;
-let ocaml_const_string s = Const_string s;;
-let ocaml_pconst_string s so = Const_string s;;
+let ocaml_const_string s loc = Const_string s;;
+let ocaml_pconst_string s loc so = Const_string s;;
let pconst_of_const =
function
Const_int i -> ocaml_pconst_int i
| Const_char c -> ocaml_pconst_char c
- | Const_string s -> ocaml_pconst_string s None
+ | Const_string s -> ocaml_pconst_string s loc_none None
| Const_float s -> ocaml_pconst_float s
| Const_int32 i32 -> Const_int32 i32
| Const_int64 i64 -> Const_int64 i64
diff --git a/ocaml_src/lib/versdep/3.11.1.ml b/ocaml_src/lib/versdep/3.11.1.ml
index 3df7b68c..424a3635 100644
--- a/ocaml_src/lib/versdep/3.11.1.ml
+++ b/ocaml_src/lib/versdep/3.11.1.ml
@@ -174,14 +174,14 @@ let ocaml_pconst_char c = Const_char c;;
let ocaml_pconst_int i = Const_int i;;
let ocaml_pconst_float s = Const_float s;;
-let ocaml_const_string s = Const_string s;;
-let ocaml_pconst_string s so = Const_string s;;
+let ocaml_const_string s loc = Const_string s;;
+let ocaml_pconst_string s loc so = Const_string s;;
let pconst_of_const =
function
Const_int i -> ocaml_pconst_int i
| Const_char c -> ocaml_pconst_char c
- | Const_string s -> ocaml_pconst_string s None
+ | Const_string s -> ocaml_pconst_string s loc_none None
| Const_float s -> ocaml_pconst_float s
| Const_int32 i32 -> Const_int32 i32
| Const_int64 i64 -> Const_int64 i64
diff --git a/ocaml_src/lib/versdep/3.11.2.ml b/ocaml_src/lib/versdep/3.11.2.ml
index 3df7b68c..424a3635 100644
--- a/ocaml_src/lib/versdep/3.11.2.ml
+++ b/ocaml_src/lib/versdep/3.11.2.ml
@@ -174,14 +174,14 @@ let ocaml_pconst_char c = Const_char c;;
let ocaml_pconst_int i = Const_int i;;
let ocaml_pconst_float s = Const_float s;;
-let ocaml_const_string s = Const_string s;;
-let ocaml_pconst_string s so = Const_string s;;
+let ocaml_const_string s loc = Const_string s;;
+let ocaml_pconst_string s loc so = Const_string s;;
let pconst_of_const =
function
Const_int i -> ocaml_pconst_int i
| Const_char c -> ocaml_pconst_char c
- | Const_string s -> ocaml_pconst_string s None
+ | Const_string s -> ocaml_pconst_string s loc_none None
| Const_float s -> ocaml_pconst_float s
| Const_int32 i32 -> Const_int32 i32
| Const_int64 i64 -> Const_int64 i64
diff --git a/ocaml_src/lib/versdep/3.11.3.ml b/ocaml_src/lib/versdep/3.11.3.ml
index 3df7b68c..424a3635 100644
--- a/ocaml_src/lib/versdep/3.11.3.ml
+++ b/ocaml_src/lib/versdep/3.11.3.ml
@@ -174,14 +174,14 @@ let ocaml_pconst_char c = Const_char c;;
let ocaml_pconst_int i = Const_int i;;
let ocaml_pconst_float s = Const_float s;;
-let ocaml_const_string s = Const_string s;;
-let ocaml_pconst_string s so = Const_string s;;
+let ocaml_const_string s loc = Const_string s;;
+let ocaml_pconst_string s loc so = Const_string s;;
let pconst_of_const =
function
Const_int i -> ocaml_pconst_int i
| Const_char c -> ocaml_pconst_char c
- | Const_string s -> ocaml_pconst_string s None
+ | Const_string s -> ocaml_pconst_string s loc_none None
| Const_float s -> ocaml_pconst_float s
| Const_int32 i32 -> Const_int32 i32
| Const_int64 i64 -> Const_int64 i64
diff --git a/ocaml_src/lib/versdep/3.11.ml b/ocaml_src/lib/versdep/3.11.ml
index 628eb420..b66f5226 100644
--- a/ocaml_src/lib/versdep/3.11.ml
+++ b/ocaml_src/lib/versdep/3.11.ml
@@ -173,14 +173,14 @@ let ocaml_pconst_char c = Const_char c;;
let ocaml_pconst_int i = Const_int i;;
let ocaml_pconst_float s = Const_float s;;
-let ocaml_const_string s = Const_string s;;
-let ocaml_pconst_string s so = Const_string s;;
+let ocaml_const_string s loc = Const_string s;;
+let ocaml_pconst_string s loc so = Const_string s;;
let pconst_of_const =
function
Const_int i -> ocaml_pconst_int i
| Const_char c -> ocaml_pconst_char c
- | Const_string s -> ocaml_pconst_string s None
+ | Const_string s -> ocaml_pconst_string s loc_none None
| Const_float s -> ocaml_pconst_float s
| Const_int32 i32 -> Const_int32 i32
| Const_int64 i64 -> Const_int64 i64
diff --git a/ocaml_src/lib/versdep/3.12.0.ml b/ocaml_src/lib/versdep/3.12.0.ml
index e9c7c1cb..6b468d72 100644
--- a/ocaml_src/lib/versdep/3.12.0.ml
+++ b/ocaml_src/lib/versdep/3.12.0.ml
@@ -174,14 +174,14 @@ let ocaml_pconst_char c = Const_char c;;
let ocaml_pconst_int i = Const_int i;;
let ocaml_pconst_float s = Const_float s;;
-let ocaml_const_string s = Const_string s;;
-let ocaml_pconst_string s so = Const_string s;;
+let ocaml_const_string s loc = Const_string s;;
+let ocaml_pconst_string s loc so = Const_string s;;
let pconst_of_const =
function
Const_int i -> ocaml_pconst_int i
| Const_char c -> ocaml_pconst_char c
- | Const_string s -> ocaml_pconst_string s None
+ | Const_string s -> ocaml_pconst_string s loc_none None
| Const_float s -> ocaml_pconst_float s
| Const_int32 i32 -> Const_int32 i32
| Const_int64 i64 -> Const_int64 i64
diff --git a/ocaml_src/lib/versdep/3.12.1.ml b/ocaml_src/lib/versdep/3.12.1.ml
index e9c7c1cb..6b468d72 100644
--- a/ocaml_src/lib/versdep/3.12.1.ml
+++ b/ocaml_src/lib/versdep/3.12.1.ml
@@ -174,14 +174,14 @@ let ocaml_pconst_char c = Const_char c;;
let ocaml_pconst_int i = Const_int i;;
let ocaml_pconst_float s = Const_float s;;
-let ocaml_const_string s = Const_string s;;
-let ocaml_pconst_string s so = Const_string s;;
+let ocaml_const_string s loc = Const_string s;;
+let ocaml_pconst_string s loc so = Const_string s;;
let pconst_of_const =
function
Const_int i -> ocaml_pconst_int i
| Const_char c -> ocaml_pconst_char c
- | Const_string s -> ocaml_pconst_string s None
+ | Const_string s -> ocaml_pconst_string s loc_none None
| Const_float s -> ocaml_pconst_float s
| Const_int32 i32 -> Const_int32 i32
| Const_int64 i64 -> Const_int64 i64
diff --git a/ocaml_src/lib/versdep/3.12.2.ml b/ocaml_src/lib/versdep/3.12.2.ml
index e9c7c1cb..6b468d72 100644
--- a/ocaml_src/lib/versdep/3.12.2.ml
+++ b/ocaml_src/lib/versdep/3.12.2.ml
@@ -174,14 +174,14 @@ let ocaml_pconst_char c = Const_char c;;
let ocaml_pconst_int i = Const_int i;;
let ocaml_pconst_float s = Const_float s;;
-let ocaml_const_string s = Const_string s;;
-let ocaml_pconst_string s so = Const_string s;;
+let ocaml_const_string s loc = Const_string s;;
+let ocaml_pconst_string s loc so = Const_string s;;
let pconst_of_const =
function
Const_int i -> ocaml_pconst_int i
| Const_char c -> ocaml_pconst_char c
- | Const_string s -> ocaml_pconst_string s None
+ | Const_string s -> ocaml_pconst_string s loc_none None
| Const_float s -> ocaml_pconst_float s
| Const_int32 i32 -> Const_int32 i32
| Const_int64 i64 -> Const_int64 i64
diff --git a/ocaml_src/lib/versdep/3.13.0-gadt.ml b/ocaml_src/lib/versdep/3.13.0-gadt.ml
index 4c96211f..04fe2af7 100644
--- a/ocaml_src/lib/versdep/3.13.0-gadt.ml
+++ b/ocaml_src/lib/versdep/3.13.0-gadt.ml
@@ -169,14 +169,14 @@ let ocaml_pconst_char c = Const_char c;;
let ocaml_pconst_int i = Const_int i;;
let ocaml_pconst_float s = Const_float s;;
-let ocaml_const_string s = Const_string s;;
-let ocaml_pconst_string s so = Const_string s;;
+let ocaml_const_string s loc = Const_string s;;
+let ocaml_pconst_string s loc so = Const_string s;;
let pconst_of_const =
function
Const_int i -> ocaml_pconst_int i
| Const_char c -> ocaml_pconst_char c
- | Const_string s -> ocaml_pconst_string s None
+ | Const_string s -> ocaml_pconst_string s loc_none None
| Const_float s -> ocaml_pconst_float s
| Const_int32 i32 -> Const_int32 i32
| Const_int64 i64 -> Const_int64 i64
diff --git a/ocaml_src/lib/versdep/4.00.0.ml b/ocaml_src/lib/versdep/4.00.0.ml
index 48521cab..6d7a126c 100644
--- a/ocaml_src/lib/versdep/4.00.0.ml
+++ b/ocaml_src/lib/versdep/4.00.0.ml
@@ -188,14 +188,14 @@ let ocaml_pconst_char c = Const_char c;;
let ocaml_pconst_int i = Const_int i;;
let ocaml_pconst_float s = Const_float s;;
-let ocaml_const_string s = Const_string s;;
-let ocaml_pconst_string s so = Const_string s;;
+let ocaml_const_string s loc = Const_string s;;
+let ocaml_pconst_string s loc so = Const_string s;;
let pconst_of_const =
function
Const_int i -> ocaml_pconst_int i
| Const_char c -> ocaml_pconst_char c
- | Const_string s -> ocaml_pconst_string s None
+ | Const_string s -> ocaml_pconst_string s loc_none None
| Const_float s -> ocaml_pconst_float s
| Const_int32 i32 -> Const_int32 i32
| Const_int64 i64 -> Const_int64 i64
diff --git a/ocaml_src/lib/versdep/4.00.1.ml b/ocaml_src/lib/versdep/4.00.1.ml
index 48521cab..6d7a126c 100644
--- a/ocaml_src/lib/versdep/4.00.1.ml
+++ b/ocaml_src/lib/versdep/4.00.1.ml
@@ -188,14 +188,14 @@ let ocaml_pconst_char c = Const_char c;;
let ocaml_pconst_int i = Const_int i;;
let ocaml_pconst_float s = Const_float s;;
-let ocaml_const_string s = Const_string s;;
-let ocaml_pconst_string s so = Const_string s;;
+let ocaml_const_string s loc = Const_string s;;
+let ocaml_pconst_string s loc so = Const_string s;;
let pconst_of_const =
function
Const_int i -> ocaml_pconst_int i
| Const_char c -> ocaml_pconst_char c
- | Const_string s -> ocaml_pconst_string s None
+ | Const_string s -> ocaml_pconst_string s loc_none None
| Const_float s -> ocaml_pconst_float s
| Const_int32 i32 -> Const_int32 i32
| Const_int64 i64 -> Const_int64 i64
diff --git a/ocaml_src/lib/versdep/4.00.2.ml b/ocaml_src/lib/versdep/4.00.2.ml
index 48521cab..6d7a126c 100644
--- a/ocaml_src/lib/versdep/4.00.2.ml
+++ b/ocaml_src/lib/versdep/4.00.2.ml
@@ -188,14 +188,14 @@ let ocaml_pconst_char c = Const_char c;;
let ocaml_pconst_int i = Const_int i;;
let ocaml_pconst_float s = Const_float s;;
-let ocaml_const_string s = Const_string s;;
-let ocaml_pconst_string s so = Const_string s;;
+let ocaml_const_string s loc = Const_string s;;
+let ocaml_pconst_string s loc so = Const_string s;;
let pconst_of_const =
function
Const_int i -> ocaml_pconst_int i
| Const_char c -> ocaml_pconst_char c
- | Const_string s -> ocaml_pconst_string s None
+ | Const_string s -> ocaml_pconst_string s loc_none None
| Const_float s -> ocaml_pconst_float s
| Const_int32 i32 -> Const_int32 i32
| Const_int64 i64 -> Const_int64 i64
diff --git a/ocaml_src/lib/versdep/4.01.0.ml b/ocaml_src/lib/versdep/4.01.0.ml
index a3258a84..8a5d58a3 100644
--- a/ocaml_src/lib/versdep/4.01.0.ml
+++ b/ocaml_src/lib/versdep/4.01.0.ml
@@ -188,14 +188,14 @@ let ocaml_pconst_char c = Const_char c;;
let ocaml_pconst_int i = Const_int i;;
let ocaml_pconst_float s = Const_float s;;
-let ocaml_const_string s = Const_string s;;
-let ocaml_pconst_string s so = Const_string s;;
+let ocaml_const_string s loc = Const_string s;;
+let ocaml_pconst_string s loc so = Const_string s;;
let pconst_of_const =
function
Const_int i -> ocaml_pconst_int i
| Const_char c -> ocaml_pconst_char c
- | Const_string s -> ocaml_pconst_string s None
+ | Const_string s -> ocaml_pconst_string s loc_none None
| Const_float s -> ocaml_pconst_float s
| Const_int32 i32 -> Const_int32 i32
| Const_int64 i64 -> Const_int64 i64
diff --git a/ocaml_src/lib/versdep/4.01.1.ml b/ocaml_src/lib/versdep/4.01.1.ml
index a3258a84..8a5d58a3 100644
--- a/ocaml_src/lib/versdep/4.01.1.ml
+++ b/ocaml_src/lib/versdep/4.01.1.ml
@@ -188,14 +188,14 @@ let ocaml_pconst_char c = Const_char c;;
let ocaml_pconst_int i = Const_int i;;
let ocaml_pconst_float s = Const_float s;;
-let ocaml_const_string s = Const_string s;;
-let ocaml_pconst_string s so = Const_string s;;
+let ocaml_const_string s loc = Const_string s;;
+let ocaml_pconst_string s loc so = Const_string s;;
let pconst_of_const =
function
Const_int i -> ocaml_pconst_int i
| Const_char c -> ocaml_pconst_char c
- | Const_string s -> ocaml_pconst_string s None
+ | Const_string s -> ocaml_pconst_string s loc_none None
| Const_float s -> ocaml_pconst_float s
| Const_int32 i32 -> Const_int32 i32
| Const_int64 i64 -> Const_int64 i64
diff --git a/ocaml_src/lib/versdep/4.02.0.ml b/ocaml_src/lib/versdep/4.02.0.ml
index 9f76b2ba..e3f5b8c4 100644
--- a/ocaml_src/lib/versdep/4.02.0.ml
+++ b/ocaml_src/lib/versdep/4.02.0.ml
@@ -236,14 +236,14 @@ let ocaml_pconst_char c = Const_char c;;
let ocaml_pconst_int i = Const_int i;;
let ocaml_pconst_float s = Const_float s;;
-let ocaml_const_string s = Const_string (s, None);;
-let ocaml_pconst_string s so = Const_string (s, so);;
+let ocaml_const_string s loc = Const_string (s, None);;
+let ocaml_pconst_string s loc so = Const_string (s, so);;
let pconst_of_const =
function
Const_int i -> ocaml_pconst_int i
| Const_char c -> ocaml_pconst_char c
- | Const_string (s, so) -> ocaml_pconst_string s so
+ | Const_string (s, so) -> ocaml_pconst_string s loc_none so
| Const_float s -> ocaml_pconst_float s
| Const_int32 i32 -> Const_int32 i32
| Const_int64 i64 -> Const_int64 i64
diff --git a/ocaml_src/lib/versdep/4.02.1.ml b/ocaml_src/lib/versdep/4.02.1.ml
index 9f76b2ba..e3f5b8c4 100644
--- a/ocaml_src/lib/versdep/4.02.1.ml
+++ b/ocaml_src/lib/versdep/4.02.1.ml
@@ -236,14 +236,14 @@ let ocaml_pconst_char c = Const_char c;;
let ocaml_pconst_int i = Const_int i;;
let ocaml_pconst_float s = Const_float s;;
-let ocaml_const_string s = Const_string (s, None);;
-let ocaml_pconst_string s so = Const_string (s, so);;
+let ocaml_const_string s loc = Const_string (s, None);;
+let ocaml_pconst_string s loc so = Const_string (s, so);;
let pconst_of_const =
function
Const_int i -> ocaml_pconst_int i
| Const_char c -> ocaml_pconst_char c
- | Const_string (s, so) -> ocaml_pconst_string s so
+ | Const_string (s, so) -> ocaml_pconst_string s loc_none so
| Const_float s -> ocaml_pconst_float s
| Const_int32 i32 -> Const_int32 i32
| Const_int64 i64 -> Const_int64 i64
diff --git a/ocaml_src/lib/versdep/4.02.2.ml b/ocaml_src/lib/versdep/4.02.2.ml
index 9f76b2ba..e3f5b8c4 100644
--- a/ocaml_src/lib/versdep/4.02.2.ml
+++ b/ocaml_src/lib/versdep/4.02.2.ml
@@ -236,14 +236,14 @@ let ocaml_pconst_char c = Const_char c;;
let ocaml_pconst_int i = Const_int i;;
let ocaml_pconst_float s = Const_float s;;
-let ocaml_const_string s = Const_string (s, None);;
-let ocaml_pconst_string s so = Const_string (s, so);;
+let ocaml_const_string s loc = Const_string (s, None);;
+let ocaml_pconst_string s loc so = Const_string (s, so);;
let pconst_of_const =
function
Const_int i -> ocaml_pconst_int i
| Const_char c -> ocaml_pconst_char c
- | Const_string (s, so) -> ocaml_pconst_string s so
+ | Const_string (s, so) -> ocaml_pconst_string s loc_none so
| Const_float s -> ocaml_pconst_float s
| Const_int32 i32 -> Const_int32 i32
| Const_int64 i64 -> Const_int64 i64
diff --git a/ocaml_src/lib/versdep/4.02.3.ml b/ocaml_src/lib/versdep/4.02.3.ml
index 9f76b2ba..e3f5b8c4 100644
--- a/ocaml_src/lib/versdep/4.02.3.ml
+++ b/ocaml_src/lib/versdep/4.02.3.ml
@@ -236,14 +236,14 @@ let ocaml_pconst_char c = Const_char c;;
let ocaml_pconst_int i = Const_int i;;
let ocaml_pconst_float s = Const_float s;;
-let ocaml_const_string s = Const_string (s, None);;
-let ocaml_pconst_string s so = Const_string (s, so);;
+let ocaml_const_string s loc = Const_string (s, None);;
+let ocaml_pconst_string s loc so = Const_string (s, so);;
let pconst_of_const =
function
Const_int i -> ocaml_pconst_int i
| Const_char c -> ocaml_pconst_char c
- | Const_string (s, so) -> ocaml_pconst_string s so
+ | Const_string (s, so) -> ocaml_pconst_string s loc_none so
| Const_float s -> ocaml_pconst_float s
| Const_int32 i32 -> Const_int32 i32
| Const_int64 i64 -> Const_int64 i64
diff --git a/ocaml_src/lib/versdep/4.02.4.ml b/ocaml_src/lib/versdep/4.02.4.ml
index 9f76b2ba..e3f5b8c4 100644
--- a/ocaml_src/lib/versdep/4.02.4.ml
+++ b/ocaml_src/lib/versdep/4.02.4.ml
@@ -236,14 +236,14 @@ let ocaml_pconst_char c = Const_char c;;
let ocaml_pconst_int i = Const_int i;;
let ocaml_pconst_float s = Const_float s;;
-let ocaml_const_string s = Const_string (s, None);;
-let ocaml_pconst_string s so = Const_string (s, so);;
+let ocaml_const_string s loc = Const_string (s, None);;
+let ocaml_pconst_string s loc so = Const_string (s, so);;
let pconst_of_const =
function
Const_int i -> ocaml_pconst_int i
| Const_char c -> ocaml_pconst_char c
- | Const_string (s, so) -> ocaml_pconst_string s so
+ | Const_string (s, so) -> ocaml_pconst_string s loc_none so
| Const_float s -> ocaml_pconst_float s
| Const_int32 i32 -> Const_int32 i32
| Const_int64 i64 -> Const_int64 i64
diff --git a/ocaml_src/lib/versdep/4.03.0.ml b/ocaml_src/lib/versdep/4.03.0.ml
index 2e0ef0d3..ca31483a 100644
--- a/ocaml_src/lib/versdep/4.03.0.ml
+++ b/ocaml_src/lib/versdep/4.03.0.ml
@@ -235,14 +235,14 @@ let ocaml_pconst_char c = Pconst_char c;;
let ocaml_pconst_int i = Pconst_integer (string_of_int i, None);;
let ocaml_pconst_float s = Pconst_float (s, None);;
-let ocaml_const_string s = Const_string (s, None);;
-let ocaml_pconst_string s so = Pconst_string (s, so);;
+let ocaml_const_string s loc = Const_string (s, None);;
+let ocaml_pconst_string s loc so = Pconst_string (s, so);;
let pconst_of_const =
function
Const_int i -> ocaml_pconst_int i
| Const_char c -> ocaml_pconst_char c
- | Const_string (s, so) -> ocaml_pconst_string s so
+ | Const_string (s, so) -> ocaml_pconst_string s loc_none so
| Const_float s -> ocaml_pconst_float s
| Const_int32 i32 -> Pconst_integer (Int32.to_string i32, Some 'l')
| Const_int64 i64 -> Pconst_integer (Int64.to_string i64, Some 'L')
diff --git a/ocaml_src/lib/versdep/4.03.1.ml b/ocaml_src/lib/versdep/4.03.1.ml
index 2e0ef0d3..ca31483a 100644
--- a/ocaml_src/lib/versdep/4.03.1.ml
+++ b/ocaml_src/lib/versdep/4.03.1.ml
@@ -235,14 +235,14 @@ let ocaml_pconst_char c = Pconst_char c;;
let ocaml_pconst_int i = Pconst_integer (string_of_int i, None);;
let ocaml_pconst_float s = Pconst_float (s, None);;
-let ocaml_const_string s = Const_string (s, None);;
-let ocaml_pconst_string s so = Pconst_string (s, so);;
+let ocaml_const_string s loc = Const_string (s, None);;
+let ocaml_pconst_string s loc so = Pconst_string (s, so);;
let pconst_of_const =
function
Const_int i -> ocaml_pconst_int i
| Const_char c -> ocaml_pconst_char c
- | Const_string (s, so) -> ocaml_pconst_string s so
+ | Const_string (s, so) -> ocaml_pconst_string s loc_none so
| Const_float s -> ocaml_pconst_float s
| Const_int32 i32 -> Pconst_integer (Int32.to_string i32, Some 'l')
| Const_int64 i64 -> Pconst_integer (Int64.to_string i64, Some 'L')
diff --git a/ocaml_src/lib/versdep/4.04.0.ml b/ocaml_src/lib/versdep/4.04.0.ml
index 2e0ef0d3..ca31483a 100644
--- a/ocaml_src/lib/versdep/4.04.0.ml
+++ b/ocaml_src/lib/versdep/4.04.0.ml
@@ -235,14 +235,14 @@ let ocaml_pconst_char c = Pconst_char c;;
let ocaml_pconst_int i = Pconst_integer (string_of_int i, None);;
let ocaml_pconst_float s = Pconst_float (s, None);;
-let ocaml_const_string s = Const_string (s, None);;
-let ocaml_pconst_string s so = Pconst_string (s, so);;
+let ocaml_const_string s loc = Const_string (s, None);;
+let ocaml_pconst_string s loc so = Pconst_string (s, so);;
let pconst_of_const =
function
Const_int i -> ocaml_pconst_int i
| Const_char c -> ocaml_pconst_char c
- | Const_string (s, so) -> ocaml_pconst_string s so
+ | Const_string (s, so) -> ocaml_pconst_string s loc_none so
| Const_float s -> ocaml_pconst_float s
| Const_int32 i32 -> Pconst_integer (Int32.to_string i32, Some 'l')
| Const_int64 i64 -> Pconst_integer (Int64.to_string i64, Some 'L')
diff --git a/ocaml_src/lib/versdep/4.04.1.ml b/ocaml_src/lib/versdep/4.04.1.ml
index 2e0ef0d3..ca31483a 100644
--- a/ocaml_src/lib/versdep/4.04.1.ml
+++ b/ocaml_src/lib/versdep/4.04.1.ml
@@ -235,14 +235,14 @@ let ocaml_pconst_char c = Pconst_char c;;
let ocaml_pconst_int i = Pconst_integer (string_of_int i, None);;
let ocaml_pconst_float s = Pconst_float (s, None);;
-let ocaml_const_string s = Const_string (s, None);;
-let ocaml_pconst_string s so = Pconst_string (s, so);;
+let ocaml_const_string s loc = Const_string (s, None);;
+let ocaml_pconst_string s loc so = Pconst_string (s, so);;
let pconst_of_const =
function
Const_int i -> ocaml_pconst_int i
| Const_char c -> ocaml_pconst_char c
- | Const_string (s, so) -> ocaml_pconst_string s so
+ | Const_string (s, so) -> ocaml_pconst_string s loc_none so
| Const_float s -> ocaml_pconst_float s
| Const_int32 i32 -> Pconst_integer (Int32.to_string i32, Some 'l')
| Const_int64 i64 -> Pconst_integer (Int64.to_string i64, Some 'L')
diff --git a/ocaml_src/lib/versdep/4.04.2.ml b/ocaml_src/lib/versdep/4.04.2.ml
index 2e0ef0d3..ca31483a 100644
--- a/ocaml_src/lib/versdep/4.04.2.ml
+++ b/ocaml_src/lib/versdep/4.04.2.ml
@@ -235,14 +235,14 @@ let ocaml_pconst_char c = Pconst_char c;;
let ocaml_pconst_int i = Pconst_integer (string_of_int i, None);;
let ocaml_pconst_float s = Pconst_float (s, None);;
-let ocaml_const_string s = Const_string (s, None);;
-let ocaml_pconst_string s so = Pconst_string (s, so);;
+let ocaml_const_string s loc = Const_string (s, None);;
+let ocaml_pconst_string s loc so = Pconst_string (s, so);;
let pconst_of_const =
function
Const_int i -> ocaml_pconst_int i
| Const_char c -> ocaml_pconst_char c
- | Const_string (s, so) -> ocaml_pconst_string s so
+ | Const_string (s, so) -> ocaml_pconst_string s loc_none so
| Const_float s -> ocaml_pconst_float s
| Const_int32 i32 -> Pconst_integer (Int32.to_string i32, Some 'l')
| Const_int64 i64 -> Pconst_integer (Int64.to_string i64, Some 'L')
diff --git a/ocaml_src/lib/versdep/4.04.3.ml b/ocaml_src/lib/versdep/4.04.3.ml
index 2e0ef0d3..ca31483a 100644
--- a/ocaml_src/lib/versdep/4.04.3.ml
+++ b/ocaml_src/lib/versdep/4.04.3.ml
@@ -235,14 +235,14 @@ let ocaml_pconst_char c = Pconst_char c;;
let ocaml_pconst_int i = Pconst_integer (string_of_int i, None);;
let ocaml_pconst_float s = Pconst_float (s, None);;
-let ocaml_const_string s = Const_string (s, None);;
-let ocaml_pconst_string s so = Pconst_string (s, so);;
+let ocaml_const_string s loc = Const_string (s, None);;
+let ocaml_pconst_string s loc so = Pconst_string (s, so);;
let pconst_of_const =
function
Const_int i -> ocaml_pconst_int i
| Const_char c -> ocaml_pconst_char c
- | Const_string (s, so) -> ocaml_pconst_string s so
+ | Const_string (s, so) -> ocaml_pconst_string s loc_none so
| Const_float s -> ocaml_pconst_float s
| Const_int32 i32 -> Pconst_integer (Int32.to_string i32, Some 'l')
| Const_int64 i64 -> Pconst_integer (Int64.to_string i64, Some 'L')
diff --git a/ocaml_src/lib/versdep/4.05.0.ml b/ocaml_src/lib/versdep/4.05.0.ml
index 4ad7556a..7b350d16 100644
--- a/ocaml_src/lib/versdep/4.05.0.ml
+++ b/ocaml_src/lib/versdep/4.05.0.ml
@@ -235,14 +235,14 @@ let ocaml_pconst_char c = Pconst_char c;;
let ocaml_pconst_int i = Pconst_integer (string_of_int i, None);;
let ocaml_pconst_float s = Pconst_float (s, None);;
-let ocaml_const_string s = Const_string (s, None);;
-let ocaml_pconst_string s so = Pconst_string (s, so);;
+let ocaml_const_string s loc = Const_string (s, None);;
+let ocaml_pconst_string s loc so = Pconst_string (s, so);;
let pconst_of_const =
function
Const_int i -> ocaml_pconst_int i
| Const_char c -> ocaml_pconst_char c
- | Const_string (s, so) -> ocaml_pconst_string s so
+ | Const_string (s, so) -> ocaml_pconst_string s loc_none so
| Const_float s -> ocaml_pconst_float s
| Const_int32 i32 -> Pconst_integer (Int32.to_string i32, Some 'l')
| Const_int64 i64 -> Pconst_integer (Int64.to_string i64, Some 'L')
diff --git a/ocaml_src/lib/versdep/4.05.1.ml b/ocaml_src/lib/versdep/4.05.1.ml
index 4ad7556a..7b350d16 100644
--- a/ocaml_src/lib/versdep/4.05.1.ml
+++ b/ocaml_src/lib/versdep/4.05.1.ml
@@ -235,14 +235,14 @@ let ocaml_pconst_char c = Pconst_char c;;
let ocaml_pconst_int i = Pconst_integer (string_of_int i, None);;
let ocaml_pconst_float s = Pconst_float (s, None);;
-let ocaml_const_string s = Const_string (s, None);;
-let ocaml_pconst_string s so = Pconst_string (s, so);;
+let ocaml_const_string s loc = Const_string (s, None);;
+let ocaml_pconst_string s loc so = Pconst_string (s, so);;
let pconst_of_const =
function
Const_int i -> ocaml_pconst_int i
| Const_char c -> ocaml_pconst_char c
- | Const_string (s, so) -> ocaml_pconst_string s so
+ | Const_string (s, so) -> ocaml_pconst_string s loc_none so
| Const_float s -> ocaml_pconst_float s
| Const_int32 i32 -> Pconst_integer (Int32.to_string i32, Some 'l')
| Const_int64 i64 -> Pconst_integer (Int64.to_string i64, Some 'L')
diff --git a/ocaml_src/lib/versdep/4.06.0.ml b/ocaml_src/lib/versdep/4.06.0.ml
index a3eae3bc..df563e29 100644
--- a/ocaml_src/lib/versdep/4.06.0.ml
+++ b/ocaml_src/lib/versdep/4.06.0.ml
@@ -235,14 +235,14 @@ let ocaml_pconst_char c = Pconst_char c;;
let ocaml_pconst_int i = Pconst_integer (string_of_int i, None);;
let ocaml_pconst_float s = Pconst_float (s, None);;
-let ocaml_const_string s = Const_string (s, None);;
-let ocaml_pconst_string s so = Pconst_string (s, so);;
+let ocaml_const_string s loc = Const_string (s, None);;
+let ocaml_pconst_string s loc so = Pconst_string (s, so);;
let pconst_of_const =
function
Const_int i -> ocaml_pconst_int i
| Const_char c -> ocaml_pconst_char c
- | Const_string (s, so) -> ocaml_pconst_string s so
+ | Const_string (s, so) -> ocaml_pconst_string s loc_none so
| Const_float s -> ocaml_pconst_float s
| Const_int32 i32 -> Pconst_integer (Int32.to_string i32, Some 'l')
| Const_int64 i64 -> Pconst_integer (Int64.to_string i64, Some 'L')
diff --git a/ocaml_src/lib/versdep/4.06.1.ml b/ocaml_src/lib/versdep/4.06.1.ml
index a3eae3bc..df563e29 100644
--- a/ocaml_src/lib/versdep/4.06.1.ml
+++ b/ocaml_src/lib/versdep/4.06.1.ml
@@ -235,14 +235,14 @@ let ocaml_pconst_char c = Pconst_char c;;
let ocaml_pconst_int i = Pconst_integer (string_of_int i, None);;
let ocaml_pconst_float s = Pconst_float (s, None);;
-let ocaml_const_string s = Const_string (s, None);;
-let ocaml_pconst_string s so = Pconst_string (s, so);;
+let ocaml_const_string s loc = Const_string (s, None);;
+let ocaml_pconst_string s loc so = Pconst_string (s, so);;
let pconst_of_const =
function
Const_int i -> ocaml_pconst_int i
| Const_char c -> ocaml_pconst_char c
- | Const_string (s, so) -> ocaml_pconst_string s so
+ | Const_string (s, so) -> ocaml_pconst_string s loc_none so
| Const_float s -> ocaml_pconst_float s
| Const_int32 i32 -> Pconst_integer (Int32.to_string i32, Some 'l')
| Const_int64 i64 -> Pconst_integer (Int64.to_string i64, Some 'L')
diff --git a/ocaml_src/lib/versdep/4.06.2.ml b/ocaml_src/lib/versdep/4.06.2.ml
index a3eae3bc..df563e29 100644
--- a/ocaml_src/lib/versdep/4.06.2.ml
+++ b/ocaml_src/lib/versdep/4.06.2.ml
@@ -235,14 +235,14 @@ let ocaml_pconst_char c = Pconst_char c;;
let ocaml_pconst_int i = Pconst_integer (string_of_int i, None);;
let ocaml_pconst_float s = Pconst_float (s, None);;
-let ocaml_const_string s = Const_string (s, None);;
-let ocaml_pconst_string s so = Pconst_string (s, so);;
+let ocaml_const_string s loc = Const_string (s, None);;
+let ocaml_pconst_string s loc so = Pconst_string (s, so);;
let pconst_of_const =
function
Const_int i -> ocaml_pconst_int i
| Const_char c -> ocaml_pconst_char c
- | Const_string (s, so) -> ocaml_pconst_string s so
+ | Const_string (s, so) -> ocaml_pconst_string s loc_none so
| Const_float s -> ocaml_pconst_float s
| Const_int32 i32 -> Pconst_integer (Int32.to_string i32, Some 'l')
| Const_int64 i64 -> Pconst_integer (Int64.to_string i64, Some 'L')
diff --git a/ocaml_src/lib/versdep/4.07.0.ml b/ocaml_src/lib/versdep/4.07.0.ml
index a3eae3bc..df563e29 100644
--- a/ocaml_src/lib/versdep/4.07.0.ml
+++ b/ocaml_src/lib/versdep/4.07.0.ml
@@ -235,14 +235,14 @@ let ocaml_pconst_char c = Pconst_char c;;
let ocaml_pconst_int i = Pconst_integer (string_of_int i, None);;
let ocaml_pconst_float s = Pconst_float (s, None);;
-let ocaml_const_string s = Const_string (s, None);;
-let ocaml_pconst_string s so = Pconst_string (s, so);;
+let ocaml_const_string s loc = Const_string (s, None);;
+let ocaml_pconst_string s loc so = Pconst_string (s, so);;
let pconst_of_const =
function
Const_int i -> ocaml_pconst_int i
| Const_char c -> ocaml_pconst_char c
- | Const_string (s, so) -> ocaml_pconst_string s so
+ | Const_string (s, so) -> ocaml_pconst_string s loc_none so
| Const_float s -> ocaml_pconst_float s
| Const_int32 i32 -> Pconst_integer (Int32.to_string i32, Some 'l')
| Const_int64 i64 -> Pconst_integer (Int64.to_string i64, Some 'L')
diff --git a/ocaml_src/lib/versdep/4.07.1.ml b/ocaml_src/lib/versdep/4.07.1.ml
index a3eae3bc..df563e29 100644
--- a/ocaml_src/lib/versdep/4.07.1.ml
+++ b/ocaml_src/lib/versdep/4.07.1.ml
@@ -235,14 +235,14 @@ let ocaml_pconst_char c = Pconst_char c;;
let ocaml_pconst_int i = Pconst_integer (string_of_int i, None);;
let ocaml_pconst_float s = Pconst_float (s, None);;
-let ocaml_const_string s = Const_string (s, None);;
-let ocaml_pconst_string s so = Pconst_string (s, so);;
+let ocaml_const_string s loc = Const_string (s, None);;
+let ocaml_pconst_string s loc so = Pconst_string (s, so);;
let pconst_of_const =
function
Const_int i -> ocaml_pconst_int i
| Const_char c -> ocaml_pconst_char c
- | Const_string (s, so) -> ocaml_pconst_string s so
+ | Const_string (s, so) -> ocaml_pconst_string s loc_none so
| Const_float s -> ocaml_pconst_float s
| Const_int32 i32 -> Pconst_integer (Int32.to_string i32, Some 'l')
| Const_int64 i64 -> Pconst_integer (Int64.to_string i64, Some 'L')
diff --git a/ocaml_src/lib/versdep/4.07.2.ml b/ocaml_src/lib/versdep/4.07.2.ml
index a3eae3bc..df563e29 100644
--- a/ocaml_src/lib/versdep/4.07.2.ml
+++ b/ocaml_src/lib/versdep/4.07.2.ml
@@ -235,14 +235,14 @@ let ocaml_pconst_char c = Pconst_char c;;
let ocaml_pconst_int i = Pconst_integer (string_of_int i, None);;
let ocaml_pconst_float s = Pconst_float (s, None);;
-let ocaml_const_string s = Const_string (s, None);;
-let ocaml_pconst_string s so = Pconst_string (s, so);;
+let ocaml_const_string s loc = Const_string (s, None);;
+let ocaml_pconst_string s loc so = Pconst_string (s, so);;
let pconst_of_const =
function
Const_int i -> ocaml_pconst_int i
| Const_char c -> ocaml_pconst_char c
- | Const_string (s, so) -> ocaml_pconst_string s so
+ | Const_string (s, so) -> ocaml_pconst_string s loc_none so
| Const_float s -> ocaml_pconst_float s
| Const_int32 i32 -> Pconst_integer (Int32.to_string i32, Some 'l')
| Const_int64 i64 -> Pconst_integer (Int64.to_string i64, Some 'L')
diff --git a/ocaml_src/lib/versdep/4.08.0.ml b/ocaml_src/lib/versdep/4.08.0.ml
index 60fb19b6..220e5255 100644
--- a/ocaml_src/lib/versdep/4.08.0.ml
+++ b/ocaml_src/lib/versdep/4.08.0.ml
@@ -241,14 +241,14 @@ let ocaml_pconst_char c = Pconst_char c;;
let ocaml_pconst_int i = Pconst_integer (string_of_int i, None);;
let ocaml_pconst_float s = Pconst_float (s, None);;
-let ocaml_const_string s = Const_string (s, None);;
-let ocaml_pconst_string s so = Pconst_string (s, so);;
+let ocaml_const_string s loc = Const_string (s, None);;
+let ocaml_pconst_string s loc so = Pconst_string (s, so);;
let pconst_of_const =
function
Const_int i -> ocaml_pconst_int i
| Const_char c -> ocaml_pconst_char c
- | Const_string (s, so) -> ocaml_pconst_string s so
+ | Const_string (s, so) -> ocaml_pconst_string s loc_none so
| Const_float s -> ocaml_pconst_float s
| Const_int32 i32 -> Pconst_integer (Int32.to_string i32, Some 'l')
| Const_int64 i64 -> Pconst_integer (Int64.to_string i64, Some 'L')
diff --git a/ocaml_src/lib/versdep/4.08.1.ml b/ocaml_src/lib/versdep/4.08.1.ml
index 60fb19b6..220e5255 100644
--- a/ocaml_src/lib/versdep/4.08.1.ml
+++ b/ocaml_src/lib/versdep/4.08.1.ml
@@ -241,14 +241,14 @@ let ocaml_pconst_char c = Pconst_char c;;
let ocaml_pconst_int i = Pconst_integer (string_of_int i, None);;
let ocaml_pconst_float s = Pconst_float (s, None);;
-let ocaml_const_string s = Const_string (s, None);;
-let ocaml_pconst_string s so = Pconst_string (s, so);;
+let ocaml_const_string s loc = Const_string (s, None);;
+let ocaml_pconst_string s loc so = Pconst_string (s, so);;
let pconst_of_const =
function
Const_int i -> ocaml_pconst_int i
| Const_char c -> ocaml_pconst_char c
- | Const_string (s, so) -> ocaml_pconst_string s so
+ | Const_string (s, so) -> ocaml_pconst_string s loc_none so
| Const_float s -> ocaml_pconst_float s
| Const_int32 i32 -> Pconst_integer (Int32.to_string i32, Some 'l')
| Const_int64 i64 -> Pconst_integer (Int64.to_string i64, Some 'L')
diff --git a/ocaml_src/lib/versdep/4.08.2.ml b/ocaml_src/lib/versdep/4.08.2.ml
index 60fb19b6..220e5255 100644
--- a/ocaml_src/lib/versdep/4.08.2.ml
+++ b/ocaml_src/lib/versdep/4.08.2.ml
@@ -241,14 +241,14 @@ let ocaml_pconst_char c = Pconst_char c;;
let ocaml_pconst_int i = Pconst_integer (string_of_int i, None);;
let ocaml_pconst_float s = Pconst_float (s, None);;
-let ocaml_const_string s = Const_string (s, None);;
-let ocaml_pconst_string s so = Pconst_string (s, so);;
+let ocaml_const_string s loc = Const_string (s, None);;
+let ocaml_pconst_string s loc so = Pconst_string (s, so);;
let pconst_of_const =
function
Const_int i -> ocaml_pconst_int i
| Const_char c -> ocaml_pconst_char c
- | Const_string (s, so) -> ocaml_pconst_string s so
+ | Const_string (s, so) -> ocaml_pconst_string s loc_none so
| Const_float s -> ocaml_pconst_float s
| Const_int32 i32 -> Pconst_integer (Int32.to_string i32, Some 'l')
| Const_int64 i64 -> Pconst_integer (Int64.to_string i64, Some 'L')
diff --git a/ocaml_src/lib/versdep/4.09.0.ml b/ocaml_src/lib/versdep/4.09.0.ml
index 60fb19b6..220e5255 100644
--- a/ocaml_src/lib/versdep/4.09.0.ml
+++ b/ocaml_src/lib/versdep/4.09.0.ml
@@ -241,14 +241,14 @@ let ocaml_pconst_char c = Pconst_char c;;
let ocaml_pconst_int i = Pconst_integer (string_of_int i, None);;
let ocaml_pconst_float s = Pconst_float (s, None);;
-let ocaml_const_string s = Const_string (s, None);;
-let ocaml_pconst_string s so = Pconst_string (s, so);;
+let ocaml_const_string s loc = Const_string (s, None);;
+let ocaml_pconst_string s loc so = Pconst_string (s, so);;
let pconst_of_const =
function
Const_int i -> ocaml_pconst_int i
| Const_char c -> ocaml_pconst_char c
- | Const_string (s, so) -> ocaml_pconst_string s so
+ | Const_string (s, so) -> ocaml_pconst_string s loc_none so
| Const_float s -> ocaml_pconst_float s
| Const_int32 i32 -> Pconst_integer (Int32.to_string i32, Some 'l')
| Const_int64 i64 -> Pconst_integer (Int64.to_string i64, Some 'L')
diff --git a/ocaml_src/lib/versdep/4.09.1.ml b/ocaml_src/lib/versdep/4.09.1.ml
index 60fb19b6..220e5255 100644
--- a/ocaml_src/lib/versdep/4.09.1.ml
+++ b/ocaml_src/lib/versdep/4.09.1.ml
@@ -241,14 +241,14 @@ let ocaml_pconst_char c = Pconst_char c;;
let ocaml_pconst_int i = Pconst_integer (string_of_int i, None);;
let ocaml_pconst_float s = Pconst_float (s, None);;
-let ocaml_const_string s = Const_string (s, None);;
-let ocaml_pconst_string s so = Pconst_string (s, so);;
+let ocaml_const_string s loc = Const_string (s, None);;
+let ocaml_pconst_string s loc so = Pconst_string (s, so);;
let pconst_of_const =
function
Const_int i -> ocaml_pconst_int i
| Const_char c -> ocaml_pconst_char c
- | Const_string (s, so) -> ocaml_pconst_string s so
+ | Const_string (s, so) -> ocaml_pconst_string s loc_none so
| Const_float s -> ocaml_pconst_float s
| Const_int32 i32 -> Pconst_integer (Int32.to_string i32, Some 'l')
| Const_int64 i64 -> Pconst_integer (Int64.to_string i64, Some 'L')
diff --git a/ocaml_src/lib/versdep/4.10.0.ml b/ocaml_src/lib/versdep/4.10.0.ml
index bb7124dd..daf3e68f 100644
--- a/ocaml_src/lib/versdep/4.10.0.ml
+++ b/ocaml_src/lib/versdep/4.10.0.ml
@@ -244,14 +244,14 @@ let ocaml_pconst_char c = Pconst_char c;;
let ocaml_pconst_int i = Pconst_integer (string_of_int i, None);;
let ocaml_pconst_float s = Pconst_float (s, None);;
-let ocaml_const_string s = Const_string (s, None);;
-let ocaml_pconst_string s so = Pconst_string (s, so);;
+let ocaml_const_string s loc = Const_string (s, None);;
+let ocaml_pconst_string s loc so = Pconst_string (s, so);;
let pconst_of_const =
function
Const_int i -> ocaml_pconst_int i
| Const_char c -> ocaml_pconst_char c
- | Const_string (s, so) -> ocaml_pconst_string s so
+ | Const_string (s, so) -> ocaml_pconst_string s loc_none so
| Const_float s -> ocaml_pconst_float s
| Const_int32 i32 -> Pconst_integer (Int32.to_string i32, Some 'l')
| Const_int64 i64 -> Pconst_integer (Int64.to_string i64, Some 'L')
diff --git a/ocaml_src/lib/versdep/jocaml/3.12.0.ml b/ocaml_src/lib/versdep/jocaml/3.12.0.ml
index e8f485cd..837917fb 100644
--- a/ocaml_src/lib/versdep/jocaml/3.12.0.ml
+++ b/ocaml_src/lib/versdep/jocaml/3.12.0.ml
@@ -174,14 +174,14 @@ let ocaml_pconst_char c = Const_char c;;
let ocaml_pconst_int i = Const_int i;;
let ocaml_pconst_float s = Const_float s;;
-let ocaml_const_string s = Const_string s;;
-let ocaml_pconst_string s so = Const_string s;;
+let ocaml_const_string s loc = Const_string s;;
+let ocaml_pconst_string s loc so = Const_string s;;
let pconst_of_const =
function
Const_int i -> ocaml_pconst_int i
| Const_char c -> ocaml_pconst_char c
- | Const_string s -> ocaml_pconst_string s None
+ | Const_string s -> ocaml_pconst_string s loc_none None
| Const_float s -> ocaml_pconst_float s
| Const_int32 i32 -> Const_int32 i32
| Const_int64 i64 -> Const_int64 i64
diff --git a/ocaml_src/lib/versdep/jocaml/3.12.1.ml b/ocaml_src/lib/versdep/jocaml/3.12.1.ml
index e8f485cd..837917fb 100644
--- a/ocaml_src/lib/versdep/jocaml/3.12.1.ml
+++ b/ocaml_src/lib/versdep/jocaml/3.12.1.ml
@@ -174,14 +174,14 @@ let ocaml_pconst_char c = Const_char c;;
let ocaml_pconst_int i = Const_int i;;
let ocaml_pconst_float s = Const_float s;;
-let ocaml_const_string s = Const_string s;;
-let ocaml_pconst_string s so = Const_string s;;
+let ocaml_const_string s loc = Const_string s;;
+let ocaml_pconst_string s loc so = Const_string s;;
let pconst_of_const =
function
Const_int i -> ocaml_pconst_int i
| Const_char c -> ocaml_pconst_char c
- | Const_string s -> ocaml_pconst_string s None
+ | Const_string s -> ocaml_pconst_string s loc_none None
| Const_float s -> ocaml_pconst_float s
| Const_int32 i32 -> Const_int32 i32
| Const_int64 i64 -> Const_int64 i64
diff --git a/ocaml_src/lib/versdep/jocaml/3.13.0.ml b/ocaml_src/lib/versdep/jocaml/3.13.0.ml
index 06f17009..bfa8919e 100644
--- a/ocaml_src/lib/versdep/jocaml/3.13.0.ml
+++ b/ocaml_src/lib/versdep/jocaml/3.13.0.ml
@@ -174,14 +174,14 @@ let ocaml_pconst_char c = Const_char c;;
let ocaml_pconst_int i = Const_int i;;
let ocaml_pconst_float s = Const_float s;;
-let ocaml_const_string s = Const_string s;;
-let ocaml_pconst_string s so = Const_string s;;
+let ocaml_const_string s loc = Const_string s;;
+let ocaml_pconst_string s loc so = Const_string s;;
let pconst_of_const =
function
Const_int i -> ocaml_pconst_int i
| Const_char c -> ocaml_pconst_char c
- | Const_string s -> ocaml_pconst_string s None
+ | Const_string s -> ocaml_pconst_string s loc_none None
| Const_float s -> ocaml_pconst_float s
| Const_int32 i32 -> Const_int32 i32
| Const_int64 i64 -> Const_int64 i64
diff --git a/ocaml_src/main/ast2pt.ml b/ocaml_src/main/ast2pt.ml
index 87b34922..ef96428f 100644
--- a/ocaml_src/main/ast2pt.ml
+++ b/ocaml_src/main/ast2pt.ml
@@ -629,7 +629,8 @@ let rec patt =
| PaStr (loc, s) ->
mkpat loc
(Ppat_constant
- (ocaml_pconst_string (string_of_string_token loc (uv s)) (mkloc loc) None))
+ (ocaml_pconst_string (string_of_string_token loc (uv s))
+ (mkloc loc) None))
| PaTup (loc, pl) -> mkpat loc (Ppat_tuple (List.map patt (uv pl)))
| PaTyc (loc, p, t) -> mkpat loc (Ppat_constraint (patt p, ctyp t))
| PaTyp (loc, sl) ->
@@ -1225,7 +1226,8 @@ let rec expr =
| ExStr (loc, s) ->
mkexp loc
(Pexp_constant
- (ocaml_pconst_string (string_of_string_token loc (uv s)) (mkloc loc) None))
+ (ocaml_pconst_string (string_of_string_token loc (uv s))
+ (mkloc loc) None))
| ExTry (loc, e, pel) ->
mkexp loc (Pexp_try (expr e, List.map mkpwe (uv pel)))
| ExTup (loc, el) -> mkexp loc (Pexp_tuple (List.map expr (uv el)))
diff --git a/ocaml_src/main/ast2pt.mli b/ocaml_src/main/ast2pt.mli
index 64f03f31..c4a42c28 100644
--- a/ocaml_src/main/ast2pt.mli
+++ b/ocaml_src/main/ast2pt.mli
@@ -15,3 +15,6 @@ val mkloc : Ploc.t -> Location.t;;
(** Convert a Camlp5 location into an OCaml location. *)
val fast : bool ref;;
(** Flag to generate fast (unsafe) access to arrays. Default: False. *)
+val ctyp : MLast.ctyp -> Parsetree.core_type;;
+val expr : MLast.expr -> Parsetree.expression;;
+val patt : MLast.patt -> Parsetree.pattern;;
--
2.24.1