From cd960482f81aea69c0662f7c15757e387082a1a0 Mon Sep 17 00:00:00 2001
From: Erwan Jahier <erwan.jahier@univ-grenoble-alpes.fr>
Date: Fri, 17 May 2019 10:50:57 +0200
Subject: [PATCH] Fix: the commit sha:712306a51d8a092663d (3/5/19) break the
code for ocaml < 4.06
Indeed the API of Format.formatter_out_functions changed in 4.06.0
To turn around this problem, I've used pp_get_formatter_out_functions
and extend it result
---
lv6-ref-man/lv6-ref-man.pdf | Bin 323630 -> 323631 bytes
src/astV6Dump.ml | 25 ++++++++++++++++---------
test/lus2lic.sum | 26 +++++++++++++-------------
3 files changed, 29 insertions(+), 22 deletions(-)
diff --git a/lv6-ref-man/lv6-ref-man.pdf b/lv6-ref-man/lv6-ref-man.pdf
index 9f8be12c5fe63f7b0fb1c022c3a2c3c5e15edb68..8f7ff75939ca40422a976938d91132c6519c10ed 100644
GIT binary patch
delta 3699
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
W8RdPICiw%*%Z=huRJ3q7><tz>?$u
delta 3674
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
KAROEsh5iHisERfK
diff --git a/src/astV6Dump.ml b/src/astV6Dump.ml
index 4110efeb..a2b52bfd 100644
--- a/src/astV6Dump.ml
+++ b/src/astV6Dump.ml
@@ -1,4 +1,4 @@
-(* Time-stamp: <modified the 21/07/2017 (at 16:52) by Erwan Jahier> *)
+(* Time-stamp: <modified the 17/05/2019 (at 10:39) by Erwan> *)
open Lxm
@@ -681,17 +681,24 @@ let print_node_exp oc ne =
(* on one line for debug ... *)
let print_short_val_exp oc ve =
- let os = Format.formatter_of_out_channel oc in
- let fof : Format.formatter_out_functions =
- {
+ let os = Format.formatter_of_out_channel oc in
+ let fof : Format.formatter_out_functions =
+ pp_get_formatter_out_functions os ()
+ in
+ let fof = {
+ fof
+ with
Format.out_string = (fun s p n -> output_string oc (String.sub s p n));
Format.out_newline = (fun () -> ());
Format.out_spaces = (fun _ -> ());
- Format.out_indent = (fun _ -> ());
+ (* This one has been introduced in ocaml 4.06; hence we use
+ the default formater ti ovoid braking backward compatility
+ Format.out_indent = (fun _ -> ()); *)
Format.out_flush = (fun () -> flush oc);
- } in
- Format.pp_set_formatter_out_functions os fof;
- dump_val_exp os ve;
- pp_print_flush os ()
+ }
+ in
+ Format.pp_set_formatter_out_functions os fof;
+ dump_val_exp os ve;
+ pp_print_flush os ()
diff --git a/test/lus2lic.sum b/test/lus2lic.sum
index a9f89a59..9fa6e06e 100644
--- a/test/lus2lic.sum
+++ b/test/lus2lic.sum
@@ -1,5 +1,5 @@
==> lus2lic0.sum <==
-Test run by jahier on Wed May 15 18:03:06
+Test run by jahier on Fri May 17 10:42:29
Native configuration is x86_64-pc-linux-gnu
=== lus2lic0 tests ===
@@ -66,7 +66,7 @@ XFAIL: Test bad programs (assert): test_lus2lic_no_node should_fail/assert/lecte
XFAIL: Test bad programs (assert): test_lus2lic_no_node should_fail/assert/s.lus
==> lus2lic1.sum <==
-Test run by jahier on Wed May 15 18:03:06
+Test run by jahier on Fri May 17 10:42:30
Native configuration is x86_64-pc-linux-gnu
=== lus2lic1 tests ===
@@ -409,7 +409,7 @@ PASS: sh multipar.sh
PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c multipar.lus {}
==> lus2lic2.sum <==
-Test run by jahier on Thu May 16 09:16:36
+Test run by jahier on Fri May 17 10:42:52
Native configuration is x86_64-pc-linux-gnu
=== lus2lic2 tests ===
@@ -749,7 +749,7 @@ PASS: sh zzz2.sh
PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c zzz2.lus {}
==> lus2lic3.sum <==
-Test run by jahier on Thu May 16 09:17:14
+Test run by jahier on Fri May 17 10:43:19
Native configuration is x86_64-pc-linux-gnu
=== lus2lic3 tests ===
@@ -1259,7 +1259,7 @@ PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node multipar.lus {}
==> lus2lic4.sum <==
-Test run by jahier on Thu May 16 09:17:54
+Test run by jahier on Fri May 17 10:43:58
Native configuration is x86_64-pc-linux-gnu
=== lus2lic4 tests ===
@@ -1777,13 +1777,13 @@ PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node zzz2.lus {}
===============================
# Total number of failures: 15
lus2lic0.log:testcase ./lus2lic.tests/test0.exp completed in 0 seconds
-lus2lic1.log:testcase ./lus2lic.tests/test1.exp completed in 54810 seconds
-lus2lic2.log:testcase ./lus2lic.tests/test2.exp completed in 38 seconds
-lus2lic3.log:testcase ./lus2lic.tests/test3.exp completed in 40 seconds
-lus2lic4.log:testcase ./lus2lic.tests/test4.exp completed in 18 seconds
+lus2lic1.log:testcase ./lus2lic.tests/test1.exp completed in 22 seconds
+lus2lic2.log:testcase ./lus2lic.tests/test2.exp completed in 27 seconds
+lus2lic3.log:testcase ./lus2lic.tests/test3.exp completed in 39 seconds
+lus2lic4.log:testcase ./lus2lic.tests/test4.exp completed in 15 seconds
* Ref time:
-64.08user 21.45system 15:15:06elapsed 0%CPU (0avgtext+0avgdata 277032maxresident)k
-0inputs+143192outputs (0major+10998297minor)pagefaults 0swaps
+53.58user 18.93system 1:43.77elapsed 69%CPU (0avgtext+0avgdata 276760maxresident)k
+32inputs+143296outputs (0major+11000415minor)pagefaults 0swaps
* Quick time (-j 4):
-59.54user 19.53system 1:06.89elapsed 118%CPU (0avgtext+0avgdata 276536maxresident)k
-0inputs+141296outputs (0major+10861295minor)pagefaults 0swaps
+60.95user 19.78system 1:06.88elapsed 120%CPU (0avgtext+0avgdata 276748maxresident)k
+2128inputs+141352outputs (0major+10869510minor)pagefaults 0swaps
--
GitLab