diff --git a/lv6-ref-man/lv6-ref-man.pdf b/lv6-ref-man/lv6-ref-man.pdf index 9f8be12c5fe63f7b0fb1c022c3a2c3c5e15edb68..8f7ff75939ca40422a976938d91132c6519c10ed 100644 Binary files a/lv6-ref-man/lv6-ref-man.pdf and b/lv6-ref-man/lv6-ref-man.pdf differ diff --git a/src/astV6Dump.ml b/src/astV6Dump.ml index 4110efeb0ae1bfc6c2d43d5325c54693b6bdca77..a2b52bfd9c0fe4a2eef36ed894c263c44fc6c0a7 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 a9f89a59b4cb00a483a3f721dedd144d1a6c7484..9fa6e06e7df9f883e5f6331e07b3c67d5abba132 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