From d33fdfe542244c97fed5f725bdbc4feb78647662 Mon Sep 17 00:00:00 2001 From: Stephane Glondu Date: Wed, 14 Nov 2012 13:02:46 +0100 Subject: [PATCH] Imported Upstream version 4.00.1 --- Changes | 35 +- Makefile | 13 +- VERSION | 4 +- asmcomp/amd64/emit.mlp | 17 +- asmcomp/amd64/emit_nt.mlp | 8 +- asmcomp/amd64/proc.ml | 25 +- asmcomp/arm/emit.mlp | 2 +- asmcomp/closure.ml | 48 +-- asmcomp/cmmgen.ml | 88 ++--- asmcomp/cmx_format.mli | 3 +- asmcomp/debuginfo.ml | 1 - asmcomp/emitaux.ml | 16 +- asmcomp/i386/emit.mlp | 2 +- asmcomp/i386/emit_nt.mlp | 2 +- asmcomp/power/emit.mlp | 2 +- asmcomp/schedgen.ml | 70 ++-- asmcomp/sparc/emit.mlp | 2 +- asmrun/amd64.S | 102 ++--- asmrun/amd64nt.asm | 66 ++-- asmrun/arm.S | 4 +- asmrun/i386.S | 10 +- asmrun/i386nt.asm | 170 ++++----- asmrun/power-elf.S | 4 +- asmrun/power-rhapsody.S | 10 +- asmrun/roots.c | 4 +- asmrun/sparc.S | 8 +- boot/ocamlc | Bin 1230377 -> 1230759 bytes boot/ocamldep | Bin 326684 -> 327194 bytes boot/ocamllex | Bin 175485 -> 175591 bytes bytecomp/bytepackager.ml | 8 +- bytecomp/matching.ml | 57 ++- bytecomp/translcore.ml | 20 +- bytecomp/translcore.mli | 4 +- bytecomp/translmod.ml | 9 +- byterun/compact.c | 39 +- byterun/extern.c | 3 +- byterun/freelist.c | 9 +- byterun/freelist.h | 4 +- byterun/hash.h | 1 - byterun/intern.c | 12 +- byterun/major_gc.c | 4 +- byterun/md5.c | 4 +- byterun/md5.h | 4 +- byterun/memory.c | 4 +- camlp4/Camlp4/Struct/Camlp4Ast2OCamlAst.ml | 50 +-- camlp4/Camlp4/Struct/Lexer.mll | 4 +- camlp4/Camlp4Parsers/Camlp4OCamlParser.ml | 16 +- .../Camlp4Parsers/Camlp4OCamlRevisedParser.ml | 10 +- camlp4/Camlp4Top/Rprint.ml | 4 +- camlp4/examples/arith.ml | 18 +- camlp4/man/camlp4.1.tpl | 2 +- debugger/command_line.ml | 6 +- emacs/caml-types.el | 14 +- emacs/caml.el | 9 +- emacs/camldebug.el | 8 +- emacs/ocamltags.in | 4 +- man/ocamlc.m | 4 +- man/ocamldoc.m | 4 +- man/ocamlopt.m | 8 +- ocamlbuild/ChangeLog | 1 - ocamlbuild/my_std.ml | 15 + ocamlbuild/ocaml_specific.ml | 2 +- ocamlbuild/ocamlbuild.odocl | 2 +- ocamlbuild/ocamlbuild_pack.mlpack | 2 +- ocamlbuild/param_tags.ml | 11 +- ocamlbuild/signatures.mli | 2 +- ocamldoc/Changes.txt | 10 +- ocamldoc/generators/odoc_todo.ml | 4 +- ocamldoc/odoc_analyse.ml | 10 +- ocamldoc/odoc_ast.ml | 34 +- ocamldoc/odoc_class.ml | 6 +- ocamldoc/odoc_dot.ml | 3 +- ocamldoc/odoc_env.ml | 8 +- ocamldoc/odoc_global.ml | 5 +- ocamldoc/odoc_html.ml | 28 +- ocamldoc/odoc_info.mli | 4 +- ocamldoc/odoc_latex.ml | 34 +- ocamldoc/odoc_lexer.mll | 6 +- ocamldoc/odoc_man.ml | 6 +- ocamldoc/odoc_merge.mli | 4 +- ocamldoc/odoc_misc.ml | 4 +- ocamldoc/odoc_name.ml | 6 +- ocamldoc/odoc_print.ml | 4 +- ocamldoc/odoc_scan.ml | 6 +- ocamldoc/odoc_sig.ml | 12 +- ocamldoc/odoc_texi.ml | 42 +-- ocamldoc/odoc_text_lexer.mll | 6 +- otherlibs/bigarray/bigarray_stubs.c | 12 +- otherlibs/bigarray/mmap_unix.c | 4 +- otherlibs/graph/.depend | 2 +- otherlibs/labltk/frx/README | 2 +- otherlibs/labltk/lib/Makefile | 6 +- otherlibs/labltk/lib/Makefile.nt | 2 +- otherlibs/labltk/lib/labltk.bat | 2 +- otherlibs/labltk/support/cltkVar.c | 4 +- otherlibs/num/nat_stubs.c | 3 +- otherlibs/str/str.mli | 69 ++-- otherlibs/systhreads/st_posix.h | 4 +- otherlibs/systhreads/st_stubs.c | 10 +- otherlibs/systhreads/st_win32.h | 20 +- otherlibs/threads/Makefile | 7 +- otherlibs/unix/select.c | 22 +- otherlibs/win32unix/close_on.c | 6 +- otherlibs/win32unix/select.c | 174 ++++----- otherlibs/win32unix/times.c | 70 ++-- otherlibs/win32unix/windbug.c | 4 +- parsing/location.mli | 3 +- parsing/parser.mly | 4 +- parsing/printast.ml | 6 +- stdlib/array.ml | 13 +- stdlib/format.mli | 7 +- stdlib/stdLabels.mli | 4 +- stdlib/stream.ml | 4 +- testsuite/interactive/lib-gc/alloc.ml | 3 +- testsuite/lib/testing.ml | 5 +- testsuite/tests/asmcomp/amd64.S | 22 +- testsuite/tests/asmcomp/arith.cmm | 5 +- testsuite/tests/asmcomp/arm.S | 3 +- testsuite/tests/asmcomp/checkbound.cmm | 4 +- testsuite/tests/asmcomp/hppa.S | 110 +++--- testsuite/tests/asmcomp/i386nt.asm | 84 ++--- testsuite/tests/asmcomp/m68k.S | 4 +- testsuite/tests/asmcomp/main.ml | 3 +- testsuite/tests/asmcomp/mainarith.c | 3 +- testsuite/tests/asmcomp/parsecmm.mly | 3 +- testsuite/tests/asmcomp/tagged-fib.cmm | 3 +- testsuite/tests/asmcomp/tagged-integr.cmm | 3 +- testsuite/tests/basic-float/tfloat_record.ml | 1 - testsuite/tests/basic-more/bounds.ml | 2 - testsuite/tests/basic-more/morematch.ml | 89 +++-- testsuite/tests/basic-more/tbuffer.ml | 1 - testsuite/tests/basic-more/tbuffer.reference | 2 +- testsuite/tests/basic-more/testrandom.ml | 4 +- .../tests/basic-more/testrandom.reference | 4 +- testsuite/tests/basic-more/tformat.reference | 2 +- testsuite/tests/basic-more/tprintf.ml | 2 +- testsuite/tests/basic-more/tprintf.reference | 2 +- testsuite/tests/basic/arrays.ml | 12 + testsuite/tests/basic/boxedints.ml | 42 +-- testsuite/tests/basic/equality.ml | 1 - testsuite/tests/basic/includestruct.ml | 3 +- testsuite/tests/basic/maps.ml | 3 +- testsuite/tests/basic/patmatch.ml | 5 +- testsuite/tests/basic/patmatch.reference | 2 +- testsuite/tests/basic/recvalues.ml | 2 +- testsuite/tests/basic/tailcalls.ml | 2 +- testsuite/tests/callback/Makefile | 4 +- testsuite/tests/callback/tcallback.ml | 1 - testsuite/tests/embedded/Makefile | 2 +- testsuite/tests/gc-roots/globrootsprim.c | 2 - testsuite/tests/lib-bigarray-2/bigarrf.f | 1 - testsuite/tests/lib-bigarray-2/bigarrfml.ml | 1 - testsuite/tests/lib-bigarray-2/bigarrfstub.c | 1 - testsuite/tests/lib-bigarray/bigarrays.ml | 16 +- testsuite/tests/lib-bigarray/fftba.ml | 35 +- testsuite/tests/lib-bigarray/pr5115.ml | 1 - testsuite/tests/lib-dynlink-bytecode/Makefile | 2 +- testsuite/tests/lib-dynlink-bytecode/main.ml | 12 +- testsuite/tests/lib-dynlink-csharp/main.ml | 3 +- testsuite/tests/lib-dynlink-csharp/plugin.ml | 2 +- testsuite/tests/lib-dynlink-native/api.ml | 2 +- testsuite/tests/lib-dynlink-native/b.ml | 1 - testsuite/tests/lib-dynlink-native/bug.ml | 2 +- testsuite/tests/lib-dynlink-native/main.ml | 15 +- testsuite/tests/lib-dynlink-native/packed1.ml | 1 - testsuite/tests/lib-dynlink-native/plugin.ml | 2 +- testsuite/tests/lib-dynlink-native/plugin4.ml | 2 - .../tests/lib-dynlink-native/plugin_ref.ml | 5 +- .../tests/lib-dynlink-native/plugin_thread.ml | 16 +- .../tests/lib-dynlink-native/sub/plugin.ml | 1 - .../tests/lib-dynlink-native/sub/plugin3.ml | 1 - testsuite/tests/lib-hashtbl/hfun.ml | 9 - testsuite/tests/lib-hashtbl/htbl.ml | 1 - testsuite/tests/lib-marshal/intext.ml | 14 +- testsuite/tests/lib-marshal/intextaux.c | 2 +- testsuite/tests/lib-num/test_big_ints.ml | 129 ++++--- testsuite/tests/lib-num/test_nats.ml | 8 +- testsuite/tests/lib-num/test_nums.ml | 44 +-- testsuite/tests/lib-printf/tprintf.ml | 4 +- testsuite/tests/lib-printf/tprintf.reference | 88 ++--- testsuite/tests/lib-scanf/tscanf.ml | 8 +- testsuite/tests/lib-scanf/tscanf.reference | 2 +- testsuite/tests/lib-set/testmap.ml | 3 +- testsuite/tests/lib-set/testset.ml | 3 +- testsuite/tests/lib-str/t01.ml | 6 +- .../lib-stream/count_concat_bug.reference | 2 +- testsuite/tests/lib-systhreads/testfork.ml | 7 +- testsuite/tests/lib-threads/test3.runner | 2 +- testsuite/tests/lib-threads/test4.runner | 2 +- testsuite/tests/lib-threads/test5.runner | 4 +- testsuite/tests/lib-threads/test7.checker | 2 +- .../tests/lib-threads/testsignal.checker | 2 +- testsuite/tests/lib-threads/testsignal.runner | 2 +- testsuite/tests/lib-threads/torture.ml | 4 +- testsuite/tests/lib-threads/torture.reference | 2 +- testsuite/tests/lib-threads/torture.runner | 2 +- testsuite/tests/misc-kb/equations.ml | 7 +- testsuite/tests/misc-kb/equations.mli | 4 +- testsuite/tests/misc-kb/kb.ml | 9 +- testsuite/tests/misc-kb/kbmain.ml | 5 +- testsuite/tests/misc-kb/orderings.ml | 13 +- testsuite/tests/misc-kb/orderings.mli | 4 +- testsuite/tests/misc-kb/terms.ml | 10 +- testsuite/tests/misc-kb/terms.mli | 4 +- testsuite/tests/misc-unsafe/almabench.ml | 74 ++-- testsuite/tests/misc-unsafe/fft.ml | 35 +- testsuite/tests/misc/bdd.ml | 42 +-- testsuite/tests/misc/boyer.ml | 352 +++++++++--------- testsuite/tests/misc/fib.ml | 5 +- testsuite/tests/misc/nucleic.ml | 36 +- testsuite/tests/misc/sieve.ml | 4 +- testsuite/tests/misc/sieve.reference | 2 +- testsuite/tests/misc/takc.ml | 3 +- testsuite/tests/regression/pr5757/Makefile | 4 + testsuite/tests/regression/pr5757/pr5757.ml | 5 + .../tests/regression/pr5757/pr5757.reference | 1 + testsuite/tests/tool-lexyacc/gram_aux.ml | 3 +- testsuite/tests/tool-lexyacc/grammar.mly | 5 +- testsuite/tests/tool-lexyacc/input | 56 +-- testsuite/tests/tool-lexyacc/input.ml | 1 - testsuite/tests/tool-lexyacc/lexgen.ml | 7 +- testsuite/tests/tool-lexyacc/main.reference | 1 - testsuite/tests/tool-lexyacc/output.ml | 9 +- testsuite/tests/tool-lexyacc/scan_aux.ml | 3 +- testsuite/tests/tool-lexyacc/scanner.mll | 56 +-- testsuite/tests/tool-ocaml/t301-object.ml | 4 +- testsuite/tests/tool-ocamldoc/odoc_test.ml | 100 ++--- testsuite/tests/tool-ocamldoc/t01.ml | 2 +- testsuite/tests/tool-ocamldoc/t03.ml | 2 +- .../tests/typing-fstclassmod/fstclassmod.ml | 1 - testsuite/tests/typing-gadts/Makefile | 1 - .../tests/typing-gadts/dynamic_frisch.ml | 24 +- testsuite/tests/typing-gadts/test.ml | 110 +++--- .../typing-gadts/test.ml.principal.reference | 32 +- .../tests/typing-gadts/test.ml.reference | 30 +- .../tests/typing-implicit_unpack/Makefile | 1 - .../typing-implicit_unpack/implicit_unpack.ml | 2 +- testsuite/tests/typing-misc/Makefile | 1 - .../tests/typing-modules-bugs/pr5164_ok.ml | 2 +- testsuite/tests/typing-modules/Makefile | 1 - .../tests/typing-objects-bugs/pr3968_bad.ml | 10 +- .../tests/typing-objects-bugs/pr4018_bad.ml | 2 +- .../tests/typing-objects-bugs/pr4766_ok.ml | 8 +- .../typing-objects-bugs/yamagata021012_ok.ml | 10 +- testsuite/tests/typing-objects/Makefile | 1 - testsuite/tests/typing-objects/Tests.ml | 2 +- .../Tests.ml.principal.reference | 8 +- .../tests/typing-objects/Tests.ml.reference | 8 +- testsuite/tests/typing-objects/pr5619_bad.ml | 2 +- testsuite/tests/typing-poly-bugs/pr5322_ok.ml | 1 - testsuite/tests/typing-poly/Makefile | 1 - testsuite/tests/typing-poly/poly.ml | 8 +- .../typing-poly/poly.ml.principal.reference | 2 +- testsuite/tests/typing-poly/poly.ml.reference | 2 +- .../typing-polyvariants-bugs/pr5057_ok.ml | 2 +- .../typing-polyvariants-bugs/pr5057a_bad.ml | 2 +- .../tests/typing-private-bugs/pr5026_bad.ml | 2 +- testsuite/tests/typing-private/Makefile | 1 - testsuite/tests/typing-private/private.ml | 6 +- .../tests/typing-private/private.ml.reference | 2 +- testsuite/tests/typing-recmod/t02bad.ml | 1 - testsuite/tests/typing-recmod/t08bad.ml | 1 - testsuite/tests/typing-recmod/t13ok.ml | 2 +- testsuite/tests/typing-recmod/t14bad.ml | 2 +- testsuite/tests/typing-recmod/t16ok.ml | 1 - testsuite/tests/typing-recmod/t17ok.ml | 5 +- testsuite/tests/typing-recmod/t18ok.ml | 3 +- testsuite/tests/typing-recmod/t19ok.ml | 1 - testsuite/tests/typing-recmod/t22ok.ml | 20 +- testsuite/tests/typing-signatures/Makefile | 1 - testsuite/tests/typing-signatures/els.ml | 4 +- testsuite/tests/typing-sigsubst/Makefile | 1 - testsuite/tests/typing-typeparam/Makefile | 1 - tools/depend.ml | 38 +- tools/make-package-macosx | 4 +- tools/pprintast.ml | 30 +- tools/read_cmt.ml | 1 - tools/typedtreeIter.ml | 18 +- tools/typedtreeIter.mli | 1 - tools/untypeast.ml | 11 +- toplevel/expunge.ml | 4 +- toplevel/genprintval.ml | 20 +- typing/btype.ml | 12 +- typing/cmt_format.ml | 224 +++++------ typing/ctype.mli | 4 +- typing/datarepr.ml | 46 +-- typing/env.ml | 20 +- typing/env.mli | 5 +- typing/includecore.ml | 22 +- typing/parmatch.ml | 262 ++++++------- typing/parmatch.mli | 3 +- typing/printtyp.ml | 10 +- typing/printtyped.ml | 4 +- typing/subst.ml | 6 +- typing/typeclass.ml | 3 +- typing/typecore.ml | 17 +- typing/typedecl.ml | 72 ++-- typing/typemod.ml | 36 +- typing/types.mli | 4 +- typing/typetexp.ml | 52 +-- utils/clflags.mli | 3 +- utils/misc.ml | 3 +- yacc/main.c | 4 +- yacc/skeleton.c | 3 +- 304 files changed, 2468 insertions(+), 2389 deletions(-) create mode 100644 testsuite/tests/regression/pr5757/Makefile create mode 100644 testsuite/tests/regression/pr5757/pr5757.ml create mode 100644 testsuite/tests/regression/pr5757/pr5757.reference diff --git a/Changes b/Changes index 3f876233..0b06ed94 100644 --- a/Changes +++ b/Changes @@ -1,3 +1,33 @@ +OCaml 4.00.1: +------------- + +Bug fixes: +- PR#4019: better documentation of Str.matched_string +- PR#5111: ocamldoc, heading tags inside spans tags is illegal in html +- PR#5278: better error message when typing "make" +- PR#5468: ocamlbuild should preserve order of parametric tags +- PR#5563: harden Unix.select against file descriptors above FD_SETSIZE +- PR#5690: "ocamldoc ... -text README" raises exception +- PR#5700: crash with native-code stack backtraces under MacOS 10.8 x86-64 +- PR#5707: AMD64 code generator: do not use r10 and r11 for parameter passing, + as these registers can be destroyed by the dynamic loader +- PR#5712: some documentation problems +- PR#5715: configuring with -no-shared-libs breaks under cygwin +- PR#5718: false positive on 'unused constructor' warning +- PR#5719: ocamlyacc generates code that is not warning 33-compliant +- PR#5725: ocamldoc output of preformatted code +- PR#5727: emacs caml-mode indents shebang line in toplevel scripts +- PR#5729: tools/untypeast.ml creates unary Pexp_tuple +- PR#5731: instruction scheduling forgot to account for destroyed registers +- PR#5735: %apply and %revapply not first class citizens +- PR#5738: first class module patterns not handled by ocamldep +- PR#5742: missing bound checks in Array.sub +- PR#5744: ocamldoc error on "val virtual" +- PR#5757: GC compaction bug (crash) +- PR#5758: Compiler bug when matching on floats +- PR#5761: Incorrect bigarray custom block size + + OCaml 4.00.0: ------------- @@ -6,7 +36,7 @@ OCaml 4.00.0: - The official name of the language is now OCaml. Language features: -- Added Generalized Abstract Data Types (GADTs) to the language. +- Added Generalized Algebraic Data Types (GADTs) to the language. See chapter "Language extensions" of the reference manual for documentation. - It is now possible to omit type annotations when packing and unpacking first-class modules. The type-checker attempts to infer it from the context. @@ -142,6 +172,7 @@ Bug Fixes: - PR#5261, PR#5497: Ocaml source-code examples are not "copy-paste-able" * PR#5279: executable name is not initialized properly in caml_startup_code - PR#5290: added hash functions for channels, nats, mutexes, conditions +- PR#5291: undetected loop in class initialization - PR#5295: OS threads: problem with caml_c_thread_unregister() - PR#5301: camlp4r and exception equal to another one with parameters - PR#5305: prevent ocamlbuild from complaining about links to _build/ @@ -208,8 +239,8 @@ Bug Fixes: - PR#5518: segfault with lazy empty array - PR#5531: Allow ocamlbuild to add ocamldoc flags through -docflag and -docflags switches -- PR#5543: in Bigarray.map_file, try to avoid using lseek() when growing file - PR#5538: combining -i and -annot in ocamlc +- PR#5543: in Bigarray.map_file, try to avoid using lseek() when growing file - PR#5648: (probably fixed) test failures in tests/lib-threads - PR#5551: repeated calls to find_in_path degrade performance - PR#5552: Mac OS X: unrecognized gcc option "-no-cpp-precomp" diff --git a/Makefile b/Makefile index e53fd0d7..c2003d34 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ # # ######################################################################### -# $Id: Makefile 12750 2012-07-20 08:06:01Z doligez $ +# $Id: Makefile 12929 2012-09-17 16:23:06Z doligez $ # The main Makefile @@ -109,8 +109,7 @@ defaultentry: @echo "Please refer to the installation instructions in file INSTALL." @echo "If you've just unpacked the distribution, something like" @echo " ./configure" - @echo " make world" - @echo " make opt" + @echo " make world.opt" @echo " make install" @echo "should work. But see the file INSTALL for more details." @@ -127,7 +126,6 @@ world: world.opt: $(MAKE) coldstart $(MAKE) opt.opt - $(MAKE) ocamltoolsopt # Hard bootstrap how-to: # (only necessary in some cases, for example if you remove some primitive) @@ -252,8 +250,9 @@ opt: # Native-code versions of the tools opt.opt: checkstack runtime core ocaml opt-core ocamlc.opt otherlibraries \ $(DEBUGGER) ocamldoc ocamlbuild.byte $(CAMLP4OUT) \ - ocamlopt.opt otherlibrariesopt ocamllex.opt ocamltoolsopt.opt \ - ocamldoc.opt ocamlbuild.native $(CAMLP4OPT) + ocamlopt.opt otherlibrariesopt ocamllex.opt \ + ocamltoolsopt ocamltoolsopt.opt ocamldoc.opt ocamlbuild.native \ + $(CAMLP4OPT) base.opt: checkstack runtime core ocaml opt-core ocamlc.opt otherlibraries \ ocamlbuild.byte $(CAMLP4OUT) $(DEBUGGER) ocamldoc ocamlopt.opt \ @@ -801,7 +800,7 @@ distclean: .PHONY: partialclean beforedepend alldepend cleanboot coldstart .PHONY: compare core coreall .PHONY: coreboot defaultentry depend distclean install installopt -.PHONY: library library-cross libraryopt ocamlbuild-mixed-boot +.PHONY: library library-cross libraryopt .PHONY: ocamlbuild.byte ocamlbuild.native ocamldebugger ocamldoc .PHONY: ocamldoc.opt ocamllex ocamllex.opt ocamltools ocamltoolsopt .PHONY: ocamltoolsopt.opt ocamlyacc opt-core opt opt.opt otherlibraries diff --git a/VERSION b/VERSION index f79807ce..5457d75b 100644 --- a/VERSION +++ b/VERSION @@ -1,6 +1,6 @@ -4.00.0 +4.00.1 # The version string is the first line of this file. # It must be in the format described in stdlib/sys.mli -# $Id: VERSION 12779 2012-07-26 09:34:15Z doligez $ +# $Id: VERSION 12983 2012-10-03 15:11:00Z doligez $ diff --git a/asmcomp/amd64/emit.mlp b/asmcomp/amd64/emit.mlp index 47f652d0..0f476e73 100644 --- a/asmcomp/amd64/emit.mlp +++ b/asmcomp/amd64/emit.mlp @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: emit.mlp 12664 2012-07-09 08:35:23Z lefessan $ *) +(* $Id: emit.mlp 12907 2012-09-08 16:51:03Z xleroy $ *) (* Emission of x86-64 (AMD 64) assembly code *) @@ -110,13 +110,13 @@ let emit_reg = function let reg_low_8_name = [| "%al"; "%bl"; "%dil"; "%sil"; "%dl"; "%cl"; "%r8b"; "%r9b"; - "%r10b"; "%r11b"; "%bpl"; "%r12b"; "%r13b" |] + "%r12b"; "%r13b"; "%bpl"; "%r10b"; "%r11b" |] let reg_low_16_name = [| "%ax"; "%bx"; "%di"; "%si"; "%dx"; "%cx"; "%r8w"; "%r9w"; - "%r10w"; "%r11w"; "%bp"; "%r12w"; "%r13w" |] + "%r12w"; "%r13w"; "%bp"; "%r10w"; "%r11w" |] let reg_low_32_name = [| "%eax"; "%ebx"; "%edi"; "%esi"; "%edx"; "%ecx"; "%r8d"; "%r9d"; - "%r10d"; "%r11d"; "%ebp"; "%r12d"; "%r13d" |] + "%r12d"; "%r13d"; "%ebp"; "%r10d"; "%r11d" |] let emit_subreg tbl r = match r.loc with @@ -670,14 +670,13 @@ let emit_profile () = match Config.system with | "linux" | "gnu" -> (* mcount preserves rax, rcx, rdx, rsi, rdi, r8, r9 explicitly - and rbx, rbp, r12-r15 like all C functions. - We need to preserve r10 and r11 ourselves, since OCaml can - use them for argument passing. *) + and rbx, rbp, r12-r15 like all C functions. This includes + all the registers used for argument passing, so we don't + need to preserve other regs. We do need to initialize rbp + like mcount expects it, though. *) ` pushq %r10\n`; ` movq %rsp, %rbp\n`; - ` pushq %r11\n`; ` {emit_call "mcount"}\n`; - ` popq %r11\n`; ` popq %r10\n` | _ -> () (*unsupported yet*) diff --git a/asmcomp/amd64/emit_nt.mlp b/asmcomp/amd64/emit_nt.mlp index 48646b77..9980efb9 100644 --- a/asmcomp/amd64/emit_nt.mlp +++ b/asmcomp/amd64/emit_nt.mlp @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: emit_nt.mlp 11887 2011-12-18 10:00:56Z xleroy $ *) +(* $Id: emit_nt.mlp 12907 2012-09-08 16:51:03Z xleroy $ *) (* Emission of x86-64 (AMD 64) assembly code, MASM syntax *) @@ -110,13 +110,13 @@ let emit_reg = function let reg_low_8_name = [| "al"; "bl"; "dil"; "sil"; "dl"; "cl"; "r8b"; "r9b"; - "r10b"; "r11b"; "bpl"; "r12b"; "r13b" |] + "r12b"; "r13b"; "bpl"; "r10b"; "r11b" |] let reg_low_16_name = [| "ax"; "bx"; "di"; "si"; "dx"; "cx"; "r8w"; "r9w"; - "r10w"; "r11w"; "bp"; "r12w"; "r13w" |] + "r12w"; "r13w"; "bp"; "r10w"; "r11w" |] let reg_low_32_name = [| "eax"; "ebx"; "edi"; "esi"; "edx"; "ecx"; "r8d"; "r9d"; - "r10d"; "r11d"; "ebp"; "r12d"; "r13d" |] + "r12d"; "r13d"; "ebp"; "r10d"; "r11d" |] let emit_subreg tbl pref r = match r.loc with diff --git a/asmcomp/amd64/proc.ml b/asmcomp/amd64/proc.ml index d3082139..bc95fe68 100644 --- a/asmcomp/amd64/proc.ml +++ b/asmcomp/amd64/proc.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: proc.ml 12149 2012-02-10 16:15:24Z doligez $ *) +(* $Id: proc.ml 12907 2012-09-08 16:51:03Z xleroy $ *) (* Description of the AMD64 processor *) @@ -45,18 +45,18 @@ let masm = rcx 5 r8 6 r9 7 - r10 8 - r11 9 + r12 8 + r13 9 rbp 10 - r12 11 - r13 12 + r10 11 + r11 12 r14 trap pointer r15 allocation pointer xmm0 - xmm15 100 - 115 *) (* Conventions: - rax - r11: OCaml function arguments + rax - r13: OCaml function arguments rax: OCaml and C function results xmm0 - xmm9: OCaml function arguments xmm0: OCaml and C function results @@ -70,16 +70,19 @@ let masm = xmm0 - xmm3: C function arguments rbx, rbp, rsi, rdi r12-r15 are preserved by C xmm6-xmm15 are preserved by C + Note (PR#5707): r11 should not be used for parameter passing, as it + can be destroyed by the dynamic loader according to SVR4 ABI. + Linux's dynamic loader also destroys r10. *) let int_reg_name = match Config.ccomp_type with | "msvc" -> [| "rax"; "rbx"; "rdi"; "rsi"; "rdx"; "rcx"; "r8"; "r9"; - "r10"; "r11"; "rbp"; "r12"; "r13" |] + "r12"; "r13"; "rbp"; "r10"; "r11" |] | _ -> [| "%rax"; "%rbx"; "%rdi"; "%rsi"; "%rdx"; "%rcx"; "%r8"; "%r9"; - "%r10"; "%r11"; "%rbp"; "%r12"; "%r13" |] + "%r12"; "%r13"; "%rbp"; "%r10"; "%r11" |] let float_reg_name = match Config.ccomp_type with @@ -188,7 +191,7 @@ let loc_results res = return value in rax or xmm0. C calling conventions under Win64: first integer args in rcx, rdx, r8, r9 - first float args in xmm0 ... xmm3 + first float args in xmm0 ... xmm3 each integer arg consumes a float reg, and conversely remaining args on stack always 32 bytes reserved at bottom of stack. @@ -241,12 +244,12 @@ let destroyed_at_c_call = if win64 then (* Win64: rbx, rbp, rsi, rdi, r12-r15, xmm6-xmm15 preserved *) Array.of_list(List.map phys_reg - [0;4;5;6;7;8;9; + [0;4;5;6;7;11;12; 100;101;102;103;104;105]) else (* Unix: rbp, rbx, r12-r15 preserved *) Array.of_list(List.map phys_reg - [0;2;3;4;5;6;7;8;9; + [0;2;3;4;5;6;7;11;12; 100;101;102;103;104;105;106;107; 108;109;110;111;112;113;114;115]) diff --git a/asmcomp/arm/emit.mlp b/asmcomp/arm/emit.mlp index 0310b4a7..8bec1730 100644 --- a/asmcomp/arm/emit.mlp +++ b/asmcomp/arm/emit.mlp @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: emit.mlp 12547 2012-06-02 18:00:43Z bmeurer $ *) +(* $Id: emit.mlp 12800 2012-07-30 18:59:07Z doligez $ *) (* Emission of ARM assembly code *) diff --git a/asmcomp/closure.ml b/asmcomp/closure.ml index 1984ee05..f0e23fa8 100644 --- a/asmcomp/closure.ml +++ b/asmcomp/closure.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: closure.ml 12179 2012-02-21 17:41:02Z xleroy $ *) +(* $Id: closure.ml 12800 2012-07-30 18:59:07Z doligez $ *) (* Introduction of closures, uncurrying, recognition of direct calls *) @@ -121,7 +121,7 @@ let lambda_smaller lam threshold = match lam with Uvar v -> () | Uconst( - (Const_base(Const_int _ | Const_char _ | Const_float _ | + (Const_base(Const_int _ | Const_char _ | Const_float _ | Const_int32 _ | Const_int64 _ | Const_nativeint _) | Const_pointer _), _) -> incr size (* Structured Constants are now emitted during closure conversion. *) @@ -496,7 +496,7 @@ let rec close fenv cenv = function | Lfunction(kind, params, body) as funct -> close_one_function fenv cenv (Ident.create "fun") funct - (* We convert [f a] to [let a' = a in fun b c -> f a' b c] + (* We convert [f a] to [let a' = a in fun b c -> f a' b c] when fun_arity > nargs *) | Lapply(funct, args, loc) -> let nargs = List.length args in @@ -513,27 +513,27 @@ let rec close fenv cenv = function | ((ufunct, Value_closure(fundesc, approx_res)), uargs) when nargs < fundesc.fun_arity -> - let first_args = List.map (fun arg -> - (Ident.create "arg", arg) ) uargs in - let final_args = Array.to_list (Array.init (fundesc.fun_arity - nargs) (fun _ -> - Ident.create "arg")) in - let rec iter args body = - match args with - [] -> body - | (arg1, arg2) :: args -> - iter args - (Ulet ( arg1, arg2, body)) - in - let internal_args = - (List.map (fun (arg1, arg2) -> Lvar arg1) first_args) - @ (List.map (fun arg -> Lvar arg ) final_args) - in - let (new_fun, approx) = close fenv cenv - (Lfunction( - Curried, final_args, Lapply(funct, internal_args, loc))) - in - let new_fun = iter first_args new_fun in - (new_fun, approx) + let first_args = List.map (fun arg -> + (Ident.create "arg", arg) ) uargs in + let final_args = Array.to_list (Array.init (fundesc.fun_arity - nargs) (fun _ -> + Ident.create "arg")) in + let rec iter args body = + match args with + [] -> body + | (arg1, arg2) :: args -> + iter args + (Ulet ( arg1, arg2, body)) + in + let internal_args = + (List.map (fun (arg1, arg2) -> Lvar arg1) first_args) + @ (List.map (fun arg -> Lvar arg ) final_args) + in + let (new_fun, approx) = close fenv cenv + (Lfunction( + Curried, final_args, Lapply(funct, internal_args, loc))) + in + let new_fun = iter first_args new_fun in + (new_fun, approx) | ((ufunct, Value_closure(fundesc, approx_res)), uargs) when fundesc.fun_arity > 0 && nargs > fundesc.fun_arity -> diff --git a/asmcomp/cmmgen.ml b/asmcomp/cmmgen.ml index eea15f5e..3f54da0e 100644 --- a/asmcomp/cmmgen.ml +++ b/asmcomp/cmmgen.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: cmmgen.ml 12237 2012-03-14 09:26:54Z xleroy $ *) +(* $Id: cmmgen.ml 12800 2012-07-30 18:59:07Z doligez $ *) (* Translation from closed lambda to C-- *) @@ -1273,7 +1273,7 @@ and transl_prim_2 p arg1 arg2 dbg = bind "header" (header arr) (fun hdr -> if wordsize_shift = numfloat_shift then Csequence(make_checkbound dbg [addr_array_length hdr; idx], - Cifthenelse(is_addr_array_hdr hdr, + Cifthenelse(is_addr_array_hdr hdr, addr_array_ref arr idx, float_array_ref arr idx)) else @@ -1390,7 +1390,7 @@ and transl_prim_3 p arg1 arg2 arg3 dbg = bind "header" (header arr) (fun hdr -> if wordsize_shift = numfloat_shift then Csequence(make_checkbound dbg [addr_array_length hdr; idx], - Cifthenelse(is_addr_array_hdr hdr, + Cifthenelse(is_addr_array_hdr hdr, addr_array_set arr idx newval, float_array_set arr idx (unbox_float newval))) @@ -1774,12 +1774,12 @@ let emit_constant_closure symb fundecls cont = let emit_all_constants cont = let c = ref cont in List.iter - (fun (lbl, global, cst) -> + (fun (lbl, global, cst) -> let cst = emit_constant lbl cst [] in - let cst = if global then - Cglobal_symbol lbl :: cst + let cst = if global then + Cglobal_symbol lbl :: cst else cst in - c:= Cdata(cst):: !c) + c:= Cdata(cst):: !c) (Compilenv.structured_constants()); (* structured_constants := []; done in Compilenv.reset() *) Hashtbl.clear immstrings; (* PR#3979 *) @@ -1992,15 +1992,15 @@ let final_curry_function arity = args @ [Cvar last_arg; Cvar clos]) else if n = arity - 1 then - begin + begin let newclos = Ident.create "clos" in Clet(newclos, get_field (Cvar clos) 3, curry_fun (get_field (Cvar clos) 2 :: args) newclos (n-1)) - end else - begin - let newclos = Ident.create "clos" in - Clet(newclos, + end else + begin + let newclos = Ident.create "clos" in + Clet(newclos, get_field (Cvar clos) 4, curry_fun (get_field (Cvar clos) 3 :: args) newclos (n-1)) end in @@ -2023,15 +2023,15 @@ let rec intermediate_curry_functions arity num = {fun_name = name2; fun_args = [arg, typ_addr; clos, typ_addr]; fun_body = - if arity - num > 2 then - Cop(Calloc, + if arity - num > 2 then + Cop(Calloc, [alloc_closure_header 5; Cconst_symbol(name1 ^ "_" ^ string_of_int (num+1)); int_const (arity - num - 1); Cconst_symbol(name1 ^ "_" ^ string_of_int (num+1) ^ "_app"); - Cvar arg; Cvar clos]) - else - Cop(Calloc, + Cvar arg; Cvar clos]) + else + Cop(Calloc, [alloc_closure_header 4; Cconst_symbol(name1 ^ "_" ^ string_of_int (num+1)); int_const 1; Cvar arg; Cvar clos]); @@ -2039,35 +2039,35 @@ let rec intermediate_curry_functions arity num = fun_dbg = Debuginfo.none } :: (if arity - num > 2 then - let rec iter i = - if i <= arity then - let arg = Ident.create (Printf.sprintf "arg%d" i) in - (arg, typ_addr) :: iter (i+1) - else [] - in - let direct_args = iter (num+2) in - let rec iter i args clos = - if i = 0 then - Cop(Capply(typ_addr, Debuginfo.none), - (get_field (Cvar clos) 2) :: args @ [Cvar clos]) - else - let newclos = Ident.create "clos" in - Clet(newclos, - get_field (Cvar clos) 4, - iter (i-1) (get_field (Cvar clos) 3 :: args) newclos) - in - let cf = - Cfunction - {fun_name = name1 ^ "_" ^ string_of_int (num+1) ^ "_app"; - fun_args = direct_args @ [clos, typ_addr]; - fun_body = iter (num+1) - (List.map (fun (arg,_) -> Cvar arg) direct_args) clos; - fun_fast = true; + let rec iter i = + if i <= arity then + let arg = Ident.create (Printf.sprintf "arg%d" i) in + (arg, typ_addr) :: iter (i+1) + else [] + in + let direct_args = iter (num+2) in + let rec iter i args clos = + if i = 0 then + Cop(Capply(typ_addr, Debuginfo.none), + (get_field (Cvar clos) 2) :: args @ [Cvar clos]) + else + let newclos = Ident.create "clos" in + Clet(newclos, + get_field (Cvar clos) 4, + iter (i-1) (get_field (Cvar clos) 3 :: args) newclos) + in + let cf = + Cfunction + {fun_name = name1 ^ "_" ^ string_of_int (num+1) ^ "_app"; + fun_args = direct_args @ [clos, typ_addr]; + fun_body = iter (num+1) + (List.map (fun (arg,_) -> Cvar arg) direct_args) clos; + fun_fast = true; fun_dbg = Debuginfo.none } - in - cf :: intermediate_curry_functions arity (num+1) + in + cf :: intermediate_curry_functions arity (num+1) else - intermediate_curry_functions arity (num+1)) + intermediate_curry_functions arity (num+1)) end let curry_function arity = diff --git a/asmcomp/cmx_format.mli b/asmcomp/cmx_format.mli index d64fc2fd..b7debe1e 100644 --- a/asmcomp/cmx_format.mli +++ b/asmcomp/cmx_format.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: cmx_format.mli 12210 2012-03-08 19:52:03Z doligez $ *) +(* $Id: cmx_format.mli 12800 2012-07-30 18:59:07Z doligez $ *) (* Format of .cmx, .cmxa and .cmxs files *) @@ -60,4 +60,3 @@ type dynheader = { dynu_magic: string; dynu_units: dynunit list; } - diff --git a/asmcomp/debuginfo.ml b/asmcomp/debuginfo.ml index 19986f83..3f96049e 100644 --- a/asmcomp/debuginfo.ml +++ b/asmcomp/debuginfo.ml @@ -54,4 +54,3 @@ let from_location kind loc = let from_call ev = from_location Dinfo_call ev.Lambda.lev_loc let from_raise ev = from_location Dinfo_raise ev.Lambda.lev_loc - diff --git a/asmcomp/emitaux.ml b/asmcomp/emitaux.ml index a0659794..f45fc162 100644 --- a/asmcomp/emitaux.ml +++ b/asmcomp/emitaux.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: emitaux.ml 12699 2012-07-11 15:26:15Z lefessan $ *) +(* $Id: emitaux.ml 12800 2012-07-30 18:59:07Z doligez $ *) (* Common functions for emitting assembly code *) @@ -197,16 +197,16 @@ let is_cfi_enabled () = let cfi_startproc () = if is_cfi_enabled () then - emit_string " .cfi_startproc\n" + emit_string "\t.cfi_startproc\n" let cfi_endproc () = if is_cfi_enabled () then - emit_string " .cfi_endproc\n" + emit_string "\t.cfi_endproc\n" let cfi_adjust_cfa_offset n = if is_cfi_enabled () then begin - emit_string " .cfi_adjust_cfa_offset "; emit_int n; emit_string "\n"; + emit_string "\t.cfi_adjust_cfa_offset\t"; emit_int n; emit_string "\n"; end (* Emit debug information *) @@ -236,12 +236,12 @@ let emit_debug_info dbg = with Not_found -> let file_num = !file_pos_num_cnt in incr file_pos_num_cnt; - emit_string " .file "; - emit_int file_num; emit_char ' '; + emit_string "\t.file\t"; + emit_int file_num; emit_char '\t'; emit_string_literal file_name; emit_char '\n'; file_pos_nums := (file_name,file_num) :: !file_pos_nums; file_num in - emit_string " .loc "; - emit_int file_num; emit_char ' '; + emit_string "\t.loc\t"; + emit_int file_num; emit_char '\t'; emit_int line; emit_char '\n' end diff --git a/asmcomp/i386/emit.mlp b/asmcomp/i386/emit.mlp index e7694d07..ace363b5 100644 --- a/asmcomp/i386/emit.mlp +++ b/asmcomp/i386/emit.mlp @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: emit.mlp 12448 2012-05-12 09:49:40Z xleroy $ *) +(* $Id: emit.mlp 12800 2012-07-30 18:59:07Z doligez $ *) (* Emission of Intel 386 assembly code *) diff --git a/asmcomp/i386/emit_nt.mlp b/asmcomp/i386/emit_nt.mlp index 6f4f8309..db4e7b40 100644 --- a/asmcomp/i386/emit_nt.mlp +++ b/asmcomp/i386/emit_nt.mlp @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: emit_nt.mlp 12166 2012-02-18 16:56:29Z xleroy $ *) +(* $Id: emit_nt.mlp 12800 2012-07-30 18:59:07Z doligez $ *) (* Emission of Intel 386 assembly code, MASM syntax. *) diff --git a/asmcomp/power/emit.mlp b/asmcomp/power/emit.mlp index 1d83ce4d..55ad9830 100644 --- a/asmcomp/power/emit.mlp +++ b/asmcomp/power/emit.mlp @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: emit.mlp 11887 2011-12-18 10:00:56Z xleroy $ *) +(* $Id: emit.mlp 12800 2012-07-30 18:59:07Z doligez $ *) (* Emission of PowerPC assembly code *) diff --git a/asmcomp/schedgen.ml b/asmcomp/schedgen.ml index 956531cf..c81b2c55 100644 --- a/asmcomp/schedgen.ml +++ b/asmcomp/schedgen.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: schedgen.ml 12179 2012-02-21 17:41:02Z xleroy $ *) +(* $Id: schedgen.ml 12876 2012-08-24 08:14:30Z xleroy $ *) (* Instruction scheduling *) @@ -65,6 +65,33 @@ let add_edge ancestor son delay = let add_edge_after son ancestor = add_edge ancestor son 0 +(* Add edges from all instructions that define a pseudoregister [arg] being used + as argument to node [node] (RAW dependencies *) + +let add_RAW_dependencies node arg = + try + let ancestor = Hashtbl.find code_results arg.loc in + add_edge ancestor node ancestor.delay + with Not_found -> + () + +(* Add edges from all instructions that use a pseudoregister [res] that is + defined by node [node] (WAR dependencies). *) + +let add_WAR_dependencies node res = + let ancestors = Hashtbl.find_all code_uses res.loc in + List.iter (add_edge_after node) ancestors + +(* Add edges from all instructions that have already defined a pseudoregister + [res] that is defined by node [node] (WAW dependencies). *) + +let add_WAW_dependencies node res = + try + let ancestor = Hashtbl.find code_results res.loc in + add_edge ancestor node 0 + with Not_found -> + () + (* Compute length of longest path to a result. For leafs of the DAG, see whether their result is used in the instruction immediately following the basic block (a "critical" output). *) @@ -200,10 +227,19 @@ method private instr_issue_cycles instr = | Lreloadretaddr -> self#reload_retaddr_issue_cycles | _ -> assert false +(* Pseudoregisters destroyed by an instruction *) + +method private destroyed_by_instr instr = + match instr.desc with + | Lop op -> Proc.destroyed_at_oper (Iop op) + | Lreloadretaddr -> [||] + | _ -> assert false + (* Add an instruction to the code dag *) method private add_instruction ready_queue instr = let delay = self#instr_latency instr in + let destroyed = self#destroyed_by_instr instr in let node = { instr = instr; delay = delay; @@ -214,28 +250,17 @@ method private add_instruction ready_queue instr = emitted_ancestors = 0 } in (* Add edges from all instructions that define one of the registers used (RAW dependencies) *) - for i = 0 to Array.length instr.arg - 1 do - try - let ancestor = Hashtbl.find code_results instr.arg.(i).loc in - add_edge ancestor node ancestor.delay - with Not_found -> - () - done; + Array.iter (add_RAW_dependencies node) instr.arg; (* Also add edges from all instructions that use one of the result regs - of this instruction (WAR dependencies). *) - for i = 0 to Array.length instr.res - 1 do - let ancestors = Hashtbl.find_all code_uses instr.res.(i).loc in - List.iter (add_edge_after node) ancestors - done; + of this instruction, or a reg destroyed by this instruction + (WAR dependencies). *) + Array.iter (add_WAR_dependencies node) instr.res; + Array.iter (add_WAR_dependencies node) destroyed; (* PR#5731 *) (* Also add edges from all instructions that have already defined one - of the results of this instruction (WAW dependencies). *) - for i = 0 to Array.length instr.res - 1 do - try - let ancestor = Hashtbl.find code_results instr.res.(i).loc in - add_edge ancestor node 0 - with Not_found -> - () - done; + of the results of this instruction, or a reg destroyed by + this instruction (WAW dependencies). *) + Array.iter (add_WAW_dependencies node) instr.res; + Array.iter (add_WAW_dependencies node) destroyed; (* PR#5731 *) (* If this is a load, add edges from the most recent store viewed so far (if any) and remember the load. Also add edges from the most recent checkbound and forget that checkbound. *) @@ -264,6 +289,9 @@ method private add_instruction ready_queue instr = for i = 0 to Array.length instr.res - 1 do Hashtbl.add code_results instr.res.(i).loc node done; + for i = 0 to Array.length destroyed - 1 do + Hashtbl.add code_results destroyed.(i).loc node (* PR#5731 *) + done; for i = 0 to Array.length instr.arg - 1 do Hashtbl.add code_uses instr.arg.(i).loc node done; diff --git a/asmcomp/sparc/emit.mlp b/asmcomp/sparc/emit.mlp index e0d1590e..4d891b5c 100644 --- a/asmcomp/sparc/emit.mlp +++ b/asmcomp/sparc/emit.mlp @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: emit.mlp 11887 2011-12-18 10:00:56Z xleroy $ *) +(* $Id: emit.mlp 12800 2012-07-30 18:59:07Z doligez $ *) (* Emission of Sparc assembly code *) diff --git a/asmrun/amd64.S b/asmrun/amd64.S index fd26e198..3ed88abb 100644 --- a/asmrun/amd64.S +++ b/asmrun/amd64.S @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: amd64.S 12664 2012-07-09 08:35:23Z lefessan $ */ +/* $Id: amd64.S 12907 2012-09-08 16:51:03Z xleroy $ */ /* Asm part of the runtime system, AMD64 processor */ /* Must be preprocessed by cpp */ @@ -111,12 +111,12 @@ /* Record lowest stack address and return address. Clobbers %rax. */ #define RECORD_STACK_FRAME(OFFSET) \ - pushq %r11 ; \ + pushq %r11 ; \ movq 8+OFFSET(%rsp), %rax ; \ - STORE_VAR(%rax,caml_last_return_address) ; \ + STORE_VAR(%rax,caml_last_return_address) ; \ leaq 16+OFFSET(%rsp), %rax ; \ - STORE_VAR(%rax,caml_bottom_of_stack) ; \ - popq %r11 + STORE_VAR(%rax,caml_bottom_of_stack) ; \ + popq %r11 #else @@ -142,9 +142,9 @@ #define RECORD_STACK_FRAME(OFFSET) \ movq OFFSET(%rsp), %rax ; \ - STORE_VAR(%rax,caml_last_return_address) ; \ + STORE_VAR(%rax,caml_last_return_address) ; \ leaq 8+OFFSET(%rsp), %rax ; \ - STORE_VAR(%rax,caml_bottom_of_stack) + STORE_VAR(%rax,caml_bottom_of_stack) #endif @@ -164,8 +164,8 @@ pushq %r13; \ pushq %r14; \ pushq %r15; \ - subq $(8+10*16), %rsp; \ - movupd %xmm6, 0*16(%rsp); \ + subq $(8+10*16), %rsp; \ + movupd %xmm6, 0*16(%rsp); \ movupd %xmm7, 1*16(%rsp); \ movupd %xmm8, 2*16(%rsp); \ movupd %xmm9, 3*16(%rsp); \ @@ -208,10 +208,10 @@ pushq %r13; \ pushq %r14; \ pushq %r15; \ - subq $8, %rsp + subq $8, %rsp #define POP_CALLEE_SAVE_REGS \ - addq $8, %rsp; \ + addq $8, %rsp; \ popq %r15; \ popq %r14; \ popq %r13; \ @@ -249,11 +249,11 @@ LBL(caml_call_gc): addq $32768, %rsp #endif /* Build array of registers, save it into caml_gc_regs */ - pushq %r13 - pushq %r12 - pushq %rbp pushq %r11 pushq %r10 + pushq %rbp + pushq %r13 + pushq %r12 pushq %r9 pushq %r8 pushq %rcx @@ -264,8 +264,8 @@ LBL(caml_call_gc): pushq %rax STORE_VAR(%rsp, caml_gc_regs) /* Save caml_young_ptr, caml_exception_pointer */ - STORE_VAR(%r15, caml_young_ptr) - STORE_VAR(%r14, caml_exception_pointer) + STORE_VAR(%r15, caml_young_ptr) + STORE_VAR(%r14, caml_exception_pointer) /* Save floating-point registers */ subq $(16*8), %rsp CFI_ADJUST(232) @@ -286,12 +286,12 @@ LBL(caml_call_gc): movsd %xmm14, 14*8(%rsp) movsd %xmm15, 15*8(%rsp) /* Call the garbage collector */ - PREPARE_FOR_C_CALL + PREPARE_FOR_C_CALL call GCALL(caml_garbage_collection) - CLEANUP_AFTER_C_CALL + CLEANUP_AFTER_C_CALL /* Restore caml_young_ptr, caml_exception_pointer */ - LOAD_VAR(caml_young_ptr, %r15) - LOAD_VAR(caml_exception_pointer, %r14) + LOAD_VAR(caml_young_ptr, %r15) + LOAD_VAR(caml_exception_pointer, %r14) /* Restore all regs used by the code generator */ movsd 0*8(%rsp), %xmm0 movsd 1*8(%rsp), %xmm1 @@ -318,11 +318,11 @@ LBL(caml_call_gc): popq %rcx popq %r8 popq %r9 - popq %r10 - popq %r11 - popq %rbp popq %r12 popq %r13 + popq %rbp + popq %r10 + popq %r11 CFI_ADJUST(-232) /* Return to caller */ ret @@ -336,9 +336,9 @@ LBL(caml_alloc1): ret LBL(100): RECORD_STACK_FRAME(0) - subq $8, %rsp + subq $8, %rsp call LBL(caml_call_gc) - addq $8, %rsp + addq $8, %rsp jmp LBL(caml_alloc1) FUNCTION(G(caml_alloc2)) @@ -349,9 +349,9 @@ LBL(caml_alloc2): ret LBL(101): RECORD_STACK_FRAME(0) - subq $8, %rsp + subq $8, %rsp call LBL(caml_call_gc) - addq $8, %rsp + addq $8, %rsp jmp LBL(caml_alloc2) FUNCTION(G(caml_alloc3)) @@ -362,9 +362,9 @@ LBL(caml_alloc3): ret LBL(102): RECORD_STACK_FRAME(0) - subq $8, %rsp + subq $8, %rsp call LBL(caml_call_gc) - addq $8, %rsp + addq $8, %rsp jmp LBL(caml_alloc3) FUNCTION(G(caml_allocN)) @@ -398,8 +398,8 @@ LBL(caml_c_call): addq $32768, %rsp #endif /* Make the exception handler and alloc ptr available to the C code */ - STORE_VAR(%r15, caml_young_ptr) - STORE_VAR(%r14, caml_exception_pointer) + STORE_VAR(%r15, caml_young_ptr) + STORE_VAR(%r14, caml_exception_pointer) /* Call the function (address in %rax) */ /* No need to PREPARE_FOR_C_CALL since the caller already reserved the stack space if needed (cf. amd64/proc.ml) */ @@ -417,14 +417,14 @@ FUNCTION(G(caml_start_program)) /* Common code for caml_start_program and caml_callback* */ LBL(caml_start_program): /* Build a callback link */ - subq $8, %rsp /* stack 16-aligned */ + subq $8, %rsp /* stack 16-aligned */ PUSH_VAR(caml_gc_regs) PUSH_VAR(caml_last_return_address) PUSH_VAR(caml_bottom_of_stack) CFI_ADJUST(32) /* Setup alloc ptr and exception ptr */ - LOAD_VAR(caml_young_ptr, %r15) - LOAD_VAR(caml_exception_pointer, %r14) + LOAD_VAR(caml_young_ptr, %r15) + LOAD_VAR(caml_exception_pointer, %r14) /* Build an exception handler */ lea LBL(108)(%rip), %r13 pushq %r13 @@ -440,13 +440,13 @@ LBL(107): CFI_ADJUST(-16) LBL(109): /* Update alloc ptr and exception ptr */ - STORE_VAR(%r15,caml_young_ptr) - STORE_VAR(%r14,caml_exception_pointer) + STORE_VAR(%r15,caml_young_ptr) + STORE_VAR(%r14,caml_exception_pointer) /* Pop the callback link, restoring the global variables */ - POP_VAR(caml_bottom_of_stack) + POP_VAR(caml_bottom_of_stack) POP_VAR(caml_last_return_address) POP_VAR(caml_gc_regs) - addq $8, %rsp + addq $8, %rsp /* Restore callee-save registers. */ POP_CALLEE_SAVE_REGS /* Return to caller. */ @@ -483,10 +483,11 @@ FUNCTION(G(caml_raise_exn)) LBL(110): movq %rax, %r12 /* Save exception bucket */ movq %rax, C_ARG_1 /* arg 1: exception bucket */ - movq 0(%rsp), C_ARG_2 /* arg 2: pc of raise */ - leaq 8(%rsp), C_ARG_3 /* arg 3: sp of raise */ + popq C_ARG_2 /* arg 2: pc of raise */ + movq %rsp, C_ARG_3 /* arg 3: sp at raise */ movq %r14, C_ARG_4 /* arg 4: sp of handler */ - PREPARE_FOR_C_CALL /* no need to cleanup after */ + /* PR#5700: thanks to popq above, stack is now 16-aligned */ + PREPARE_FOR_C_CALL /* no need to cleanup after */ call GCALL(caml_stash_backtrace) movq %r12, %rax /* Recover exception bucket */ movq %r14, %rsp @@ -506,15 +507,16 @@ FUNCTION(G(caml_raise_exception)) LBL(111): movq C_ARG_1, %r12 /* Save exception bucket */ /* arg 1: exception bucket */ - LOAD_VAR(caml_last_return_address,C_ARG_2) /* arg 2: pc of raise */ + LOAD_VAR(caml_last_return_address,C_ARG_2) /* arg 2: pc of raise */ LOAD_VAR(caml_bottom_of_stack,C_ARG_3) /* arg 3: sp of raise */ LOAD_VAR(caml_exception_pointer,C_ARG_4) /* arg 4: sp of handler */ - PREPARE_FOR_C_CALL /* no need to cleanup after */ + subq $8, %rsp /* PR#5700: maintain stack alignment */ + PREPARE_FOR_C_CALL /* no need to cleanup after */ call GCALL(caml_stash_backtrace) movq %r12, %rax /* Recover exception bucket */ - LOAD_VAR(caml_exception_pointer,%rsp) + LOAD_VAR(caml_exception_pointer,%rsp) popq %r14 /* Recover previous exception handler */ - LOAD_VAR(caml_young_ptr,%r15) /* Reload alloc ptr */ + LOAD_VAR(caml_young_ptr,%r15) /* Reload alloc ptr */ ret /* Callback from C to OCaml */ @@ -567,20 +569,20 @@ G(caml_system__frametable): .align EIGHT_ALIGN #if defined(SYS_macosx) - .literal16 + .literal16 #elif defined(SYS_mingw64) - .section .rdata,"dr" + .section .rdata,"dr" #else - .section .rodata.cst8,"a",@progbits + .section .rodata.cst8,"a",@progbits #endif .globl G(caml_negf_mask) .align SIXTEEN_ALIGN G(caml_negf_mask): - .quad 0x8000000000000000, 0 + .quad 0x8000000000000000, 0 .globl G(caml_absf_mask) .align SIXTEEN_ALIGN G(caml_absf_mask): - .quad 0x7FFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF + .quad 0x7FFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF #if defined(SYS_linux) /* Mark stack as non-executable, PR#4564 */ diff --git a/asmrun/amd64nt.asm b/asmrun/amd64nt.asm index 76a4732b..59697150 100644 --- a/asmrun/amd64nt.asm +++ b/asmrun/amd64nt.asm @@ -11,7 +11,7 @@ ;* * ;*********************************************************************** -; $Id: amd64nt.asm 12149 2012-02-10 16:15:24Z doligez $ +; $Id: amd64nt.asm 12907 2012-09-08 16:51:03Z xleroy $ ; Asm part of the runtime system, AMD64 processor, Intel syntax @@ -30,7 +30,7 @@ EXTRN caml_bottom_of_stack: QWORD EXTRN caml_last_return_address: QWORD EXTRN caml_gc_regs: QWORD - EXTRN caml_exception_pointer: QWORD + EXTRN caml_exception_pointer: QWORD EXTRN caml_backtrace_active: DWORD EXTRN caml_stash_backtrace: NEAR @@ -48,14 +48,14 @@ caml_call_gc: mov caml_bottom_of_stack, rax L105: ; Save caml_young_ptr, caml_exception_pointer - mov caml_young_ptr, r15 - mov caml_exception_pointer, r14 + mov caml_young_ptr, r15 + mov caml_exception_pointer, r14 ; Build array of registers, save it into caml_gc_regs - push r13 - push r12 - push rbp push r11 push r10 + push rbp + push r13 + push r12 push r9 push r8 push rcx @@ -113,14 +113,14 @@ L105: pop rcx pop r8 pop r9 - pop r10 - pop r11 - pop rbp pop r12 pop r13 + pop rbp + pop r10 + pop r11 ; Restore caml_young_ptr, caml_exception_pointer - mov r15, caml_young_ptr - mov r14, caml_exception_pointer + mov r15, caml_young_ptr + mov r14, caml_exception_pointer ; Return to caller ret @@ -136,9 +136,9 @@ L100: mov caml_last_return_address, rax lea rax, [rsp + 8] mov caml_bottom_of_stack, rax - sub rsp, 8 + sub rsp, 8 call L105 - add rsp, 8 + add rsp, 8 jmp caml_alloc1 PUBLIC caml_alloc2 @@ -153,9 +153,9 @@ L101: mov caml_last_return_address, rax lea rax, [rsp + 8] mov caml_bottom_of_stack, rax - sub rsp, 8 + sub rsp, 8 call L105 - add rsp, 8 + add rsp, 8 jmp caml_alloc2 PUBLIC caml_alloc3 @@ -170,9 +170,9 @@ L102: mov caml_last_return_address, rax lea rax, [rsp + 8] mov caml_bottom_of_stack, rax - sub rsp, 8 + sub rsp, 8 call L105 - add rsp, 8 + add rsp, 8 jmp caml_alloc3 PUBLIC caml_allocN @@ -202,15 +202,15 @@ caml_c_call: mov caml_last_return_address, r12 mov caml_bottom_of_stack, rsp ; Make the exception handler and alloc ptr available to the C code - mov caml_young_ptr, r15 - mov caml_exception_pointer, r14 + mov caml_young_ptr, r15 + mov caml_exception_pointer, r14 ; Call the function (address in rax) call rax ; Reload alloc ptr - mov r15, caml_young_ptr + mov r15, caml_young_ptr ; Return to caller - push r12 - ret + push r12 + ret ; Start the OCaml program @@ -242,13 +242,13 @@ caml_start_program: ; Common code for caml_start_program and caml_callback* L106: ; Build a callback link - sub rsp, 8 ; stack 16-aligned + sub rsp, 8 ; stack 16-aligned push caml_gc_regs push caml_last_return_address push caml_bottom_of_stack ; Setup alloc ptr and exception ptr - mov r15, caml_young_ptr - mov r14, caml_exception_pointer + mov r15, caml_young_ptr + mov r14, caml_exception_pointer ; Build an exception handler lea r13, L108 push r13 @@ -262,13 +262,13 @@ L107: pop r12 ; dummy register L109: ; Update alloc ptr and exception ptr - mov caml_young_ptr, r15 - mov caml_exception_pointer, r14 + mov caml_young_ptr, r15 + mov caml_exception_pointer, r14 ; Pop the callback restoring, link the global variables pop caml_bottom_of_stack pop caml_last_return_address pop caml_gc_regs - add rsp, 8 + add rsp, 8 ; Restore callee-save registers. movapd xmm6, OWORD PTR [rsp + 0*16] movapd xmm7, OWORD PTR [rsp + 1*16] @@ -441,8 +441,8 @@ caml_callback3_exn: PUBLIC caml_ml_array_bound_error ALIGN 16 caml_ml_array_bound_error: - lea rax, caml_array_bound_error - jmp caml_c_call + lea rax, caml_array_bound_error + jmp caml_c_call .DATA PUBLIC caml_system__frametable @@ -456,11 +456,11 @@ caml_system__frametable LABEL QWORD PUBLIC caml_negf_mask ALIGN 16 caml_negf_mask LABEL QWORD - QWORD 8000000000000000H, 0 + QWORD 8000000000000000H, 0 PUBLIC caml_absf_mask ALIGN 16 caml_absf_mask LABEL QWORD - QWORD 7FFFFFFFFFFFFFFFH, 0FFFFFFFFFFFFFFFFH + QWORD 7FFFFFFFFFFFFFFFH, 0FFFFFFFFFFFFFFFFH END diff --git a/asmrun/arm.S b/asmrun/arm.S index d6f59a20..cb390e45 100644 --- a/asmrun/arm.S +++ b/asmrun/arm.S @@ -12,7 +12,7 @@ /* */ /***********************************************************************/ -/* $Id: arm.S 12210 2012-03-08 19:52:03Z doligez $ */ +/* $Id: arm.S 12800 2012-07-30 18:59:07Z doligez $ */ /* Asm part of the runtime system, ARM processor */ /* Must be preprocessed by cpp */ @@ -60,7 +60,7 @@ alloc_limit .req r11 .globl caml_system__code_begin caml_system__code_begin: - + .align 2 .globl caml_call_gc .type caml_call_gc, %function diff --git a/asmrun/i386.S b/asmrun/i386.S index e8e00a44..f2765871 100644 --- a/asmrun/i386.S +++ b/asmrun/i386.S @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: i386.S 12179 2012-02-21 17:41:02Z xleroy $ */ +/* $Id: i386.S 12800 2012-07-30 18:59:07Z doligez $ */ /* Asm part of the runtime system, Intel 386 processor */ /* Must be preprocessed by cpp */ @@ -281,9 +281,9 @@ LBL(107): /* Pop the exception handler */ popl G(caml_exception_pointer) #ifdef SYS_macosx - addl $12, %esp + addl $12, %esp #else - addl $4, %esp + addl $4, %esp #endif CFI_ADJUST(-8) LBL(109): @@ -339,7 +339,7 @@ LBL(110): .align FUNCTION_ALIGN G(caml_raise_exception): PROFILE_C - testl $1, G(caml_backtrace_active) + testl $1, G(caml_backtrace_active) jne LBL(111) movl 4(%esp), %eax movl G(caml_exception_pointer), %esp @@ -429,7 +429,7 @@ G(caml_ml_array_bound_error): movl %edx, G(caml_bottom_of_stack) /* For MacOS X: re-align the stack */ #ifdef SYS_macosx - andl $-16, %esp + andl $-16, %esp #endif /* Branch to [caml_array_bound_error] (never returns) */ call G(caml_array_bound_error) diff --git a/asmrun/i386nt.asm b/asmrun/i386nt.asm index 41d77bc5..6a6098a1 100644 --- a/asmrun/i386nt.asm +++ b/asmrun/i386nt.asm @@ -11,12 +11,12 @@ ;* * ;*********************************************************************** -; $Id: i386nt.asm 12149 2012-02-10 16:15:24Z doligez $ +; $Id: i386nt.asm 12800 2012-07-30 18:59:07Z doligez $ ; Asm part of the runtime system, Intel 386 processor, Intel syntax - .386 - .MODEL FLAT + .386 + .MODEL FLAT EXTERN _caml_garbage_collection: PROC EXTERN _caml_apply2: PROC @@ -25,10 +25,10 @@ EXTERN _caml_array_bound_error: PROC EXTERN _caml_young_limit: DWORD EXTERN _caml_young_ptr: DWORD - EXTERN _caml_bottom_of_stack: DWORD - EXTERN _caml_last_return_address: DWORD - EXTERN _caml_gc_regs: DWORD - EXTERN _caml_exception_pointer: DWORD + EXTERN _caml_bottom_of_stack: DWORD + EXTERN _caml_last_return_address: DWORD + EXTERN _caml_gc_regs: DWORD + EXTERN _caml_exception_pointer: DWORD EXTERN _caml_backtrace_active: DWORD EXTERN _caml_stash_backtrace: PROC @@ -39,11 +39,11 @@ PUBLIC _caml_alloc2 PUBLIC _caml_alloc3 PUBLIC _caml_allocN - PUBLIC _caml_call_gc + PUBLIC _caml_call_gc _caml_call_gc: ; Record lowest stack address and return address - mov eax, [esp] + mov eax, [esp] mov _caml_last_return_address, eax lea eax, [esp+4] mov _caml_bottom_of_stack, eax @@ -57,9 +57,9 @@ L105: push ebp push eax mov _caml_gc_regs, esp ; Call the garbage collector - call _caml_garbage_collection + call _caml_garbage_collection ; Restore all regs used by the code generator - pop eax + pop eax pop ebx pop ecx pop edx @@ -71,13 +71,13 @@ L105: push ebp ALIGN 4 _caml_alloc1: - mov eax, _caml_young_ptr - sub eax, 8 - mov _caml_young_ptr, eax - cmp eax, _caml_young_limit - jb L100 + mov eax, _caml_young_ptr + sub eax, 8 + mov _caml_young_ptr, eax + cmp eax, _caml_young_limit + jb L100 ret -L100: mov eax, [esp] +L100: mov eax, [esp] mov _caml_last_return_address, eax lea eax, [esp+4] mov _caml_bottom_of_stack, eax @@ -86,13 +86,13 @@ L100: mov eax, [esp] ALIGN 4 _caml_alloc2: - mov eax, _caml_young_ptr - sub eax, 12 - mov _caml_young_ptr, eax - cmp eax, _caml_young_limit - jb L101 + mov eax, _caml_young_ptr + sub eax, 12 + mov _caml_young_ptr, eax + cmp eax, _caml_young_limit + jb L101 ret -L101: mov eax, [esp] +L101: mov eax, [esp] mov _caml_last_return_address, eax lea eax, [esp+4] mov _caml_bottom_of_stack, eax @@ -101,13 +101,13 @@ L101: mov eax, [esp] ALIGN 4 _caml_alloc3: - mov eax, _caml_young_ptr - sub eax, 16 - mov _caml_young_ptr, eax - cmp eax, _caml_young_limit - jb L102 + mov eax, _caml_young_ptr + sub eax, 16 + mov _caml_young_ptr, eax + cmp eax, _caml_young_limit + jb L102 ret -L102: mov eax, [esp] +L102: mov eax, [esp] mov _caml_last_return_address, eax lea eax, [esp+4] mov _caml_bottom_of_stack, eax @@ -126,7 +126,7 @@ L103: sub eax, _caml_young_ptr ; eax = - size neg eax ; eax = size push eax ; save desired size sub _caml_young_ptr, eax ; must update young_ptr - mov eax, [esp+4] + mov eax, [esp+4] mov _caml_last_return_address, eax lea eax, [esp+8] mov _caml_bottom_of_stack, eax @@ -140,12 +140,12 @@ L103: sub eax, _caml_young_ptr ; eax = - size ALIGN 4 _caml_c_call: ; Record lowest stack address and return address - mov edx, [esp] - mov _caml_last_return_address, edx - lea edx, [esp+4] - mov _caml_bottom_of_stack, edx + mov edx, [esp] + mov _caml_last_return_address, edx + lea edx, [esp+4] + mov _caml_bottom_of_stack, edx ; Call the function (address in %eax) - jmp eax + jmp eax ; Start the OCaml program @@ -153,10 +153,10 @@ _caml_c_call: ALIGN 4 _caml_start_program: ; Save callee-save registers - push ebx - push esi - push edi - push ebp + push ebx + push esi + push edi + push ebp ; Initial code pointer is caml_program mov esi, offset _caml_program @@ -165,29 +165,29 @@ _caml_start_program: L106: ; Build a callback link push _caml_gc_regs - push _caml_last_return_address - push _caml_bottom_of_stack + push _caml_last_return_address + push _caml_bottom_of_stack ; Build an exception handler - push L108 - push _caml_exception_pointer - mov _caml_exception_pointer, esp + push L108 + push _caml_exception_pointer + mov _caml_exception_pointer, esp ; Call the OCaml code - call esi + call esi L107: ; Pop the exception handler - pop _caml_exception_pointer - pop esi ; dummy register + pop _caml_exception_pointer + pop esi ; dummy register L109: ; Pop the callback link, restoring the global variables ; used by caml_c_call - pop _caml_bottom_of_stack - pop _caml_last_return_address + pop _caml_bottom_of_stack + pop _caml_last_return_address pop _caml_gc_regs ; Restore callee-save registers. - pop ebp - pop edi - pop esi - pop ebx + pop ebp + pop edi + pop esi + pop ebx ; Return to caller. ret L108: @@ -203,8 +203,8 @@ L108: _caml_raise_exn: test _caml_backtrace_active, 1 jne L110 - mov esp, _caml_exception_pointer - pop _caml_exception_pointer + mov esp, _caml_exception_pointer + pop _caml_exception_pointer ret L110: mov esi, eax ; Save exception bucket in esi @@ -228,9 +228,9 @@ L110: _caml_raise_exception: test _caml_backtrace_active, 1 jne L111 - mov eax, [esp+4] - mov esp, _caml_exception_pointer - pop _caml_exception_pointer + mov eax, [esp+4] + mov esp, _caml_exception_pointer + pop _caml_exception_pointer ret L111: mov esi, [esp+4] ; Save exception bucket in esi @@ -250,46 +250,46 @@ L111: ALIGN 4 _caml_callback_exn: ; Save callee-save registers - push ebx - push esi - push edi - push ebp + push ebx + push esi + push edi + push ebp ; Initial loading of arguments - mov ebx, [esp+20] ; closure - mov eax, [esp+24] ; argument - mov esi, [ebx] ; code pointer + mov ebx, [esp+20] ; closure + mov eax, [esp+24] ; argument + mov esi, [ebx] ; code pointer jmp L106 PUBLIC _caml_callback2_exn ALIGN 4 _caml_callback2_exn: ; Save callee-save registers - push ebx - push esi - push edi - push ebp + push ebx + push esi + push edi + push ebp ; Initial loading of arguments - mov ecx, [esp+20] ; closure - mov eax, [esp+24] ; first argument - mov ebx, [esp+28] ; second argument - mov esi, offset _caml_apply2 ; code pointer - jmp L106 + mov ecx, [esp+20] ; closure + mov eax, [esp+24] ; first argument + mov ebx, [esp+28] ; second argument + mov esi, offset _caml_apply2 ; code pointer + jmp L106 PUBLIC _caml_callback3_exn - ALIGN 4 + ALIGN 4 _caml_callback3_exn: ; Save callee-save registers - push ebx - push esi - push edi - push ebp + push ebx + push esi + push edi + push ebp ; Initial loading of arguments - mov edx, [esp+20] ; closure - mov eax, [esp+24] ; first argument - mov ebx, [esp+28] ; second argument - mov ecx, [esp+32] ; third argument - mov esi, offset _caml_apply3 ; code pointer - jmp L106 + mov edx, [esp+20] ; closure + mov eax, [esp+24] ; first argument + mov ebx, [esp+28] ; second argument + mov ecx, [esp+32] ; third argument + mov esi, offset _caml_apply3 ; code pointer + jmp L106 PUBLIC _caml_ml_array_bound_error ALIGN 4 diff --git a/asmrun/power-elf.S b/asmrun/power-elf.S index 9183fc7f..fa182421 100644 --- a/asmrun/power-elf.S +++ b/asmrun/power-elf.S @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: power-elf.S 12160 2012-02-17 10:43:50Z xleroy $ */ +/* $Id: power-elf.S 12800 2012-07-30 18:59:07Z doligez $ */ #define Addrglobal(reg,glob) \ addis reg, 0, glob@ha; \ @@ -29,7 +29,7 @@ .globl caml_system__code_begin caml_system__code_begin: - + .globl caml_call_gc .type caml_call_gc, @function caml_call_gc: diff --git a/asmrun/power-rhapsody.S b/asmrun/power-rhapsody.S index a42652b6..eab18095 100644 --- a/asmrun/power-rhapsody.S +++ b/asmrun/power-rhapsody.S @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: power-rhapsody.S 12159 2012-02-17 10:12:09Z xleroy $ */ +/* $Id: power-rhapsody.S 12800 2012-07-30 18:59:07Z doligez $ */ #ifdef __ppc64__ #define X(a,b) b @@ -43,7 +43,7 @@ .globl _caml_system__code_begin _caml_system__code_begin: - + /* Invoke the garbage collector. */ .globl _caml_call_gc @@ -287,8 +287,8 @@ L113: L112: mr r28, r3 /* preserve exn bucket in callee-save */ /* arg 1: exception bucket (already in r3) */ - Loadglobal r4, _caml_last_return_address, r11 /* arg 2: PC of raise */ - Loadglobal r5, _caml_bottom_of_stack, r11 /* arg 3: SP of raise */ + Loadglobal r4, _caml_last_return_address, r11 /* arg 2: PC of raise */ + Loadglobal r5, _caml_bottom_of_stack, r11 /* arg 3: SP of raise */ Loadglobal r6, _caml_exception_pointer, r11 /* arg 4: SP of handler */ addi r1, r1, -(16*WORD) /* reserve stack space for C call */ bl _caml_stash_backtrace @@ -487,4 +487,4 @@ _caml_system__frametable: gdata L105 + 4 /* return address into callback */ .short -1 /* negative size count => use callback link */ .short 0 /* no roots here */ - .align X(2,3) + .align X(2,3) diff --git a/asmrun/roots.c b/asmrun/roots.c index 720bcae4..0df8a24d 100644 --- a/asmrun/roots.c +++ b/asmrun/roots.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: roots.c 12149 2012-02-10 16:15:24Z doligez $ */ +/* $Id: roots.c 12800 2012-07-30 18:59:07Z doligez $ */ /* To walk the memory roots for garbage collection */ @@ -369,5 +369,3 @@ uintnat caml_stack_usage (void) sz += (*caml_stack_usage_hook)(); return sz; } - - diff --git a/asmrun/sparc.S b/asmrun/sparc.S index 918a02a7..19cb6d83 100644 --- a/asmrun/sparc.S +++ b/asmrun/sparc.S @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: sparc.S 12159 2012-02-17 10:12:09Z xleroy $ */ +/* $Id: sparc.S 12800 2012-07-30 18:59:07Z doligez $ */ /* Asm part of the runtime system for the Sparc processor. */ /* Must be preprocessed by cpp */ @@ -351,10 +351,10 @@ caml_system__frametable: .half 0 /* no roots */ #ifdef SYS_solaris - .type caml_allocN, #function - .type caml_call_gc, #function + .type caml_allocN, #function + .type caml_call_gc, #function .type caml_c_call, #function .type caml_start_program, #function .type caml_raise_exception, #function - .type caml_system__frametable, #object + .type caml_system__frametable, #object #endif diff --git a/boot/ocamlc b/boot/ocamlc index a586202281913937739e98dc763f4d4b4ed5755c..bc99e6c184b9fb11453615a4c12602461e9f534a 100755 GIT binary patch delta 154314 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�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 WSJRmN9{=`gjc7KOU%Of(=KlauVWV*X delta 36077 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⁡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 HNk#uZQoR*5 delta 11801 zcma)B3tW{|wr6cbIRqxn!2_Il3kamB2#62hfNumJ_(~HmDk47cg)dStE634M(>=OM zd{ict205MbOfRcxu1z%Iqsb{vQcGvXu4XmYW-Rso*LOI_!_j-^e!t&hpY_;lueJ8t zYd`qw>3|!j0uI_jRfC^S?bTUN>DgOv48326Ei&tnZf5(7p@C+5Qnwk3SM8!swLjgw zb<5=Ao4$1|es^D<`~+*jM?PS& zN8}78mFB}aSE#dnRql*?s5g4Y@yC;?lRad_T%vTnrZAH-xOos+^zp)>l*!$#_}R0l ziw-NgU%&orC;KBsBid1xy?M-DGWCVYT>+$Lk1e);JT{alS9jlL(Kp7eBb$Bg_;R8= zePzOFeR+aepPBfs{&1q1({rd3XAM(k!&ZIf!5MnjgJwN$(tpI*piJT#4oCp_0_5uh z5T38TIVVaF_`+Y`m^AVKEgfioX7aiYG}xXz{T-q#eQ8ErghX5BC>9{8A#V5s(g8#C zCbHOHFIz`6R9`xqqUV**(6(~3zEHkgA4j|G9O5vmt1lJU_s=;>G(uO;OQk|?e1r=0 zt^-xNqH-)1>BE&9Xru%)N>|M9qle8m>(}Q0T0et!3ZP=aL)x~$tZ$qR)!!|6fr|Bx zg>m?McwrP3+glcXLZ-2>Mj%}mkyU@X*qlBNSP4L~(g?k90pkJp0E9Ok;K`eyBdhx9 zh^jzcR@F&ASQQxake9?H;F9-~Tib{9vsIa_^ZMk8~tX8bTuw^!|+qR5b zW=@|2irBIf;AxA*$z{tHFWx-8ds#odYgwSau&k5*d|6=3dM}9uz{M7^QQAd1c6nw} z5q`A;NJXdx+`=c^#Q?EkD?sony=M7dT4GOFG1=E|DG2xR;UUPZT`T`V5e2|SNi;yp zi@1{q$OIJW#+q_kraRXzMvASkWkM7CNFC8~eRxeKt*~EP1Eku%^)YKZdf48$Zm*(b zJ!Zr7uxfOdPpXvI(h(r5r&>2}$cM~*zm~t_jlVmLzb(Jc3|{*I`|zG?FwKdQBN-&R1hS|84gvOl$b>^<~| z{mL^R_=c>3Qc)8RkWX5ZZro?xdto2xE>6hdO)8*JH7cCsb4vZ7!Sxq<)XL$MzmgU`Z>yOdgp}>v_Vh$qgDU*h}nMb z$a12Mg3>0GPm6uyA6NR(W*yL+=wAO)Wn>!U%Lj;&S@xplD558H<X?yG^KPps&@RJ)bfAuGQ+o|6; zE!XdzS{)&2)E*#HwF)pE&;cOJd7HiDGy++m_kU5Vr<^wH0cU23jx!wyg{8423V)kh z5`$ejB*ljT#_Gs379H{BP;{O7%Rlrb}p9+xYB|O zfBD?~U<8~`gWl}(Rw}YjI&W1}rSNRUe~6-I_)08%`qkCm_K<(%cA#hN{bIIcudDiV$(V`vU#@%k8wLbE>xacSi9 zF|^01SkP@4F8)bLc9j>Xi-lPQ+!RZXqA7}_M0%N<`;f)4F^~ z*MRcnF658FhsUEcy}})n(b~ChGL<__iS#F;SDm!i3>sG?(Q|ajNpd(Kb`R0-oapOL ziO*9Y@rIN1Chva$K4x*pcx7Q*H=2mwJG#--__ttz#OdwU_Apv2AQ~X^B)oSVk=>CS z^e*S6!m9VUG8J?4dtDP`;b&6G9Q;0nA_4vYr%OjtX)(W+N}Z^IhxeeI;QzcsWCzIn zs~(2Pr5>2&54d|z==~!P?`dRWWluz|j<@&3G}Jj%FY4eM^r346w2C7~B0IaKV^-_9 zZ#pHKT&po&-+aUpEVefRB*&a)ZG{j#er~HsVfhi7q7X6R8DT7jYN(QE@ z*(rAPE@H<-Y$_esS7PHB$HkRFCm_`c;2iB_CZ%P40#pq7b8Gu4T3K|_012=x0^y$o z$U?py!@NFZhq2fCP+Y`cz>&>dddO1$4B)ny6S64EF)oXqAUf^1*jMK23l8W{{pbu2 z?vFIIaZ`W#D69p&4AanxCRuob7dRRR&|;!5^_2$_c~}mXPyyHE&^vV2k)2B^D(D=f zT#ilUrFryI(0P!8TNTXantVDyUvct4`h>pbn*%YC7o_5*@UB4==qEN`bdvw-Cimcl zgXjUrzXs7+qO*Kz2z^C=cN`u{%ZQR48N*S5Xo+KX0r?VLa#W5$y`gWoz6gF5InEa$ zW$3@;80;7{igpH2GM}FWTCyWyGW}q}G7B%GpMZ9rNjRBmzF3aHe8T~=s2EMjEc%8n z^Y98};jju6gIyKWg}&wH1hVp(3Y4<~NBi0IvZAYwLvxWY^c|m^N1DEO%&sIH=iLgg z&8Jk;53P}C;O+~MW8d)j1(ZYokUIc3ET9Jv&{GSLrrQ=^s43y(A0$OXCf_*$yBE>~ z=TS(376*`%T^kv`Z!sLW=Eztq*3|L%DmYTd`>U|B>o|D{y@}@H5`)-xDNVkk9Lsdy zF2}DdMX*rsm(u*C0&ra8x>k$OrFK&_jSTteu3AMrfL}`&MJ0gG0pkH>09kb%@50OArpL%?5woTZHe&Oi28L1OwhUUKLE?asCmpnl~gxBDwMPz~>g6kX*bTd}5V_{vs;n7xfsxne7IYSUjb{f_=iHRb$!sf!vV z&8>bnBb9@!%Acofqx)OwA)av%MItxLF)V@3S13mJc)95l_x!En7aK*$~T2#{>0M;KJTPT?Wl98eO^SN+nrjZoc74nYUV3N{DK?)5tYT()@o@ z?P-cQ;4)`of;kSt7b zZWcgfuL9(gg((-F6hZJ^#sy#S2LN!$_`bu_po_n!^#LFZOnEf<2*B^{q)@aidHOf)Gi92;;DXqt9qBZiC*|nFTAH09`A*R=$eYC+RyMHDo3j@fM^!Oy&qLK zdOe~p^TJD8b;!}pr6aeMcE1NL#jBt7=B+VpoNdk9)R=ggjHI@&3ow4i2jg~Rp2@n%h@FaAlp*{S3ZqPYqjIV z({ebj=4;O&_p7<@v$Vlh4FTD#WCkQL6OkV>KncLLo95xSY-C;U!pr1K&tf-~B_Sfo zoV=H;At`r}v~V_9)R8Bl;VpaVE!a@>9I9e9FMZCi=nW^<@*)IoJcpZ2HD^DD{UBx^ z^)YpaPFbA|T(cjv75k_^_~>E{5(k_S!3!6+?4yDR@k@3~S;G<-@h#P@VQ{?+>!_^9 z`6t#h1TsKDYnPbTZas+K38T(@<9V8e5of+Y&!g%1A`S@EJk8k{W+-&**KNW`_Iet#RU_ra^A1C$G`vky>;sh3-R_W_!0N&_lh^k(%E&TXrMGf3xML&z65Q>L^rrDd*Pe?GBAyFhrl(Drtx|nB{GdoVo;^r8ifnpQhK1k0 zjMEoxT@Rsm30@jZS#ASfu~S-@9J=Hi38)32+}x6Q74c0wcEM^+eieuDzP$fc+5puV zuVJ>0V>r|pm0aQ@pOg{lh$H7AoGI#f?ID^U)(>K?^p#R6mC7lFcbKEppIaPw8yUd+ ze@E}*VpI9L+(VN2#|7sSsoXDQWB z#*5^eKjWEc-&uMZa{#f<}0n%rH5TBhKSWl*PTyQ+ZG!*sf*N;HW>3 z+`@gS_RB4W8_4WiL-2(g@Ui9W-5DdQWwNnGXa-%!6KdFL0g7=Ro& zBuc{o7Jx({2jifE`o!px_7=U0{2gKcMO_ph|B6B#5EP84If{r40VQT%^Mj^(`Xaef=;65&liX*{3!p5~h-xT(W`pk=0sZnWtKs_pq8 zPWUi%SOUC(5YRVZr2 zKcTyJ0l||UoBoNH6ZH`3UtUk(tm}BF%HrYI@i;NXIgtZ?M$kWeivk^&uTvl5_pVbk z|NR!_^5Z`Pzv?*rGu9=?|4jGuxVP}1K8SU4JaZG5Q7*d);)PqZ5;Fy{)YrDCr-?tj z1r4K>T7b^KR|?M^SNVE7wHQsMpPB&b5kF<|rD={9f2GN|<93!;Fst}$ZZC5(o%H;p zo%y{0bw91;mH^ccP53>^nzb2R`C8Ur7?SG@`LqE0Fft7v;Cl@sQ9rj!H1y#N_I$8n{T zI?#@0ICg}nVufXP#iH^}$zVzD#&O3`Wi`3xDVa+`;Zrj22vsR)j)ba5-I!x(m>S}X zc{+T*dI!{+2vv+ic_IS$djxSzlv;+SDGJo992u=XfM~}UcyJ?H$@JoP3OIdZ)JQbz zV^m_8ED7ubzp~#h*Lu`Pc!2{p)#)TqRK^Yyh;q7 z2~CmEAWn(j4Lmqr>7;UyJ@b1OaLMb6JH%Cj%1N5-B|fKBeC{3MvlEn+=JDDDHJvK? zQi4K3=I}(-&;2hSDch1W^U>Ee8x6cDQB4k70FvuKC*GY}ZcMz(s>pRM65kq{<}B$1>iL zq@oO?p~{#DiO+IKy4O9QOj2>dvW8t7oLIDi1CmuHyv|EjDM8ifAcezeOm(uF8vHOw zl8W*YVvrq|l2w6k@Ji6d)q!sM;OgvLwXxb#0`(+h9achKdgQ73jBv-8TaZYBjIVfD`M% z5!Y7pD;X*?NtB8*nFaxu85=-%(VUUEFHt5<2STcQs=C(P-%Agmvt3Y<+M-xz?> zVUVocGaEbeKHikAa)Rq&i%fEwuXF6@WjSp?zRk`-&3nPA_P06ep*sr1i^9tsCetX1 z-31`IXslPX`$7MA%jJNl%)ebOFSU`za>+L}faF{c)i$pL7du>O)d(?J4<4CmyGtp5 z8Dh6ZV)JlnILOs`h~;m&B~LvX^a=!Sr)OopN{hFHB=af@03mb_`6}qQE9?=7PI=8k zRHpfmrwDNQybFp0GH#QcBJQ>JJJ0?+exSz(C~x zYHq~#;@Vl>gn-x1@>UxXb{4DgU#Yiw#~_t@M`j%6Q-e_Xuyqec>B{1g!PwBVc=uqO zBye;Xg7SNn8;2Ojg;PUtECM#vi4Dch_6`Pf@0A=oOr;Hb*OSy51_>3&hNvW33_$$# ztTz(o_dNUZ?qS#{e-F~_V$w8B4GDU`ja1}t6nq;x%NGL>#ezf1y@~z-h`UUK?xSla zT6ooP6&U=VV7X#1t2$0+zi%m&wSUCB6KIJ5*PieJ_-^MxmrpzuPyXo1|t7$ld zMC$+r?wXmwPZb&bFxBMn0!=Z3lDXZHpF_uCUF{%{!Qzkhf&!%(6vb z)$vR9DzsMT+VT(PcFCVry2$2ZLw9se$e%xN-uy}%(Q4_R2y{W|^eW(G!tRp4xJ(dp zu1z!!tSB#A4BY3eFuM+}m|Ip^Iet%E<~<62Z$e5S(Vny<})?7 zR_p_o(c9)T+Za54MA>pNkOs)u3BbzB#FQC^Wk4$`%WXc@7+dTfQGuaXIJI^uEUgg9 zucc#LVd(-4xLJB77M3nrJgaoB&8OHfIjN|$s$ywbMP-$3q|Xv(=eUv6X4`zm8e@)J zQng@-cvvsJlbqrF!T#*m{r5UFQ|mt21Cu5(#je0=fQ|?L@2IU zg66ZGwSBP@LY diff --git a/bytecomp/bytepackager.ml b/bytecomp/bytepackager.ml index 459dce02..821883a3 100644 --- a/bytecomp/bytepackager.ml +++ b/bytecomp/bytepackager.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: bytepackager.ml 12202 2012-03-07 17:50:17Z frisch $ *) +(* $Id: bytepackager.ml 12800 2012-07-30 18:59:07Z doligez $ *) (* "Package" a set of .cmo files into one .cmo file having the original compilation units as sub-modules. *) @@ -68,7 +68,7 @@ let rename_relocation packagename objfile mapping defined base (rel, ofs) = (* PR#5276, as above *) let name = Ident.name id in if String.contains name '.' then - Reloc_setglobal (Ident.create_persistent (packagename ^ "." ^ name)) + Reloc_setglobal (Ident.create_persistent (packagename ^ "." ^ name)) else rel end @@ -235,10 +235,10 @@ let package_object_files ppf files targetfile targetname coercion = let package_files ppf files targetfile = let files = List.map - (fun f -> + (fun f -> try find_in_path !Config.load_path f with Not_found -> raise(Error(File_not_found f))) - files in + files in let prefix = chop_extensions targetfile in let targetcmi = prefix ^ ".cmi" in let targetname = String.capitalize(Filename.basename prefix) in diff --git a/bytecomp/matching.ml b/bytecomp/matching.ml index 3ff157a3..8dd21aeb 100644 --- a/bytecomp/matching.ml +++ b/bytecomp/matching.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: matching.ml 12511 2012-05-30 13:29:48Z lefessan $ *) +(* $Id: matching.ml 12961 2012-09-27 13:30:07Z garrigue $ *) (* Compilation of pattern matching *) @@ -170,7 +170,7 @@ let ctx_matcher p = | _ -> raise NoMatch) | Tpat_constant cst -> (fun q rem -> match q.pat_desc with - | Tpat_constant cst' when cst=cst' -> + | Tpat_constant cst' when const_compare cst cst' = 0 -> p,rem | Tpat_any -> p,rem | _ -> raise NoMatch) @@ -321,7 +321,7 @@ let jumps_add i pss jumps = match pss with add jumps -let rec jumps_union env1 env2 = match env1,env2 with +let rec jumps_union (env1:(int*ctx list)list) env2 = match env1,env2 with | [],_ -> env2 | _,[] -> env1 | ((i1,pss1) as x1::rem1), ((i2,pss2) as x2::rem2) -> @@ -433,7 +433,7 @@ let pretty_precompiled_res first nexts = (* A slight attempt to identify semantically equivalent lambda-expressions *) exception Not_simple -let rec raw_rec env = function +let rec raw_rec env : lambda -> lambda = function | Llet(Alias,x,ex, body) -> raw_rec ((x,raw_rec env ex)::env) body | Lvar id as l -> begin try List.assoc id env with @@ -549,7 +549,8 @@ let rec simplify_cases args cls = match args with simplify rem | Tpat_record (lbls, closed) -> let all_lbls = all_record_args lbls in - let full_pat = {pat with pat_desc=Tpat_record (all_lbls, closed)} in + let full_pat = + {pat with pat_desc=Tpat_record (all_lbls, closed)} in (full_pat::patl,action):: simplify rem | Tpat_or _ -> @@ -1023,9 +1024,9 @@ type cell = ctx : ctx list ; pat : pattern} -let add make_matching_fun division key patl_action args = +let add make_matching_fun division eq_key key patl_action args = try - let cell = List.assoc key division in + let (_,cell) = List.find (fun (k,_) -> eq_key key k) division in cell.pm.cases <- patl_action :: cell.pm.cases; division with Not_found -> @@ -1034,14 +1035,14 @@ let add make_matching_fun division key patl_action args = (key, cell) :: division -let divide make get_key get_args ctx pm = +let divide make eq_key get_key get_args ctx pm = let rec divide_rec = function | (p::patl,action) :: rem -> let this_match = divide_rec rem in add (make p pm.default ctx) - this_match (get_key p) (get_args p patl,action) pm.args + this_match eq_key (get_key p) (get_args p patl,action) pm.args | _ -> [] in divide_rec pm.cases @@ -1084,8 +1085,8 @@ let rec matcher_const cst p rem = match p.pat_desc with matcher_const cst p1 rem with | NoMatch -> matcher_const cst p2 rem end -| Tpat_constant c1 when c1=cst -> rem -| Tpat_any -> rem +| Tpat_constant c1 when const_compare c1 cst = 0 -> rem +| Tpat_any -> rem | _ -> raise NoMatch let get_key_constant caller = function @@ -1114,7 +1115,8 @@ let make_constant_matching p def ctx = function let divide_constant ctx m = divide - make_constant_matching (get_key_constant "divide") + make_constant_matching + (fun c d -> const_compare c d = 0) (get_key_constant "divide") get_args_constant ctx m @@ -1167,13 +1169,13 @@ let matcher_constr cstr = match cstr.cstr_arity with | None, Some r2 -> r2 | Some (a1::rem1), Some (a2::_) -> {a1 with -pat_loc = Location.none ; -pat_desc = Tpat_or (a1, a2, None)}:: + pat_loc = Location.none ; + pat_desc = Tpat_or (a1, a2, None)}:: rem | _, _ -> assert false end - | Tpat_construct (_, _, cstr1, [arg],_) when cstr.cstr_tag = cstr1.cstr_tag -> - arg::rem + | Tpat_construct (_, _, cstr1, [arg],_) + when cstr.cstr_tag = cstr1.cstr_tag -> arg::rem | Tpat_any -> omega::rem | _ -> raise NoMatch in matcher_rec @@ -1181,7 +1183,7 @@ pat_desc = Tpat_or (a1, a2, None)}:: fun q rem -> match q.pat_desc with | Tpat_or (_,_,_) -> raise OrPat | Tpat_construct (_, _, cstr1, args,_) - when cstr.cstr_tag = cstr1.cstr_tag -> args @ rem + when cstr.cstr_tag = cstr1.cstr_tag -> args @ rem | Tpat_any -> Parmatch.omegas cstr.cstr_arity @ rem | _ -> raise NoMatch @@ -1205,7 +1207,7 @@ let make_constr_matching p def ctx = function let divide_constructor ctx pm = divide make_constr_matching - get_key_constr get_args_constr + (=) get_key_constr get_args_constr ctx pm (* Matching against a variant *) @@ -1269,10 +1271,10 @@ let divide_variant row ctx {cases = cl; args = al; default=def} = match pato with None -> add (make_variant_matching_constant p lab def ctx) variants - (Cstr_constant tag) (patl, action) al + (=) (Cstr_constant tag) (patl, action) al | Some pat -> add (make_variant_matching_nonconst p lab def ctx) variants - (Cstr_block tag) (pat :: patl, action) al + (=) (Cstr_block tag) (pat :: patl, action) al end | cl -> [] in @@ -1524,20 +1526,12 @@ let make_array_matching kind p def ctx = function let divide_array kind ctx pm = divide (make_array_matching kind) - get_key_array get_args_array ctx pm + (=) get_key_array get_args_array ctx pm (* To combine sub-matchings together *) -let float_compare s1 s2 = - let f1 = float_of_string s1 and f2 = float_of_string s2 in - Pervasives.compare f1 f2 - let sort_lambda_list l = - List.sort - (fun (x,_) (y,_) -> match x,y with - | Const_float f1, Const_float f2 -> float_compare f1 f2 - | _, _ -> Pervasives.compare x y) - l + List.sort (fun (x,_) (y,_) -> const_compare x y) l let rec cut n l = if n = 0 then [],l @@ -2329,7 +2323,8 @@ let rec comp_exit ctx m = match m.default with -let rec comp_match_handlers comp_fun partial ctx arg first_match next_matchs = match next_matchs with +let rec comp_match_handlers comp_fun partial ctx arg first_match next_matchs = + match next_matchs with | [] -> comp_fun partial ctx arg first_match | rem -> let rec c_rec body total_body = function diff --git a/bytecomp/translcore.ml b/bytecomp/translcore.ml index b515cd1a..520e2528 100644 --- a/bytecomp/translcore.ml +++ b/bytecomp/translcore.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: translcore.ml 12681 2012-07-10 08:33:16Z garrigue $ *) +(* $Id: translcore.ml 12871 2012-08-21 07:14:03Z lefessan $ *) (* Translation from typed abstract syntax to lambda terms, for the core language *) @@ -286,6 +286,12 @@ let prim_obj_dup = { prim_name = "caml_obj_dup"; prim_arity = 1; prim_alloc = true; prim_native_name = ""; prim_native_float = false } +let find_primitive loc prim_name = + match prim_name with + "%revapply" -> Prevapply loc + | "%apply" -> Pdirapply loc + | name -> Hashtbl.find primitives_table name + let transl_prim loc prim args = let prim_name = prim.prim_name in try @@ -324,11 +330,7 @@ let transl_prim loc prim args = end with Not_found -> try - let p = - match prim_name with - "%revapply" -> Prevapply loc - | "%apply" -> Pdirapply loc - | name -> Hashtbl.find primitives_table name in + let p = find_primitive loc prim_name in (* Try strength reduction based on the type of the argument *) begin match (p, args) with (Psetfield(n, _), [arg1; arg2]) -> Psetfield(n, maybe_pointer arg2) @@ -355,7 +357,7 @@ let transl_prim loc prim args = (* Eta-expand a primitive without knowing the types of its arguments *) -let transl_primitive p = +let transl_primitive loc p = let prim = try let (gencomp, _, _, _, _, _, _, _) = @@ -363,7 +365,7 @@ let transl_primitive p = gencomp with Not_found -> try - Hashtbl.find primitives_table p.prim_name + find_primitive loc p.prim_name with Not_found -> Pccall p in match prim with @@ -584,7 +586,7 @@ and transl_exp0 e = Lfunction(Curried, [obj; meth; cache; pos], Lsend(Cached, Lvar meth, Lvar obj, [Lvar cache; Lvar pos], e.exp_loc)) else - transl_primitive p + transl_primitive e.exp_loc p | Texp_ident(path, _, {val_kind = Val_anc _}) -> raise(Error(e.exp_loc, Free_super_var)) | Texp_ident(path, _, {val_kind = Val_reg | Val_self _}) -> diff --git a/bytecomp/translcore.mli b/bytecomp/translcore.mli index 5914b4dd..7203dcb9 100644 --- a/bytecomp/translcore.mli +++ b/bytecomp/translcore.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: translcore.mli 12511 2012-05-30 13:29:48Z lefessan $ *) +(* $Id: translcore.mli 12871 2012-08-21 07:14:03Z lefessan $ *) (* Translation from typed abstract syntax to lambda terms, for the core language *) @@ -27,7 +27,7 @@ val transl_apply: lambda -> (label * expression option * optional) list -> Location.t -> lambda val transl_let: rec_flag -> (pattern * expression) list -> lambda -> lambda -val transl_primitive: Primitive.description -> lambda +val transl_primitive: Location.t -> Primitive.description -> lambda val transl_exception: Ident.t -> Path.t option -> exception_declaration -> lambda diff --git a/bytecomp/translmod.ml b/bytecomp/translmod.ml index a39c1178..fe4a2017 100644 --- a/bytecomp/translmod.ml +++ b/bytecomp/translmod.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: translmod.ml 12511 2012-05-30 13:29:48Z lefessan $ *) +(* $Id: translmod.ml 12871 2012-08-21 07:14:03Z lefessan $ *) (* Translation from typed abstract syntax to lambda terms, for the module language *) @@ -50,7 +50,7 @@ let rec apply_coercion restr arg = (Lapply(Lvar id, [apply_coercion cc_arg (Lvar param)], Location.none)))) | Tcoerce_primitive p -> - transl_primitive p + transl_primitive Location.none p and apply_coercion_field id (pos, cc) = apply_coercion cc (Lprim(Pfield pos, [Lvar id])) @@ -279,7 +279,7 @@ and transl_structure fields cc rootpath = function List.map (fun (pos, cc) -> match cc with - Tcoerce_primitive p -> transl_primitive p + Tcoerce_primitive p -> transl_primitive Location.none p | _ -> apply_coercion cc (Lvar v.(pos))) pos_cc_list) | _ -> @@ -480,7 +480,8 @@ let transl_store_structure glob map prims str = and store_primitive (pos, prim) cont = Lsequence(Lprim(Psetfield(pos, false), - [Lprim(Pgetglobal glob, []); transl_primitive prim]), + [Lprim(Pgetglobal glob, []); + transl_primitive Location.none prim]), cont) in List.fold_right store_primitive prims (transl_store !transl_store_subst str) diff --git a/byterun/compact.c b/byterun/compact.c index 11a2cad2..dec89e6f 100644 --- a/byterun/compact.c +++ b/byterun/compact.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: compact.c 12621 2012-06-20 15:39:09Z doligez $ */ +/* $Id: compact.c 12910 2012-09-10 09:52:09Z doligez $ */ #include @@ -331,7 +331,7 @@ static void do_compaction (void) word q = *p; if (Color_hd (q) == Caml_white){ size_t sz = Bhsize_hd (q); - char *newadr = compact_allocate (sz); Assert (newadr <= (char *)p); + char *newadr = compact_allocate (sz); memmove (newadr, p, sz); p += Wsize_bsize (sz); }else{ @@ -384,7 +384,8 @@ static void do_compaction (void) while (ch != NULL){ if (Chunk_size (ch) > Chunk_alloc (ch)){ caml_make_free_blocks ((value *) (ch + Chunk_alloc (ch)), - Wsize_bsize (Chunk_size(ch)-Chunk_alloc(ch)), 1); + Wsize_bsize (Chunk_size(ch)-Chunk_alloc(ch)), 1, + Caml_white); } ch = Chunk_next (ch); } @@ -397,7 +398,7 @@ uintnat caml_percent_max; /* used in gc_ctrl.c and memory.c */ void caml_compact_heap (void) { - uintnat target_size, live; + uintnat target_words, target_size, live; do_compaction (); /* Compaction may fail to shrink the heap to a reasonable size @@ -414,26 +415,33 @@ void caml_compact_heap (void) See PR#5389 */ /* We compute: - freewords = caml_fl_cur_size (exact) - heapsize = caml_heap_size (exact) - live = heap_size - freewords - target_size = live * (1 + caml_percent_free / 100) - = live / 100 * (100 + caml_percent_free) - We add 1 to live/100 to make sure it isn't 0. + freewords = caml_fl_cur_size (exact) + heapwords = Wsize_bsize (caml_heap_size) (exact) + live = heapwords - freewords + wanted = caml_percent_free * (live / 100 + 1) (same as in do_compaction) + target_words = live + wanted + We add one page to make sure a small difference in counting sizes + won't make [do_compaction] keep the second block (and break all sorts + of invariants). We recompact if target_size < heap_size / 2 */ - live = caml_stat_heap_size - Bsize_wsize (caml_fl_cur_size); - target_size = (live / 100 + 1) * (100 + caml_percent_free); - target_size = caml_round_heap_chunk_size (target_size); + live = Wsize_bsize (caml_stat_heap_size) - caml_fl_cur_size; + target_words = live + caml_percent_free * (live / 100 + 1) + + Wsize_bsize (Page_size); + target_size = caml_round_heap_chunk_size (Bsize_wsize (target_words)); if (target_size < caml_stat_heap_size / 2){ char *chunk; - /* round it up to a page size */ + caml_gc_message (0x10, "Recompacting heap (target=%luk)\n", + target_size / 1024); + chunk = caml_alloc_for_heap (target_size); if (chunk == NULL) return; + /* PR#5757: we need to make the new blocks blue, or they won't be + recognized as free by the recompaction. */ caml_make_free_blocks ((value *) chunk, - Wsize_bsize (Chunk_size (chunk)), 0); + Wsize_bsize (Chunk_size (chunk)), 0, Caml_blue); if (caml_page_table_add (In_heap, chunk, chunk + Chunk_size (chunk)) != 0){ caml_free_for_heap (chunk); return; @@ -448,6 +456,7 @@ void caml_compact_heap (void) do_compaction (); Assert (caml_stat_heap_chunks == 1); Assert (Chunk_next (caml_heap_start) == NULL); + Assert (caml_stat_heap_size == Chunk_size (chunk)); } } diff --git a/byterun/extern.c b/byterun/extern.c index a1d9bac3..bf9f47d4 100644 --- a/byterun/extern.c +++ b/byterun/extern.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: extern.c 12394 2012-04-25 00:40:46Z meyer $ */ +/* $Id: extern.c 12800 2012-07-30 18:59:07Z doligez $ */ /* Structured output */ @@ -823,4 +823,3 @@ static struct code_fragment * extern_find_code(char *addr) } return NULL; } - diff --git a/byterun/freelist.c b/byterun/freelist.c index f84478ba..a67ce86c 100644 --- a/byterun/freelist.c +++ b/byterun/freelist.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: freelist.c 12708 2012-07-13 12:03:26Z doligez $ */ +/* $Id: freelist.c 12910 2012-09-10 09:52:09Z doligez $ */ #define FREELIST_DEBUG 0 #if FREELIST_DEBUG @@ -509,8 +509,11 @@ void caml_fl_add_blocks (char *bp) p: pointer to the first word of the block size: size of the block (in words) do_merge: 1 -> do merge; 0 -> do not merge + color: which color to give to the pieces; if [do_merge] is 1, this + is overridden by the merge code, but we have historically used + [Caml_white]. */ -void caml_make_free_blocks (value *p, mlsize_t size, int do_merge) +void caml_make_free_blocks (value *p, mlsize_t size, int do_merge, int color) { mlsize_t sz; @@ -520,7 +523,7 @@ void caml_make_free_blocks (value *p, mlsize_t size, int do_merge) }else{ sz = size; } - *(header_t *)p = Make_header (Wosize_whsize (sz), 0, Caml_white); + *(header_t *)p = Make_header (Wosize_whsize (sz), 0, color); if (do_merge) caml_fl_merge_block (Bp_hp (p)); size -= sz; p += sz; diff --git a/byterun/freelist.h b/byterun/freelist.h index 531e4665..c3479909 100644 --- a/byterun/freelist.h +++ b/byterun/freelist.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: freelist.h 11156 2011-07-27 14:17:02Z doligez $ */ +/* $Id: freelist.h 12910 2012-09-10 09:52:09Z doligez $ */ /* Free lists of heap blocks. */ @@ -29,7 +29,7 @@ void caml_fl_init_merge (void); void caml_fl_reset (void); char *caml_fl_merge_block (char *); void caml_fl_add_blocks (char *); -void caml_make_free_blocks (value *, mlsize_t, int); +void caml_make_free_blocks (value *, mlsize_t, int, int); void caml_set_allocation_policy (uintnat); diff --git a/byterun/hash.h b/byterun/hash.h index 22b051ac..037c9c5a 100644 --- a/byterun/hash.h +++ b/byterun/hash.h @@ -29,4 +29,3 @@ CAMLextern uint32 caml_hash_mix_string(uint32 h, value s); #endif - diff --git a/byterun/intern.c b/byterun/intern.c index bdeb4a2f..7395d986 100644 --- a/byterun/intern.c +++ b/byterun/intern.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: intern.c 12441 2012-05-08 13:48:33Z xleroy $ */ +/* $Id: intern.c 12910 2012-09-10 09:52:09Z doligez $ */ /* Structured input, compact format */ @@ -337,7 +337,7 @@ static void intern_rec(value *dest) ReadItems(&Field(v, 2), size - 2); /* Request freshing OID */ PushItem(); - sp->op = OFreshOID; + sp->op = OFreshOID; sp->dest = &Field(v, 1); sp->arg = 1; /* Finally read first two block elements: method table and old OID */ @@ -463,9 +463,9 @@ static void intern_rec(value *dest) case CODE_INFIXPOINTER: ofs = read32u(); /* Read a value to *dest, then offset *dest by ofs */ - PushItem(); + PushItem(); sp->dest = dest; - sp->op = OShift; + sp->op = OShift; sp->arg = ofs; ReadItems(dest, 1); continue; /* with next iteration of main loop, skipping *dest = v */ @@ -489,7 +489,7 @@ static void intern_rec(value *dest) caml_failwith("input_value: ill-formed message"); } } - } + } /* end of case OReadItems */ *dest = v; break; @@ -558,7 +558,7 @@ static void intern_add_to_heap(mlsize_t whsize) Assert(intern_dest <= end_extra_block); if (intern_dest < end_extra_block){ caml_make_free_blocks ((value *) intern_dest, - end_extra_block - intern_dest, 0); + end_extra_block - intern_dest, 0, Caml_white); } caml_allocated_words += Wsize_bsize ((char *) intern_dest - intern_extra_block); diff --git a/byterun/major_gc.c b/byterun/major_gc.c index ab8f7459..99a92858 100644 --- a/byterun/major_gc.c +++ b/byterun/major_gc.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: major_gc.c 12625 2012-06-21 13:43:03Z doligez $ */ +/* $Id: major_gc.c 12910 2012-09-10 09:52:09Z doligez $ */ #include @@ -496,7 +496,7 @@ void caml_init_major_heap (asize_t heap_size) caml_fl_init_merge (); caml_make_free_blocks ((value *) caml_heap_start, - Wsize_bsize (caml_stat_heap_size), 1); + Wsize_bsize (caml_stat_heap_size), 1, Caml_white); caml_gc_phase = Phase_idle; gray_vals_size = 2048; gray_vals = (value *) malloc (gray_vals_size * sizeof (value)); diff --git a/byterun/md5.c b/byterun/md5.c index dc3ba43e..2e571272 100644 --- a/byterun/md5.c +++ b/byterun/md5.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: md5.c 12227 2012-03-13 14:44:48Z xleroy $ */ +/* $Id: md5.c 12800 2012-07-30 18:59:07Z doligez $ */ #include #include "alloc.h" @@ -68,7 +68,7 @@ CAMLprim value caml_md5_chan(value vchan, value len) CAMLreturn (res); } -CAMLexport void caml_md5_block(unsigned char digest[16], +CAMLexport void caml_md5_block(unsigned char digest[16], void * data, uintnat len) { struct MD5Context ctx; diff --git a/byterun/md5.h b/byterun/md5.h index eab0c053..a041fab0 100644 --- a/byterun/md5.h +++ b/byterun/md5.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: md5.h 12227 2012-03-13 14:44:48Z xleroy $ */ +/* $Id: md5.h 12800 2012-07-30 18:59:07Z doligez $ */ /* MD5 message digest */ @@ -24,7 +24,7 @@ CAMLextern value caml_md5_string (value str, value ofs, value len); CAMLextern value caml_md5_chan (value vchan, value len); -CAMLextern void caml_md5_block(unsigned char digest[16], +CAMLextern void caml_md5_block(unsigned char digest[16], void * data, uintnat len); struct MD5Context { diff --git a/byterun/memory.c b/byterun/memory.c index 3ca41da2..82357802 100644 --- a/byterun/memory.c +++ b/byterun/memory.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: memory.c 12364 2012-04-17 08:20:35Z doligez $ */ +/* $Id: memory.c 12910 2012-09-10 09:52:09Z doligez $ */ #include #include @@ -318,7 +318,7 @@ static char *expand_heap (mlsize_t request) } remain = malloc_request; prev = hp = mem; - /* XXX find a way to do this with a call to caml_make_free_blocks */ + /* FIXME find a way to do this with a call to caml_make_free_blocks */ while (Wosize_bhsize (remain) > Max_wosize){ Hd_hp (hp) = Make_header (Max_wosize, 0, Caml_blue); #ifdef DEBUG diff --git a/camlp4/Camlp4/Struct/Camlp4Ast2OCamlAst.ml b/camlp4/Camlp4/Struct/Camlp4Ast2OCamlAst.ml index 2838083f..c9e94154 100644 --- a/camlp4/Camlp4/Struct/Camlp4Ast2OCamlAst.ml +++ b/camlp4/Camlp4/Struct/Camlp4Ast2OCamlAst.ml @@ -279,7 +279,7 @@ module Make (Ast : Sig.Camlp4Ast) = struct | TyAnt loc _ -> error loc "antiquotation not allowed here" | TyOfAmp _ _ _ |TyAmp _ _ _ |TySta _ _ _ | TyCom _ _ _ |TyVrn _ _ |TyQuM _ _ |TyQuP _ _ |TyDcl _ _ _ _ _ | - TyAnP _ | TyAnM _ | TyTypePol _ _ _ | + TyAnP _ | TyAnM _ | TyTypePol _ _ _ | TyObj _ _ (RvAnt _) | TyNil _ | TyTup _ _ -> assert False ] and row_field = fun @@ -631,28 +631,28 @@ value varify_constructors var_names = let rec loop t = let desc = match t.ptyp_desc with - [ + [ Ptyp_any -> Ptyp_any | Ptyp_var x -> Ptyp_var x | Ptyp_arrow label core_type core_type' -> - Ptyp_arrow label (loop core_type) (loop core_type') + Ptyp_arrow label (loop core_type) (loop core_type') | Ptyp_tuple lst -> Ptyp_tuple (List.map loop lst) | Ptyp_constr ({ txt = Lident s }) [] when List.mem s var_names -> - Ptyp_var ("&" ^ s) + Ptyp_var ("&" ^ s) | Ptyp_constr longident lst -> - Ptyp_constr longident (List.map loop lst) + Ptyp_constr longident (List.map loop lst) | Ptyp_object lst -> - Ptyp_object (List.map loop_core_field lst) + Ptyp_object (List.map loop_core_field lst) | Ptyp_class longident lst lbl_list -> - Ptyp_class (longident, List.map loop lst, lbl_list) + Ptyp_class (longident, List.map loop lst, lbl_list) | Ptyp_alias core_type string -> - Ptyp_alias(loop core_type, string) + Ptyp_alias(loop core_type, string) | Ptyp_variant row_field_list flag lbl_lst_option -> - Ptyp_variant(List.map loop_row_field row_field_list, flag, lbl_lst_option) + Ptyp_variant(List.map loop_row_field row_field_list, flag, lbl_lst_option) | Ptyp_poly string_lst core_type -> - Ptyp_poly(string_lst, loop core_type) + Ptyp_poly(string_lst, loop core_type) | Ptyp_package longident lst -> - Ptyp_package(longident,List.map (fun (n,typ) -> (n,loop typ) ) lst) + Ptyp_package(longident,List.map (fun (n,typ) -> (n,loop typ) ) lst) ] in {(t) with ptyp_desc = desc} @@ -660,17 +660,17 @@ value varify_constructors var_names = let desc = match t.pfield_desc with [ Pfield(n,typ) -> - Pfield(n,loop typ) + Pfield(n,loop typ) | Pfield_var -> - Pfield_var] + Pfield_var] in { (t) with pfield_desc=desc} and loop_row_field x = match x with [ Rtag(label,flag,lst) -> - Rtag(label,flag,List.map loop lst) + Rtag(label,flag,List.map loop lst) | Rinherit t -> - Rinherit (loop t) ] + Rinherit (loop t) ] in loop; @@ -893,10 +893,10 @@ value varify_constructors var_names = | <:binding@_loc< $pat:( <:patt@sloc< $lid:bind_name$ >> )$ = ($e$ : $TyTypePol _ vs ty$) >> -> (* this code is not pretty because it is temporary *) let rec id_to_string x = - match x with - [ <:ctyp< $lid:x$ >> -> [x] - | <:ctyp< $x$ $y$ >> -> (id_to_string x) @ (id_to_string y) - | _ -> assert False] + match x with + [ <:ctyp< $lid:x$ >> -> [x] + | <:ctyp< $x$ $y$ >> -> (id_to_string x) @ (id_to_string y) + | _ -> assert False] in let vars = id_to_string vs in let ampersand_vars = List.map (fun x -> "&" ^ x) vars in @@ -905,14 +905,14 @@ value varify_constructors var_names = let mkpat = mkpat _loc in let e = mkexp (Pexp_constraint (expr e) (Some (ctyp ty)) None) in let rec mk_newtypes x = - match x with - [ [newtype :: []] -> mkexp (Pexp_newtype(newtype, e)) - | [newtype :: newtypes] -> - mkexp(Pexp_newtype (newtype,mk_newtypes newtypes)) - | [] -> assert False] + match x with + [ [newtype :: []] -> mkexp (Pexp_newtype(newtype, e)) + | [newtype :: newtypes] -> + mkexp(Pexp_newtype (newtype,mk_newtypes newtypes)) + | [] -> assert False] in let pat = - mkpat (Ppat_constraint (mkpat (Ppat_var (with_loc bind_name sloc)), + mkpat (Ppat_constraint (mkpat (Ppat_var (with_loc bind_name sloc)), mktyp _loc (Ptyp_poly ampersand_vars ty'))) in let e = mk_newtypes vars in diff --git a/camlp4/Camlp4/Struct/Lexer.mll b/camlp4/Camlp4/Struct/Lexer.mll index c7336995..6d5099a8 100644 --- a/camlp4/Camlp4/Struct/Lexer.mll +++ b/camlp4/Camlp4/Struct/Lexer.mll @@ -180,9 +180,9 @@ module Make (Token : Sig.Camlp4Token) pos_lnum = if absolute then line else pos.pos_lnum + line; pos_bol = pos.pos_cnum - chars; } - + (* To convert integer literals, copied from "../parsing/lexer.mll" *) - + let cvt_int_literal s = - int_of_string ("-" ^ s) let cvt_int32_literal s = diff --git a/camlp4/Camlp4Parsers/Camlp4OCamlParser.ml b/camlp4/Camlp4Parsers/Camlp4OCamlParser.ml index bbec29b9..4a2f8d90 100644 --- a/camlp4/Camlp4Parsers/Camlp4OCamlParser.ml +++ b/camlp4/Camlp4Parsers/Camlp4OCamlParser.ml @@ -107,13 +107,13 @@ module Make (Syntax : Sig.Camlp4Syntax) = struct | _ -> 1 ]) ; - value lident_colon = - Gram.Entry.of_parser "lident_colon" - (fun strm -> - match Stream.npeek 2 strm with - [ [(LIDENT i, _); (KEYWORD ":", _)] -> - do { Stream.junk strm; Stream.junk strm; i } - | _ -> raise Stream.Failure ]) + value lident_colon = + Gram.Entry.of_parser "lident_colon" + (fun strm -> + match Stream.npeek 2 strm with + [ [(LIDENT i, _); (KEYWORD ":", _)] -> + do { Stream.junk strm; Stream.junk strm; i } + | _ -> raise Stream.Failure ]) ; value rec is_ident_constr_call = @@ -576,7 +576,7 @@ module Make (Syntax : Sig.Camlp4Syntax) = struct optional_type_parameter: [ [ `ANTIQUOT (""|"typ"|"anti" as n) s -> <:ctyp< $anti:mk_anti n s$ >> | `QUOTATION x -> Quotation.expand _loc x Quotation.DynAst.ctyp_tag - | "+"; "_" -> Ast.TyAnP _loc + | "+"; "_" -> Ast.TyAnP _loc | "+"; "'"; i = a_ident -> <:ctyp< +'$lid:i$ >> | "-"; "_" -> Ast.TyAnM _loc | "-"; "'"; i = a_ident -> <:ctyp< -'$lid:i$ >> diff --git a/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParser.ml b/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParser.ml index edd5fe0a..328e00f9 100644 --- a/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParser.ml +++ b/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParser.ml @@ -1055,7 +1055,7 @@ New syntax:\ | "'"; i = a_ident -> <:ctyp< '$lid:i$ >> | "+"; "'"; i = a_ident -> <:ctyp< +'$lid:i$ >> | "-"; "'"; i = a_ident -> <:ctyp< -'$lid:i$ >> - | "+"; "_" -> Ast.TyAnP _loc + | "+"; "_" -> Ast.TyAnP _loc | "-"; "_" -> Ast.TyAnM _loc | "_" -> Ast.TyAny _loc @@ -1148,7 +1148,7 @@ New syntax:\ let (tl, rt) = generalized_type_of_type t in <:ctyp< $uid:s$ : ($Ast.tyAnd_of_list tl$ -> $rt$) >> | s = a_UIDENT -> - <:ctyp< $uid:s$ >> + <:ctyp< $uid:s$ >> ] ] ; constructor_declaration: @@ -1400,9 +1400,9 @@ New syntax:\ ; cvalue_binding: [ [ "="; e = expr -> e - | ":"; "type"; t1 = unquoted_typevars; "." ; t2 = ctyp ; "="; e = expr -> - let u = Ast.TyTypePol _loc t1 t2 in - <:expr< ($e$ : $u$) >> + | ":"; "type"; t1 = unquoted_typevars; "." ; t2 = ctyp ; "="; e = expr -> + let u = Ast.TyTypePol _loc t1 t2 in + <:expr< ($e$ : $u$) >> | ":"; t = poly_type; "="; e = expr -> <:expr< ($e$ : $t$) >> | ":"; t = poly_type; ":>"; t2 = ctyp; "="; e = expr -> match t with diff --git a/camlp4/Camlp4Top/Rprint.ml b/camlp4/Camlp4Top/Rprint.ml index 0a177824..9e49aa0f 100644 --- a/camlp4/Camlp4Top/Rprint.ml +++ b/camlp4/Camlp4Top/Rprint.ml @@ -456,10 +456,10 @@ and print_out_type_decl kwd ppf (name, args, ty, priv, constraints) = match ty with [ Otyp_abstract -> fprintf ppf "@[<2>@[@[%s %t@]@]%a@]" kwd type_defined - print_constraints constraints + print_constraints constraints | _ -> fprintf ppf "@[<2>@[@[%s %t@] =%a@]%a@]" kwd type_defined - print_types ty print_constraints constraints ] + print_types ty print_constraints constraints ] ; (* Phrases *) diff --git a/camlp4/examples/arith.ml b/camlp4/examples/arith.ml index e60c7fb5..15953262 100644 --- a/camlp4/examples/arith.ml +++ b/camlp4/examples/arith.ml @@ -16,17 +16,17 @@ open Camlp4.PreCast;; module ArithGram = MakeGram(Lexer);; - + type t = Local of string * t * t | Binop of t * (int -> int -> int) * t | Int of int | Var of string;; - + let expression = ArithGram.Entry.mk "expression";; - + EXTEND ArithGram GLOBAL: expression; - + expression: (* A grammar entry for expressions *) [ "top" [ "let"; `LIDENT s; "="; e1 = SELF; "in"; e2 = SELF -> Local(s,e1,e2) ] @@ -41,12 +41,12 @@ | `LIDENT s -> Var(s) | "("; e = expression; ")" -> e ] ]; - + END;; - + let parse_arith s = ArithGram.parse_string expression (Loc.mk "") s;; - + let rec eval env = function | Local(x, e1, e2) -> @@ -56,8 +56,8 @@ op (eval env e1) (eval env e2) | Int(i) -> i | Var(x) -> List.assoc x env;; - + let calc s = Format.printf "%s ==> %d@." s (eval [] (parse_arith s));; - + calc "42 * let x = 21 in x + x";; diff --git a/camlp4/man/camlp4.1.tpl b/camlp4/man/camlp4.1.tpl index 52c544a0..45f15b99 100644 --- a/camlp4/man/camlp4.1.tpl +++ b/camlp4/man/camlp4.1.tpl @@ -11,7 +11,7 @@ .\"* * .\"*********************************************************************** .\" -.\" $Id: camlp4.1.tpl 11156 2011-07-27 14:17:02Z doligez $ +.\" $Id: camlp4.1.tpl 12800 2012-07-30 18:59:07Z doligez $ .\" .TH CAMLP4 1 "" "INRIA" .SH NAME diff --git a/debugger/command_line.ml b/debugger/command_line.ml index ddc3c84f..19fab689 100644 --- a/debugger/command_line.ml +++ b/debugger/command_line.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: command_line.ml 12511 2012-05-30 13:29:48Z lefessan $ *) +(* $Id: command_line.ml 12800 2012-07-30 18:59:07Z doligez $ *) (************************ Reading and executing commands ***************) @@ -236,9 +236,9 @@ let instr_env ppf lexbuf = if cmdarg <> "" then try if (String.index cmdarg '=') > 0 then - Debugger_config.environment := cmdarg :: !Debugger_config.environment + Debugger_config.environment := cmdarg :: !Debugger_config.environment else - eprintf "Environment variables should not have an empty name\n%!" + eprintf "Environment variables should not have an empty name\n%!" with Not_found -> eprintf "Environment variables should have the \"name=value\" format\n%!" else diff --git a/emacs/caml-types.el b/emacs/caml-types.el index 4b9556c4..727ae641 100644 --- a/emacs/caml-types.el +++ b/emacs/caml-types.el @@ -10,7 +10,7 @@ ;(* *) ;(***********************************************************************) -;(* $Id: caml-types.el 12695 2012-07-10 17:49:46Z doligez $ *) +;(* $Id: caml-types.el 12800 2012-07-30 18:59:07Z doligez $ *) ; An emacs-lisp complement to the "-annot" option of ocamlc and ocamlopt. @@ -687,21 +687,21 @@ The function uses two overlays. (vector target-file target-line target-bol cnum)) (save-excursion (setq node (caml-types-find-location target-pos "type" () - target-tree)) + target-tree)) (set-buffer caml-types-buffer) (erase-buffer) (cond - ((null node) + ((null node) (delete-overlay caml-types-expr-ovl) (setq type "*no type information*") (setq limits (caml-types-find-interval target-buf target-pos target-tree))) (t - (let ((left - (caml-types-get-pos target-buf (elt node 0))) + (let ((left + (caml-types-get-pos target-buf (elt node 0))) (right - (caml-types-get-pos target-buf (elt node 1)))) + (caml-types-get-pos target-buf (elt node 1)))) (move-overlay caml-types-expr-ovl left right target-buf) (setq limits @@ -709,7 +709,7 @@ The function uses two overlays. target-pos node) type (cdr (assoc "type" (elt node 2)))) )) - ) + ) (setq mes (format "type: %s" type)) (insert type) )) diff --git a/emacs/caml.el b/emacs/caml.el index b1413234..90a142d9 100644 --- a/emacs/caml.el +++ b/emacs/caml.el @@ -10,7 +10,7 @@ ;(* *) ;(***********************************************************************) -;(* $Id: caml.el 12152 2012-02-13 17:48:41Z doligez $ *) +;(* $Id: caml.el 12973 2012-09-28 16:54:20Z doligez $ *) ;;; caml.el --- OCaml code editing commands for Emacs @@ -1185,6 +1185,11 @@ Used to distinguish it from toplevel let construct.") (defconst caml-kwop-regexps (make-vector 9 nil) "Array of regexps representing caml keywords of different priorities.") +(defun caml-in-shebang-line () + (save-excursion + (beginning-of-line) + (and (= 1 (point)) (looking-at "#!")))) + (defun caml-in-expr-p () (let ((pos (point)) (in-expr t)) (caml-find-kwop @@ -1192,6 +1197,8 @@ Used to distinguish it from toplevel let construct.") caml-matching-kw-regexp "\\|" (aref caml-kwop-regexps caml-max-indent-priority))) (cond + ; special case for #! at beginning of file + ((caml-in-shebang-line) (setq in-expr nil)) ; special case for ;; ((and (> (point) 1) (= (preceding-char) ?\;) (= (following-char) ?\;)) (setq in-expr nil)) diff --git a/emacs/camldebug.el b/emacs/camldebug.el index b1b2660d..a805c389 100644 --- a/emacs/camldebug.el +++ b/emacs/camldebug.el @@ -10,7 +10,7 @@ ;(* *) ;(***********************************************************************) -;(* $Id: camldebug.el 12149 2012-02-10 16:15:24Z doligez $ *) +;(* $Id: camldebug.el 12800 2012-07-30 18:59:07Z doligez $ *) ;;; Run camldebug under Emacs ;;; Derived from gdb.el. @@ -575,7 +575,7 @@ the camldebug commands `cd DIR' and `directory'." (let ((process-window)) ;; it does not seem necessary to save excursion here, ;; since set-buffer as a temporary effect. - ;; comint-output-filter explicitly avoids it. + ;; comint-output-filter explicitly avoids it. ;; in version 23, it prevents the marker to stay at end of buffer ;; (save-excursion (set-buffer (process-buffer proc)) @@ -595,8 +595,8 @@ the camldebug commands `cd DIR' and `directory'." (get-buffer-window (current-buffer)))) ;; Insert the text, moving the process-marker. (comint-output-filter proc output) - ;; ) - ;; this was the end of save-excursion. + ;; ) + ;; this was the end of save-excursion. ;; if save-excursion is used (comint-next-prompt 1) would be needed ;; to move the mark past then next prompt, but this is not as good ;; as solution. diff --git a/emacs/ocamltags.in b/emacs/ocamltags.in index 47a4deb8..4c6c7d89 100644 --- a/emacs/ocamltags.in +++ b/emacs/ocamltags.in @@ -12,7 +12,7 @@ ;(* *) ;(***********************************************************************) -;(* $Id: ocamltags.in 11156 2011-07-27 14:17:02Z doligez $ *) +;(* $Id: ocamltags.in 12800 2012-07-30 18:59:07Z doligez $ *) ;; Copyright (C) 1998 Ian Zimmerman ;; This program is free software; you can redistribute it and/or @@ -24,7 +24,7 @@ ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ;; General Public License for more details. -;; $Id: ocamltags.in 11156 2011-07-27 14:17:02Z doligez $ +;; $Id: ocamltags.in 12800 2012-07-30 18:59:07Z doligez $ (require 'caml) diff --git a/man/ocamlc.m b/man/ocamlc.m index fc55d12a..6f9a39b0 100644 --- a/man/ocamlc.m +++ b/man/ocamlc.m @@ -10,7 +10,7 @@ .\"* * .\"*********************************************************************** .\" -.\" $Id: ocamlc.m 12527 2012-05-31 15:15:03Z doligez $ +.\" $Id: ocamlc.m 12800 2012-07-30 18:59:07Z doligez $ .\" .TH OCAMLC 1 @@ -407,7 +407,7 @@ specify the name of the output file produced. .B \-output\-obj Cause the linker to produce a C object file instead of a bytecode executable file. This is useful to wrap OCaml code as a C library, -callable from any C program. The name of the output object file +callable from any C program. The name of the output object file must be set with the .B \-o option. This diff --git a/man/ocamldoc.m b/man/ocamldoc.m index 50df4ea5..2cb71761 100644 --- a/man/ocamldoc.m +++ b/man/ocamldoc.m @@ -10,7 +10,7 @@ .\"* * .\"*********************************************************************** .\" -.\" $Id: ocamldoc.m 11156 2011-07-27 14:17:02Z doligez $ +.\" $Id: ocamldoc.m 12800 2012-07-30 18:59:07Z doligez $ .\" .TH OCAMLDOC 1 @@ -253,7 +253,7 @@ as the title for the generated documentation. .BI \-intro \ file Use content of .I file -as +as .B ocamldoc text to use as introduction (HTML, LaTeX and TeXinfo only). For HTML, the file is used to create the whole "index.html" file. diff --git a/man/ocamlopt.m b/man/ocamlopt.m index 2e22e5fd..eaf0cde1 100644 --- a/man/ocamlopt.m +++ b/man/ocamlopt.m @@ -10,7 +10,7 @@ .\"* * .\"*********************************************************************** .\" -.\" $Id: ocamlopt.m 12428 2012-05-03 17:01:27Z doligez $ +.\" $Id: ocamlopt.m 12800 2012-07-30 18:59:07Z doligez $ .\" .TH OCAMLOPT 1 @@ -171,8 +171,8 @@ file can be used with the emacs commands given in to display types and other annotations interactively. .TP .B \-dtypes -Has been deprecated. Please use -.BI \-annot +Has been deprecated. Please use +.BI \-annot instead. .TP .B \-c @@ -336,7 +336,7 @@ option is given, specify the name of plugin file produced. .B \-output\-obj Cause the linker to produce a C object file instead of an executable file. This is useful to wrap OCaml code as a C library, -callable from any C program. The name of the output object file +callable from any C program. The name of the output object file must be set with the .B \-o option. diff --git a/ocamlbuild/ChangeLog b/ocamlbuild/ChangeLog index 0899500e..183be582 100644 --- a/ocamlbuild/ChangeLog +++ b/ocamlbuild/ChangeLog @@ -3619,4 +3619,3 @@ * ocamlbuild.ml: Add some flags -lflag, -ppflag, -cflag, --. Also add a detection mechanism for dependencies. * discard_printf.ml, Makefile: Update. - diff --git a/ocamlbuild/my_std.ml b/ocamlbuild/my_std.ml index a7839d05..a9478ab5 100644 --- a/ocamlbuild/my_std.ml +++ b/ocamlbuild/my_std.ml @@ -119,6 +119,21 @@ module List = struct let union a b = rev (rev_append_uniq (rev_append_uniq [] a) b) + let ordered_unique (type el) (lst : el list) = + let module Set = Set.Make(struct + type t = el + let compare = Pervasives.compare + let print _ _ = () + end) + in + let _, lst = + List.fold_left (fun (set,acc) el -> + if Set.mem el set + then set, acc + else Set.add el set, el :: acc) (Set.empty,[]) lst + in + List.rev lst + end module String = struct diff --git a/ocamlbuild/ocaml_specific.ml b/ocamlbuild/ocaml_specific.ml index e23a0e99..05343de1 100644 --- a/ocamlbuild/ocaml_specific.ml +++ b/ocamlbuild/ocaml_specific.ml @@ -474,7 +474,7 @@ let () = (fun param -> S [A "-pp"; A param]); pflag ["ocaml"; "infer_interface"] "pp" (fun param -> S [A "-pp"; A param]); - pflag ["ocaml";"compile";] "warn" + pflag ["ocaml";"compile";] "warn" (fun param -> S [A "-w"; A param]) let camlp4_flags camlp4s = diff --git a/ocamlbuild/ocamlbuild.odocl b/ocamlbuild/ocamlbuild.odocl index 9b56f12d..c3b04f06 100644 --- a/ocamlbuild/ocamlbuild.odocl +++ b/ocamlbuild/ocamlbuild.odocl @@ -39,4 +39,4 @@ Ocaml_dependencies Exit_codes Digest_cache Ocamlbuild_plugin -Findlib \ No newline at end of file +Findlib diff --git a/ocamlbuild/ocamlbuild_pack.mlpack b/ocamlbuild/ocamlbuild_pack.mlpack index 9653afbc..09dc4e02 100644 --- a/ocamlbuild/ocamlbuild_pack.mlpack +++ b/ocamlbuild/ocamlbuild_pack.mlpack @@ -38,4 +38,4 @@ Ocaml_dependencies Exit_codes Digest_cache Findlib -Param_tags \ No newline at end of file +Param_tags diff --git a/ocamlbuild/param_tags.ml b/ocamlbuild/param_tags.ml index 02001ded..94e96788 100644 --- a/ocamlbuild/param_tags.ml +++ b/ocamlbuild/param_tags.ml @@ -13,15 +13,11 @@ (* Original author: Romain Bardou *) module StringSet = Set.Make(String) -module SSOSet = Set.Make(struct - type t = string * string option - let compare = Pervasives.compare -end) (* tag name -> tag action (string -> unit) *) let declared_tags = Hashtbl.create 17 -let acknowledged_tags = ref SSOSet.empty +let acknowledged_tags = ref [] let only_once f = let instances = ref StringSet.empty in @@ -37,7 +33,8 @@ let declare name action = let acknowledge tag = let tag = Lexers.tag_gen (Lexing.from_string tag) in - acknowledged_tags := SSOSet.add tag !acknowledged_tags + acknowledged_tags := tag :: !acknowledged_tags + let really_acknowledge (name, param) = match param with @@ -51,6 +48,6 @@ let really_acknowledge (name, param) = List.iter (fun f -> f param) actions let init () = - SSOSet.iter really_acknowledge !acknowledged_tags + List.iter really_acknowledge (My_std.List.ordered_unique !acknowledged_tags) let make = Printf.sprintf "%s(%s)" diff --git a/ocamlbuild/signatures.mli b/ocamlbuild/signatures.mli index 3b6c44ec..c191cbef 100644 --- a/ocamlbuild/signatures.mli +++ b/ocamlbuild/signatures.mli @@ -33,7 +33,7 @@ module type LIST = sig val print : (Format.formatter -> 'a -> 'b) -> Format.formatter -> 'a list -> unit val filter_opt : ('a -> 'b option) -> 'a list -> 'b list val union : 'a list -> 'a list -> 'a list - + val ordered_unique : 'a list -> 'a list (* Original functions *) include module type of List end diff --git a/ocamldoc/Changes.txt b/ocamldoc/Changes.txt index 3707d265..49ed84d2 100644 --- a/ocamldoc/Changes.txt +++ b/ocamldoc/Changes.txt @@ -6,8 +6,8 @@ TODO: module type M = sig type u end module N : sig include M val f: u -> unit end Here, in html for example, f in displayed being of type Foo.u instead of Foo.M.u - - latex: types variant polymorphes dépassent de la page quand ils sont trop longs - - utilisation nouvelles infos de Xavier: "début de rec", etc. + - latex: types variant polymorphes depassent de la page quand ils sont trop longs + - utilisation nouvelles infos de Xavier: "debut de rec", etc. - xml generator ===== @@ -61,12 +61,12 @@ Release 3.08.1: Release 3.08.0: - fix: method parameters names in signature are now retrieved correctly (fix of Odoc_value.parameter_list_from_arrows to handle Tpoly for methods) - - ajout à la doc de Module_list et Index_list (utilisé dans le html seulement) - - ajout à la doc: fichier de l'option -intro utilisé pour l'index en html + - ajout a la doc de Module_list et Index_list (utilise dans le html seulement) + - ajout a la doc: fichier de l'option -intro utilise pour l'index en html - fix: create a Module_with instead of a Module_alias when we encounter module A : Foo in a signature - latex: style latex pour indenter dans les module kind et les class kind - - latex: il manque la génération des paramètres de classe + - latex: il manque la generation des parametres de classe - parse des {!modules: } et {!indexlist} - gestion des Module_list et Index_list - no need to Dynlink.add_available_units any more diff --git a/ocamldoc/generators/odoc_todo.ml b/ocamldoc/generators/odoc_todo.ml index 7c025e12..626236cf 100644 --- a/ocamldoc/generators/odoc_todo.ml +++ b/ocamldoc/generators/odoc_todo.ml @@ -48,7 +48,7 @@ struct method private gen_if_tag name target info_opt = match info_opt with None -> () - | Some i -> + | Some i -> let l = List.fold_left (fun acc (t, text) -> @@ -69,7 +69,7 @@ struct | _ -> (None, text) :: acc end - | _ -> acc + | _ -> acc ) [] i.i_custom diff --git a/ocamldoc/odoc_analyse.ml b/ocamldoc/odoc_analyse.ml index 6e86af0b..8eb26eaa 100644 --- a/ocamldoc/odoc_analyse.ml +++ b/ocamldoc/odoc_analyse.ml @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_analyse.ml 12511 2012-05-30 13:29:48Z lefessan $ *) +(* $Id: odoc_analyse.ml 12862 2012-08-16 09:44:48Z guesdon $ *) (** Analysis of source files. This module is strongly inspired from driver/main.ml :-) *) @@ -115,7 +115,7 @@ let process_implementation_file ppf sourcefile = let parsetree = parse_file inputfile Parse.implementation ast_impl_magic_number in let typedtree = Typemod.type_implementation - sourcefile prefixname modulename env parsetree + sourcefile prefixname modulename env parsetree in (Some (parsetree, typedtree), inputfile) with @@ -284,7 +284,11 @@ let process_file ppf sourcefile = Location.input_name := file; try let mod_name = - String.capitalize (Filename.basename (Filename.chop_extension file)) + let s = + try Filename.chop_extension file + with _ -> file + in + String.capitalize (Filename.basename s) in let txt = try Odoc_text.Texter.text_of_string (Odoc_misc.input_file_as_string file) diff --git a/ocamldoc/odoc_ast.ml b/ocamldoc/odoc_ast.ml index c67903e1..2aa7caee 100644 --- a/ocamldoc/odoc_ast.ml +++ b/ocamldoc/odoc_ast.ml @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_ast.ml 12511 2012-05-30 13:29:48Z lefessan $ *) +(* $Id: odoc_ast.ml 12951 2012-09-25 07:14:43Z guesdon $ *) (** Analysis of implementation files. *) open Misc @@ -188,6 +188,9 @@ module Typedtree_search = | { cf_desc = Typedtree.Tcf_val (_, _, _, ident, Tcfk_concrete exp, _) } :: q when Name.from_ident ident = name -> exp.Typedtree.exp_type + | { cf_desc = Typedtree.Tcf_val (_, _, _, ident, Tcfk_virtual typ, _) } :: q + when Name.from_ident ident = name -> + typ.Typedtree.ctyp_type | _ :: q -> iter q in @@ -201,12 +204,6 @@ module Typedtree_search = in fun ct_decl -> iter ct_decl.Types.clty_type - let search_virtual_attribute_type table ctname name = - let ct_decl = search_class_type_declaration table ctname in - let cls_sig = class_sig_of_cltype_decl ct_decl.ci_type_decl in - let (_,_,texp) = Types.Vars.find name cls_sig.cty_vars in - texp - let search_method_expression cls name = let rec iter = function | [] -> @@ -452,7 +449,7 @@ module Analyser = | l -> match l with [] -> - (* cas impossible, on l'a filtré avant *) + (* cas impossible, on l'a filtre avant *) assert false | (pattern_param, exp) :: second_ele :: q -> (* implicit pattern matching -> anonymous parameter *) @@ -564,12 +561,7 @@ module Analyser = let complete_name = Name.concat current_class_name label in let (info_opt, ele_comments) = get_comments_in_class last_pos loc.Location.loc_start.Lexing.pos_cnum in let type_exp = - try - if virt then - Typedtree_search.search_virtual_attribute_type table - (Name.simple current_class_name) label - else - Typedtree_search.search_attribute_type tt_cls label + try Typedtree_search.search_attribute_type tt_cls label with Not_found -> raise (Failure (Odoc_messages.attribute_not_found_in_typedtree complete_name)) in @@ -697,10 +689,10 @@ module Analyser = Typedtree.Tcl_ident (p,_,_) -> Name.from_path p | _ -> (* we try to get the name from the environment. *) - (* A VOIR : dommage qu'on n'ait pas un Tclass_ident :-( même quand on a class tutu = toto *) + (* A VOIR : dommage qu'on n'ait pas un Tclass_ident :-( meme quand on a class tutu = toto *) Name.from_longident lid.txt in - (* On n'a pas ici les paramètres de type sous forme de Types.type_expr, + (* On n'a pas ici les parametres de type sous forme de Types.type_expr, par contre on peut les trouver dans le class_type *) let params = match tt_class_exp.Typedtree.cl_type with @@ -785,7 +777,7 @@ module Analyser = match tt_class_expr2.Typedtree.cl_desc with Typedtree.Tcl_ident (p,_,_) -> Name.from_path p (* A VOIR : obtenir le nom complet *) | _ -> - (* A VOIR : dommage qu'on n'ait pas un Tclass_ident :-( même quand on a class tutu = toto *) + (* A VOIR : dommage qu'on n'ait pas un Tclass_ident :-( meme quand on a class tutu = toto *) match p_class_expr2.Parsetree.pcl_desc with Parsetree.Pcl_constr (lid, _) -> (* we try to get the name from the environment. *) @@ -978,7 +970,7 @@ module Analyser = | Element_type t -> (function Types.Sig_type (ident,_,_) -> - (* A VOIR: il est possible que le détail du type soit caché *) + (* A VOIR: il est possible que le detail du type soit cache *) let n1 = Name.simple t.ty_name and n2 = Ident.name ident in n1 = n2 @@ -1321,7 +1313,7 @@ module Analyser = let new_env = Odoc_env.add_module env new_module.m_name in let new_env2 = match new_module.m_type with - (* A VOIR : cela peut-il être Tmty_ident ? dans ce cas, on aurait pas la signature *) + (* A VOIR : cela peut-il etre Tmty_ident ? dans ce cas, on aurait pas la signature *) Types.Mty_signature s -> Odoc_env.add_signature new_env new_module.m_name ~rel: (Name.simple new_module.m_name) s @@ -1420,7 +1412,7 @@ module Analyser = let new_env = Odoc_env.add_module_type env mt.mt_name in let new_env2 = match tt_module_type.mty_type with - (* A VOIR : cela peut-il être Tmty_ident ? dans ce cas, on n'aurait pas la signature *) + (* A VOIR : cela peut-il etre Tmty_ident ? dans ce cas, on n'aurait pas la signature *) Types.Mty_signature s -> Odoc_env.add_signature new_env mt.mt_name ~rel: (Name.simple mt.mt_name) s | _ -> @@ -1549,7 +1541,7 @@ module Analyser = im_info = comment_opt ; } in - (0, env, [ Element_included_module im ]) (* A VOIR : étendre l'environnement ? avec quoi ? *) + (0, env, [ Element_included_module im ]) (* A VOIR : etendre l'environnement ? avec quoi ? *) (** Analysis of a [Parsetree.module_expr] and a name to return a [t_module].*) and analyse_module env current_module_name module_name comment_opt p_module_expr tt_module_expr = diff --git a/ocamldoc/odoc_class.ml b/ocamldoc/odoc_class.ml index a8457ab8..40c62824 100644 --- a/ocamldoc/odoc_class.ml +++ b/ocamldoc/odoc_class.ml @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_class.ml 12341 2012-04-11 16:46:30Z guesdon $ *) +(* $Id: odoc_class.ml 12796 2012-07-30 11:22:29Z doligez $ *) (** Representation and manipulation of classes and class types.*) @@ -115,7 +115,7 @@ let rec class_elements ?(trans=true) cl = | Class_constraint (c_kind, ct_kind) -> iter_kind c_kind (* A VOIR : utiliser le c_kind ou le ct_kind ? - Pour l'instant, comme le ct_kind n'est pas analysé, + Pour l'instant, comme le ct_kind n'est pas analyse, on cherche dans le c_kind class_type_elements ~trans: trans { clt_name = "" ; clt_info = None ; @@ -250,4 +250,4 @@ let class_type_parameter_text_by_name clt label = None -(* eof $Id: odoc_class.ml 12341 2012-04-11 16:46:30Z guesdon $ *) +(* eof $Id: odoc_class.ml 12796 2012-07-30 11:22:29Z doligez $ *) diff --git a/ocamldoc/odoc_dot.ml b/ocamldoc/odoc_dot.ml index bf31217a..b63f9ba0 100644 --- a/ocamldoc/odoc_dot.ml +++ b/ocamldoc/odoc_dot.ml @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_dot.ml 11156 2011-07-27 14:17:02Z doligez $ *) +(* $Id: odoc_dot.ml 12798 2012-07-30 11:53:27Z doligez $ *) (** Definition of a class which outputs a dot file showing top modules dependencies.*) @@ -143,4 +143,3 @@ class dot = end module type Dot_generator = module type of Generator - diff --git a/ocamldoc/odoc_env.ml b/ocamldoc/odoc_env.ml index 3140be11..ff58d9f0 100644 --- a/ocamldoc/odoc_env.ml +++ b/ocamldoc/odoc_env.ml @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_env.ml 12511 2012-05-30 13:29:48Z lefessan $ *) +(* $Id: odoc_env.ml 12796 2012-07-30 11:22:29Z doligez $ *) (** Environment for finding complete names from relative names. *) @@ -56,7 +56,7 @@ let rec add_signature env root ?rel signat = | Types.Sig_exception (ident, _) -> { env with env_exceptions = (rel_name ident, qualify ident) :: env.env_exceptions } | Types.Sig_module (ident, modtype, _) -> let env2 = - match modtype with (* A VOIR : le cas où c'est un identificateur, dans ce cas on n'a pas de signature *) + match modtype with (* A VOIR : le cas ou c'est un identificateur, dans ce cas on n'a pas de signature *) Types.Mty_signature s -> add_signature env (qualify ident) ~rel: (rel_name ident) s | _ -> env in @@ -68,7 +68,7 @@ let rec add_signature env root ?rel signat = env | Types.Modtype_manifest modtype -> match modtype with - (* A VOIR : le cas où c'est un identificateur, dans ce cas on n'a pas de signature *) + (* A VOIR : le cas ou c'est un identificateur, dans ce cas on n'a pas de signature *) Types.Mty_signature s -> add_signature env (qualify ident) ~rel: (rel_name ident) s | _ -> env in @@ -246,4 +246,4 @@ let subst_class_type env t = in iter t -(* eof $Id: odoc_env.ml 12511 2012-05-30 13:29:48Z lefessan $ *) +(* eof $Id: odoc_env.ml 12796 2012-07-30 11:22:29Z doligez $ *) diff --git a/ocamldoc/odoc_global.ml b/ocamldoc/odoc_global.ml index 7a37554e..95c9118a 100644 --- a/ocamldoc/odoc_global.ml +++ b/ocamldoc/odoc_global.ml @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_global.ml 11156 2011-07-27 14:17:02Z doligez $ *) +(* $Id: odoc_global.ml 12798 2012-07-30 11:53:27Z doligez $ *) (** Global variables. *) @@ -84,6 +84,3 @@ let with_trailer = ref true let with_toc = ref true let with_index = ref true - - - diff --git a/ocamldoc/odoc_html.ml b/ocamldoc/odoc_html.ml index efe12d16..a4a5cfdb 100644 --- a/ocamldoc/odoc_html.ml +++ b/ocamldoc/odoc_html.ml @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_html.ml 12434 2012-05-07 09:41:28Z guesdon $ *) +(* $Id: odoc_html.ml 12953 2012-09-25 07:50:40Z guesdon $ *) (** Generation of html documentation.*) @@ -335,7 +335,11 @@ class virtual text = in fun b s -> if !colorize_code then - self#html_of_code b (remove_useless_newlines s) + ( + bs b "
";
+           self#html_of_code b (remove_useless_newlines s);
+           bs b "
" + ) else ( bs b "
" (Naming.label_target label1);
       let (tag_o, tag_c) =
         if n > 6 then
           (Printf.sprintf "div class=\"h%d\"" n, "div")
@@ -411,13 +414,12 @@ class virtual text =
           let t = Printf.sprintf "h%d" n in (t, t)
       in
       bs b "<";
-      bs b tag_o;
+      bp b "%s id=\"%s\"" tag_o (Naming.label_target label1);
       bs b ">";
       self#html_of_text b t;
       bs b "";
-      bs b ""
+      bs b ">"
 
     method html_of_Latex b _ = ()
       (* don't care about LaTeX stuff in HTML. *)
@@ -836,9 +838,9 @@ class html =
         "pre.verbatim, pre.codepre { }";
 
         ".indextable {border: 1px #ddd solid; border-collapse: collapse}";
-        ".indextable td, .indextable th {border: 1px #ddd solid;	min-width: 80px}";
+        ".indextable td, .indextable th {border: 1px #ddd solid; min-width: 80px}";
         ".indextable td.module {background-color: #eee ;  padding-left: 2px; padding-right: 2px}";
-        ".indextable td.module a {color: 4E6272;	text-decoration: none; display: block; width: 100%}";
+        ".indextable td.module a {color: 4E6272; text-decoration: none; display: block; width: 100%}";
         ".indextable td.module a:hover {text-decoration: underline; background-color: transparent}";
         ".deprecated {color: #888; font-style: italic}" ;
 
@@ -1513,7 +1515,7 @@ class html =
              | l,Some r ->
                  bs b (" " ^ (self#keyword ":") ^ " ");
                  self#html_of_type_expr_list ~par: false b father " * " l;
-		 bs b (" " ^ (self#keyword "->") ^ " ");
+                 bs b (" " ^ (self#keyword "->") ^ " ");
                  self#html_of_type_expr b father r;
             );
             bs b "\n";
@@ -1780,7 +1782,7 @@ class html =
       if info then
         (
          if complete then
-           self#html_of_info ~indent: false
+           self#html_of_info ~indent: true
          else
            self#html_of_info_first_sentence
         ) b m.m_info
@@ -1809,7 +1811,7 @@ class html =
       if info then
         (
          if complete then
-           self#html_of_info ~indent: false
+           self#html_of_info ~indent: true
          else
            self#html_of_info_first_sentence
         ) b mt.mt_info
@@ -1966,7 +1968,7 @@ class html =
       print_DEBUG "html#html_of_class : info" ;
       (
        if complete then
-         self#html_of_info ~indent: false
+         self#html_of_info ~indent: true
        else
          self#html_of_info_first_sentence
       ) b c.cl_info
@@ -2009,7 +2011,7 @@ class html =
       bs b "
"; ( if complete then - self#html_of_info ~indent: false + self#html_of_info ~indent: true else self#html_of_info_first_sentence ) b ct.clt_info diff --git a/ocamldoc/odoc_info.mli b/ocamldoc/odoc_info.mli index 00d626af..4f42986e 100644 --- a/ocamldoc/odoc_info.mli +++ b/ocamldoc/odoc_info.mli @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_info.mli 12435 2012-05-07 10:31:18Z guesdon $ *) +(* $Id: odoc_info.mli 12798 2012-07-30 11:53:27Z doligez $ *) (** Interface to the information collected in source files. *) @@ -203,7 +203,7 @@ module Type : { vc_name : string ; (** Name of the constructor. *) vc_args : Types.type_expr list ; (** Arguments of the constructor. *) - vc_ret : Types.type_expr option ; + vc_ret : Types.type_expr option ; mutable vc_text : text option ; (** Optional description in the associated comment. *) } diff --git a/ocamldoc/odoc_latex.ml b/ocamldoc/odoc_latex.ml index 0c6b75e4..bec8b91c 100644 --- a/ocamldoc/odoc_latex.ml +++ b/ocamldoc/odoc_latex.ml @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_latex.ml 12249 2012-03-20 12:00:11Z guesdon $ *) +(* $Id: odoc_latex.ml 12798 2012-07-30 11:53:27Z doligez $ *) (** Generation of LaTeX documentation. *) @@ -97,19 +97,19 @@ class text = "}", "\\\\}"; "\\$", "\\\\$"; "\\^", "{\\\\textasciicircum}"; - "à", "\\\\`a"; - "â", "\\\\^a"; - "é", "\\\\'e"; - "è", "\\\\`e"; - "ê", "\\\\^e"; - "ë", "\\\\\"e"; - "ç", "\\\\c{c}"; - "ô", "\\\\^o"; - "ö", "\\\\\"o"; - "î", "\\\\^i"; - "ï", "\\\\\"i"; - "ù", "\\\\`u"; - "û", "\\\\^u"; + "\xE0", "\\\\`a"; + "\xE2", "\\\\^a"; + "\xE9", "\\\\'e"; + "\xE8", "\\\\`e"; + "\xEA", "\\\\^e"; + "\xEB", "\\\\\"e"; + "\xE7", "\\\\c{c}"; + "\xF4", "\\\\^o"; + "\xF6", "\\\\\"o"; + "\xEE", "\\\\^i"; + "\xEF", "\\\\\"i"; + "\xF9", "\\\\`u"; + "\xFB", "\\\\^u"; "%", "\\\\%"; "_", "\\\\_"; "~", "\\\\~{}"; @@ -574,7 +574,7 @@ class latex = p fmt2 " %s@ %s@ %s@ %s" ":" (self#normal_type_list ~par: false mod_name " * " l) - "->" + "->" (self#normal_type mod_name r) ); flush2 () @@ -703,7 +703,7 @@ class latex = self#latex_of_module_kind fmt father k2; self#latex_of_text fmt [Code ")"] | Module_with (k, s) -> - (* TODO: à modifier quand Module_with sera plus détaillé *) + (* TODO: a modifier quand Module_with sera plus detaille *) self#latex_of_module_type_kind fmt father k; self#latex_of_text fmt [ Code " "; @@ -732,7 +732,7 @@ class latex = self#latex_of_text fmt [Latex "\\end{ocamldocobjectend}\n"] | Class_apply capp -> - (* TODO: afficher le type final à partir du typedtree *) + (* TODO: afficher le type final a partir du typedtree *) self#latex_of_text fmt [Raw "class application not handled yet"] | Class_constr cco -> diff --git a/ocamldoc/odoc_lexer.mll b/ocamldoc/odoc_lexer.mll index ac2d00e0..4b8dcb9f 100644 --- a/ocamldoc/odoc_lexer.mll +++ b/ocamldoc/odoc_lexer.mll @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_lexer.mll 10652 2010-08-24 09:45:45Z guesdon $ *) +(* $Id: odoc_lexer.mll 12796 2012-07-30 11:22:29Z doligez $ *) (** The lexer for special comments. *) @@ -22,10 +22,10 @@ let line_number = ref 0 let string_buffer = Buffer.create 32 -(** Fonction de remise à zéro de la chaine de caractères tampon *) +(** Fonction de remise a zero de la chaine de caracteres tampon *) let reset_string_buffer () = Buffer.reset string_buffer -(** Fonction d'ajout d'un caractère dans la chaine de caractères tampon *) +(** Fonction d'ajout d'un caractere dans la chaine de caracteres tampon *) let ajout_char_string = Buffer.add_char string_buffer (** Add a string to the buffer. *) diff --git a/ocamldoc/odoc_man.ml b/ocamldoc/odoc_man.ml index fe855ea4..4a813da4 100644 --- a/ocamldoc/odoc_man.ml +++ b/ocamldoc/odoc_man.ml @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_man.ml 12249 2012-03-20 12:00:11Z guesdon $ *) +(* $Id: odoc_man.ml 12798 2012-07-30 11:53:27Z doligez $ *) (** The man pages generator. *) open Odoc_info @@ -492,13 +492,13 @@ class man = | l, None, Some r -> bs b "\n.B : "; self#man_of_type_expr_list ~par: false b father " * " l; - bs b ".B -> "; + bs b ".B -> "; self#man_of_type_expr b father r; bs b " " | l, (Some t), Some r -> bs b "\n.B of "; self#man_of_type_expr_list ~par: false b father " * " l; - bs b ".B -> "; + bs b ".B -> "; self#man_of_type_expr b father r; bs b ".I \" \"\n"; bs b "(* "; diff --git a/ocamldoc/odoc_merge.mli b/ocamldoc/odoc_merge.mli index 0c270191..a28e8fb5 100644 --- a/ocamldoc/odoc_merge.mli +++ b/ocamldoc/odoc_merge.mli @@ -9,11 +9,11 @@ (* *) (***********************************************************************) -(* $Id: odoc_merge.mli 12341 2012-04-11 16:46:30Z guesdon $ *) +(* $Id: odoc_merge.mli 12796 2012-07-30 11:22:29Z doligez $ *) (** Merge of information from [.ml] and [.mli] for a module.*) -(** Merging \@before tags. *) +(** Merging \@before tags. *) val merge_before_tags : (string * Odoc_types.text) list -> (string * Odoc_types.text) list diff --git a/ocamldoc/odoc_misc.ml b/ocamldoc/odoc_misc.ml index 46189745..29a46655 100644 --- a/ocamldoc/odoc_misc.ml +++ b/ocamldoc/odoc_misc.ml @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_misc.ml 12341 2012-04-11 16:46:30Z guesdon $ *) +(* $Id: odoc_misc.ml 12796 2012-07-30 11:22:29Z doligez $ *) let no_blanks s = let len = String.length s in @@ -334,7 +334,7 @@ let rec get_before_dot s = let len = String.length s in let n = String.index s '.' in if n + 1 >= len then - (* le point est le dernier caractère *) + (* le point est le dernier caractere *) (true, s, "") else match s.[n+1] with diff --git a/ocamldoc/odoc_name.ml b/ocamldoc/odoc_name.ml index e937a00b..f9b9b1ca 100644 --- a/ocamldoc/odoc_name.ml +++ b/ocamldoc/odoc_name.ml @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_name.ml 12622 2012-06-21 05:46:28Z guesdon $ *) +(* $Id: odoc_name.ml 12798 2012-07-30 11:53:27Z doligez $ *) (** Representation of element names. *) @@ -52,11 +52,11 @@ let strip_string s = else match s.[n] with ' ' | '\t' | '\n' | '\r' -> iter_last (n-1) - | _ -> Some n + | _ -> Some n in match iter_last (len-1) with None -> String.sub s first 1 - | Some last -> String.sub s first ((last-first)+1) + | Some last -> String.sub s first ((last-first)+1) let parens_if_infix name = match strip_string name with diff --git a/ocamldoc/odoc_print.ml b/ocamldoc/odoc_print.ml index 6e75ce1d..3c3c22b5 100644 --- a/ocamldoc/odoc_print.ml +++ b/ocamldoc/odoc_print.ml @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_print.ml 12511 2012-05-30 13:29:48Z lefessan $ *) +(* $Id: odoc_print.ml 12796 2012-07-30 11:22:29Z doligez $ *) open Format @@ -82,7 +82,7 @@ let simpl_class_type t = match t with Types.Cty_constr (p,texp_list,ct) -> t | Types.Cty_signature cs -> - (* on vire les vals et methods pour ne pas qu'elles soient imprimées + (* on vire les vals et methods pour ne pas qu'elles soient imprimees quand on affichera le type *) let tnil = { Types.desc = Types.Tnil ; Types.level = 0; Types.id = 0 } in Types.Cty_signature { Types.cty_self = { cs.Types.cty_self with diff --git a/ocamldoc/odoc_scan.ml b/ocamldoc/odoc_scan.ml index 32554f91..6b1b392f 100644 --- a/ocamldoc/odoc_scan.ml +++ b/ocamldoc/odoc_scan.ml @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_scan.ml 12341 2012-04-11 16:46:30Z guesdon $ *) +(* $Id: odoc_scan.ml 12796 2012-07-30 11:22:29Z doligez $ *) (** Scanning of modules and elements. @@ -56,7 +56,7 @@ class scanner = method scan_class_pre (c : Odoc_class.t_class) = true (** This method scan the elements of the given class. - A VOIR : scan des classes héritées.*) + A VOIR : scan des classes heritees.*) method scan_class_elements c = List.iter (fun ele -> @@ -82,7 +82,7 @@ class scanner = method scan_class_type_pre (ct : Odoc_class.t_class_type) = true (** This method scan the elements of the given class type. - A VOIR : scan des classes héritées.*) + A VOIR : scan des classes heritees.*) method scan_class_type_elements ct = List.iter (fun ele -> diff --git a/ocamldoc/odoc_sig.ml b/ocamldoc/odoc_sig.ml index 28772530..f5d56681 100644 --- a/ocamldoc/odoc_sig.ml +++ b/ocamldoc/odoc_sig.ml @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_sig.ml 12622 2012-06-21 05:46:28Z guesdon $ *) +(* $Id: odoc_sig.ml 12798 2012-07-30 11:53:27Z doligez $ *) (** Analysis of interface files. *) @@ -232,7 +232,7 @@ module Analyser = { vc_name = constructor_name ; vc_args = List.map (Odoc_env.subst_type env) type_expr_list ; - vc_ret = may_map (Odoc_env.subst_type env) ret_type; + vc_ret = may_map (Odoc_env.subst_type env) ret_type; vc_text = comment_opt } in @@ -728,7 +728,7 @@ module Analyser = new_module.m_info <- merge_infos new_module.m_info info_after_opt ; let new_env = Odoc_env.add_module env new_module.m_name in let new_env2 = - match new_module.m_type with (* A VOIR : cela peut-il être Tmty_ident ? dans ce cas, on aurait pas la signature *) + match new_module.m_type with (* A VOIR : cela peut-il etre Tmty_ident ? dans ce cas, on aurait pas la signature *) Types.Mty_signature s -> Odoc_env.add_signature new_env new_module.m_name ~rel: (Name.simple new_module.m_name) s | _ -> new_env in @@ -748,7 +748,7 @@ module Analyser = raise (Failure (Odoc_messages.module_not_found current_module_name name)) in match sig_module_type with - (* A VOIR : cela peut-il être Tmty_ident ? dans ce cas, on aurait pas la signature *) + (* A VOIR : cela peut-il etre Tmty_ident ? dans ce cas, on aurait pas la signature *) Types.Mty_signature s -> Odoc_env.add_signature e complete_name ~rel: name s | _ -> @@ -863,7 +863,7 @@ module Analyser = mt.mt_info <- merge_infos mt.mt_info info_after_opt ; let new_env = Odoc_env.add_module_type env mt.mt_name in let new_env2 = - match sig_mtype with (* A VOIR : cela peut-il être Tmty_ident ? dans ce cas, on aurait pas la signature *) + match sig_mtype with (* A VOIR : cela peut-il etre Tmty_ident ? dans ce cas, on aurait pas la signature *) Some (Types.Mty_signature s) -> Odoc_env.add_signature new_env mt.mt_name ~rel: (Name.simple mt.mt_name) s | _ -> new_env in @@ -1223,7 +1223,7 @@ module Analyser = ([], Class_structure (inher_l, ele)) | (Parsetree.Pcty_fun (parse_label, _, pclass_type), Types.Cty_fun (label, type_expr, class_type)) -> - (* label = string. Dans les signatures, pas de nom de paramètres à l'intérieur des tuples *) + (* label = string. Dans les signatures, pas de nom de parametres a l'interieur des tuples *) (* si label = "", pas de label. ici on a l'information pour savoir si on a un label explicite. *) if parse_label = label then ( diff --git a/ocamldoc/odoc_texi.ml b/ocamldoc/odoc_texi.ml index e8f80962..48fb55b5 100644 --- a/ocamldoc/odoc_texi.ml +++ b/ocamldoc/odoc_texi.ml @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_texi.ml 11160 2011-07-29 10:32:43Z garrigue $ *) +(* $Id: odoc_texi.ml 12798 2012-07-30 11:53:27Z doligez $ *) (** Generation of Texinfo documentation. *) @@ -149,23 +149,23 @@ struct ] @ (if !esc_8bits then [ - (Str.regexp "à", "@`a") ; - (Str.regexp "â", "@^a") ; - (Str.regexp "é", "@'e") ; - (Str.regexp "è", "@`e") ; - (Str.regexp "ê", "@^e") ; - (Str.regexp "ë", "@\"e") ; - (Str.regexp "ç", "@,{c}") ; - (Str.regexp "ô", "@^o") ; - (Str.regexp "ö", "@\"o") ; - (Str.regexp "î", "@^i") ; - (Str.regexp "ï", "@\"i") ; - (Str.regexp "ù", "@`u") ; - (Str.regexp "û", "@^u") ; - (Str.regexp "æ", "@ae{}" ) ; - (Str.regexp "Æ", "@AE{}" ) ; - (Str.regexp "ß", "@ss{}" ) ; - (Str.regexp "©", "@copyright{}" ) ; + (Str.regexp "\xE0", "@`a") ; + (Str.regexp "\xE2", "@^a") ; + (Str.regexp "\xE9", "@'e") ; + (Str.regexp "\xE8", "@`e") ; + (Str.regexp "\xEA", "@^e") ; + (Str.regexp "\xEB", "@\"e") ; + (Str.regexp "\xF7", "@,{c}") ; + (Str.regexp "\xF4", "@^o") ; + (Str.regexp "\xF6", "@\"o") ; + (Str.regexp "\xEE", "@^i") ; + (Str.regexp "\xEF", "@\"i") ; + (Str.regexp "\xF9", "@`u") ; + (Str.regexp "\xFB", "@^u") ; + (Str.regexp "\xE6", "@ae{}" ) ; + (Str.regexp "\xC6", "@AE{}" ) ; + (Str.regexp "\xDF", "@ss{}" ) ; + (Str.regexp "\xA9", "@copyright{}" ) ; ] else []) @@ -640,13 +640,13 @@ class texi = Printf.sprintf "(%s) " (String.concat ", " (List.map f l)) - method string_of_type_args (args:Types.type_expr list) (ret:Types.type_expr option) = + method string_of_type_args (args:Types.type_expr list) (ret:Types.type_expr option) = match args, ret with | [], None -> "" | args, None -> " of " ^ (Odoc_info.string_of_type_list " * " args) | [], Some r -> " : " ^ (Odoc_info.string_of_type_expr r) - | args, Some r -> " : " ^ (Odoc_info.string_of_type_list " * " args) ^ - " -> " ^ (Odoc_info.string_of_type_expr r) + | args, Some r -> " : " ^ (Odoc_info.string_of_type_list " * " args) ^ + " -> " ^ (Odoc_info.string_of_type_expr r) (** Return Texinfo code for a type. *) method texi_of_type ty = diff --git a/ocamldoc/odoc_text_lexer.mll b/ocamldoc/odoc_text_lexer.mll index fb45d1e2..b2b8ecc5 100644 --- a/ocamldoc/odoc_text_lexer.mll +++ b/ocamldoc/odoc_text_lexer.mll @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_text_lexer.mll 12249 2012-03-20 12:00:11Z guesdon $ *) +(* $Id: odoc_text_lexer.mll 12796 2012-07-30 11:22:29Z doligez $ *) (** The lexer for string to build text structures. *) @@ -22,10 +22,10 @@ let char_number = ref 0 let string_buffer = Buffer.create 32 -(** Fonction de remise à zéro de la chaine de caractères tampon *) +(** Fonction de remise a zero de la chaine de caracteres tampon *) let reset_string_buffer () = Buffer.reset string_buffer -(** Fonction d'ajout d'un caractère dans la chaine de caractères tampon *) +(** Fonction d'ajout d'un caractere dans la chaine de caracteres tampon *) let ajout_char_string = Buffer.add_char string_buffer (** Add a string to the buffer. *) diff --git a/otherlibs/bigarray/bigarray_stubs.c b/otherlibs/bigarray/bigarray_stubs.c index 7d63a97f..15f5fb2b 100644 --- a/otherlibs/bigarray/bigarray_stubs.c +++ b/otherlibs/bigarray/bigarray_stubs.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: bigarray_stubs.c 12433 2012-05-06 08:23:37Z xleroy $ */ +/* $Id: bigarray_stubs.c 12963 2012-09-27 15:48:40Z doligez $ */ #include #include @@ -779,7 +779,12 @@ static void caml_ba_serialize(value v, } /* Compute required size in OCaml heap. Assumes struct caml_ba_array is exactly 4 + num_dims words */ + /* PR#5516: use C99's flexible array types if possible */ +#if (__STDC_VERSION__ >= 199901L) + Assert(sizeof(struct caml_ba_array) == 4 * sizeof(value)); +#else Assert(sizeof(struct caml_ba_array) == 5 * sizeof(value)); +#endif *wsize_32 = (4 + b->num_dims) * 4; *wsize_64 = (4 + b->num_dims) * 8; } @@ -846,7 +851,12 @@ uintnat caml_ba_deserialize(void * dst) case CAML_BA_NATIVE_INT: caml_ba_deserialize_longarray(b->data, num_elts); break; } + /* PR#5516: use C99's flexible array types if possible */ +#if (__STDC_VERSION__ >= 199901L) + return sizeof(struct caml_ba_array) + b->num_dims * sizeof(intnat); +#else return sizeof(struct caml_ba_array) + (b->num_dims - 1) * sizeof(intnat); +#endif } /* Create / update proxy to indicate that b2 is a sub-array of b1 */ diff --git a/otherlibs/bigarray/mmap_unix.c b/otherlibs/bigarray/mmap_unix.c index 971c7495..e208f21f 100644 --- a/otherlibs/bigarray/mmap_unix.c +++ b/otherlibs/bigarray/mmap_unix.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: mmap_unix.c 12582 2012-06-07 12:17:44Z xleroy $ */ +/* $Id: mmap_unix.c 12800 2012-07-30 18:59:07Z doligez $ */ /* Needed (under Linux at least) to get pwrite's prototype in unistd.h. Must be defined before the first system .h is included. */ @@ -70,7 +70,7 @@ static int caml_grow_file(int fd, file_offset size) if (p != -1) { c = 0; p = write(fd, &c, 1); - if (p != -1) + if (p != -1) p = lseek(fd, currpos, SEEK_SET); } } diff --git a/otherlibs/graph/.depend b/otherlibs/graph/.depend index ab9faa61..84c8960d 100644 --- a/otherlibs/graph/.depend +++ b/otherlibs/graph/.depend @@ -5,7 +5,7 @@ color.o: color.c libgraph.h \ ../../byterun/mlvalues.h ../../byterun/compatibility.h \ ../../byterun/config.h ../../byterun/../config/m.h \ ../../byterun/../config/s.h ../../byterun/misc.h \ - + draw.o: draw.c libgraph.h \ \ \ diff --git a/otherlibs/labltk/frx/README b/otherlibs/labltk/frx/README index b86f8dcd..65e5dc4c 100644 --- a/otherlibs/labltk/frx/README +++ b/otherlibs/labltk/frx/README @@ -1,2 +1,2 @@ This is Francois Rouaix's widget set library, Frx. -It uses CamlTk API. \ No newline at end of file +It uses CamlTk API. diff --git a/otherlibs/labltk/lib/Makefile b/otherlibs/labltk/lib/Makefile index cae3f225..cc3e4145 100644 --- a/otherlibs/labltk/lib/Makefile +++ b/otherlibs/labltk/lib/Makefile @@ -21,7 +21,7 @@ all: $(LIBNAME).cma $(LIBNAME)top$(EXE) $(LIBNAME) opt: $(LIBNAME).cmxa clean: - rm -f $(LIBNAME)top$(EXE) $(LIBNAME) *.cm* *.$(A) + rm -f $(LIBNAME)top$(EXE) $(LIBNAME) *.cm* *.$(A) *$(EXT_DLL) superclean: - if test -f tk.cmo; then \ @@ -56,7 +56,7 @@ $(LIBNAME).cma: $(SUPPORT) ../Widgets.src cd ../camltk; $(MAKE) $(MKLIB) -ocamlc '$(CAMLCB)' -o $(LIBNAME) \ -I ../labltk -I ../camltk $(TKOBJS) \ - -ccopt "\"$(TK_LINK)\"" + -cclib "\"$(TK_LINK)\"" $(LIBNAME).cmxa: $(SUPPORT:.cmo=.cmx) ../Widgets.src $(MAKE) superclean @@ -64,7 +64,7 @@ $(LIBNAME).cmxa: $(SUPPORT:.cmo=.cmx) ../Widgets.src cd ../camltk; $(MAKE) opt $(MKLIB) -ocamlopt '$(CAMLOPTB)' -o $(LIBNAME) -oc $(LIBNAME) \ -I ../labltk -I ../camltk $(TKOBJS:.cmo=.cmx) \ - -ccopt "\"$(TK_LINK)\"" + -cclib "\"$(TK_LINK)\"" $(LIBNAME)top$(EXE) : $(TOPDEPS) $(LIBNAME).cma ../support/lib$(LIBNAME).$(A) $(CAMLC) -verbose -linkall -o $(LIBNAME)top$(EXE) -I ../support \ diff --git a/otherlibs/labltk/lib/Makefile.nt b/otherlibs/labltk/lib/Makefile.nt index 67bf904e..2b0b5ab5 100644 --- a/otherlibs/labltk/lib/Makefile.nt +++ b/otherlibs/labltk/lib/Makefile.nt @@ -1 +1 @@ -include Makefile \ No newline at end of file +include Makefile diff --git a/otherlibs/labltk/lib/labltk.bat b/otherlibs/labltk/lib/labltk.bat index f760e800..8020fafd 100755 --- a/otherlibs/labltk/lib/labltk.bat +++ b/otherlibs/labltk/lib/labltk.bat @@ -1 +1 @@ -@ocaml -I +labltk labltk.cma %1 %2 %3 %4 %5 %6 %7 %8 %9 \ No newline at end of file +@ocaml -I +labltk labltk.cma %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/otherlibs/labltk/support/cltkVar.c b/otherlibs/labltk/support/cltkVar.c index 9e35921f..5196edb7 100644 --- a/otherlibs/labltk/support/cltkVar.c +++ b/otherlibs/labltk/support/cltkVar.c @@ -14,7 +14,7 @@ /* */ /***********************************************************************/ -/* $Id: cltkVar.c 12149 2012-02-10 16:15:24Z doligez $ */ +/* $Id: cltkVar.c 12800 2012-07-30 18:59:07Z doligez $ */ /* Alternative to tkwait variable */ #include @@ -65,7 +65,7 @@ CAMLprim value camltk_setvar(value var, value contents) if (s == NULL) tk_error(Tcl_GetStringResult(cltclinterp)); - else + else return(Val_unit); } diff --git a/otherlibs/num/nat_stubs.c b/otherlibs/num/nat_stubs.c index 70393967..fa0cce02 100644 --- a/otherlibs/num/nat_stubs.c +++ b/otherlibs/num/nat_stubs.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: nat_stubs.c 11156 2011-07-27 14:17:02Z doligez $ */ +/* $Id: nat_stubs.c 12800 2012-07-30 18:59:07Z doligez $ */ #include "alloc.h" #include "config.h" @@ -416,4 +416,3 @@ static intnat hash_nat(value v) } return h; } - diff --git a/otherlibs/str/str.mli b/otherlibs/str/str.mli index f5c992ae..46c86135 100644 --- a/otherlibs/str/str.mli +++ b/otherlibs/str/str.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: str.mli 11156 2011-07-27 14:17:02Z doligez $ *) +(* $Id: str.mli 12922 2012-09-11 14:40:43Z doligez $ *) (** Regular expressions and high-level string processing *) @@ -48,7 +48,7 @@ val regexp : string -> regexp ([\2] for the second expression, and so on up to [\9]). - [\b ] Matches word boundaries. - [\ ] Quotes special characters. The special characters - are [$^.*+?[]]. + are [$^\.*+?[]]. *) val regexp_case_fold : string -> regexp @@ -82,15 +82,16 @@ val search_forward : regexp -> string -> int -> int matching the regular expression [r]. The search starts at position [start] and proceeds towards the end of the string. Return the position of the first character of the matched - substring, or raise [Not_found] if no substring matches. *) + substring. + @raise Not_found if no substring matches. *) val search_backward : regexp -> string -> int -> int (** [search_backward r s last] searches the string [s] for a substring matching the regular expression [r]. The search first considers substrings that start at position [last] and proceeds towards the beginning of string. Return the position of the first - character of the matched substring; raise [Not_found] if no - substring matches. *) + character of the matched substring. + @raise Not_found if no substring matches. *) val string_partial_match : regexp -> string -> int -> bool (** Similar to {!Str.string_match}, but also returns true if @@ -99,29 +100,50 @@ val string_partial_match : regexp -> string -> int -> bool val matched_string : string -> string (** [matched_string s] returns the substring of [s] that was matched - by the latest {!Str.string_match}, {!Str.search_forward} or - {!Str.search_backward}. + by the last call to one of the following matching or searching + functions: + - {!Str.string_match} + - {!Str.search_forward} + - {!Str.search_backward} + - {!Str.string_partial_match} + - {!Str.global_substitute} + - {!Str.substitute_first} + provided that none of the following functions was called inbetween: + - {!Str.global_replace} + - {!Str.replace_first} + - {!Str.split} + - {!Str.bounded_split} + - {!Str.split_delim} + - {!Str.bounded_split_delim} + - {!Str.full_split} + - {!Str.bounded_full_split} + + Note: in the case of [global_substitute] and [substitute_first], + a call to [matched_string] is only valid within the [subst] argument, + not after [global_substitute] or [substitute_first] returns. + The user must make sure that the parameter [s] is the same string that was passed to the matching or searching function. *) val match_beginning : unit -> int (** [match_beginning()] returns the position of the first character - of the substring that was matched by {!Str.string_match}, - {!Str.search_forward} or {!Str.search_backward}. *) + of the substring that was matched by the last call to a matching + or searching function (see {!Str.matched_string} for details). *) val match_end : unit -> int (** [match_end()] returns the position of the character following the - last character of the substring that was matched by [string_match], - [search_forward] or [search_backward]. *) + last character of the substring that was matched by the last call + to a matching or searching function (see {!Str.matched_string} for + details). *) val matched_group : int -> string -> string (** [matched_group n s] returns the substring of [s] that was matched - by the [n]th group [\(...\)] of the regular expression during - the latest {!Str.string_match}, {!Str.search_forward} or - {!Str.search_backward}. + by the [n]th group [\(...\)] of the regular expression that was + matched by the last call to a matching or searching function (see + {!Str.matched_string} for details). The user must make sure that the parameter [s] is the same string that was passed to the matching or searching function. - [matched_group n s] raises [Not_found] if the [n]th group + @raise Not_found if the [n]th group of the regular expression was not matched. This can happen with groups inside alternatives [\|], options [?] or repetitions [*]. For instance, the empty string will match @@ -131,7 +153,8 @@ val matched_group : int -> string -> string val group_beginning : int -> int (** [group_beginning n] returns the position of the first character of the substring that was matched by the [n]th group of - the regular expression. + the regular expression that was matched by the last call to a + matching or searching function (see {!Str.matched_string} for details). @raise Not_found if the [n]th group of the regular expression was not matched. @raise Invalid_argument if there are fewer than [n] groups in @@ -140,7 +163,9 @@ val group_beginning : int -> int val group_end : int -> int (** [group_end n] returns the position of the character following the last character of - substring that was matched by the [n]th group of the regular expression. + substring that was matched by the [n]th group of the regular + expression that was matched by the last call to a matching or + searching function (see {!Str.matched_string} for details). @raise Not_found if the [n]th group of the regular expression was not matched. @raise Invalid_argument if there are fewer than [n] groups in @@ -176,9 +201,11 @@ val substitute_first : regexp -> (string -> string) -> string -> string val replace_matched : string -> string -> string (** [replace_matched repl s] returns the replacement text [repl] in which [\1], [\2], etc. have been replaced by the text - matched by the corresponding groups in the most recent matching - operation. [s] must be the same string that was matched during - this matching operation. *) + matched by the corresponding groups in the regular expression + that was matched by the last call to a matching or searching + function (see {!Str.matched_string} for details). + [s] must be the same string that was passed to the matching or + searching function. *) (** {6 Splitting} *) @@ -189,7 +216,7 @@ val split : regexp -> string -> string list the substrings that match [r], and returns the list of substrings. For instance, [split (regexp "[ \t]+") s] splits [s] into blank-separated words. An occurrence of the delimiter at the - beginning and at the end of the string is ignored. *) + beginning or at the end of the string is ignored. *) val bounded_split : regexp -> string -> int -> string list (** Same as {!Str.split}, but splits into at most [n] substrings, diff --git a/otherlibs/systhreads/st_posix.h b/otherlibs/systhreads/st_posix.h index 070a4496..44b47511 100644 --- a/otherlibs/systhreads/st_posix.h +++ b/otherlibs/systhreads/st_posix.h @@ -158,7 +158,7 @@ static INLINE int st_masterlock_waiters(st_masterlock * m) { return m->waiters; } - + /* Mutexes */ typedef pthread_mutex_t * st_mutex; @@ -411,6 +411,6 @@ value caml_wait_signal(value sigs) /* ML */ return Val_int(signo); #else invalid_argument("Thread.wait_signal not implemented"); - return Val_int(0); /* not reached */ + return Val_int(0); /* not reached */ #endif } diff --git a/otherlibs/systhreads/st_stubs.c b/otherlibs/systhreads/st_stubs.c index 550a1762..78d6d925 100644 --- a/otherlibs/systhreads/st_stubs.c +++ b/otherlibs/systhreads/st_stubs.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: st_stubs.c 12324 2012-04-08 17:11:47Z xleroy $ */ +/* $Id: st_stubs.c 12800 2012-07-30 18:59:07Z doligez $ */ #include "alloc.h" #include "backtrace.h" @@ -279,7 +279,7 @@ static uintnat caml_thread_stack_usage(void) sz += (value *) th->top_of_stack - (value *) th->bottom_of_stack; #else sz += th->stack_high - th->sp; -#endif +#endif } if (prev_stack_usage_hook != NULL) sz += prev_stack_usage_hook(); @@ -501,7 +501,7 @@ static ST_THREAD_FUNCTION caml_thread_start(void * arg) #endif /* The thread now stops running */ return 0; -} +} CAMLprim value caml_thread_new(value clos) /* ML */ { @@ -525,7 +525,7 @@ CAMLprim value caml_thread_new(value clos) /* ML */ caml_thread_remove_info(th); st_check_error(err, "Thread.create"); } - /* Create the tick thread if not already done. + /* Create the tick thread if not already done. Because of PR#4666, we start the tick thread late, only when we create the first additional thread in the current process*/ if (! caml_tick_thread_running) { @@ -581,7 +581,7 @@ CAMLexport int caml_c_thread_register(void) return 1; } -/* Unregister a thread that was created from C and registered with +/* Unregister a thread that was created from C and registered with the function above */ CAMLexport int caml_c_thread_unregister(void) diff --git a/otherlibs/systhreads/st_win32.h b/otherlibs/systhreads/st_win32.h index da602b7f..206646df 100644 --- a/otherlibs/systhreads/st_win32.h +++ b/otherlibs/systhreads/st_win32.h @@ -54,7 +54,7 @@ static DWORD st_initialize(void) typedef HANDLE st_thread_id; -static DWORD st_thread_create(st_thread_id * res, +static DWORD st_thread_create(st_thread_id * res, LPTHREAD_START_ROUTINE fn, void * arg) { HANDLE h = CreateThread(NULL, 0, fn, arg, 0, NULL); @@ -150,7 +150,7 @@ static INLINE int st_masterlock_waiters(st_masterlock * m) { return 1; /* info not maintained */ } - + /* Mutexes */ typedef CRITICAL_SECTION * st_mutex; @@ -367,12 +367,12 @@ static void st_check_error(DWORD retcode, char * msg) if (retcode == 0) return; if (retcode == ERROR_NOT_ENOUGH_MEMORY) raise_out_of_memory(); if (! FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM|FORMAT_MESSAGE_IGNORE_INSERTS, - NULL, - retcode, - 0, - err, - sizeof(err), - NULL)) { + NULL, + retcode, + 0, + err, + sizeof(err), + NULL)) { sprintf(err, "error code %lx", retcode); } msglen = strlen(msg); @@ -410,11 +410,11 @@ static DWORD st_atfork(void (*fn)(void)) value caml_thread_sigmask(value cmd, value sigs) /* ML */ { invalid_argument("Thread.sigmask not implemented"); - return Val_int(0); /* not reached */ + return Val_int(0); /* not reached */ } value caml_wait_signal(value sigs) /* ML */ { invalid_argument("Thread.wait_signal not implemented"); - return Val_int(0); /* not reached */ + return Val_int(0); /* not reached */ } diff --git a/otherlibs/threads/Makefile b/otherlibs/threads/Makefile index 971c3876..07d38631 100644 --- a/otherlibs/threads/Makefile +++ b/otherlibs/threads/Makefile @@ -11,7 +11,7 @@ # # ######################################################################### -# $Id: Makefile 12383 2012-04-19 13:12:23Z xleroy $ +# $Id: Makefile 12867 2012-08-21 04:39:34Z garrigue $ include ../../config/Makefile @@ -36,9 +36,10 @@ LIB_OBJS=pervasives.cmo \ $(LIB)/lazy.cmo $(LIB)/stream.cmo $(LIB)/buffer.cmo \ $(LIB)/printf.cmo $(LIB)/arg.cmo $(LIB)/printexc.cmo $(LIB)/gc.cmo \ $(LIB)/digest.cmo $(LIB)/random.cmo $(LIB)/hashtbl.cmo \ - $(LIB)/format.cmo $(LIB)/scanf.cmo $(LIB)/camlinternalOO.cmo \ + $(LIB)/format.cmo $(LIB)/scanf.cmo $(LIB)/callback.cmo \ + $(LIB)/camlinternalOO.cmo \ $(LIB)/oo.cmo $(LIB)/camlinternalMod.cmo $(LIB)/genlex.cmo \ - $(LIB)/callback.cmo $(LIB)/weak.cmo $(LIB)/filename.cmo \ + $(LIB)/weak.cmo $(LIB)/filename.cmo \ $(LIB)/complex.cmo $(LIB)/arrayLabels.cmo $(LIB)/listLabels.cmo \ $(LIB)/stringLabels.cmo $(LIB)/stdLabels.cmo $(LIB)/moreLabels.cmo diff --git a/otherlibs/unix/select.c b/otherlibs/unix/select.c index cee2ed13..ad21804c 100644 --- a/otherlibs/unix/select.c +++ b/otherlibs/unix/select.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: select.c 11156 2011-07-27 14:17:02Z doligez $ */ +/* $Id: select.c 12947 2012-09-24 11:25:32Z xleroy $ */ #include #include @@ -29,18 +29,20 @@ #endif #include #include +#include -typedef fd_set file_descr_set; - -static void fdlist_to_fdset(value fdlist, fd_set *fdset, int *maxfd) +static int fdlist_to_fdset(value fdlist, fd_set *fdset, int *maxfd) { value l; FD_ZERO(fdset); for (l = fdlist; l != Val_int(0); l = Field(l, 1)) { - int fd = Int_val(Field(l, 0)); - FD_SET(fd, fdset); + long fd = Long_val(Field(l, 0)); + /* PR#5563: harden against bad fds */ + if (fd < 0 || fd >= FD_SETSIZE) return -1; + FD_SET((int) fd, fdset); if (fd > *maxfd) *maxfd = fd; } + return 0; } static value fdset_to_fdlist(value fdlist, fd_set *fdset) @@ -75,9 +77,11 @@ CAMLprim value unix_select(value readfds, value writefds, value exceptfds, Begin_roots3 (readfds, writefds, exceptfds); maxfd = -1; - fdlist_to_fdset(readfds, &read, &maxfd); - fdlist_to_fdset(writefds, &write, &maxfd); - fdlist_to_fdset(exceptfds, &except, &maxfd); + retcode = fdlist_to_fdset(readfds, &read, &maxfd); + retcode += fdlist_to_fdset(writefds, &write, &maxfd); + retcode += fdlist_to_fdset(exceptfds, &except, &maxfd); + /* PR#5563: if a bad fd was encountered, report EINVAL error */ + if (retcode != 0) unix_error(EINVAL, "select", Nothing); tm = Double_val(timeout); if (tm < 0.0) tvp = (struct timeval *) NULL; diff --git a/otherlibs/win32unix/close_on.c b/otherlibs/win32unix/close_on.c index 0f3245a9..00c93f85 100644 --- a/otherlibs/win32unix/close_on.c +++ b/otherlibs/win32unix/close_on.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: close_on.c 11888 2011-12-20 08:59:09Z xleroy $ */ +/* $Id: close_on.c 12800 2012-07-30 18:59:07Z doligez $ */ #include #include @@ -22,8 +22,8 @@ int win_set_inherit(value fd, BOOL inherit) /* According to the MSDN, SetHandleInformation may not work for console handles on WinNT4 and earlier versions. */ if (! SetHandleInformation(Handle_val(fd), - HANDLE_FLAG_INHERIT, - inherit ? HANDLE_FLAG_INHERIT : 0)) { + HANDLE_FLAG_INHERIT, + inherit ? HANDLE_FLAG_INHERIT : 0)) { win32_maperr(GetLastError()); return -1; } diff --git a/otherlibs/win32unix/select.c b/otherlibs/win32unix/select.c index cd9ad22f..e9169dfa 100644 --- a/otherlibs/win32unix/select.c +++ b/otherlibs/win32unix/select.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: select.c 12023 2012-01-14 09:40:49Z xleroy $ */ +/* $Id: select.c 12800 2012-07-30 18:59:07Z doligez $ */ #include #include @@ -31,7 +31,7 @@ * It takes the following parameters into account: * - limitation on number of objects is mostly due to limitation * a WaitForMultipleObjects - * - there is always an event "hStop" to watch + * - there is always an event "hStop" to watch * * This lead to pick the following value as the biggest possible * value @@ -115,7 +115,7 @@ typedef enum _SELECTHANDLETYPE { typedef enum _SELECTMODE { SELECT_MODE_NONE = 0, SELECT_MODE_READ = 1, - SELECT_MODE_WRITE = 2, + SELECT_MODE_WRITE = 2, SELECT_MODE_EXCEPT = 4, } SELECTMODE; @@ -191,18 +191,18 @@ LPSELECTDATA select_data_new (LPSELECTDATA lpSelectData, SELECTTYPE EType) /* Allocate the data structure */ LPSELECTDATA res; DWORD i; - - res = (LPSELECTDATA)caml_stat_alloc(sizeof(SELECTDATA)); + + res = (LPSELECTDATA)caml_stat_alloc(sizeof(SELECTDATA)); /* Init common data */ list_init((LPLIST)res); list_next_set((LPLIST)res, (LPLIST)lpSelectData); res->EType = EType; res->nResultsCount = 0; - + /* Data following are dedicated to APC like call, they - will be initialized if required. For now they are set to + will be initialized if required. For now they are set to invalid values. */ res->funcWorker = NULL; @@ -255,14 +255,14 @@ DWORD select_data_result_add (LPSELECTDATA lpSelectData, SELECTMODE EMode, int l } /* Add a query to select data, return zero if something goes wrong */ -DWORD select_data_query_add (LPSELECTDATA lpSelectData, - SELECTMODE EMode, - HANDLE hFileDescr, +DWORD select_data_query_add (LPSELECTDATA lpSelectData, + SELECTMODE EMode, + HANDLE hFileDescr, int lpOrigIdx, unsigned int uFlagsFd) { DWORD res; - DWORD i; + DWORD i; res = 0; if (lpSelectData->nQueriesCount < MAXIMUM_SELECT_OBJECTS) @@ -280,22 +280,22 @@ DWORD select_data_query_add (LPSELECTDATA lpSelectData, } /* Search for a job that has available query slots and that match provided type. - * If none is found, create a new one. Return the corresponding SELECTDATA, and + * If none is found, create a new one. Return the corresponding SELECTDATA, and * update provided SELECTDATA head, if required. */ LPSELECTDATA select_data_job_search (LPSELECTDATA *lppSelectData, SELECTTYPE EType) { LPSELECTDATA res; - + res = NULL; - + /* Search for job */ DEBUG_PRINT("Searching an available job for type %d", EType); res = *lppSelectData; while ( res != NULL && !( - res->EType == EType + res->EType == EType && res->nQueriesCount < MAXIMUM_SELECT_OBJECTS ) ) @@ -326,7 +326,7 @@ void read_console_poll(HANDLE hStop, void *_data) DWORD n; LPSELECTDATA lpSelectData; LPSELECTQUERY lpQuery; - + DEBUG_PRINT("Waiting for data on console"); record; @@ -338,7 +338,7 @@ void read_console_poll(HANDLE hStop, void *_data) events[0] = hStop; events[1] = lpQuery->hFileDescr; while (lpSelectData->EState == SELECT_STATE_NONE) - { + { waitRes = WaitForMultipleObjects(2, events, FALSE, INFINITE); if (waitRes == WAIT_OBJECT_0 || check_error(lpSelectData, waitRes == WAIT_FAILED)) { @@ -359,7 +359,7 @@ void read_console_poll(HANDLE hStop, void *_data) lpSelectData->EState = SELECT_STATE_SIGNALED; break; } - else + else { /* discard everything else and try again */ if (check_error(lpSelectData, ReadConsoleInput(lpQuery->hFileDescr, &record, 1, &n) == 0)) @@ -371,9 +371,9 @@ void read_console_poll(HANDLE hStop, void *_data) } /* Add a function to monitor console input */ -LPSELECTDATA read_console_poll_add (LPSELECTDATA lpSelectData, - SELECTMODE EMode, - HANDLE hFileDescr, +LPSELECTDATA read_console_poll_add (LPSELECTDATA lpSelectData, + SELECTMODE EMode, + HANDLE hFileDescr, int lpOrigIdx, unsigned int uFlagsFd) { @@ -414,14 +414,14 @@ void read_pipe_poll (HANDLE hStop, void *_data) { iterQuery = &(lpSelectData->aQueries[i]); res = PeekNamedPipe( - iterQuery->hFileDescr, - NULL, - 0, - NULL, - &n, + iterQuery->hFileDescr, + NULL, + 0, + NULL, + &n, NULL); - if (check_error(lpSelectData, - (res == 0) && + if (check_error(lpSelectData, + (res == 0) && (GetLastError() != ERROR_BROKEN_PIPE))) { break; @@ -435,7 +435,7 @@ void read_pipe_poll (HANDLE hStop, void *_data) }; /* Alas, nothing except polling seems to work for pipes. - Check the state & stop_worker_event every 10 ms + Check the state & stop_worker_event every 10 ms */ if (lpSelectData->EState == SELECT_STATE_NONE) { @@ -446,7 +446,7 @@ void read_pipe_poll (HANDLE hStop, void *_data) * a chance that one of the 4 first calls succeed. */ wait = 2 * wait; - if (wait > 10) + if (wait > 10) { wait = 10; }; @@ -460,23 +460,23 @@ void read_pipe_poll (HANDLE hStop, void *_data) } /* Add a function to monitor pipe input */ -LPSELECTDATA read_pipe_poll_add (LPSELECTDATA lpSelectData, - SELECTMODE EMode, - HANDLE hFileDescr, +LPSELECTDATA read_pipe_poll_add (LPSELECTDATA lpSelectData, + SELECTMODE EMode, + HANDLE hFileDescr, int lpOrigIdx, unsigned int uFlagsFd) { LPSELECTDATA res; LPSELECTDATA hd; - + hd = lpSelectData; /* Polling pipe is a non blocking operation by default. This means that each - worker can handle many pipe. We begin to try to find a worker that is + worker can handle many pipe. We begin to try to find a worker that is polling pipe, but for which there is under the limit of pipe per worker. */ DEBUG_PRINT("Searching an available worker handling pipe"); res = select_data_job_search(&hd, SELECT_TYPE_PIPE_READ); - + /* Add a new pipe to poll */ res->funcWorker = read_pipe_poll; select_data_query_add(res, EMode, hFileDescr, lpOrigIdx, uFlagsFd); @@ -528,22 +528,22 @@ void socket_poll (HANDLE hStop, void *_data) check_error(lpSelectData, WSAEventSelect( - (SOCKET)(iterQuery->hFileDescr), - aEvents[nEvents], + (SOCKET)(iterQuery->hFileDescr), + aEvents[nEvents], maskEvents) == SOCKET_ERROR); } - + /* Add stop event */ aEvents[nEvents] = hStop; nEvents++; if (lpSelectData->nError == 0) { - check_error(lpSelectData, + check_error(lpSelectData, WaitForMultipleObjects( - nEvents, - aEvents, - FALSE, + nEvents, + aEvents, + FALSE, INFINITE) == WAIT_FAILED); }; @@ -599,9 +599,9 @@ void socket_poll (HANDLE hStop, void *_data) } /* Add a function to monitor socket */ -LPSELECTDATA socket_poll_add (LPSELECTDATA lpSelectData, - SELECTMODE EMode, - HANDLE hFileDescr, +LPSELECTDATA socket_poll_add (LPSELECTDATA lpSelectData, + SELECTMODE EMode, + HANDLE hFileDescr, int lpOrigIdx, unsigned int uFlagsFd) { @@ -609,7 +609,7 @@ LPSELECTDATA socket_poll_add (LPSELECTDATA lpSelectData, LPSELECTDATA candidate; DWORD i; LPSELECTQUERY aQueries; - + res = lpSelectData; candidate = NULL; aQueries = NULL; @@ -695,19 +695,19 @@ LPSELECTDATA socket_poll_add (LPSELECTDATA lpSelectData, /***********************/ /* Add a static result */ -LPSELECTDATA static_poll_add (LPSELECTDATA lpSelectData, - SELECTMODE EMode, - HANDLE hFileDescr, +LPSELECTDATA static_poll_add (LPSELECTDATA lpSelectData, + SELECTMODE EMode, + HANDLE hFileDescr, int lpOrigIdx, unsigned int uFlagsFd) { LPSELECTDATA res; LPSELECTDATA hd; - + /* Look for an already initialized static element */ hd = lpSelectData; res = select_data_job_search(&hd, SELECT_TYPE_STATIC); - + /* Add a new query/result */ select_data_query_add(res, EMode, hFileDescr, lpOrigIdx, uFlagsFd); select_data_result_add(res, EMode, lpOrigIdx); @@ -738,7 +738,7 @@ static SELECTHANDLETYPE get_handle_type(value fd) { switch(GetFileType(Handle_val(fd))) { - case FILE_TYPE_DISK: + case FILE_TYPE_DISK: res = SELECT_HANDLE_DISK; break; @@ -783,8 +783,8 @@ LPSELECTDATA select_data_dispatch (LPSELECTDATA lpSelectData, SELECTMODE EMode, DEBUG_PRINT("Begin dispatching handle %x", hFileDescr); DEBUG_PRINT("Waiting for %d on handle %x", EMode, hFileDescr); - - /* There is only 2 way to have except mode: transmission of OOB data through + + /* There is only 2 way to have except mode: transmission of OOB data through a socket TCP/IP and through a strange interaction with a TTY. With windows, we only consider the TCP/IP except condition */ @@ -879,7 +879,7 @@ static value find_handle(LPSELECTRESULT iterResult, value readfds, value writefd CAMLlocal2(result, list); int i; - switch( iterResult->EMode ) + switch( iterResult->EMode ) { case SELECT_MODE_READ: list = readfds; @@ -892,12 +892,12 @@ static value find_handle(LPSELECTRESULT iterResult, value readfds, value writefd break; }; - for(i=0; list != Val_unit && i < iterResult->lpOrigIdx; ++i ) + for(i=0; list != Val_unit && i < iterResult->lpOrigIdx; ++i ) { list = Field(list, 1); } - if (list == Val_unit) + if (list == Val_unit) failwith ("select.c: original file handle not found"); result = Field(list, 0); @@ -944,12 +944,12 @@ static value fdset_to_fdlist(value fdlist, fd_set *fdset) } CAMLprim value unix_select(value readfds, value writefds, value exceptfds, value timeout) -{ +{ /* Event associated to handle */ DWORD nEventsCount; DWORD nEventsMax; HANDLE *lpEventsDone; - + /* Data for all handles */ LPSELECTDATA lpSelectData; LPSELECTDATA iterSelectData; @@ -990,7 +990,7 @@ CAMLprim value unix_select(value readfds, value writefds, value exceptfds, value double tm; struct timeval tv; struct timeval * tvp; - + DEBUG_PRINT("in select"); err = 0; @@ -1003,7 +1003,7 @@ CAMLprim value unix_select(value readfds, value writefds, value exceptfds, value leave_blocking_section(); } read_list = write_list = except_list = Val_int(0); - } else { + } else { if (fdlist_to_fdset(readfds, &read) && fdlist_to_fdset(writefds, &write) && fdlist_to_fdset(exceptfds, &except)) { DEBUG_PRINT("only sockets to select on, using classic select"); if (tm < 0.0) { @@ -1040,9 +1040,9 @@ CAMLprim value unix_select(value readfds, value writefds, value exceptfds, value writefds_len = caml_list_length(writefds); exceptfds_len = caml_list_length(exceptfds); hdsMax = MAX(readfds_len, MAX(writefds_len, exceptfds_len)); - + hdsData = (HANDLE *)caml_stat_alloc(sizeof(HANDLE) * hdsMax); - + if (tm >= 0.0) { milliseconds = 1000 * tm; @@ -1052,8 +1052,8 @@ CAMLprim value unix_select(value readfds, value writefds, value exceptfds, value { milliseconds = INFINITE; } - - + + /* Create list of select data, based on the different list of fd to watch */ DEBUG_PRINT("Dispatch read fd"); handle_set_init(&hds, hdsData, hdsMax); @@ -1072,7 +1072,7 @@ CAMLprim value unix_select(value readfds, value writefds, value exceptfds, value } } handle_set_reset(&hds); - + DEBUG_PRINT("Dispatch write fd"); handle_set_init(&hds, hdsData, hdsMax); i=0; @@ -1090,7 +1090,7 @@ CAMLprim value unix_select(value readfds, value writefds, value exceptfds, value } } handle_set_reset(&hds); - + DEBUG_PRINT("Dispatch exceptional fd"); handle_set_init(&hds, hdsData, hdsMax); i=0; @@ -1108,13 +1108,13 @@ CAMLprim value unix_select(value readfds, value writefds, value exceptfds, value } } handle_set_reset(&hds); - + /* Building the list of handle to wait for */ DEBUG_PRINT("Building events done array"); nEventsMax = list_length((LPLIST)lpSelectData); nEventsCount = 0; lpEventsDone = (HANDLE *)caml_stat_alloc(sizeof(HANDLE) * nEventsMax); - + iterSelectData = lpSelectData; while (iterSelectData != NULL) { @@ -1127,23 +1127,23 @@ CAMLprim value unix_select(value readfds, value writefds, value exceptfds, value { hasStaticData = TRUE; }; - + /* Execute APC */ if (iterSelectData->funcWorker != NULL) { - iterSelectData->lpWorker = + iterSelectData->lpWorker = worker_job_submit( - iterSelectData->funcWorker, + iterSelectData->funcWorker, (void *)iterSelectData); - DEBUG_PRINT("Job submitted to worker %x", iterSelectData->lpWorker); + DEBUG_PRINT("Job submitted to worker %x", iterSelectData->lpWorker); lpEventsDone[nEventsCount] = worker_job_event_done(iterSelectData->lpWorker); nEventsCount++; }; iterSelectData = LIST_NEXT(LPSELECTDATA, iterSelectData); }; - + DEBUG_PRINT("Need to watch %d workers", nEventsCount); - + /* Processing select itself */ enter_blocking_section(); /* There are worker started, waiting to be monitored */ @@ -1158,17 +1158,17 @@ CAMLprim value unix_select(value readfds, value writefds, value exceptfds, value case WAIT_FAILED: err = GetLastError(); break; - + case WAIT_TIMEOUT: DEBUG_PRINT("Select timeout"); break; - + default: DEBUG_PRINT("One worker is done"); break; }; } - + /* Ordering stop to every worker */ DEBUG_PRINT("Sending stop signal to every select workers"); iterSelectData = lpSelectData; @@ -1180,14 +1180,14 @@ CAMLprim value unix_select(value readfds, value writefds, value exceptfds, value }; iterSelectData = LIST_NEXT(LPSELECTDATA, iterSelectData); }; - + DEBUG_PRINT("Waiting for every select worker to be done"); switch (WaitForMultipleObjects(nEventsCount, lpEventsDone, TRUE, INFINITE)) { case WAIT_FAILED: err = GetLastError(); break; - + default: DEBUG_PRINT("Every worker is done"); break; @@ -1199,16 +1199,16 @@ CAMLprim value unix_select(value readfds, value writefds, value exceptfds, value Sleep(milliseconds); } leave_blocking_section(); - + DEBUG_PRINT("Error status: %d (0 is ok)", err); /* Build results */ if (err == 0) { DEBUG_PRINT("Building result"); - read_list = Val_unit; + read_list = Val_unit; write_list = Val_unit; except_list = Val_unit; - + iterSelectData = lpSelectData; while (iterSelectData != NULL) { @@ -1241,7 +1241,7 @@ CAMLprim value unix_select(value readfds, value writefds, value exceptfds, value iterSelectData = LIST_NEXT(LPSELECTDATA, iterSelectData); } } - + /* Free resources */ DEBUG_PRINT("Free selectdata resources"); iterSelectData = lpSelectData; @@ -1252,12 +1252,12 @@ CAMLprim value unix_select(value readfds, value writefds, value exceptfds, value select_data_free(lpSelectData); } lpSelectData = NULL; - + /* Free allocated events/handle set array */ DEBUG_PRINT("Free local allocated resources"); caml_stat_free(lpEventsDone); caml_stat_free(hdsData); - + DEBUG_PRINT("Raise error if required"); if (err != 0) { diff --git a/otherlibs/win32unix/times.c b/otherlibs/win32unix/times.c index 725895ec..1946452d 100644 --- a/otherlibs/win32unix/times.c +++ b/otherlibs/win32unix/times.c @@ -1,35 +1,35 @@ -#include -#include -#include "unixsupport.h" - - -double to_sec(FILETIME ft) { - ULARGE_INTEGER tmp; - - tmp.u.LowPart = ft.dwLowDateTime; - tmp.u.HighPart = ft.dwHighDateTime; - - /* convert to seconds: - GetProcessTimes returns number of 100-nanosecond intervals */ - return tmp.QuadPart / 1e7; -} - - -value unix_times(value unit) { - - value res; - FILETIME creation, exit, stime, utime; - - if (!(GetProcessTimes(GetCurrentProcess(), &creation, &exit, &stime, &utime))) { - win32_maperr(GetLastError()); - uerror("times", Nothing); - } - - res = alloc_small(4 * Double_wosize, Double_array_tag); - Store_double_field(res, 0, to_sec(utime)); - Store_double_field(res, 1, to_sec(stime)); - Store_double_field(res, 2, 0); - Store_double_field(res, 3, 0); - return res; - -} +#include +#include +#include "unixsupport.h" + + +double to_sec(FILETIME ft) { + ULARGE_INTEGER tmp; + + tmp.u.LowPart = ft.dwLowDateTime; + tmp.u.HighPart = ft.dwHighDateTime; + + /* convert to seconds: + GetProcessTimes returns number of 100-nanosecond intervals */ + return tmp.QuadPart / 1e7; +} + + +value unix_times(value unit) { + + value res; + FILETIME creation, exit, stime, utime; + + if (!(GetProcessTimes(GetCurrentProcess(), &creation, &exit, &stime, &utime))) { + win32_maperr(GetLastError()); + uerror("times", Nothing); + } + + res = alloc_small(4 * Double_wosize, Double_array_tag); + Store_double_field(res, 0, to_sec(utime)); + Store_double_field(res, 1, to_sec(stime)); + Store_double_field(res, 2, 0); + Store_double_field(res, 3, 0); + return res; + +} diff --git a/otherlibs/win32unix/windbug.c b/otherlibs/win32unix/windbug.c index 6904c27a..ffbfaca9 100644 --- a/otherlibs/win32unix/windbug.c +++ b/otherlibs/win32unix/windbug.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: windbug.c 11156 2011-07-27 14:17:02Z doligez $ */ +/* $Id: windbug.c 12800 2012-07-30 18:59:07Z doligez $ */ #include "windbug.h" @@ -26,7 +26,7 @@ int debug_test (void) debug = (getenv("OCAMLDEBUG") != NULL); debug_init = 1; }; -#endif +#endif return debug; } diff --git a/parsing/location.mli b/parsing/location.mli index 3576b000..fd247214 100644 --- a/parsing/location.mli +++ b/parsing/location.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: location.mli 12511 2012-05-30 13:29:48Z lefessan $ *) +(* $Id: location.mli 12800 2012-07-30 18:59:07Z doligez $ *) (* Source code locations (ranges of positions), used in parsetree. *) @@ -77,4 +77,3 @@ val show_filename: string -> string val absname: bool ref - diff --git a/parsing/parser.mly b/parsing/parser.mly index cf48b9bb..5cfee41a 100644 --- a/parsing/parser.mly +++ b/parsing/parser.mly @@ -10,7 +10,7 @@ /* */ /***********************************************************************/ -/* $Id: parser.mly 12638 2012-06-21 17:10:58Z frisch $ */ +/* $Id: parser.mly 12800 2012-07-30 18:59:07Z doligez $ */ /* The parser definition */ @@ -1423,7 +1423,7 @@ constructor_declaration: | constr_ident generalized_constructor_arguments { let arg_types,ret_type = $2 in - (mkrhs $1 1, arg_types,ret_type, symbol_rloc()) } + (mkrhs $1 1, arg_types,ret_type, symbol_rloc()) } ; constructor_arguments: diff --git a/parsing/printast.ml b/parsing/printast.ml index dea08e3b..8b2f3e02 100644 --- a/parsing/printast.ml +++ b/parsing/printast.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: printast.ml 12511 2012-05-30 13:29:48Z lefessan $ *) +(* $Id: printast.ml 12800 2012-07-30 18:59:07Z doligez $ *) open Asttypes;; open Format;; @@ -338,9 +338,9 @@ and value_description i ppf x = and string_option_underscore i ppf = function | Some x -> - string i ppf x.txt + string i ppf x.txt | None -> - string i ppf "_" + string i ppf "_" and type_declaration i ppf x = line i ppf "type_declaration %a\n" fmt_location x.ptype_loc; diff --git a/stdlib/array.ml b/stdlib/array.ml index 346dd9d5..78857a46 100644 --- a/stdlib/array.ml +++ b/stdlib/array.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: array.ml 11914 2011-12-21 10:41:59Z xleroy $ *) +(* $Id: array.ml 12891 2012-08-28 15:07:45Z xleroy $ *) (* Array operations *) @@ -22,7 +22,7 @@ external unsafe_get: 'a array -> int -> 'a = "%array_unsafe_get" external unsafe_set: 'a array -> int -> 'a -> unit = "%array_unsafe_set" external make: int -> 'a -> 'a array = "caml_make_vect" external create: int -> 'a -> 'a array = "caml_make_vect" -external sub : 'a array -> int -> int -> 'a array = "caml_array_sub" +external unsafe_sub : 'a array -> int -> int -> 'a array = "caml_array_sub" external append_prim : 'a array -> 'a array -> 'a array = "caml_array_append" external concat : 'a array list -> 'a array = "caml_array_concat" external unsafe_blit : 'a array -> int -> 'a array -> int -> int -> unit = "caml_array_blit" @@ -45,14 +45,19 @@ let make_matrix sx sy init = let create_matrix = make_matrix let copy a = - let l = length a in if l = 0 then [||] else sub a 0 l + let l = length a in if l = 0 then [||] else unsafe_sub a 0 l let append a1 a2 = let l1 = length a1 in if l1 = 0 then copy a2 - else if length a2 = 0 then sub a1 0 l1 + else if length a2 = 0 then unsafe_sub a1 0 l1 else append_prim a1 a2 +let sub a ofs len = + if len < 0 || ofs > length a - len + then invalid_arg "Array.sub" + else unsafe_sub a ofs len + let fill a ofs len v = if ofs < 0 || len < 0 || ofs > length a - len then invalid_arg "Array.fill" diff --git a/stdlib/format.mli b/stdlib/format.mli index 07f11520..6dc86940 100644 --- a/stdlib/format.mli +++ b/stdlib/format.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: format.mli 12213 2012-03-08 22:36:21Z doligez $ *) +(* $Id: format.mli 12906 2012-09-08 15:27:53Z doligez $ *) (** Pretty printing. @@ -164,7 +164,7 @@ val set_margin : int -> unit;; overflows that leads to split lines. Nothing happens if [d] is smaller than 2. If [d] is too large, the right margin is set to the maximum - admissible value (which is greater than [10^10]). *) + admissible value (which is greater than [10^9]). *) val get_margin : unit -> int;; (** Returns the position of the right margin. *) @@ -178,7 +178,7 @@ val set_max_indent : int -> unit;; if they do not fit on the current line. Nothing happens if [d] is smaller than 2. If [d] is too large, the limit is set to the maximum - admissible value (which is greater than [10^10]). *) + admissible value (which is greater than [10^9]). *) val get_max_indent : unit -> int;; (** Return the value of the maximum indentation limit (in characters). *) @@ -632,7 +632,6 @@ val fprintf : formatter -> ('a, formatter, unit) format -> 'a;; For more details about tags, see the functions [open_tag] and [close_tag]. - [@\}]: close the most recently opened tag. - - [@%]: print a plain [%] character. Example: [printf "@[%s@ %d@]@." "x =" 1] is equivalent to [open_box (); print_string "x ="; print_space (); diff --git a/stdlib/stdLabels.mli b/stdlib/stdLabels.mli index f2a553da..0a3e1ced 100644 --- a/stdlib/stdLabels.mli +++ b/stdlib/stdLabels.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: stdLabels.mli 12210 2012-03-08 19:52:03Z doligez $ *) +(* $Id: stdLabels.mli 12823 2012-08-06 11:41:12Z doligez $ *) (** Standard labeled libraries. @@ -117,6 +117,8 @@ module String : unit val concat : sep:string -> string list -> string val iter : f:(char -> unit) -> string -> unit + val iteri : f:(int -> char -> unit) -> string -> unit + val map : f:(char -> char) -> string -> string val trim : string -> string val escaped : string -> string val index : string -> char -> int diff --git a/stdlib/stream.ml b/stdlib/stream.ml index 454c0f4a..f63f31cb 100644 --- a/stdlib/stream.ml +++ b/stdlib/stream.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: stream.ml 12683 2012-07-10 10:01:57Z scherer $ *) +(* $Id: stream.ml 12800 2012-07-30 18:59:07Z doligez $ *) (* The fields of type t are not mutable to preserve polymorphism of the empty stream. This is type safe because the empty stream is never @@ -46,7 +46,7 @@ let rec get_data s d = match d with (* Only return a "forced stream", that is either Sempty or Scons(a,_). If d is a generator or a buffer, the item a is seen as extracted from the generator/buffer. - + Forcing also updates the "count" field of the delayed stream, in the Sapp and Slazy cases (see slazy/lapp implementation below). *) Sempty | Scons (_, _) -> d diff --git a/testsuite/interactive/lib-gc/alloc.ml b/testsuite/interactive/lib-gc/alloc.ml index 146785cb..9f6ad1b5 100644 --- a/testsuite/interactive/lib-gc/alloc.ml +++ b/testsuite/interactive/lib-gc/alloc.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: alloc.ml 11156 2011-07-27 14:17:02Z doligez $ *) +(* $Id: alloc.ml 12800 2012-07-30 18:59:07Z doligez $ *) (* Random allocation test *) @@ -48,4 +48,3 @@ let argspecs = [ Arg.parse argspecs (fun _ -> ()) "Usage: alloc [-c]";; main ();; - diff --git a/testsuite/lib/testing.ml b/testsuite/lib/testing.ml index b1ae33d4..6398f754 100644 --- a/testsuite/lib/testing.ml +++ b/testsuite/lib/testing.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: testing.ml 11156 2011-07-27 14:17:02Z doligez $ *) +(* $Id: testing.ml 12800 2012-07-30 18:59:07Z doligez $ *) (* Testing auxilliaries. *) @@ -30,7 +30,7 @@ at_exit finish;; let test_num = ref (-1);; let print_test_number () = - print_int !test_num; print_string " "; flush stdout;; + print_string " "; print_int !test_num; flush stdout;; let next_test () = incr test_num; @@ -93,4 +93,3 @@ let any_failure_test = test_raises_some_failure;; let scan_failure_test f x = test_raises_exc_p (function Scan_failure _ -> true | _ -> false) f x;; - diff --git a/testsuite/tests/asmcomp/amd64.S b/testsuite/tests/asmcomp/amd64.S index b71e7965..7b64db8a 100644 --- a/testsuite/tests/asmcomp/amd64.S +++ b/testsuite/tests/asmcomp/amd64.S @@ -10,7 +10,7 @@ /* */ /***********************************************************************/ -/* $Id: amd64.S 11156 2011-07-27 14:17:02Z doligez $ */ +/* $Id: amd64.S 12800 2012-07-30 18:59:07Z doligez $ */ #ifdef SYS_macosx #define ALIGN 4 @@ -39,12 +39,12 @@ CALL_GEN_CODE: pushq %r13 pushq %r14 pushq %r15 - movq %rdi, %r10 - movq %rsi, %rax - movq %rdx, %rbx - movq %rcx, %rdi - movq %r8, %rsi - call *%r10 + movq %rdi, %r10 + movq %rsi, %rax + movq %rdx, %rbx + movq %rcx, %rdi + movq %r8, %rsi + call *%r10 popq %r15 popq %r14 popq %r13 @@ -59,17 +59,17 @@ CAML_C_CALL: jmp *%rax #ifdef SYS_macosx - .literal16 + .literal16 #else - .section .rodata.cst8,"aM",@progbits,8 + .section .rodata.cst8,"aM",@progbits,8 #endif .globl CAML_NEGF_MASK .align ALIGN CAML_NEGF_MASK: - .quad 0x8000000000000000, 0 + .quad 0x8000000000000000, 0 .globl CAML_ABSF_MASK .align ALIGN CAML_ABSF_MASK: - .quad 0x7FFFFFFFFFFFFFFF, 0 + .quad 0x7FFFFFFFFFFFFFFF, 0 .comm young_limit, 8 diff --git a/testsuite/tests/asmcomp/arith.cmm b/testsuite/tests/asmcomp/arith.cmm index 984e9e40..fe3b0f84 100644 --- a/testsuite/tests/asmcomp/arith.cmm +++ b/testsuite/tests/asmcomp/arith.cmm @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: arith.cmm 11156 2011-07-27 14:17:02Z doligez $ *) +(* $Id: arith.cmm 12800 2012-07-30 18:59:07Z doligez $ *) (* Regression test for arithmetic instructions *) @@ -217,6 +217,3 @@ (floataset d 38 (absf f)) ))))))) - - - diff --git a/testsuite/tests/asmcomp/arm.S b/testsuite/tests/asmcomp/arm.S index be89133e..f459bd33 100644 --- a/testsuite/tests/asmcomp/arm.S +++ b/testsuite/tests/asmcomp/arm.S @@ -10,7 +10,7 @@ /* */ /***********************************************************************/ -/* $Id: arm.S 11156 2011-07-27 14:17:02Z doligez $ */ +/* $Id: arm.S 12800 2012-07-30 18:59:07Z doligez $ */ .text @@ -37,4 +37,3 @@ call_gen_code: caml_c_call: @ function to call is in r10 mov pc, r10 - diff --git a/testsuite/tests/asmcomp/checkbound.cmm b/testsuite/tests/asmcomp/checkbound.cmm index da8abdf4..81c72651 100644 --- a/testsuite/tests/asmcomp/checkbound.cmm +++ b/testsuite/tests/asmcomp/checkbound.cmm @@ -10,12 +10,10 @@ (* *) (***********************************************************************) -(* $Id: checkbound.cmm 11156 2011-07-27 14:17:02Z doligez $ *) +(* $Id: checkbound.cmm 12800 2012-07-30 18:59:07Z doligez $ *) (function "checkbound2" (x: int y: int) (checkbound x y)) (function "checkbound1" (x: int) (checkbound x 2)) - - diff --git a/testsuite/tests/asmcomp/hppa.S b/testsuite/tests/asmcomp/hppa.S index 87a96da9..2d130ded 100644 --- a/testsuite/tests/asmcomp/hppa.S +++ b/testsuite/tests/asmcomp/hppa.S @@ -10,7 +10,7 @@ ;* * ;********************************************************************* -; $Id: hppa.S 11156 2011-07-27 14:17:02Z doligez $ +; $Id: hppa.S 12800 2012-07-30 18:59:07Z doligez $ ; Must be preprocessed by cpp #ifdef SYS_hpux @@ -32,13 +32,13 @@ #endif #ifdef SYS_hpux - .space $PRIVATE$ - .subspa $DATA$,quad=1,align=8,access=31 - .subspa $BSS$,quad=1,align=8,access=31,zero,sort=82 - .space $TEXT$ - .subspa $LIT$,quad=0,align=8,access=44 - .subspa $CODE$,quad=0,align=8,access=44,code_only - .import $global$, data + .space $PRIVATE$ + .subspa $DATA$,quad=1,align=8,access=31 + .subspa $BSS$,quad=1,align=8,access=31,zero,sort=82 + .space $TEXT$ + .subspa $LIT$,quad=0,align=8,access=44 + .subspa $CODE$,quad=0,align=8,access=44,code_only + .import $global$, data .import $$dyncall, millicode #endif @@ -47,8 +47,8 @@ EXPORT_CODE(G(call_gen_code)) G(call_gen_code): STARTPROC - stw %r2,-20(%r30) - ldo 256(%r30), %r30 + stw %r2,-20(%r30) + ldo 256(%r30), %r30 ; Save the callee-save registers ldo -32(%r30), %r1 stws,ma %r3, -4(%r1) @@ -67,26 +67,26 @@ G(call_gen_code): stws,ma %r16, -4(%r1) stws,ma %r17, -4(%r1) stws,ma %r18, -4(%r1) - fstds,ma %fr12, -8(%r1) - fstds,ma %fr13, -8(%r1) - fstds,ma %fr14, -8(%r1) - fstds,ma %fr15, -8(%r1) - fstds,ma %fr16, -8(%r1) - fstds,ma %fr17, -8(%r1) - fstds,ma %fr18, -8(%r1) - fstds,ma %fr19, -8(%r1) - fstds,ma %fr20, -8(%r1) - fstds,ma %fr21, -8(%r1) - fstds,ma %fr22, -8(%r1) - fstds,ma %fr23, -8(%r1) - fstds,ma %fr24, -8(%r1) - fstds,ma %fr25, -8(%r1) - fstds,ma %fr26, -8(%r1) - fstds,ma %fr27, -8(%r1) - fstds,ma %fr28, -8(%r1) - fstds,ma %fr29, -8(%r1) - fstds,ma %fr30, -8(%r1) - fstds,ma %fr31, -8(%r1) + fstds,ma %fr12, -8(%r1) + fstds,ma %fr13, -8(%r1) + fstds,ma %fr14, -8(%r1) + fstds,ma %fr15, -8(%r1) + fstds,ma %fr16, -8(%r1) + fstds,ma %fr17, -8(%r1) + fstds,ma %fr18, -8(%r1) + fstds,ma %fr19, -8(%r1) + fstds,ma %fr20, -8(%r1) + fstds,ma %fr21, -8(%r1) + fstds,ma %fr22, -8(%r1) + fstds,ma %fr23, -8(%r1) + fstds,ma %fr24, -8(%r1) + fstds,ma %fr25, -8(%r1) + fstds,ma %fr26, -8(%r1) + fstds,ma %fr27, -8(%r1) + fstds,ma %fr28, -8(%r1) + fstds,ma %fr29, -8(%r1) + fstds,ma %fr30, -8(%r1) + fstds,ma %fr31, -8(%r1) ; Shuffle the arguments and call copy %r26, %r22 @@ -121,42 +121,42 @@ G(call_gen_code): ldws,ma -4(%r1), %r16 ldws,ma -4(%r1), %r17 ldws,ma -4(%r1), %r18 - fldds,ma -8(%r1), %fr12 - fldds,ma -8(%r1), %fr13 - fldds,ma -8(%r1), %fr14 - fldds,ma -8(%r1), %fr15 - fldds,ma -8(%r1), %fr16 - fldds,ma -8(%r1), %fr17 - fldds,ma -8(%r1), %fr18 - fldds,ma -8(%r1), %fr19 - fldds,ma -8(%r1), %fr20 - fldds,ma -8(%r1), %fr21 - fldds,ma -8(%r1), %fr22 - fldds,ma -8(%r1), %fr23 - fldds,ma -8(%r1), %fr24 - fldds,ma -8(%r1), %fr25 - fldds,ma -8(%r1), %fr26 - fldds,ma -8(%r1), %fr27 - fldds,ma -8(%r1), %fr28 - fldds,ma -8(%r1), %fr29 - fldds,ma -8(%r1), %fr30 - fldds,ma -8(%r1), %fr31 + fldds,ma -8(%r1), %fr12 + fldds,ma -8(%r1), %fr13 + fldds,ma -8(%r1), %fr14 + fldds,ma -8(%r1), %fr15 + fldds,ma -8(%r1), %fr16 + fldds,ma -8(%r1), %fr17 + fldds,ma -8(%r1), %fr18 + fldds,ma -8(%r1), %fr19 + fldds,ma -8(%r1), %fr20 + fldds,ma -8(%r1), %fr21 + fldds,ma -8(%r1), %fr22 + fldds,ma -8(%r1), %fr23 + fldds,ma -8(%r1), %fr24 + fldds,ma -8(%r1), %fr25 + fldds,ma -8(%r1), %fr26 + fldds,ma -8(%r1), %fr27 + fldds,ma -8(%r1), %fr28 + fldds,ma -8(%r1), %fr29 + fldds,ma -8(%r1), %fr30 + fldds,ma -8(%r1), %fr31 - ldo -256(%r30), %r30 - ldw -20(%r30), %r2 + ldo -256(%r30), %r30 + ldw -20(%r30), %r2 bv 0(%r2) nop ENDPROC - .align CODE_ALIGN - EXPORT_CODE(caml_c_call) + .align CODE_ALIGN + EXPORT_CODE(caml_c_call) G(caml_c_call): STARTPROC #ifdef SYS_hpux bl $$dyncall, %r0 nop #else - bv 0(%r22) + bv 0(%r22) nop #endif ENDPROC diff --git a/testsuite/tests/asmcomp/i386nt.asm b/testsuite/tests/asmcomp/i386nt.asm index 4e9b62f7..5a2fc0c8 100644 --- a/testsuite/tests/asmcomp/i386nt.asm +++ b/testsuite/tests/asmcomp/i386nt.asm @@ -1,67 +1,67 @@ -;********************************************************************* -; -; OCaml -; -; Xavier Leroy, projet Cristal, INRIA Rocquencourt -; -; Copyright 1996 Institut National de Recherche en Informatique et -; en Automatique. All rights reserved. This file is distributed -; under the terms of the Q Public License version 1.0. -; -;********************************************************************* +;*********************************************************************; +; ; +; OCaml ; +; ; +; Xavier Leroy, projet Cristal, INRIA Rocquencourt ; +; ; +; Copyright 1996 Institut National de Recherche en Informatique et ; +; en Automatique. All rights reserved. This file is distributed ; +; under the terms of the Q Public License version 1.0. ; +; ; +;*********************************************************************; -; $Id: i386nt.asm 11156 2011-07-27 14:17:02Z doligez $ +; $Id: i386nt.asm 12800 2012-07-30 18:59:07Z doligez $ - .386 - .MODEL FLAT + .386 + .MODEL FLAT .CODE PUBLIC _call_gen_code ALIGN 4 _call_gen_code: - push ebp - mov ebp, esp - push ebx - push esi - push edi - mov eax, [ebp+12] - mov ebx, [ebp+16] - mov ecx, [ebp+20] - mov edx, [ebp+24] - call DWORD PTR [ebp+8] - pop edi - pop esi - pop ebx - pop ebp - ret + push ebp + mov ebp, esp + push ebx + push esi + push edi + mov eax, [ebp+12] + mov ebx, [ebp+16] + mov ecx, [ebp+20] + mov edx, [ebp+24] + call DWORD PTR [ebp+8] + pop edi + pop esi + pop ebx + pop ebp + ret PUBLIC _caml_c_call ALIGN 4 _caml_c_call: - ffree st(0) - ffree st(1) - ffree st(2) - ffree st(3) - jmp eax + ffree st(0) + ffree st(1) + ffree st(2) + ffree st(3) + jmp eax PUBLIC _caml_call_gc PUBLIC _caml_alloc PUBLIC _caml_alloc1 PUBLIC _caml_alloc2 - PUBLIC _caml_alloc3 + PUBLIC _caml_alloc3 _caml_call_gc: _caml_alloc: _caml_alloc1: _caml_alloc2: _caml_alloc3: - int 3 + int 3 .DATA - PUBLIC _caml_exception_pointer -_caml_exception_pointer dword 0 - PUBLIC _young_ptr -_young_ptr dword 0 - PUBLIC _young_limit -_young_limit dword 0 + PUBLIC _caml_exception_pointer +_caml_exception_pointer dword 0 + PUBLIC _young_ptr +_young_ptr dword 0 + PUBLIC _young_limit +_young_limit dword 0 END diff --git a/testsuite/tests/asmcomp/m68k.S b/testsuite/tests/asmcomp/m68k.S index 409f8d32..8cfc407f 100644 --- a/testsuite/tests/asmcomp/m68k.S +++ b/testsuite/tests/asmcomp/m68k.S @@ -10,7 +10,7 @@ |* * |*********************************************************************** -| $Id: m68k.S 11156 2011-07-27 14:17:02Z doligez $ +| $Id: m68k.S 12800 2012-07-30 18:59:07Z doligez $ | call_gen_code is used with the following types: | unit -> int @@ -19,7 +19,7 @@ | int * int * address -> void | int * int -> void | unit -> unit -| Hence arg1 -> d0, arg2 -> d1, arg3 -> a0, +| Hence arg1 -> d0, arg2 -> d1, arg3 -> a0, | and we need a special case for int -> double .text diff --git a/testsuite/tests/asmcomp/main.ml b/testsuite/tests/asmcomp/main.ml index 607a9b18..b454a030 100644 --- a/testsuite/tests/asmcomp/main.ml +++ b/testsuite/tests/asmcomp/main.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: main.ml 11156 2011-07-27 14:17:02Z doligez $ *) +(* $Id: main.ml 12800 2012-07-30 18:59:07Z doligez $ *) open Clflags @@ -57,4 +57,3 @@ let main() = ] compile_file usage let _ = (*Printexc.catch*) main (); exit 0 - diff --git a/testsuite/tests/asmcomp/mainarith.c b/testsuite/tests/asmcomp/mainarith.c index e1b7ded4..77b13473 100644 --- a/testsuite/tests/asmcomp/mainarith.c +++ b/testsuite/tests/asmcomp/mainarith.c @@ -10,7 +10,7 @@ /* */ /***********************************************************************/ -/* $Id: mainarith.c 11156 2011-07-27 14:17:02Z doligez $ */ +/* $Id: mainarith.c 12800 2012-07-30 18:59:07Z doligez $ */ #include #include @@ -304,4 +304,3 @@ int main(int argc, char **argv) } return 0; } - diff --git a/testsuite/tests/asmcomp/parsecmm.mly b/testsuite/tests/asmcomp/parsecmm.mly index 70337e25..666ef86d 100644 --- a/testsuite/tests/asmcomp/parsecmm.mly +++ b/testsuite/tests/asmcomp/parsecmm.mly @@ -10,7 +10,7 @@ /* */ /***********************************************************************/ -/* $Id: parsecmm.mly 12235 2012-03-14 09:24:19Z xleroy $ */ +/* $Id: parsecmm.mly 12800 2012-07-30 18:59:07Z doligez $ */ /* A simple parser for C-- */ @@ -325,4 +325,3 @@ dataitem: | SKIP INTCONST { Cskip $2 } | ALIGN INTCONST { Calign $2 } ; - diff --git a/testsuite/tests/asmcomp/tagged-fib.cmm b/testsuite/tests/asmcomp/tagged-fib.cmm index 6f3501e2..ece00ec3 100644 --- a/testsuite/tests/asmcomp/tagged-fib.cmm +++ b/testsuite/tests/asmcomp/tagged-fib.cmm @@ -10,10 +10,9 @@ (* *) (***********************************************************************) -(* $Id: tagged-fib.cmm 11156 2011-07-27 14:17:02Z doligez $ *) +(* $Id: tagged-fib.cmm 12800 2012-07-30 18:59:07Z doligez $ *) (function "fib" (n: int) (if (< n 5) 3 (- (+ (app "fib" (- n 2) int) (app "fib" (- n 4) int)) 1))) - diff --git a/testsuite/tests/asmcomp/tagged-integr.cmm b/testsuite/tests/asmcomp/tagged-integr.cmm index d03b00a8..1a92e8f9 100644 --- a/testsuite/tests/asmcomp/tagged-integr.cmm +++ b/testsuite/tests/asmcomp/tagged-integr.cmm @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: tagged-integr.cmm 11156 2011-07-27 14:17:02Z doligez $ *) +(* $Id: tagged-integr.cmm 12800 2012-07-30 18:59:07Z doligez $ *) ("res_square": skip 8) ("h": skip 8) @@ -42,4 +42,3 @@ (store float "low" 0.0) (store float "hi" 1.0) (load float (app "integr" "square" "low" "hi" n addr))) - diff --git a/testsuite/tests/basic-float/tfloat_record.ml b/testsuite/tests/basic-float/tfloat_record.ml index 4d197f5d..996640a0 100644 --- a/testsuite/tests/basic-float/tfloat_record.ml +++ b/testsuite/tests/basic-float/tfloat_record.ml @@ -2,4 +2,3 @@ let s = { Float_record.f = Float_record.make 1.0 };; print_float (Float_record.from s.Float_record.f);; print_newline ();; - diff --git a/testsuite/tests/basic-more/bounds.ml b/testsuite/tests/basic-more/bounds.ml index 7fe52a1f..edaa0c8a 100644 --- a/testsuite/tests/basic-more/bounds.ml +++ b/testsuite/tests/basic-more/bounds.ml @@ -24,5 +24,3 @@ let _ = print_string "Trail:"; List.iter (fun n -> print_string " "; print_int n) !trail; print_newline() - - diff --git a/testsuite/tests/basic-more/morematch.ml b/testsuite/tests/basic-more/morematch.ml index e45234d0..05bfea5e 100644 --- a/testsuite/tests/basic-more/morematch.ml +++ b/testsuite/tests/basic-more/morematch.ml @@ -51,13 +51,13 @@ test "deux" g 6 5 ; test "deux" g 9 7 ; () ;; - + let g x = match x with 1 -> 1 | 2 -> 2 | 3 -> 3 | 4 | 5 -> 4 -| 6 -> 5 +| 6 -> 5 | 7 | 8 -> 6 | 9 -> 7 | _ -> 8;; @@ -70,7 +70,7 @@ let g x= match x with | 2 -> 2 | 3 -> 3 | 4 | 5 -> 4 -| 6 -> 5 +| 6 -> 5 | 4|5|7 -> 100 | 7 | 8 -> 6 | 9 -> 7 @@ -251,7 +251,7 @@ test "fin" f (D (C,1)) (D (A,1)) ; test "fin" f (E (C,A)) (D (A,0)) ; () ;; -type length = +type length = Char of int | Pixel of int | Percent of int | No of string | Default let length = function @@ -550,7 +550,7 @@ test "flatgarde" flatgarde (2,4) 3 ; () (* Les bugs de jerome *) type f = - | ABSENT + | ABSENT | FILE | SYMLINK | DIRECTORY @@ -584,27 +584,27 @@ let replicaContent2shortString rc = ;; -test "jerome_constr" +test "jerome_constr" replicaContent2shortString (ABSENT, Unchanged) " " ; -test "jerome_constr" +test "jerome_constr" replicaContent2shortString (ABSENT, Deleted) "deleted " ; -test "jerome_constr" +test "jerome_constr" replicaContent2shortString (FILE, Modified) "changed " ; -test "jerome_constr" +test "jerome_constr" replicaContent2shortString (DIRECTORY, PropsChanged) "props " ; -test "jerome_constr" +test "jerome_constr" replicaContent2shortString (FILE, Deleted) "assert false" ; -test "jerome_constr" +test "jerome_constr" replicaContent2shortString (SYMLINK, Deleted) "assert false" ; -test "jerome_constr" +test "jerome_constr" replicaContent2shortString (SYMLINK, PropsChanged) "assert false" ; -test "jerome_constr" +test "jerome_constr" replicaContent2shortString (DIRECTORY, Deleted) "assert false" ; -test "jerome_constr" +test "jerome_constr" replicaContent2shortString (ABSENT, Created) "assert false" ; -test "jerome_constr" +test "jerome_constr" replicaContent2shortString (ABSENT, Modified) "assert false" ; -test "jerome_constr" +test "jerome_constr" replicaContent2shortString (ABSENT, PropsChanged) "assert false" ; ;; @@ -631,27 +631,27 @@ let replicaContent2shortString rc = ;; -test "jerome_variant" +test "jerome_variant" replicaContent2shortString (`ABSENT, `Unchanged) " " ; -test "jerome_variant" +test "jerome_variant" replicaContent2shortString (`ABSENT, `Deleted) "deleted " ; -test "jerome_variant" +test "jerome_variant" replicaContent2shortString (`FILE, `Modified) "changed " ; -test "jerome_variant" +test "jerome_variant" replicaContent2shortString (`DIRECTORY, `PropsChanged) "props " ; -test "jerome_variant" +test "jerome_variant" replicaContent2shortString (`FILE, `Deleted) "assert false" ; -test "jerome_variant" +test "jerome_variant" replicaContent2shortString (`SYMLINK, `Deleted) "assert false" ; -test "jerome_variant" +test "jerome_variant" replicaContent2shortString (`SYMLINK, `PropsChanged) "assert false" ; -test "jerome_variant" +test "jerome_variant" replicaContent2shortString (`DIRECTORY, `Deleted) "assert false" ; -test "jerome_variant" +test "jerome_variant" replicaContent2shortString (`ABSENT, `Created) "assert false" ; -test "jerome_variant" +test "jerome_variant" replicaContent2shortString (`ABSENT, `Modified) "assert false" ; -test "jerome_variant" +test "jerome_variant" replicaContent2shortString (`ABSENT, `PropsChanged) "assert false" ; ;; @@ -972,10 +972,10 @@ match n with type habert_a= | A of habert_c | B of habert_c - -and habert_c= {lvar:int; lassoc: habert_c;lnb:int} - - + +and habert_c= {lvar:int; lassoc: habert_c;lnb:int} + + let habert=function | (A {lnb=i}|B {lnb=i}) when i=0 -> 1 | A {lassoc=({lnb=j});lnb=i} -> 2 @@ -1000,13 +1000,13 @@ type type_expr = [ | `TVariant of string list | `TBlock of int | `TCopy of type_expr - ] + ] and recurs_type_expr = [ | `TTuple of type_expr list | `TConstr of type_expr list | `TVariant of string list - ] + ] let rec maf te = @@ -1129,7 +1129,7 @@ type bg = [ | `False | `True ] - + type vg = [ | `A | `B @@ -1142,7 +1142,7 @@ type tg = { x : bg; } -let predg x = true +let predg x = true let rec gilles o = match o with | {v = (`U data | `V data); x = `False} when predg o -> 1 @@ -1168,3 +1168,22 @@ let () = test "lucexn1" lucexn (Error "coucou") "coucou" ; test "lucexn2" lucexn (Found ("int: ",0)) "int: 0" ; () + +(* + PR#5758: different representations of floats +*) + +let pr5758 x str = + match (x, str) with + | (1. , "A") -> "Matched A" + | (1.0, "B") -> "Matched B" + | (1. , "C") -> "Matched C" + | result -> + match result with + | (1., "A") -> "Failed match A then later matched" + | _ -> "Failed twice" +;; + +let () = + test "pr5758" (pr5758 1.) "A" "Matched A" +;; diff --git a/testsuite/tests/basic-more/tbuffer.ml b/testsuite/tests/basic-more/tbuffer.ml index d48268db..b8348575 100644 --- a/testsuite/tests/basic-more/tbuffer.ml +++ b/testsuite/tests/basic-more/tbuffer.ml @@ -24,4 +24,3 @@ Buffer.clear b; Buffer.add_substitute b identity pat1; test (String.length (Buffer.contents b) = n1) ;; - diff --git a/testsuite/tests/basic-more/tbuffer.reference b/testsuite/tests/basic-more/tbuffer.reference index e41ae649..f0f68347 100644 --- a/testsuite/tests/basic-more/tbuffer.reference +++ b/testsuite/tests/basic-more/tbuffer.reference @@ -1,2 +1,2 @@ -0 1 + 0 1 All tests succeeded. diff --git a/testsuite/tests/basic-more/testrandom.ml b/testsuite/tests/basic-more/testrandom.ml index af0e3a2f..8a7ab475 100644 --- a/testsuite/tests/basic-more/testrandom.ml +++ b/testsuite/tests/basic-more/testrandom.ml @@ -2,11 +2,11 @@ open Random let _ = for i = 0 to 20 do - print_int (int 1000); print_char ' ' + print_char ' '; print_int (int 1000); done; print_newline (); print_newline (); for i = 0 to 20 do - print_float (float 1000.); print_char ' ' + print_char ' '; print_float (float 1000.); done let _ = exit 0 diff --git a/testsuite/tests/basic-more/testrandom.reference b/testsuite/tests/basic-more/testrandom.reference index 366e682c..943addd1 100644 --- a/testsuite/tests/basic-more/testrandom.reference +++ b/testsuite/tests/basic-more/testrandom.reference @@ -1,4 +1,4 @@ -344 685 182 641 439 500 104 20 921 370 217 885 949 678 615 412 401 606 428 869 289 + 344 685 182 641 439 500 104 20 921 370 217 885 949 678 615 412 401 606 428 869 289 -122.128067547 461.324792129 360.006556146 768.75882284 396.500946942 190.217751234 567.660068681 403.59226778 59.8488223602 363.816246826 764.705761642 172.627051105 481.861849093 399.173195422 629.424106752 391.547032203 676.701133948 174.382120878 994.425675487 585.00027757 34.3270777955 + 122.128067547 461.324792129 360.006556146 768.75882284 396.500946942 190.217751234 567.660068681 403.59226778 59.8488223602 363.816246826 764.705761642 172.627051105 481.861849093 399.173195422 629.424106752 391.547032203 676.701133948 174.382120878 994.425675487 585.00027757 34.3270777955 All tests succeeded. diff --git a/testsuite/tests/basic-more/tformat.reference b/testsuite/tests/basic-more/tformat.reference index 11742326..819c5ba6 100644 --- a/testsuite/tests/basic-more/tformat.reference +++ b/testsuite/tests/basic-more/tformat.reference @@ -1,2 +1,2 @@ -0 + 0 All tests succeeded. diff --git a/testsuite/tests/basic-more/tprintf.ml b/testsuite/tests/basic-more/tprintf.ml index 518859da..8bbc9f71 100644 --- a/testsuite/tests/basic-more/tprintf.ml +++ b/testsuite/tests/basic-more/tprintf.ml @@ -42,7 +42,7 @@ test (test1 ());; let test2 () = true (* sprintf "%1$d\n" 5 1 = " 1\n" && sprintf "%01$d\n" 5 1 = "00001\n" *);; - + test (test2 ());; (* Testing meta format string printing. *) diff --git a/testsuite/tests/basic-more/tprintf.reference b/testsuite/tests/basic-more/tprintf.reference index d804a0b8..1fb209d4 100644 --- a/testsuite/tests/basic-more/tprintf.reference +++ b/testsuite/tests/basic-more/tprintf.reference @@ -1,2 +1,2 @@ -0 1 2 3 4 5 + 0 1 2 3 4 5 All tests succeeded. diff --git a/testsuite/tests/basic/arrays.ml b/testsuite/tests/basic/arrays.ml index 8dcf1166..a25e4ccd 100644 --- a/testsuite/tests/basic/arrays.ml +++ b/testsuite/tests/basic/arrays.ml @@ -110,6 +110,17 @@ let test7 () = if a <> [|"a"; "a"; "a"; "a"; "a"; "b1"; "b1"; "b2"; "b3"; "a"|] then print_string "Test7: failed(2)\n" +let test8 () = + (try + ignore (Array.sub [||] 0 1); print_string "Test 8.1: failed\n" + with Invalid_argument _ -> ()); + (try + ignore (Array.sub [|3;4|] 1 (-1)); print_string "Test 8.2: failed\n" + with Invalid_argument _ -> ()); + (try + ignore (Array.sub [|3;4|] max_int 1); print_string "Test 8.3: failed\n" + with Invalid_argument _ -> ()) + let _ = test1(); test2(); @@ -118,4 +129,5 @@ let _ = test5(); test6(); test7(); + test8(); exit 0 diff --git a/testsuite/tests/basic/boxedints.ml b/testsuite/tests/basic/boxedints.ml index 6dd1773d..a84e65de 100644 --- a/testsuite/tests/basic/boxedints.ml +++ b/testsuite/tests/basic/boxedints.ml @@ -28,30 +28,30 @@ let test test_number answer correct_answer = module type TESTSIG = sig type t module Ops : sig - val neg: t -> t - val add: t -> t -> t - val sub: t -> t -> t - val mul: t -> t -> t - val div: t -> t -> t - val rem: t -> t -> t - val logand: t -> t -> t - val logor: t -> t -> t - val logxor: t -> t -> t - val shift_left: t -> int -> t - val shift_right: t -> int -> t - val shift_right_logical: t -> int -> t - val of_int: int -> t - val to_int: t -> int - val of_float: float -> t + val neg: t -> t + val add: t -> t -> t + val sub: t -> t -> t + val mul: t -> t -> t + val div: t -> t -> t + val rem: t -> t -> t + val logand: t -> t -> t + val logor: t -> t -> t + val logxor: t -> t -> t + val shift_left: t -> int -> t + val shift_right: t -> int -> t + val shift_right_logical: t -> int -> t + val of_int: int -> t + val to_int: t -> int + val of_float: float -> t val to_float: t -> float val zero: t val one: t val minus_one: t val min_int: t val max_int: t - val format : string -> t -> string + val format : string -> t -> string val to_string: t -> string - val of_string: string -> t + val of_string: string -> t end val testcomp: t -> t -> bool*bool*bool*bool*bool*bool*int val skip_float_tests: bool @@ -347,7 +347,7 @@ struct test 5 (add (of_int (-123)) (of_int 456)) (of_int 333); test 6 (add (of_int 123) (of_int (-456))) (of_int (-333)); test 7 (add (of_int (-123)) (of_int (-456))) (of_int (-579)); - test 8 (add (of_string "0x1234567812345678") + test 8 (add (of_string "0x1234567812345678") (of_string "0x9ABCDEF09ABCDEF")) (of_string "0x1be024671be02467"); test 9 (add max_int max_int) (of_int (-2)); @@ -364,7 +364,7 @@ struct test 5 (sub (of_int (-123)) (of_int 456)) (of_int (-579)); test 6 (sub (of_int 123) (of_int (-456))) (of_int 579); test 7 (sub (of_int (-123)) (of_int (-456))) (of_int 333); - test 8 (sub (of_string "0x1234567812345678") + test 8 (sub (of_string "0x1234567812345678") (of_string "0x9ABCDEF09ABCDEF")) (of_string "0x888888908888889"); test 9 (sub max_int min_int) minus_one; @@ -528,7 +528,7 @@ let _ = begin match Sys.word_size with 32 -> let module C = - Test32(struct type t = nativeint + Test32(struct type t = nativeint module Ops = Nativeint let testcomp = testcomp_nativeint let skip_float_tests = true end) @@ -537,7 +537,7 @@ let _ = let module C = Test64(struct type t = nativeint module Ops = Nativeint - let testcomp = testcomp_nativeint + let testcomp = testcomp_nativeint let skip_float_tests = true end) in () | _ -> diff --git a/testsuite/tests/basic/equality.ml b/testsuite/tests/basic/equality.ml index f69120c9..ebf5cf43 100644 --- a/testsuite/tests/basic/equality.ml +++ b/testsuite/tests/basic/equality.ml @@ -102,4 +102,3 @@ let _ = test 53 eqtrue (testcmpfloat 0.0 0.0); test 54 eqtrue (testcmpfloat 1.0 0.0); test 55 eqtrue (testcmpfloat 0.0 1.0) - diff --git a/testsuite/tests/basic/includestruct.ml b/testsuite/tests/basic/includestruct.ml index 182272c1..15708bf9 100644 --- a/testsuite/tests/basic/includestruct.ml +++ b/testsuite/tests/basic/includestruct.ml @@ -65,7 +65,7 @@ module D = include F(struct end) let test() = print_t A; print_newline(); print_t (B 42); print_newline() end - + let _ = D.test(); D.print_t D.A; print_newline(); D.print_t (D.B 42); print_newline() @@ -89,4 +89,3 @@ module G = let _ = begin try raise (G.Exn "foo") with G.Exn s -> print_string s end; print_int ((new G.c)#m); print_newline() - diff --git a/testsuite/tests/basic/maps.ml b/testsuite/tests/basic/maps.ml index 932ecbe7..deb86c43 100644 --- a/testsuite/tests/basic/maps.ml +++ b/testsuite/tests/basic/maps.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: maps.ml 11156 2011-07-27 14:17:02Z doligez $ *) +(* $Id: maps.ml 12800 2012-07-30 18:59:07Z doligez $ *) module IntMap = Map.Make(struct type t = int let compare x y = x-y end) @@ -25,4 +25,3 @@ let () = print_endline "Inter"; show (IntMap.merge (fun _ l r -> match l, r with Some x, Some y when x = y -> Some x | _ -> None) m1 m2); () - diff --git a/testsuite/tests/basic/patmatch.ml b/testsuite/tests/basic/patmatch.ml index 1cc37c1c..64e56174 100644 --- a/testsuite/tests/basic/patmatch.ml +++ b/testsuite/tests/basic/patmatch.ml @@ -91,7 +91,7 @@ let _ = done; for i = 0 to 255 do let c = Char.chr i in - printf "k(%s) = %s\t" (escaped c) (k c) + printf "\tk(%s) = %s" (escaped c) (k c) done; printf "\n"; printf "p([|\"hello\"|]) = %s\n" (p [|"hello"|]); @@ -103,6 +103,3 @@ let _ = printf "l([|2;3|]) = %d\n" (l [|2;3|]); printf "l([|4;5;6|]) = %d\n" (l [|4;5;6|]); exit 0 - - - diff --git a/testsuite/tests/basic/patmatch.reference b/testsuite/tests/basic/patmatch.reference index eb7dc978..125c466f 100644 --- a/testsuite/tests/basic/patmatch.reference +++ b/testsuite/tests/basic/patmatch.reference @@ -57,7 +57,7 @@ h({) = ? h(|) = ? h(}) = ? h(~) = ? -k(\000) = othr k(\001) = othr k(\002) = othr k(\003) = othr k(\004) = othr k(\005) = othr k(\006) = othr k(\007) = othr k(\b) = othr k(\t) = blk k(\n) = blk k(\011) = othr k(\012) = othr k(\r) = blk k(\014) = othr k(\015) = othr k(\016) = othr k(\017) = othr k(\018) = othr k(\019) = othr k(\020) = othr k(\021) = othr k(\022) = othr k(\023) = othr k(\024) = othr k(\025) = othr k(\026) = othr k(\027) = othr k(\028) = othr k(\029) = othr k(\030) = othr k(\031) = othr k( ) = blk k(!) = oper k(\034) = othr k(#) = oper k($) = oper k(%) = oper k(&) = oper k(\') = othr k(\040) = othr k(\041) = othr k(*) = oper k(+) = oper k(\044) = othr k(\045) = othr k(\046) = othr k(/) = oper k(0) = dig k(1) = dig k(2) = dig k(3) = dig k(4) = dig k(5) = dig k(6) = dig k(7) = dig k(8) = dig k(9) = dig k(:) = oper k(\059) = othr k(<) = oper k(=) = oper k(>) = oper k(?) = oper k(@) = oper k(A) = letr k(B) = letr k(C) = letr k(D) = letr k(E) = letr k(F) = letr k(G) = letr k(H) = letr k(I) = letr k(J) = letr k(K) = letr k(L) = letr k(M) = letr k(N) = letr k(O) = letr k(P) = letr k(Q) = letr k(R) = letr k(S) = letr k(T) = letr k(U) = letr k(V) = letr k(W) = letr k(X) = letr k(Y) = letr k(Z) = letr k(\091) = othr k(\\) = oper k(\093) = othr k(^) = oper k(\095) = othr k(\096) = othr k(a) = letr k(b) = letr k(c) = letr k(d) = letr k(e) = letr k(f) = letr k(g) = letr k(h) = letr k(i) = letr k(j) = letr k(k) = letr k(l) = letr k(m) = letr k(n) = letr k(o) = letr k(p) = letr k(q) = letr k(r) = letr k(s) = letr k(t) = letr k(u) = letr k(v) = letr k(w) = letr k(x) = letr k(y) = letr k(z) = letr k(\123) = othr k(|) = oper k(\125) = othr k(~) = oper k(\127) = othr k(\128) = othr k(\129) = othr k(\130) = othr k(\131) = othr k(\132) = othr k(\133) = othr k(\134) = othr k(\135) = othr k(\136) = othr k(\137) = othr k(\138) = othr k(\139) = othr k(\140) = othr k(\141) = othr k(\142) = othr k(\143) = othr k(\144) = othr k(\145) = othr k(\146) = othr k(\147) = othr k(\148) = othr k(\149) = othr k(\150) = othr k(\151) = othr k(\152) = othr k(\153) = othr k(\154) = othr k(\155) = othr k(\156) = othr k(\157) = othr k(\158) = othr k(\159) = othr k(\160) = othr k(\161) = othr k(\162) = othr k(\163) = othr k(\164) = othr k(\165) = othr k(\166) = othr k(\167) = othr k(\168) = othr k(\169) = othr k(\170) = othr k(\171) = othr k(\172) = othr k(\173) = othr k(\174) = othr k(\175) = othr k(\176) = othr k(\177) = othr k(\178) = othr k(\179) = othr k(\180) = othr k(\181) = othr k(\182) = othr k(\183) = othr k(\184) = othr k(\185) = othr k(\186) = othr k(\187) = othr k(\188) = othr k(\189) = othr k(\190) = othr k(\191) = othr k(\192) = letr k(\193) = letr k(\194) = letr k(\195) = letr k(\196) = letr k(\197) = letr k(\198) = letr k(\199) = letr k(\200) = letr k(\201) = letr k(\202) = letr k(\203) = letr k(\204) = letr k(\205) = letr k(\206) = letr k(\207) = letr k(\208) = letr k(\209) = letr k(\210) = letr k(\211) = letr k(\212) = letr k(\213) = letr k(\214) = letr k(\215) = letr k(\216) = letr k(\217) = letr k(\218) = letr k(\219) = letr k(\220) = letr k(\221) = letr k(\222) = letr k(\223) = letr k(\224) = letr k(\225) = letr k(\226) = letr k(\227) = letr k(\228) = letr k(\229) = letr k(\230) = letr k(\231) = letr k(\232) = letr k(\233) = letr k(\234) = letr k(\235) = letr k(\236) = letr k(\237) = letr k(\238) = letr k(\239) = letr k(\240) = letr k(\241) = letr k(\242) = letr k(\243) = letr k(\244) = letr k(\245) = letr k(\246) = letr k(\247) = letr k(\248) = letr k(\249) = letr k(\250) = letr k(\251) = letr k(\252) = letr k(\253) = letr k(\254) = letr k(\255) = letr + k(\000) = othr k(\001) = othr k(\002) = othr k(\003) = othr k(\004) = othr k(\005) = othr k(\006) = othr k(\007) = othr k(\b) = othr k(\t) = blk k(\n) = blk k(\011) = othr k(\012) = othr k(\r) = blk k(\014) = othr k(\015) = othr k(\016) = othr k(\017) = othr k(\018) = othr k(\019) = othr k(\020) = othr k(\021) = othr k(\022) = othr k(\023) = othr k(\024) = othr k(\025) = othr k(\026) = othr k(\027) = othr k(\028) = othr k(\029) = othr k(\030) = othr k(\031) = othr k( ) = blk k(!) = oper k(\034) = othr k(#) = oper k($) = oper k(%) = oper k(&) = oper k(\') = othr k(\040) = othr k(\041) = othr k(*) = oper k(+) = oper k(\044) = othr k(\045) = othr k(\046) = othr k(/) = oper k(0) = dig k(1) = dig k(2) = dig k(3) = dig k(4) = dig k(5) = dig k(6) = dig k(7) = dig k(8) = dig k(9) = dig k(:) = oper k(\059) = othr k(<) = oper k(=) = oper k(>) = oper k(?) = oper k(@) = oper k(A) = letr k(B) = letr k(C) = letr k(D) = letr k(E) = letr k(F) = letr k(G) = letr k(H) = letr k(I) = letr k(J) = letr k(K) = letr k(L) = letr k(M) = letr k(N) = letr k(O) = letr k(P) = letr k(Q) = letr k(R) = letr k(S) = letr k(T) = letr k(U) = letr k(V) = letr k(W) = letr k(X) = letr k(Y) = letr k(Z) = letr k(\091) = othr k(\\) = oper k(\093) = othr k(^) = oper k(\095) = othr k(\096) = othr k(a) = letr k(b) = letr k(c) = letr k(d) = letr k(e) = letr k(f) = letr k(g) = letr k(h) = letr k(i) = letr k(j) = letr k(k) = letr k(l) = letr k(m) = letr k(n) = letr k(o) = letr k(p) = letr k(q) = letr k(r) = letr k(s) = letr k(t) = letr k(u) = letr k(v) = letr k(w) = letr k(x) = letr k(y) = letr k(z) = letr k(\123) = othr k(|) = oper k(\125) = othr k(~) = oper k(\127) = othr k(\128) = othr k(\129) = othr k(\130) = othr k(\131) = othr k(\132) = othr k(\133) = othr k(\134) = othr k(\135) = othr k(\136) = othr k(\137) = othr k(\138) = othr k(\139) = othr k(\140) = othr k(\141) = othr k(\142) = othr k(\143) = othr k(\144) = othr k(\145) = othr k(\146) = othr k(\147) = othr k(\148) = othr k(\149) = othr k(\150) = othr k(\151) = othr k(\152) = othr k(\153) = othr k(\154) = othr k(\155) = othr k(\156) = othr k(\157) = othr k(\158) = othr k(\159) = othr k(\160) = othr k(\161) = othr k(\162) = othr k(\163) = othr k(\164) = othr k(\165) = othr k(\166) = othr k(\167) = othr k(\168) = othr k(\169) = othr k(\170) = othr k(\171) = othr k(\172) = othr k(\173) = othr k(\174) = othr k(\175) = othr k(\176) = othr k(\177) = othr k(\178) = othr k(\179) = othr k(\180) = othr k(\181) = othr k(\182) = othr k(\183) = othr k(\184) = othr k(\185) = othr k(\186) = othr k(\187) = othr k(\188) = othr k(\189) = othr k(\190) = othr k(\191) = othr k(\192) = letr k(\193) = letr k(\194) = letr k(\195) = letr k(\196) = letr k(\197) = letr k(\198) = letr k(\199) = letr k(\200) = letr k(\201) = letr k(\202) = letr k(\203) = letr k(\204) = letr k(\205) = letr k(\206) = letr k(\207) = letr k(\208) = letr k(\209) = letr k(\210) = letr k(\211) = letr k(\212) = letr k(\213) = letr k(\214) = letr k(\215) = letr k(\216) = letr k(\217) = letr k(\218) = letr k(\219) = letr k(\220) = letr k(\221) = letr k(\222) = letr k(\223) = letr k(\224) = letr k(\225) = letr k(\226) = letr k(\227) = letr k(\228) = letr k(\229) = letr k(\230) = letr k(\231) = letr k(\232) = letr k(\233) = letr k(\234) = letr k(\235) = letr k(\236) = letr k(\237) = letr k(\238) = letr k(\239) = letr k(\240) = letr k(\241) = letr k(\242) = letr k(\243) = letr k(\244) = letr k(\245) = letr k(\246) = letr k(\247) = letr k(\248) = letr k(\249) = letr k(\250) = letr k(\251) = letr k(\252) = letr k(\253) = letr k(\254) = letr k(\255) = letr p([|"hello"|]) = hello p([|1.0|]) = 1.000000 q([|2|]) = 2 diff --git a/testsuite/tests/basic/recvalues.ml b/testsuite/tests/basic/recvalues.ml index c00ced82..df32f5e7 100644 --- a/testsuite/tests/basic/recvalues.ml +++ b/testsuite/tests/basic/recvalues.ml @@ -8,7 +8,7 @@ let _ = then print_string "Test 1: passed\n" else print_string "Test 1: FAILED\n"; let one = 1 in - let rec y = (one, one+1) :: y in + let rec y = (one, one+1) :: y in if match y with (1,2) :: y' -> y == y' | _ -> false diff --git a/testsuite/tests/basic/tailcalls.ml b/testsuite/tests/basic/tailcalls.ml index 23b73535..7e37ea71 100644 --- a/testsuite/tests/basic/tailcalls.ml +++ b/testsuite/tests/basic/tailcalls.ml @@ -18,7 +18,7 @@ let indtailcall8 fn a b c d e f g h = fn a b c d e f g h let indtailcall16 fn a b c d e f g h i j k l m n o p = - fn a b c d e f g h i j k l m n o p + fn a b c d e f g h i j k l m n o p let _ = print_int (tailcall4 10000000 0 0 0); print_newline(); diff --git a/testsuite/tests/callback/Makefile b/testsuite/tests/callback/Makefile index a8905668..0db946a1 100644 --- a/testsuite/tests/callback/Makefile +++ b/testsuite/tests/callback/Makefile @@ -12,7 +12,7 @@ run-byte: common @$(OCAMLC) -c tcallback.ml @$(OCAMLC) -o ./program -custom unix.cma callbackprim.$(O) tcallback.cmo @./program > bytecode.result - @$(DIFF) reference bytecode.result || (echo " => failed" && exit 1) + @$(DIFF) reference bytecode.result || (echo " => failed" && exit 1) @echo " => passed" run-opt: common @@ -24,7 +24,7 @@ run-opt: common $(DIFF) reference native.result || (echo " => failed" && exit 1); \ echo " => passed"; \ fi - + promote: defaultpromote clean: defaultclean diff --git a/testsuite/tests/callback/tcallback.ml b/testsuite/tests/callback/tcallback.ml index 32914119..e0f66fe5 100644 --- a/testsuite/tests/callback/tcallback.ml +++ b/testsuite/tests/callback/tcallback.ml @@ -65,4 +65,3 @@ let _ = print_string(tripwire mycamlparam); print_newline(); Sys.set_signal Sys.sigusr1 (Sys.Signal_handle sighandler); print_string(callbacksig ()); print_newline() - diff --git a/testsuite/tests/embedded/Makefile b/testsuite/tests/embedded/Makefile index ed331434..ec2308dd 100644 --- a/testsuite/tests/embedded/Makefile +++ b/testsuite/tests/embedded/Makefile @@ -13,7 +13,7 @@ run: @./program > program.result @$(DIFF) program.reference program.result > /dev/null || (echo " => failed" && exit 1) @echo " => passed" - + promote: defaultpromote clean: defaultclean diff --git a/testsuite/tests/gc-roots/globrootsprim.c b/testsuite/tests/gc-roots/globrootsprim.c index f58fff1c..32a61a7c 100644 --- a/testsuite/tests/gc-roots/globrootsprim.c +++ b/testsuite/tests/gc-roots/globrootsprim.c @@ -52,5 +52,3 @@ value gb_generational_remove(value vblock) caml_remove_generational_global_root(&(Block_val(vblock)->v)); return Val_unit; } - - diff --git a/testsuite/tests/lib-bigarray-2/bigarrf.f b/testsuite/tests/lib-bigarray-2/bigarrf.f index 5c2462c2..ff52de1d 100644 --- a/testsuite/tests/lib-bigarray-2/bigarrf.f +++ b/testsuite/tests/lib-bigarray-2/bigarrf.f @@ -24,4 +24,3 @@ 300 format(/1X, I3, 2X, 10F6.1/) 200 continue end - diff --git a/testsuite/tests/lib-bigarray-2/bigarrfml.ml b/testsuite/tests/lib-bigarray-2/bigarrfml.ml index c9156228..562cfc8a 100644 --- a/testsuite/tests/lib-bigarray-2/bigarrfml.ml +++ b/testsuite/tests/lib-bigarray-2/bigarrfml.ml @@ -60,4 +60,3 @@ let _ = test 2 a.{2,1} 201.0; test 3 a.{1,2} 102.0; test 4 a.{5,4} 504.0; - diff --git a/testsuite/tests/lib-bigarray-2/bigarrfstub.c b/testsuite/tests/lib-bigarray-2/bigarrfstub.c index 87bd67b7..be142f6a 100644 --- a/testsuite/tests/lib-bigarray-2/bigarrfstub.c +++ b/testsuite/tests/lib-bigarray-2/bigarrfstub.c @@ -57,4 +57,3 @@ value fortran_printtab(value ba) printtab_(Data_bigarray_val(ba), &dimx, &dimy); return Val_unit; } - diff --git a/testsuite/tests/lib-bigarray/bigarrays.ml b/testsuite/tests/lib-bigarray/bigarrays.ml index 85901400..9c790a1a 100644 --- a/testsuite/tests/lib-bigarray/bigarrays.ml +++ b/testsuite/tests/lib-bigarray/bigarrays.ml @@ -139,14 +139,14 @@ let _ = let from_list kind vals = let a = Array1.create kind c_layout (List.length vals) in let rec set i = function - [] -> () + [] -> () | hd :: tl -> a.{i} <- hd; set (i+1) tl in set 0 vals; a in let from_list_fortran kind vals = let a = Array1.create kind fortran_layout (List.length vals) in let rec set i = function - [] -> () + [] -> () | hd :: tl -> a.{i} <- hd; set (i+1) tl in set 1 vals; a in @@ -157,7 +157,7 @@ let _ = for i = 0 to 2 do test (i+1) a.{i} i done; test 4 true (try ignore a.{3}; false with Invalid_argument _ -> true); test 5 true (try ignore a.{-1}; false with Invalid_argument _ -> true); - + let b = Array1.create float64 fortran_layout 3 in for i = 1 to 3 do b.{i} <- float i done; for i = 1 to 3 do test (5 + i) b.{i} (float i) done; @@ -180,7 +180,7 @@ let _ = let a = Array1.create int c_layout 3 in for i = 0 to 2 do Array1.unsafe_set a i i done; for i = 0 to 2 do test (i+1) (Array1.unsafe_get a i) i done; - + let b = Array1.create float64 fortran_layout 3 in for i = 1 to 3 do Array1.unsafe_set b i (float i) done; for i = 1 to 3 do test (5 + i) (Array1.unsafe_get b i) (float i) done; @@ -459,7 +459,7 @@ let _ = test 3 true (try ignore a.{-1,0}; false with Invalid_argument _ -> true); test 4 true (try ignore a.{0,3}; false with Invalid_argument _ -> true); test 5 true (try ignore a.{0,-1}; false with Invalid_argument _ -> true); - + let b = Array2.create float32 fortran_layout 3 3 in for i = 1 to 3 do for j = 1 to 3 do b.{i,j} <- float(i-j) done done; let ok = ref true in @@ -480,7 +480,7 @@ let _ = for j = 0 to 2 do if Array2.unsafe_get a i j <> i-j then ok := false done done; test 1 true !ok; - + let b = Array2.create float32 fortran_layout 3 3 in for i = 1 to 3 do for j = 1 to 3 do Array2.unsafe_set b i j (float(i-j)) done done; let ok = ref true in @@ -611,7 +611,7 @@ let _ = if Int32.to_int a.{i,j,k} <> (i lsl 4) + (j lsl 2) + k then ok := false done done done; test 1 true !ok; - + let b = Array3.create int64 fortran_layout 2 3 4 in for i = 1 to 2 do for j = 1 to 3 do for k = 1 to 4 do b.{i,j,k} <- Int64.of_int((i lsl 4) + (j lsl 2) + k) @@ -764,7 +764,7 @@ let _ = Sys.remove mapped_file; () - + (********* End of test *********) let _ = diff --git a/testsuite/tests/lib-bigarray/fftba.ml b/testsuite/tests/lib-bigarray/fftba.ml index bd010e92..f9c62500 100644 --- a/testsuite/tests/lib-bigarray/fftba.ml +++ b/testsuite/tests/lib-bigarray/fftba.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: fftba.ml 11156 2011-07-27 14:17:02Z doligez $ *) +(* $Id: fftba.ml 12800 2012-07-30 18:59:07Z doligez $ *) open Bigarray @@ -22,17 +22,17 @@ let fft (px : (float, float64_elt, c_layout) Array1.t) (py : (float, float64_elt, c_layout) Array1.t) np = let i = ref 2 in let m = ref 1 in - + while (!i < np) do - i := !i + !i; + i := !i + !i; m := !m + 1 done; - let n = !i in - + let n = !i in + if n <> np then begin for i = np+1 to n do - px.{i} <- 0.0; + px.{i} <- 0.0; py.{i} <- 0.0 done; print_string "Use "; print_int n; @@ -41,7 +41,7 @@ let fft (px : (float, float64_elt, c_layout) Array1.t) let n2 = ref(n+n) in for k = 1 to !m-1 do - n2 := !n2 / 2; + n2 := !n2 / 2; let n4 = !n2 / 4 in let e = tpi /. float !n2 in @@ -54,7 +54,7 @@ let fft (px : (float, float64_elt, c_layout) Array1.t) let ss3 = sin(a3) in let is = ref j in let id = ref(2 * !n2) in - + while !is < n do let i0r = ref !is in while !i0r < n do @@ -74,13 +74,13 @@ let fft (px : (float, float64_elt, c_layout) Array1.t) let r1 = r1 +. s2 in let s2 = r2 -. s1 in let r2 = r2 +. s1 in - px.{i2} <- r1*.cc1 -. s2*.ss1; + px.{i2} <- r1*.cc1 -. s2*.ss1; py.{i2} <- -.s2*.cc1 -. r1*.ss1; px.{i3} <- s3*.cc3 +. r2*.ss3; py.{i3} <- r2*.cc3 -. s3*.ss3; i0r := i0 + !id done; - is := 2 * !id - !n2 + j; + is := 2 * !id - !n2 + j; id := 4 * !id done done @@ -92,7 +92,7 @@ let fft (px : (float, float64_elt, c_layout) Array1.t) let is = ref 1 in let id = ref 4 in - + while !is < n do let i0r = ref !is in while !i0r <= n do @@ -106,7 +106,7 @@ let fft (px : (float, float64_elt, c_layout) Array1.t) py.{i1} <- r1 -. py.{i1}; i0r := i0 + !id done; - is := 2 * !id - 1; + is := 2 * !id - 1; id := 4 * !id done; @@ -115,11 +115,11 @@ let fft (px : (float, float64_elt, c_layout) Array1.t) (*************************) let j = ref 1 in - + for i = 1 to n - 1 do if i < !j then begin let xt = px.{!j} in - px.{!j} <- px.{i}; + px.{!j} <- px.{i}; px.{i} <- xt; let xt = py.{!j} in py.{!j} <- py.{i}; @@ -127,7 +127,7 @@ let fft (px : (float, float64_elt, c_layout) Array1.t) end; let k = ref(n / 2) in while !k < !j do - j := !j - !k; + j := !j - !k; k := !k / 2 done; j := !j + !k @@ -173,12 +173,12 @@ let test np = for i = 0 to np-1 do let a = abs_float(pxr.{i+1} -. float i) in if !zr < a then begin - zr := a; + zr := a; kr := i end; let a = abs_float(pxi.{i+1}) in if !zi < a then begin - zi := a; + zi := a; ki := i end done; @@ -194,4 +194,3 @@ let test np = let _ = let np = ref 16 in for i = 1 to 13 do test !np; np := !np*2 done - diff --git a/testsuite/tests/lib-bigarray/pr5115.ml b/testsuite/tests/lib-bigarray/pr5115.ml index 69cdca64..e75215cf 100644 --- a/testsuite/tests/lib-bigarray/pr5115.ml +++ b/testsuite/tests/lib-bigarray/pr5115.ml @@ -10,4 +10,3 @@ let _ = let y = Array1.of_array float64 fortran_layout [| 1. |] in (f y).{1}; (f y).{1} <- 3.14 - diff --git a/testsuite/tests/lib-dynlink-bytecode/Makefile b/testsuite/tests/lib-dynlink-bytecode/Makefile index 53e9f469..089d17a5 100644 --- a/testsuite/tests/lib-dynlink-bytecode/Makefile +++ b/testsuite/tests/lib-dynlink-bytecode/Makefile @@ -32,7 +32,7 @@ run: @export LD_LIBRARY_PATH=`pwd` && ./custom > custom.result @$(DIFF) custom.reference custom.result > /dev/null || (echo " => failed" && exit 1) @echo " => passed" - + promote: defaultpromote clean: defaultclean diff --git a/testsuite/tests/lib-dynlink-bytecode/main.ml b/testsuite/tests/lib-dynlink-bytecode/main.ml index b7950428..725ee80c 100644 --- a/testsuite/tests/lib-dynlink-bytecode/main.ml +++ b/testsuite/tests/lib-dynlink-bytecode/main.ml @@ -8,17 +8,17 @@ let _ = for i = 1 to Array.length Sys.argv - 1 do let name = Sys.argv.(i) in Printf.printf "Loading %s\n" name; flush stdout; - try + try if name.[0] = '-' - then Dynlink.loadfile_private - (String.sub name 1 (String.length name - 1)) + then Dynlink.loadfile_private + (String.sub name 1 (String.length name - 1)) else Dynlink.loadfile name with | Dynlink.Error err -> - Printf.printf "Dynlink error: %s\n" - (Dynlink.error_message err) + Printf.printf "Dynlink error: %s\n" + (Dynlink.error_message err) | exn -> - Printf.printf "Error: %s\n" (Printexc.to_string exn) + Printf.printf "Error: %s\n" (Printexc.to_string exn) done; flush stdout; try diff --git a/testsuite/tests/lib-dynlink-csharp/main.ml b/testsuite/tests/lib-dynlink-csharp/main.ml index fd48914a..ad461882 100755 --- a/testsuite/tests/lib-dynlink-csharp/main.ml +++ b/testsuite/tests/lib-dynlink-csharp/main.ml @@ -17,7 +17,6 @@ let () = "../../../otherlibs/bigarray/bigarray.cma", "plugin.cmo" in - load s1; + load s1; load s2; print_endline "OK." - diff --git a/testsuite/tests/lib-dynlink-csharp/plugin.ml b/testsuite/tests/lib-dynlink-csharp/plugin.ml index 39c46f3a..aacf9f21 100755 --- a/testsuite/tests/lib-dynlink-csharp/plugin.ml +++ b/testsuite/tests/lib-dynlink-csharp/plugin.ml @@ -1,4 +1,4 @@ let f x = x.{2} - + let () = print_endline "I'm the plugin." diff --git a/testsuite/tests/lib-dynlink-native/api.ml b/testsuite/tests/lib-dynlink-native/api.ml index 304ee1f1..cd735abe 100644 --- a/testsuite/tests/lib-dynlink-native/api.ml +++ b/testsuite/tests/lib-dynlink-native/api.ml @@ -1,7 +1,7 @@ let mods = ref [] let reg_mod name = - if List.mem name !mods then + if List.mem name !mods then Printf.printf "Reloading module %s\n" name else ( mods := name :: !mods; diff --git a/testsuite/tests/lib-dynlink-native/b.ml b/testsuite/tests/lib-dynlink-native/b.ml index 58149e22..afa1bef0 100755 --- a/testsuite/tests/lib-dynlink-native/b.ml +++ b/testsuite/tests/lib-dynlink-native/b.ml @@ -2,4 +2,3 @@ let () = print_endline "B is running"; incr A.x; Printf.printf "A.x = %i\n" !A.x - diff --git a/testsuite/tests/lib-dynlink-native/bug.ml b/testsuite/tests/lib-dynlink-native/bug.ml index 02828378..31c0f025 100644 --- a/testsuite/tests/lib-dynlink-native/bug.ml +++ b/testsuite/tests/lib-dynlink-native/bug.ml @@ -1,2 +1,2 @@ -let () = try raise (Invalid_argument "X") with Invalid_argument s -> +let () = try raise (Invalid_argument "X") with Invalid_argument s -> raise (Invalid_argument (s ^ s)) diff --git a/testsuite/tests/lib-dynlink-native/main.ml b/testsuite/tests/lib-dynlink-native/main.ml index 04b3aef7..8c738aeb 100644 --- a/testsuite/tests/lib-dynlink-native/main.ml +++ b/testsuite/tests/lib-dynlink-native/main.ml @@ -7,17 +7,17 @@ let () = for i = 1 to Array.length Sys.argv - 1 do let name = Sys.argv.(i) in Printf.printf "Loading %s\n" name; flush stdout; - try + try if name.[0] = '-' - then Dynlink.loadfile_private - (String.sub name 1 (String.length name - 1)) + then Dynlink.loadfile_private + (String.sub name 1 (String.length name - 1)) else Dynlink.loadfile name with | Dynlink.Error err -> - Printf.printf "Dynlink error: %s\n" - (Dynlink.error_message err) + Printf.printf "Dynlink error: %s\n" + (Dynlink.error_message err) | exn -> - Printf.printf "Error: %s\n" (Printexc.to_string exn) + Printf.printf "Error: %s\n" (Printexc.to_string exn) done; flush stdout; try @@ -30,6 +30,3 @@ let () = List.iter (fun f -> f()) l with Failure s -> Printf.printf "Failure: %s\n" s - - - diff --git a/testsuite/tests/lib-dynlink-native/packed1.ml b/testsuite/tests/lib-dynlink-native/packed1.ml index 8f00e39d..2ee83633 100644 --- a/testsuite/tests/lib-dynlink-native/packed1.ml +++ b/testsuite/tests/lib-dynlink-native/packed1.ml @@ -3,4 +3,3 @@ let () = let bla = Sys.argv.(0) ^ "XXX" let mykey = Sys.argv.(0) - diff --git a/testsuite/tests/lib-dynlink-native/plugin.ml b/testsuite/tests/lib-dynlink-native/plugin.ml index f307b4f1..d9b0574f 100644 --- a/testsuite/tests/lib-dynlink-native/plugin.ml +++ b/testsuite/tests/lib-dynlink-native/plugin.ml @@ -7,5 +7,5 @@ let facts = [ fact 1; fact 2; fact 3; fact (Random.int 4) ] let () = Api.reg_mod "Plugin"; Api.add_cb (fun () -> print_endline "Callback from plugin"); - print_endline "COUCOU"; + print_endline "COUCOU"; () diff --git a/testsuite/tests/lib-dynlink-native/plugin4.ml b/testsuite/tests/lib-dynlink-native/plugin4.ml index ccf4642f..a9f86e60 100644 --- a/testsuite/tests/lib-dynlink-native/plugin4.ml +++ b/testsuite/tests/lib-dynlink-native/plugin4.ml @@ -1,5 +1,3 @@ let () = Printf.printf "time = %f\n" (Unix.time ()); Api.reg_mod "Plugin" - - diff --git a/testsuite/tests/lib-dynlink-native/plugin_ref.ml b/testsuite/tests/lib-dynlink-native/plugin_ref.ml index 06001241..60f12735 100644 --- a/testsuite/tests/lib-dynlink-native/plugin_ref.ml +++ b/testsuite/tests/lib-dynlink-native/plugin_ref.ml @@ -2,10 +2,9 @@ let x = ref 0 let () = Api.reg_mod "Plugin_ref"; - - Api.add_cb + + Api.add_cb (fun () -> Printf.printf "current value for ref = %i\n" !x; incr x ) - diff --git a/testsuite/tests/lib-dynlink-native/plugin_thread.ml b/testsuite/tests/lib-dynlink-native/plugin_thread.ml index a66b958f..6e3d9d48 100644 --- a/testsuite/tests/lib-dynlink-native/plugin_thread.ml +++ b/testsuite/tests/lib-dynlink-native/plugin_thread.ml @@ -1,21 +1,15 @@ let () = Api.reg_mod "Plugin_thread"; let _t = - Thread.create + Thread.create (fun () -> - for i = 1 to 5 do - print_endline "Thread"; flush stdout; - Thread.delay 1.; - done + for i = 1 to 5 do + print_endline "Thread"; flush stdout; + Thread.delay 1.; + done ) () in for i = 1 to 10 do print_endline "Thread"; flush stdout; Thread.delay 0.50; done - - - - - - diff --git a/testsuite/tests/lib-dynlink-native/sub/plugin.ml b/testsuite/tests/lib-dynlink-native/sub/plugin.ml index 2a41493c..d7faf9c8 100644 --- a/testsuite/tests/lib-dynlink-native/sub/plugin.ml +++ b/testsuite/tests/lib-dynlink-native/sub/plugin.ml @@ -4,4 +4,3 @@ let facts = [ fact 1; fact 2; fact 3; fact 4; fact 5 ] let () = Api.reg_mod "Plugin'" - diff --git a/testsuite/tests/lib-dynlink-native/sub/plugin3.ml b/testsuite/tests/lib-dynlink-native/sub/plugin3.ml index 7b0b099f..82c9e486 100644 --- a/testsuite/tests/lib-dynlink-native/sub/plugin3.ml +++ b/testsuite/tests/lib-dynlink-native/sub/plugin3.ml @@ -1,3 +1,2 @@ let () = ignore (Api.f 10) - diff --git a/testsuite/tests/lib-hashtbl/hfun.ml b/testsuite/tests/lib-hashtbl/hfun.ml index 5699587c..8b8205e7 100644 --- a/testsuite/tests/lib-hashtbl/hfun.ml +++ b/testsuite/tests/lib-hashtbl/hfun.ml @@ -39,12 +39,3 @@ let _ = printf "[10..0]\t\t%08x\n" (Hashtbl.hash [10;9;8;7;6;5;4;3;2;1;0]); () - - - - - - - - - diff --git a/testsuite/tests/lib-hashtbl/htbl.ml b/testsuite/tests/lib-hashtbl/htbl.ml index 6bed1fd5..f5815696 100644 --- a/testsuite/tests/lib-hashtbl/htbl.ml +++ b/testsuite/tests/lib-hashtbl/htbl.ml @@ -190,4 +190,3 @@ let _ = TSP.test (pair_data d); printf "-- Lists of strings\n%!"; TSL.test (list_data d) - diff --git a/testsuite/tests/lib-marshal/intext.ml b/testsuite/tests/lib-marshal/intext.ml index af59734b..80fe5b77 100644 --- a/testsuite/tests/lib-marshal/intext.ml +++ b/testsuite/tests/lib-marshal/intext.ml @@ -447,7 +447,7 @@ let test_deep () = test 426 (Marshal.from_string s 0 = x) (* Test for objects *) -class foo = object (self : 'self) +class foo = object (self : 'self) val data1 = "foo" val data2 = "bar" val data3 = 42L @@ -462,11 +462,11 @@ class bar = object (self : 'self) val! data2 = "test5" val data4 = "test3" val data5 = "test4" - method test1 = - data1 - ^ data2 - ^ data4 - ^ data5 + method test1 = + data1 + ^ data2 + ^ data4 + ^ data5 ^ Int64.to_string self#test4 end @@ -523,7 +523,7 @@ let test_infix () = test 605 (even' 41 = even 41); test 606 (even' 142 = true); test 607 (even' 142 = even 142) - + let main() = if Array.length Sys.argv <= 2 then begin test_out "intext.data"; test_in "intext.data"; diff --git a/testsuite/tests/lib-marshal/intextaux.c b/testsuite/tests/lib-marshal/intextaux.c index 9225b90b..fca1fb38 100644 --- a/testsuite/tests/lib-marshal/intextaux.c +++ b/testsuite/tests/lib-marshal/intextaux.c @@ -3,7 +3,7 @@ value marshal_to_block(value vbuf, value vlen, value v, value vflags) { - return Val_long(output_value_to_block(v, vflags, + return Val_long(output_value_to_block(v, vflags, (char *) vbuf, Long_val(vlen))); } diff --git a/testsuite/tests/lib-num/test_big_ints.ml b/testsuite/tests/lib-num/test_big_ints.ml index badc5216..9d726206 100644 --- a/testsuite/tests/lib-num/test_big_ints.ml +++ b/testsuite/tests/lib-num/test_big_ints.ml @@ -56,52 +56,52 @@ testing_function "add_big_int";; test 1 eq_big_int (add_big_int zero_big_int zero_big_int, zero_big_int);; test 2 -eq_big_int (add_big_int zero_big_int (big_int_of_int 1), +eq_big_int (add_big_int zero_big_int (big_int_of_int 1), big_int_of_int 1);; test 3 -eq_big_int (add_big_int (big_int_of_int 1) zero_big_int, +eq_big_int (add_big_int (big_int_of_int 1) zero_big_int, big_int_of_int 1);; test 4 -eq_big_int (add_big_int zero_big_int (big_int_of_int (-1)), +eq_big_int (add_big_int zero_big_int (big_int_of_int (-1)), big_int_of_int (-1));; test 5 -eq_big_int (add_big_int (big_int_of_int (-1)) zero_big_int, +eq_big_int (add_big_int (big_int_of_int (-1)) zero_big_int, big_int_of_int (-1));; test 6 -eq_big_int (add_big_int (big_int_of_int 1) (big_int_of_int 1), +eq_big_int (add_big_int (big_int_of_int 1) (big_int_of_int 1), big_int_of_int 2);; test 7 -eq_big_int (add_big_int (big_int_of_int 1) (big_int_of_int 2), +eq_big_int (add_big_int (big_int_of_int 1) (big_int_of_int 2), big_int_of_int 3);; test 8 -eq_big_int (add_big_int (big_int_of_int 2) (big_int_of_int 1), +eq_big_int (add_big_int (big_int_of_int 2) (big_int_of_int 1), big_int_of_int 3);; test 9 -eq_big_int (add_big_int (big_int_of_int (-1)) (big_int_of_int (-1)), +eq_big_int (add_big_int (big_int_of_int (-1)) (big_int_of_int (-1)), big_int_of_int (-2));; test 10 -eq_big_int (add_big_int (big_int_of_int (-1)) (big_int_of_int (-2)), +eq_big_int (add_big_int (big_int_of_int (-1)) (big_int_of_int (-2)), big_int_of_int (-3));; test 11 -eq_big_int (add_big_int (big_int_of_int (-2)) (big_int_of_int (-1)), +eq_big_int (add_big_int (big_int_of_int (-2)) (big_int_of_int (-1)), big_int_of_int (-3));; test 12 -eq_big_int (add_big_int (big_int_of_int 1) (big_int_of_int (-1)), +eq_big_int (add_big_int (big_int_of_int 1) (big_int_of_int (-1)), zero_big_int);; test 13 -eq_big_int (add_big_int (big_int_of_int (-1)) (big_int_of_int 1), +eq_big_int (add_big_int (big_int_of_int (-1)) (big_int_of_int 1), zero_big_int);; test 14 -eq_big_int (add_big_int (big_int_of_int 1) (big_int_of_int (-2)), +eq_big_int (add_big_int (big_int_of_int 1) (big_int_of_int (-2)), big_int_of_int (-1));; test 15 -eq_big_int (add_big_int (big_int_of_int (-2)) (big_int_of_int 1), +eq_big_int (add_big_int (big_int_of_int (-2)) (big_int_of_int 1), big_int_of_int (-1));; test 16 -eq_big_int (add_big_int (big_int_of_int (-1)) (big_int_of_int 2), +eq_big_int (add_big_int (big_int_of_int (-1)) (big_int_of_int 2), big_int_of_int 1);; test 17 -eq_big_int (add_big_int (big_int_of_int 2) (big_int_of_int (-1)), +eq_big_int (add_big_int (big_int_of_int 2) (big_int_of_int (-1)), big_int_of_int 1);; @@ -110,52 +110,52 @@ testing_function "sub_big_int";; test 1 eq_big_int (sub_big_int zero_big_int zero_big_int, zero_big_int);; test 2 -eq_big_int (sub_big_int zero_big_int (big_int_of_int 1), +eq_big_int (sub_big_int zero_big_int (big_int_of_int 1), big_int_of_int (-1));; test 3 -eq_big_int (sub_big_int (big_int_of_int 1) zero_big_int, +eq_big_int (sub_big_int (big_int_of_int 1) zero_big_int, big_int_of_int 1);; test 4 -eq_big_int (sub_big_int zero_big_int (big_int_of_int (-1)), +eq_big_int (sub_big_int zero_big_int (big_int_of_int (-1)), big_int_of_int 1);; test 5 -eq_big_int (sub_big_int (big_int_of_int (-1)) zero_big_int, +eq_big_int (sub_big_int (big_int_of_int (-1)) zero_big_int, big_int_of_int (-1));; test 6 -eq_big_int (sub_big_int (big_int_of_int 1) (big_int_of_int 1), +eq_big_int (sub_big_int (big_int_of_int 1) (big_int_of_int 1), zero_big_int);; test 7 -eq_big_int (sub_big_int (big_int_of_int 1) (big_int_of_int 2), +eq_big_int (sub_big_int (big_int_of_int 1) (big_int_of_int 2), big_int_of_int (-1));; test 8 -eq_big_int (sub_big_int (big_int_of_int 2) (big_int_of_int 1), +eq_big_int (sub_big_int (big_int_of_int 2) (big_int_of_int 1), big_int_of_int 1);; test 9 -eq_big_int (sub_big_int (big_int_of_int (-1)) (big_int_of_int (-1)), +eq_big_int (sub_big_int (big_int_of_int (-1)) (big_int_of_int (-1)), zero_big_int);; test 10 -eq_big_int (sub_big_int (big_int_of_int (-1)) (big_int_of_int (-2)), +eq_big_int (sub_big_int (big_int_of_int (-1)) (big_int_of_int (-2)), big_int_of_int 1);; test 11 -eq_big_int (sub_big_int (big_int_of_int (-2)) (big_int_of_int (-1)), +eq_big_int (sub_big_int (big_int_of_int (-2)) (big_int_of_int (-1)), big_int_of_int (-1));; test 12 -eq_big_int (sub_big_int (big_int_of_int 1) (big_int_of_int (-1)), +eq_big_int (sub_big_int (big_int_of_int 1) (big_int_of_int (-1)), big_int_of_int 2);; test 13 -eq_big_int (sub_big_int (big_int_of_int (-1)) (big_int_of_int 1), +eq_big_int (sub_big_int (big_int_of_int (-1)) (big_int_of_int 1), big_int_of_int (-2));; test 14 -eq_big_int (sub_big_int (big_int_of_int 1) (big_int_of_int (-2)), +eq_big_int (sub_big_int (big_int_of_int 1) (big_int_of_int (-2)), big_int_of_int 3);; test 15 -eq_big_int (sub_big_int (big_int_of_int (-2)) (big_int_of_int 1), +eq_big_int (sub_big_int (big_int_of_int (-2)) (big_int_of_int 1), big_int_of_int (-3));; test 16 -eq_big_int (sub_big_int (big_int_of_int (-1)) (big_int_of_int 2), +eq_big_int (sub_big_int (big_int_of_int (-1)) (big_int_of_int 2), big_int_of_int (-3));; test 17 -eq_big_int (sub_big_int (big_int_of_int 2) (big_int_of_int (-1)), +eq_big_int (sub_big_int (big_int_of_int 2) (big_int_of_int (-1)), big_int_of_int 3);; testing_function "mult_int_big_int";; @@ -172,21 +172,21 @@ eq_big_int (mult_int_big_int 2 (big_int_of_int 3), big_int_of_int 6);; testing_function "mult_big_int";; test 1 -eq_big_int (mult_big_int zero_big_int zero_big_int, +eq_big_int (mult_big_int zero_big_int zero_big_int, zero_big_int);; test 2 -eq_big_int (mult_big_int (big_int_of_int 2) (big_int_of_int 3), +eq_big_int (mult_big_int (big_int_of_int 2) (big_int_of_int 3), big_int_of_int 6);; test 3 -eq_big_int (mult_big_int (big_int_of_int 2) (big_int_of_int (-3)), +eq_big_int (mult_big_int (big_int_of_int 2) (big_int_of_int (-3)), big_int_of_int (-6));; -test 4 -eq_big_int (mult_big_int (big_int_of_string "12724951") - (big_int_of_string "81749606400"), +test 4 +eq_big_int (mult_big_int (big_int_of_string "12724951") + (big_int_of_string "81749606400"), big_int_of_string "1040259735709286400");; -test 5 -eq_big_int (mult_big_int (big_int_of_string "26542080") - (big_int_of_string "81749606400"), +test 5 +eq_big_int (mult_big_int (big_int_of_string "26542080") + (big_int_of_string "81749606400"), big_int_of_string "2169804593037312000");; testing_function "quomod_big_int";; @@ -201,14 +201,14 @@ let (quotient, modulo) = test 3 eq_big_int (quotient, big_int_of_int (-1)) && test 4 eq_big_int (modulo, zero_big_int);; -let (quotient, modulo) = +let (quotient, modulo) = quomod_big_int (big_int_of_int (-1)) (big_int_of_int 1) in - test 5 eq_big_int (quotient, big_int_of_int (-1)) && + test 5 eq_big_int (quotient, big_int_of_int (-1)) && test 6 eq_big_int (modulo, zero_big_int);; -let (quotient, modulo) = +let (quotient, modulo) = quomod_big_int (big_int_of_int 3) (big_int_of_int 2) in - test 7 eq_big_int (quotient, big_int_of_int 1) && + test 7 eq_big_int (quotient, big_int_of_int 1) && test 8 eq_big_int (modulo, big_int_of_int 1);; let (quotient, modulo) = @@ -221,12 +221,12 @@ let (quotient, modulo) = test 11 eq_big_int (quotient, big_int_of_int (-2)) && test 12 eq_big_int (modulo, big_int_of_int 1);; -let (quotient, modulo) = +let (quotient, modulo) = quomod_big_int (big_int_of_int 1) (big_int_of_int 2) in - test 13 eq_big_int (quotient, zero_big_int) && + test 13 eq_big_int (quotient, zero_big_int) && test 14 eq_big_int (modulo, big_int_of_int 1);; -let (quotient, modulo) = +let (quotient, modulo) = quomod_big_int (big_int_of_int (-1)) (big_int_of_int 3) in test 15 eq_big_int (quotient, minus_big_int unit_big_int) && test 16 eq_big_int (modulo, big_int_of_int 2);; @@ -236,22 +236,22 @@ failwith_test 17 Division_by_zero ;; -let (quotient, modulo) = +let (quotient, modulo) = quomod_big_int (big_int_of_int 10) (big_int_of_int 20) in test 18 eq_big_int (quotient, big_int_of_int 0) && test 19 eq_big_int (modulo, big_int_of_int 10);; -let (quotient, modulo) = +let (quotient, modulo) = quomod_big_int (big_int_of_int (-10)) (big_int_of_int 20) in test 20 eq_big_int (quotient, big_int_of_int (-1)) && test 21 eq_big_int (modulo, big_int_of_int 10);; -let (quotient, modulo) = +let (quotient, modulo) = quomod_big_int (big_int_of_int 10) (big_int_of_int (-20)) in test 22 eq_big_int (quotient, big_int_of_int 0) && test 23 eq_big_int (modulo, big_int_of_int 10);; -let (quotient, modulo) = +let (quotient, modulo) = quomod_big_int (big_int_of_int (-10)) (big_int_of_int (-20)) in test 24 eq_big_int (quotient, big_int_of_int 1) && test 25 eq_big_int (modulo, big_int_of_int 10);; @@ -260,28 +260,28 @@ let (quotient, modulo) = testing_function "gcd_big_int";; test 1 -eq_big_int (gcd_big_int zero_big_int zero_big_int, +eq_big_int (gcd_big_int zero_big_int zero_big_int, zero_big_int);; test 2 -eq_big_int (gcd_big_int zero_big_int (big_int_of_int 1), +eq_big_int (gcd_big_int zero_big_int (big_int_of_int 1), big_int_of_int 1);; test 3 -eq_big_int (gcd_big_int (big_int_of_int 1) zero_big_int, +eq_big_int (gcd_big_int (big_int_of_int 1) zero_big_int, big_int_of_int 1);; test 4 -eq_big_int (gcd_big_int (big_int_of_int 1) (big_int_of_int 2), +eq_big_int (gcd_big_int (big_int_of_int 1) (big_int_of_int 2), big_int_of_int 1);; test 5 -eq_big_int (gcd_big_int (big_int_of_int 2) (big_int_of_int 1), +eq_big_int (gcd_big_int (big_int_of_int 2) (big_int_of_int 1), big_int_of_int 1);; test 6 -eq_big_int (gcd_big_int (big_int_of_int 1) (big_int_of_int 1), +eq_big_int (gcd_big_int (big_int_of_int 1) (big_int_of_int 1), big_int_of_int 1);; test 7 -eq_big_int (gcd_big_int (big_int_of_int 9) (big_int_of_int 16), +eq_big_int (gcd_big_int (big_int_of_int 9) (big_int_of_int 16), big_int_of_int 1);; test 8 -eq_big_int (gcd_big_int (big_int_of_int 12) (big_int_of_int 16), +eq_big_int (gcd_big_int (big_int_of_int 12) (big_int_of_int 16), big_int_of_int 4);; for i = 9 to 28 do @@ -404,7 +404,7 @@ let bi1 = big_int_of_string (implode (rev l)) in let bi2 = big_int_of_string (implode (rev ("3" :: tl l))) in test 10 -eq_big_int (bi1, (add_big_int (mult_big_int bi2 (big_int_of_string "10")) +eq_big_int (bi1, (add_big_int (mult_big_int bi2 (big_int_of_string "10")) (big_int_of_string "2"))) (* test 11 && @@ -444,7 +444,7 @@ test 2 eq_big_int (big_int_of_nat (power_base_int 10 8), big_int_of_int 100000000) ;; test 3 -eq_big_int (big_int_of_nat (power_base_int 2 (length_of_int + 2)), +eq_big_int (big_int_of_nat (power_base_int 2 (length_of_int + 2)), big_int_of_nat (let nat = make_nat 2 in set_digit_nat nat 1 1; nat)) @@ -933,12 +933,11 @@ test 3 eq_int (Hashtbl.hash (minus_big_int unit_big_int), 161678167);; test 4 eq_int (Hashtbl.hash (big_int_of_string "123456789123456789"), 755417385);; -test 5 eq_int (Hashtbl.hash (sub_big_int +test 5 eq_int (Hashtbl.hash (sub_big_int (big_int_of_string "123456789123456789") (big_int_of_string "123456789123456789")), 955772237);; -test 6 eq_int (Hashtbl.hash (sub_big_int +test 6 eq_int (Hashtbl.hash (sub_big_int (big_int_of_string "123456789123456789") (big_int_of_string "123456789123456788")), 992063522);; - diff --git a/testsuite/tests/lib-num/test_nats.ml b/testsuite/tests/lib-num/test_nats.ml index b47b39f8..739ed37e 100644 --- a/testsuite/tests/lib-num/test_nats.ml +++ b/testsuite/tests/lib-num/test_nats.ml @@ -3,7 +3,7 @@ open Nat;; (* Can compare nats less than 2**32 *) let equal_nat n1 n2 = - eq_nat n1 0 (num_digits_nat n1 0 1) + eq_nat n1 0 (num_digits_nat n1 0 1) n2 0 (num_digits_nat n2 0 1);; testing_function "num_digits_nat";; @@ -108,10 +108,10 @@ let set_mult_digit_nat n1 d1 l1 n2 d2 l2 n3 d3 = let s = "3333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333" in test 21 equal_nat ( nat_of_string s, -(let nat = make_nat 15 in +(let nat = make_nat 15 in set_digit_nat nat 0 3; - set_mult_digit_nat nat 0 15 - (nat_of_string (String.sub s 0 135)) 0 14 + set_mult_digit_nat nat 0 15 + (nat_of_string (String.sub s 0 135)) 0 14 (nat_of_int 10) 0; nat)) ;; diff --git a/testsuite/tests/lib-num/test_nums.ml b/testsuite/tests/lib-num/test_nums.ml index b26001bc..24b5d264 100644 --- a/testsuite/tests/lib-num/test_nums.ml +++ b/testsuite/tests/lib-num/test_nums.ml @@ -12,10 +12,10 @@ eq_num (add_num (Int 1) (Int 3), Int 4);; test 2 eq_num (add_num (Int 1) (Big_int (big_int_of_int 3)), Int 4);; test 3 -eq_num (add_num (Int 1) (Ratio (ratio_of_string "3/4")), +eq_num (add_num (Int 1) (Ratio (ratio_of_string "3/4")), Ratio (ratio_of_string "7/4"));; test 4 -eq_num (add_num (Big_int (big_int_of_int 1)) (Ratio (ratio_of_string "3/4")), +eq_num (add_num (Big_int (big_int_of_int 1)) (Ratio (ratio_of_string "3/4")), Ratio (ratio_of_string "7/4"));; test 5 eq_num (add_num (Big_int (big_int_of_int 1)) (Big_int (big_int_of_int 3)), @@ -27,10 +27,10 @@ test 7 eq_num (add_num (Ratio (ratio_of_string "2/3")) (Ratio (ratio_of_string "3/4")), Ratio (ratio_of_string "17/12"));; test 8 -eq_num (add_num (Int least_int) (Int 1), +eq_num (add_num (Int least_int) (Int 1), Int (- (pred biggest_int)));; test 9 -eq_num (add_num (Int biggest_int) (Int 1), +eq_num (add_num (Int biggest_int) (Int 1), Big_int (minus_big_int (pred_big_int (big_int_of_int least_int))));; testing_function "sub_num";; @@ -40,10 +40,10 @@ eq_num (sub_num (Int 1) (Int 3), Int (-2));; test 2 eq_num (sub_num (Int 1) (Big_int (big_int_of_int 3)), Int (-2));; test 3 -eq_num (sub_num (Int 1) (Ratio (ratio_of_string "3/4")), +eq_num (sub_num (Int 1) (Ratio (ratio_of_string "3/4")), Ratio (ratio_of_string "1/4"));; test 4 -eq_num (sub_num (Big_int (big_int_of_int 1)) (Ratio (ratio_of_string "3/4")), +eq_num (sub_num (Big_int (big_int_of_int 1)) (Ratio (ratio_of_string "3/4")), Ratio (ratio_of_string "1/4"));; test 5 eq_num (sub_num (Big_int (big_int_of_int 1)) (Big_int (big_int_of_int 3)), @@ -55,7 +55,7 @@ test 8 eq_num (sub_num (Ratio (ratio_of_string "2/3")) (Ratio (ratio_of_string "3/4")), Ratio (ratio_of_string "-1/12"));; test 9 -eq_num (sub_num (Int least_int) (Int (-1)), +eq_num (sub_num (Int least_int) (Int (-1)), Int (- (pred biggest_int)));; test 10 eq_num (sub_num (Int (-1)) (Int biggest_int), pred_num (Int least_int));; @@ -68,12 +68,12 @@ test 2 eq_num (mult_num (Int 127) (Int (int_of_string "257")), Int (int_of_string "32639"));; test 3 -eq_num (mult_num (Int 257) (Int (int_of_string "260")), +eq_num (mult_num (Int 257) (Int (int_of_string "260")), Big_int (big_int_of_string "66820"));; test 4 eq_num (mult_num (Int 2) (Big_int (big_int_of_int 3)), Int 6);; test 5 -eq_num (mult_num (Int 10) (Ratio (ratio_of_string "3/4")), +eq_num (mult_num (Int 10) (Ratio (ratio_of_string "3/4")), Ratio (ratio_of_string "15/2"));; test 6 eq_num (mult_num (Big_int (big_int_of_int 10)) (Ratio (ratio_of_string "3/4")), @@ -93,31 +93,31 @@ testing_function "div_num";; test 1 eq_num (div_num (Int 6) (Int 3), Int 2);; test 2 -eq_num (div_num (Int (int_of_string "32639")) +eq_num (div_num (Int (int_of_string "32639")) (Int (int_of_string "257")), Int 127);; test 3 -eq_num (div_num (Big_int (big_int_of_string "66820")) - (Int (int_of_string "257")), +eq_num (div_num (Big_int (big_int_of_string "66820")) + (Int (int_of_string "257")), Int 260);; test 4 eq_num (div_num (Int 6) (Big_int (big_int_of_int 3)), Int 2);; test 5 -eq_num (div_num (Ratio (ratio_of_string "15/2")) +eq_num (div_num (Ratio (ratio_of_string "15/2")) (Int 10), - Ratio (ratio_of_string "3/4"));; + Ratio (ratio_of_string "3/4"));; test 6 eq_num (div_num (Big_int (big_int_of_int 6)) (Big_int (big_int_of_int 3)), Int 2);; -test 7 -eq_num (div_num (Ratio (ratio_of_string "15/2")) +test 7 +eq_num (div_num (Ratio (ratio_of_string "15/2")) (Big_int (big_int_of_int 10)), Ratio (ratio_of_string "3/4"));; test 8 -eq_num (div_num (Ratio (ratio_of_string "15/2")) +eq_num (div_num (Ratio (ratio_of_string "15/2")) (Ratio (ratio_of_string "3/4")), Big_int (big_int_of_int 10));; test 9 -eq_num (div_num (Ratio (ratio_of_string "1/2")) +eq_num (div_num (Ratio (ratio_of_string "1/2")) (Ratio (ratio_of_string "3/4")), Ratio (ratio_of_string "2/3"));; @@ -137,7 +137,7 @@ testing_function "num_of_ratio";; test 1 eq_num (num_of_ratio (ratio_of_string "4/2"), Int 2);; test 2 -eq_num (num_of_ratio (ratio_of_string "11811160075/11"), +eq_num (num_of_ratio (ratio_of_string "11811160075/11"), Big_int (big_int_of_string "1073741825"));; test 3 eq_num (num_of_ratio (ratio_of_string "123456789012/1234"), @@ -205,13 +205,13 @@ test 2 eq (f1 1, false);; test 3 eq (f1 (0/1), true);; -test 4 eq (f1 (let n = num_of_string "2000000000000000000000000" in n-n) , +test 4 eq (f1 (let n = num_of_string "2000000000000000000000000" in n-n) , true);; -test 5 eq (f1 (let n = num_of_string "2000000000000000000000000" in n/n-1) , +test 5 eq (f1 (let n = num_of_string "2000000000000000000000000" in n/n-1) , true);; -test 6 eq (f1 (let n = num_of_string "2000000000000000000000000" in n+1) , +test 6 eq (f1 (let n = num_of_string "2000000000000000000000000" in n+1) , false);; test 7 eq (f1 (1/2), false);; diff --git a/testsuite/tests/lib-printf/tprintf.ml b/testsuite/tests/lib-printf/tprintf.ml index 16046a7c..1e276228 100644 --- a/testsuite/tests/lib-printf/tprintf.ml +++ b/testsuite/tests/lib-printf/tprintf.ml @@ -274,7 +274,7 @@ try test (sprintf "%B" true = "true"); test (sprintf "%B" false = "false"); - printf "ld/li positive\n%!"; + printf "\nld/li positive\n%!"; test (sprintf "%ld/%li" 42l 43l = "42/43"); test (sprintf "%-4ld/%-5li" 42l 43l = "42 /43 "); test (sprintf "%04ld/%05li" 42l 43l = "0042/00043"); @@ -355,7 +355,7 @@ try (* Nativeint not tested: looks like too much work, and anyway it should work like Int32 or Int64. *) - printf "Ld/Li positive\n%!"; + printf "\nLd/Li positive\n%!"; test (sprintf "%Ld/%Li" 42L 43L = "42/43"); test (sprintf "%-4Ld/%-5Li" 42L 43L = "42 /43 "); test (sprintf "%04Ld/%05Li" 42L 43L = "0042/00043"); diff --git a/testsuite/tests/lib-printf/tprintf.reference b/testsuite/tests/lib-printf/tprintf.reference index 693db249..c30013eb 100644 --- a/testsuite/tests/lib-printf/tprintf.reference +++ b/testsuite/tests/lib-printf/tprintf.reference @@ -1,87 +1,89 @@ d/i positive -0 1 2 3 4 5 6 7 8 + 0 1 2 3 4 5 6 7 8 d/i negative -9 10 11 12 13 14 15 16 17 + 9 10 11 12 13 14 15 16 17 u positive -18 19 20 21 22 23 24 25 26 + 18 19 20 21 22 23 24 25 26 u negative -27 + 27 x positive -28 29 30 31 32 33 34 35 36 + 28 29 30 31 32 33 34 35 36 x negative -37 + 37 X positive -38 39 40 41 42 43 44 45 46 + 38 39 40 41 42 43 44 45 46 x negative -47 + 47 o positive -48 49 50 51 52 53 54 55 56 + 48 49 50 51 52 53 54 55 56 o negative -57 + 57 s -58 59 60 61 62 63 64 65 66 67 68 69 70 71 + 58 59 60 61 62 63 64 65 66 67 68 69 70 71 S -72 73 74 75 76 77 78 79 80 + 72 73 74 75 76 77 78 79 80 c -81 82 83 84 + 81 82 83 84 C -85 86 87 88 89 + 85 86 87 88 89 f -90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 + 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 F -108 109 110 111 + 108 109 110 111 e -112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 + 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 E -130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 + 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 B -148 149 ld/li positive -150 151 152 153 154 155 156 157 158 + 148 149 +ld/li positive + 150 151 152 153 154 155 156 157 158 ld/li negative -159 160 161 162 163 164 165 166 167 + 159 160 161 162 163 164 165 166 167 lu positive -168 169 170 171 172 173 174 175 176 + 168 169 170 171 172 173 174 175 176 lu negative -177 + 177 lx positive -178 179 180 181 182 183 184 185 186 + 178 179 180 181 182 183 184 185 186 lx negative -187 + 187 lX positive -188 189 190 191 192 193 194 195 196 + 188 189 190 191 192 193 194 195 196 lx negative -197 + 197 lo positive -198 199 200 201 202 203 204 205 206 + 198 199 200 201 202 203 204 205 206 lo negative -207 Ld/Li positive -208 209 210 211 212 213 214 215 216 + 207 +Ld/Li positive + 208 209 210 211 212 213 214 215 216 Ld/Li negative -217 218 219 220 221 222 223 224 225 + 217 218 219 220 221 222 223 224 225 Lu positive -226 227 228 229 230 231 232 233 234 + 226 227 228 229 230 231 232 233 234 Lu negative -235 + 235 Lx positive -236 237 238 239 240 241 242 243 244 + 236 237 238 239 240 241 242 243 244 Lx negative -245 + 245 LX positive -246 247 248 249 250 251 252 253 254 + 246 247 248 249 250 251 252 253 254 Lx negative -255 + 255 Lo positive -256 257 258 259 260 261 262 263 264 + 256 257 258 259 260 261 262 263 264 Lo negative -265 + 265 a -266 + 266 t -267 + 267 (...%) -268 + 268 ! % @ , and constants -269 270 271 272 273 274 275 + 269 270 271 272 273 274 275 end of tests All tests succeeded. diff --git a/testsuite/tests/lib-scanf/tscanf.ml b/testsuite/tests/lib-scanf/tscanf.ml index 98209011..1ee1b4a2 100644 --- a/testsuite/tests/lib-scanf/tscanf.ml +++ b/testsuite/tests/lib-scanf/tscanf.ml @@ -10,7 +10,7 @@ (* *) (*************************************************************************) -(* $Id: tscanf.ml 12210 2012-03-08 19:52:03Z doligez $ +(* $Id: tscanf.ml 12800 2012-07-30 18:59:07Z doligez $ A testbed file for the module Scanf. @@ -265,15 +265,15 @@ test (test10 ()) (* %[] style *) let test11 () = - sscanf "Pierre Weis 70" "%s %s %s" + sscanf "Pierre\tWeis\t70" "%s %s %s" (fun prenom nom poids -> prenom = "Pierre" && nom = "Weis" && int_of_string poids = 70) && - sscanf "Jean-Luc de Léage 68" "%[^ ] %[^ ] %d" + sscanf "Jean-Luc\tde Léage\t68" "%[^\t] %[^\t] %d" (fun prenom nom poids -> prenom = "Jean-Luc" && nom = "de Léage" && poids = 68) && - sscanf "Daniel de Rauglaudre 66" "%s@\t %s@\t %d" + sscanf "Daniel\tde Rauglaudre\t66" "%s@\t %s@\t %d" (fun prenom nom poids -> prenom = "Daniel" && nom = "de Rauglaudre" && poids = 66) ;; diff --git a/testsuite/tests/lib-scanf/tscanf.reference b/testsuite/tests/lib-scanf/tscanf.reference index 3c9fa442..18fe92ba 100644 --- a/testsuite/tests/lib-scanf/tscanf.reference +++ b/testsuite/tests/lib-scanf/tscanf.reference @@ -1,2 +1,2 @@ -0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 + 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 All tests succeeded. diff --git a/testsuite/tests/lib-set/testmap.ml b/testsuite/tests/lib-set/testmap.ml index 1197fbf6..c54764ea 100644 --- a/testsuite/tests/lib-set/testmap.ml +++ b/testsuite/tests/lib-set/testmap.ml @@ -103,7 +103,7 @@ let test x v s1 s2 = check "split" (let (l, p, r) = M.split x s1 in - fun i -> + fun i -> if i < x then img i l = img i s1 else if i > x then img i r = img i s1 else p = img i s1) @@ -120,4 +120,3 @@ let rmap() = let _ = Random.init 42; for i = 1 to 25000 do test (rkey()) (rdata()) (rmap()) (rmap()) done - diff --git a/testsuite/tests/lib-set/testset.ml b/testsuite/tests/lib-set/testset.ml index c4ab0441..024342f8 100644 --- a/testsuite/tests/lib-set/testset.ml +++ b/testsuite/tests/lib-set/testset.ml @@ -102,7 +102,7 @@ let test x s1 s2 = check "split" (let (l, p, r) = S.split x s1 in - fun i -> + fun i -> if i < x then S.mem i l = S.mem i s1 else if i > x then S.mem i r = S.mem i s1 else p = S.mem i s1) @@ -117,4 +117,3 @@ let rset() = let _ = Random.init 42; for i = 1 to 25000 do test (relt()) (rset()) (rset()) done - diff --git a/testsuite/tests/lib-str/t01.ml b/testsuite/tests/lib-str/t01.ml index 03c85ea4..ab0c10eb 100644 --- a/testsuite/tests/lib-str/t01.ml +++ b/testsuite/tests/lib-str/t01.ml @@ -34,7 +34,7 @@ let start_test msg = let num_failures = ref 0 let test res1 res2 = - if res1 = res2 + if res1 = res2 then print_char '.' else begin print_string " FAIL "; incr num_failures end @@ -743,7 +743,7 @@ let automated_test() = test (Str.split_delim (Str.regexp "[ \t]+") " si non e vero\t") [""; "si"; "non"; "e"; "vero"; ""]; test (Str.full_split (Str.regexp "[ \t]+") " si non\te vero\t") - [Str.Delim " "; Str.Text "si"; + [Str.Delim " "; Str.Text "si"; Str.Delim " "; Str.Text "non"; Str.Delim "\t"; Str.Text "e"; Str.Delim " "; Str.Text "vero"; Str.Delim "\t"]; @@ -752,7 +752,7 @@ let automated_test() = (* See "REX: XML Shallow Parsing with Regular Expressions", Robert D. Cameron, Simon Fraser University, CMPT TR 1998-17. *) start_test "XML tokenization"; - begin + begin let _TextSE = "[^<]+" in let _UntilHyphen = "[^-]*-" in let _Until2Hyphens = _UntilHyphen ^ "\\([^-]" ^ _UntilHyphen ^ "\\)*-" in diff --git a/testsuite/tests/lib-stream/count_concat_bug.reference b/testsuite/tests/lib-stream/count_concat_bug.reference index acdc75ca..52e367ea 100644 --- a/testsuite/tests/lib-stream/count_concat_bug.reference +++ b/testsuite/tests/lib-stream/count_concat_bug.reference @@ -1,2 +1,2 @@ -0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 + 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 All tests succeeded. diff --git a/testsuite/tests/lib-systhreads/testfork.ml b/testsuite/tests/lib-systhreads/testfork.ml index d0d253b3..1c1f232f 100644 --- a/testsuite/tests/lib-systhreads/testfork.ml +++ b/testsuite/tests/lib-systhreads/testfork.ml @@ -2,7 +2,7 @@ let compute_thread c = ignore c (* - while true do + while true do print_char c; flush stdout; for i = 1 to 100000 do ignore(ref []) done done @@ -14,6 +14,7 @@ let main () = print_string "Forking..."; print_newline(); match Unix.fork() with | 0 -> + Thread.delay 0.5; print_string "In child..."; print_newline(); Gc.minor(); print_string "Child did minor GC."; print_newline(); @@ -23,10 +24,8 @@ let main () = exit 0 | pid -> print_string "In parent..."; print_newline(); - Thread.delay 2.0; + Thread.delay 4.0; print_string "Parent is exiting."; print_newline(); exit 0 let _ = main() - - diff --git a/testsuite/tests/lib-threads/test3.runner b/testsuite/tests/lib-threads/test3.runner index 907135b6..e6d40a24 100644 --- a/testsuite/tests/lib-threads/test3.runner +++ b/testsuite/tests/lib-threads/test3.runner @@ -1,4 +1,4 @@ ./program > test3.result & pid=$! sleep 5 -kill -9 $pid \ No newline at end of file +kill -9 $pid diff --git a/testsuite/tests/lib-threads/test4.runner b/testsuite/tests/lib-threads/test4.runner index 4f1a16d0..0559da0f 100644 --- a/testsuite/tests/lib-threads/test4.runner +++ b/testsuite/tests/lib-threads/test4.runner @@ -1 +1 @@ -./program < test4.data > test4.result 2> /dev/null || true \ No newline at end of file +./program < test4.data > test4.result 2> /dev/null || true diff --git a/testsuite/tests/lib-threads/test5.runner b/testsuite/tests/lib-threads/test5.runner index 877d176e..6973ea78 100644 --- a/testsuite/tests/lib-threads/test5.runner +++ b/testsuite/tests/lib-threads/test5.runner @@ -1,4 +1,4 @@ ./program > test5.result & pid=$! -sleep 1 -kill -9 $pid \ No newline at end of file +sleep 3 +kill -9 $pid diff --git a/testsuite/tests/lib-threads/test7.checker b/testsuite/tests/lib-threads/test7.checker index c5eb2dcd..7cdb8412 100644 --- a/testsuite/tests/lib-threads/test7.checker +++ b/testsuite/tests/lib-threads/test7.checker @@ -1 +1 @@ -test `grep -E '^-?[0123456789]+$' test7.result | wc -l` = `cat test7.result | wc -l` \ No newline at end of file +test `grep -E '^-?[0123456789]+$' test7.result | wc -l` = `cat test7.result | wc -l` diff --git a/testsuite/tests/lib-threads/testsignal.checker b/testsuite/tests/lib-threads/testsignal.checker index 2e8ef03a..e7a5f061 100644 --- a/testsuite/tests/lib-threads/testsignal.checker +++ b/testsuite/tests/lib-threads/testsignal.checker @@ -1 +1 @@ -sed -e 1q testsignal.result | grep -q '^[ab]*Got ctrl-C, exiting...$' +sed -e 1q testsignal.result | grep -q '^[ab]*Got ctrl-C, exiting...$' diff --git a/testsuite/tests/lib-threads/testsignal.runner b/testsuite/tests/lib-threads/testsignal.runner index 897ef173..74c0d54d 100644 --- a/testsuite/tests/lib-threads/testsignal.runner +++ b/testsuite/tests/lib-threads/testsignal.runner @@ -1,4 +1,4 @@ ./program > testsignal.result & pid=$! sleep 3 -kill -INT $pid \ No newline at end of file +kill -INT $pid diff --git a/testsuite/tests/lib-threads/torture.ml b/testsuite/tests/lib-threads/torture.ml index cfc57833..02006a7a 100644 --- a/testsuite/tests/lib-threads/torture.ml +++ b/testsuite/tests/lib-threads/torture.ml @@ -9,9 +9,9 @@ let gc_thread () = let stdin_thread () = while true do - print_string "> "; flush stdout; + print_string ">"; flush stdout; let s = read_line() in - print_string ">>> "; print_string s; print_newline() + print_string " >>> "; print_string s; print_newline() done let writer_thread (oc, size) = diff --git a/testsuite/tests/lib-threads/torture.reference b/testsuite/tests/lib-threads/torture.reference index cd5f474f..f726cc46 100644 --- a/testsuite/tests/lib-threads/torture.reference +++ b/testsuite/tests/lib-threads/torture.reference @@ -1,4 +1,4 @@ > >>> abc > >>> def > >>> ghi -> \ No newline at end of file +> \ No newline at end of file diff --git a/testsuite/tests/lib-threads/torture.runner b/testsuite/tests/lib-threads/torture.runner index f4ad597b..12ceeb64 100644 --- a/testsuite/tests/lib-threads/torture.runner +++ b/testsuite/tests/lib-threads/torture.runner @@ -1 +1 @@ -./program < torture.data > torture.result 2> /dev/null || true \ No newline at end of file +./program < torture.data > torture.result 2> /dev/null || true diff --git a/testsuite/tests/misc-kb/equations.ml b/testsuite/tests/misc-kb/equations.ml index 0045504d..d45bd7d6 100644 --- a/testsuite/tests/misc-kb/equations.ml +++ b/testsuite/tests/misc-kb/equations.ml @@ -10,13 +10,13 @@ (* *) (***********************************************************************) -(* $Id: equations.ml 11156 2011-07-27 14:17:02Z doligez $ *) +(* $Id: equations.ml 12800 2012-07-30 18:59:07Z doligez $ *) (****************** Equation manipulations *************) open Terms -type rule = +type rule = { number: int; numvars: int; lhs: term; @@ -53,7 +53,7 @@ let pretty_rule rule = let pretty_rules rules = List.iter pretty_rule rules - + (****************** Rewriting **************************) (* Top-level rewriting. Let eq:L=R be an equation, M be a term such that L<=M. @@ -112,4 +112,3 @@ let rec mrewrite_all rules m = mrewrite_all rules (mrewrite1 rules m) with Failure _ -> m - diff --git a/testsuite/tests/misc-kb/equations.mli b/testsuite/tests/misc-kb/equations.mli index 01b9dcd2..c9ea8aac 100644 --- a/testsuite/tests/misc-kb/equations.mli +++ b/testsuite/tests/misc-kb/equations.mli @@ -10,11 +10,11 @@ (* *) (***********************************************************************) -(* $Id: equations.mli 11156 2011-07-27 14:17:02Z doligez $ *) +(* $Id: equations.mli 12800 2012-07-30 18:59:07Z doligez $ *) open Terms -type rule = +type rule = { number: int; numvars: int; lhs: term; diff --git a/testsuite/tests/misc-kb/kb.ml b/testsuite/tests/misc-kb/kb.ml index 4cbc3771..9af59194 100644 --- a/testsuite/tests/misc-kb/kb.ml +++ b/testsuite/tests/misc-kb/kb.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: kb.ml 11156 2011-07-27 14:17:02Z doligez $ *) +(* $Id: kb.ml 12800 2012-07-30 18:59:07Z doligez $ *) open Terms open Equations @@ -37,7 +37,7 @@ let rec super m = function (* Ex : -let (m,_) = <> +let (m,_) = <> and (n,_) = <> in super m n ==> [[1],[2,Term ("B",[])]; x <- B [2],[2,Term ("A",[]); 1,Term ("B",[])]] x <- A y <- B @@ -109,7 +109,7 @@ let rec get_rule n = function (* Improved Knuth-Bendix completion procedure *) -let kb_completion greater = +let kb_completion greater = let rec kbrec j rules = let rec process failures (k,l) eqs = (**** @@ -165,7 +165,7 @@ let kb_completion greater = (strict_critical_pairs el (rename rl.numvars el)) else try - let rk = get_rule k rules in + let rk = get_rule k rules in let ek = (rk.lhs, rk.rhs) in process failures (k,l) (mutual_critical_pairs el (rename rl.numvars ek)) @@ -185,4 +185,3 @@ let kb_complete greater complete_rules rules = kb_completion greater n complete_rules [] (n,n) eqs in print_string "Canonical set found :"; print_newline(); pretty_rules (List.rev completed_rules) - diff --git a/testsuite/tests/misc-kb/kbmain.ml b/testsuite/tests/misc-kb/kbmain.ml index 8592ab08..8e918c58 100644 --- a/testsuite/tests/misc-kb/kbmain.ml +++ b/testsuite/tests/misc-kb/kbmain.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: kbmain.ml 11156 2011-07-27 14:17:02Z doligez $ *) +(* $Id: kbmain.ml 12800 2012-07-30 18:59:07Z doligez $ *) open Terms open Equations @@ -72,11 +72,10 @@ let group_precedence op1 op2 = if r1 = r2 then Equal else if r1 > r2 then Greater else NotGE -let group_order = rpo group_precedence lex_ext +let group_order = rpo group_precedence lex_ext let greater pair = match group_order pair with Greater -> true | _ -> false let _ = for i = 1 to 20 do kb_complete greater [] geom_rules done - diff --git a/testsuite/tests/misc-kb/orderings.ml b/testsuite/tests/misc-kb/orderings.ml index 245f9b40..81b06196 100644 --- a/testsuite/tests/misc-kb/orderings.ml +++ b/testsuite/tests/misc-kb/orderings.ml @@ -10,13 +10,13 @@ (* *) (***********************************************************************) -(* $Id: orderings.ml 11156 2011-07-27 14:17:02Z doligez $ *) +(* $Id: orderings.ml 12800 2012-07-30 18:59:07Z doligez $ *) (*********************** Recursive Path Ordering ****************************) open Terms -type ordering = +type ordering = Greater | Equal | NotGE @@ -65,10 +65,10 @@ let lex_ext order = function | ( _ , []) -> Greater | (x1::l1, x2::l2) -> match order (x1,x2) with - Greater -> if List.for_all (fun n' -> gt_ord order (m,n')) l2 + Greater -> if List.for_all (fun n' -> gt_ord order (m,n')) l2 then Greater else NotGE | Equal -> lexrec (l1,l2) - | NotGE -> if List.exists (fun m' -> ge_ord order (m',n)) l1 + | NotGE -> if List.exists (fun m' -> ge_ord order (m',n)) l1 then Greater else NotGE in lexrec (sons1, sons2) | _ -> failwith "lex_ext" @@ -76,9 +76,9 @@ let lex_ext order = function (* Recursive path ordering *) -let rpo op_order ext = +let rpo op_order ext = let rec rporec (m,n) = - if m = n then Equal else + if m = n then Equal else match m with Var vm -> NotGE | Term(op1,sons1) -> @@ -96,4 +96,3 @@ let rpo op_order ext = if List.exists (fun m' -> ge_ord rporec (m',n)) sons1 then Greater else NotGE in rporec - diff --git a/testsuite/tests/misc-kb/orderings.mli b/testsuite/tests/misc-kb/orderings.mli index eb9dde13..5d5a4c2b 100644 --- a/testsuite/tests/misc-kb/orderings.mli +++ b/testsuite/tests/misc-kb/orderings.mli @@ -10,11 +10,11 @@ (* *) (***********************************************************************) -(* $Id: orderings.mli 11156 2011-07-27 14:17:02Z doligez $ *) +(* $Id: orderings.mli 12800 2012-07-30 18:59:07Z doligez $ *) open Terms -type ordering = +type ordering = Greater | Equal | NotGE diff --git a/testsuite/tests/misc-kb/terms.ml b/testsuite/tests/misc-kb/terms.ml index 899750a2..bc3cd64b 100644 --- a/testsuite/tests/misc-kb/terms.ml +++ b/testsuite/tests/misc-kb/terms.ml @@ -10,11 +10,11 @@ (* *) (***********************************************************************) -(* $Id: terms.ml 11156 2011-07-27 14:17:02Z doligez $ *) +(* $Id: terms.ml 12800 2012-07-30 18:59:07Z doligez $ *) (****************** Term manipulations *****************) -type term = +type term = Var of int | Term of string * term list @@ -22,7 +22,7 @@ let rec union l1 l2 = match l1 with [] -> l2 | a::r -> if List.mem a l2 then union r l2 else a :: union r l2 - + let rec vars = function Var n -> [n] @@ -73,7 +73,7 @@ let matching term1 term2 = (* A naive unification algorithm. *) -let compsubst subst1 subst2 = +let compsubst subst1 subst2 = (List.map (fun (v,t) -> (v, substitute subst1 t)) subst2) @ subst1 @@ -133,5 +133,3 @@ and pretty_close = function pretty_term m | m -> pretty_term m - - diff --git a/testsuite/tests/misc-kb/terms.mli b/testsuite/tests/misc-kb/terms.mli index 7dc6c286..c80d8423 100644 --- a/testsuite/tests/misc-kb/terms.mli +++ b/testsuite/tests/misc-kb/terms.mli @@ -10,9 +10,9 @@ (* *) (***********************************************************************) -(* $Id: terms.mli 11156 2011-07-27 14:17:02Z doligez $ *) +(* $Id: terms.mli 12800 2012-07-30 18:59:07Z doligez $ *) -type term = +type term = Var of int | Term of string * term list diff --git a/testsuite/tests/misc-unsafe/almabench.ml b/testsuite/tests/misc-unsafe/almabench.ml index 73293e9a..e5cdf36c 100644 --- a/testsuite/tests/misc-unsafe/almabench.ml +++ b/testsuite/tests/misc-unsafe/almabench.ml @@ -16,7 +16,7 @@ * Longitudes, Paris, France), as detailed in Astronomy & Astrophysics * 282, 663 (1994) * - * Note that the code herein is design for the purpose of testing + * Note that the code herein is design for the purpose of testing * computational performance; error handling and other such "niceties" * is virtually non-existent. * @@ -68,7 +68,7 @@ and a = [| [| 19.2184460618; -3716e-10; 979e-10 |]; [| 30.1103868694; -16635e-10; 686e-10 |] |] -and dlm = +and dlm = [| [| 252.25090552; 5381016286.88982; -1.92789 |]; [| 181.97980085; 2106641364.33548; 0.59381 |]; [| 100.46645683; 1295977422.83429; -2.04411 |]; @@ -151,7 +151,7 @@ and sa = (* tables giving the trigonometric terms to be added to the mean elements of the mean longitudes . *) -and kq = +and kq = [| [| 3086.0; 15746.0; 69613.0; 59899.0; 75645.0; 88306.0; 12661.0; 2658.0; 0.0; 0.0 |]; [| 21863.0; 32794.0; 10931.0; 73.0; 4387.0; 26934.0; 1473.0; 2157.0; 0.0; 0.0 |]; [| 10.0; 16002.0; 21863.0; 10931.0; 1473.0; 32004.0; 4387.0; 73.0; 0.0; 0.0 |]; @@ -181,15 +181,15 @@ and sl = [| 71234.0;-41116.0; 5334.0;-4935.0;-1848.0; 66.0; 434.0;-1748.0; 3780.0; -701.0 |]; [| -47645.0; 11647.0; 2166.0; 3194.0; 679.0; 0.0; -244.0; -419.0; -2531.0; 48.0 |] |] - + (* Normalize angle into the range -pi <= A < +pi. *) let anpm a = let w = mod_float a twopi in if abs_float w >= pic then begin if a < 0.0 then - w +. twopi + w +. twopi else - w -. twopi + w -. twopi end else w @@ -204,10 +204,10 @@ let planetpv epoch np pv = and de = e.(np).(0) +. (e.(np).(1) +. e.(np).(2) *. t ) *. t and dp = anpm ((3600.0 *. pi.(np).(0) +. (pi.(np).(1) +. pi.(np).(2) *. t ) *. t ) *. a2r ) and di = (3600.0 *. dinc.(np).(0) +. (dinc.(np).(1) +. dinc.(np).(2) *. t ) *. t ) *. a2r - and doh = anpm ((3600.0 *. omega.(np).(0) +. (omega.(np).(1) +. omega.(np).(2) *. t ) *. t ) *. a2r ) - (* apply the trigonometric terms. *) + and doh = anpm ((3600.0 *. omega.(np).(0) +. (omega.(np).(1) +. omega.(np).(2) *. t ) *. t ) *. a2r ) + (* apply the trigonometric terms. *) and dmu = 0.35953620 *. t in - + (* loop invariant *) let kp = kp.(np) and kq = kq.(np) and ca = ca.(np) and sa = sa.(np) and cl = cl.(np) and sl = sl.(np) in @@ -231,20 +231,20 @@ let planetpv epoch np pv = (* iterative solution of kepler's equation to get eccentric anomaly. *) let am = !dl -. dp in let ae = ref (am +. de *. sin am) - and k = ref 0 in + and k = ref 0 in let dae = ref ((am -. !ae +. de *. sin !ae) /. (1.0 -. de *. cos !ae)) in ae := !ae +. !dae; incr k; while !k < 10 or abs_float !dae >= 1e-12 do - dae := (am -. !ae +. de *. sin !ae) /. (1.0 -. de *. cos !ae); - ae := !ae +. !dae; - incr k + dae := (am -. !ae +. de *. sin !ae) /. (1.0 -. de *. cos !ae); + ae := !ae +. !dae; + incr k done; - + (* true anomaly. *) let ae2 = !ae /. 2.0 in - let at = 2.0 *. atan2 (sqrt ((1.0 +. de) /. (1.0 -. de)) *. sin ae2) (cos ae2) - (* distance (au) and speed (radians per day). *) + let at = 2.0 *. atan2 (sqrt ((1.0 +. de) /. (1.0 -. de)) *. sin ae2) (cos ae2) + (* distance (au) and speed (radians per day). *) and r = !da *. (1.0 -. de *. cos !ae) and v = gaussk *. sqrt ((1.0 +. 1.0 /. amas.(np) ) /. (!da *. !da *. !da)) and si2 = sin (di /. 2.0) in @@ -253,7 +253,7 @@ let planetpv epoch np pv = and tl = at +. dp in let xsw = sin tl and xcw = cos tl in - let xm2 = 2.0 *. (xp *. xcw -. xq *. xsw ) + let xm2 = 2.0 *. (xp *. xcw -. xq *. xsw ) and xf = !da /. sqrt (1.0 -. de *. de) and ci2 = cos (di /. 2.0) in let xms = (de *. sin dp +. xsw) *. xf @@ -265,42 +265,42 @@ let planetpv epoch np pv = and y = r *. (xsw +. xm2 *. xq) and z = r *. (-.xm2 *. ci2) in - (* rotate to equatorial. *) - pv.(0).(0) <- x; - pv.(0).(1) <- y *. coseps -. z *. sineps; - pv.(0).(2) <- y *. sineps +. z *. coseps; + (* rotate to equatorial. *) + pv.(0).(0) <- x; + pv.(0).(1) <- y *. coseps -. z *. sineps; + pv.(0).(2) <- y *. sineps +. z *. coseps; - (* velocity (j2000 ecliptic xdot,ydot,zdot in au/d). *) - let x = v *. ((-1.0 +. 2.0 *. xp *. xp) *. xms +. xpxq2 *. xmc) - and y = v *. (( 1.0 -. 2.0 *. xq *. xq ) *. xmc -. xpxq2 *. xms) - and z = v *. (2.0 *. ci2 *. (xp *. xms +. xq *. xmc)) in + (* velocity (j2000 ecliptic xdot,ydot,zdot in au/d). *) + let x = v *. ((-1.0 +. 2.0 *. xp *. xp) *. xms +. xpxq2 *. xmc) + and y = v *. (( 1.0 -. 2.0 *. xq *. xq ) *. xmc -. xpxq2 *. xms) + and z = v *. (2.0 *. ci2 *. (xp *. xms +. xq *. xmc)) in - (* rotate to equatorial *) - pv.(1).(0) <- x; - pv.(1).(1) <- y *. coseps -. z *. sineps; - pv.(1).(2) <- y *. sineps +. z *. coseps + (* rotate to equatorial *) + pv.(1).(0) <- x; + pv.(1).(1) <- y *. coseps -. z *. sineps; + pv.(1).(2) <- y *. sineps +. z *. coseps -(* Computes RA, Declination, and distance from a state vector returned by +(* Computes RA, Declination, and distance from a state vector returned by * planetpv. *) let radecdist state rdd = (* Distance *) rdd.(2) <- sqrt (state.(0).(0) *. state.(0).(0) - +. state.(0).(1) *. state.(0).(1) - +. state.(0).(2) *. state.(0).(2)); + +. state.(0).(1) *. state.(0).(1) + +. state.(0).(2) *. state.(0).(2)); (* RA *) rdd.(0) <- atan2 state.(0).(1) state.(0).(0) *. r2h; if rdd.(0) < 0.0 then rdd.(0) <- rdd.(0) +. 24.0; - + (* Declination *) rdd.(1) <- asin (state.(0).(2) /. rdd.(2)) *. r2d - + (* Entry point. Calculate RA and Dec for noon on every day in 1900-2100 *) let _ = let jd = [| 0.0; 0.0 |] - and pv = [| [| 0.0; 0.0; 0.0 |]; [| 0.0; 0.0; 0.0 |] |] + and pv = [| [| 0.0; 0.0; 0.0 |]; [| 0.0; 0.0; 0.0 |] |] and position = [| 0.0; 0.0; 0.0 |] in (* Test *) jd.(0) <- j2000; @@ -317,8 +317,8 @@ let _ = for n = 0 to test_length - 1 do jd.(0) <- jd.(0) +. 1.0; for p = 0 to 7 do - planetpv jd p pv; - radecdist pv position; + planetpv jd p pv; + radecdist pv position; done done done diff --git a/testsuite/tests/misc-unsafe/fft.ml b/testsuite/tests/misc-unsafe/fft.ml index f513e5ad..eb13b1e0 100644 --- a/testsuite/tests/misc-unsafe/fft.ml +++ b/testsuite/tests/misc-unsafe/fft.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: fft.ml 11156 2011-07-27 14:17:02Z doligez $ *) +(* $Id: fft.ml 12800 2012-07-30 18:59:07Z doligez $ *) let pi = 3.14159265358979323846 @@ -19,17 +19,17 @@ let tpi = 2.0 *. pi let fft px py np = let i = ref 2 in let m = ref 1 in - + while (!i < np) do - i := !i + !i; + i := !i + !i; m := !m + 1 done; - let n = !i in - + let n = !i in + if n <> np then begin for i = np+1 to n do - px.(i) <- 0.0; + px.(i) <- 0.0; py.(i) <- 0.0 done; print_string "Use "; print_int n; @@ -38,7 +38,7 @@ let fft px py np = let n2 = ref(n+n) in for k = 1 to !m-1 do - n2 := !n2 / 2; + n2 := !n2 / 2; let n4 = !n2 / 4 in let e = tpi /. float !n2 in @@ -51,7 +51,7 @@ let fft px py np = let ss3 = sin(a3) in let is = ref j in let id = ref(2 * !n2) in - + while !is < n do let i0r = ref !is in while !i0r < n do @@ -71,13 +71,13 @@ let fft px py np = let r1 = r1 +. s2 in let s2 = r2 -. s1 in let r2 = r2 +. s1 in - px.(i2) <- r1*.cc1 -. s2*.ss1; + px.(i2) <- r1*.cc1 -. s2*.ss1; py.(i2) <- -.s2*.cc1 -. r1*.ss1; px.(i3) <- s3*.cc3 +. r2*.ss3; py.(i3) <- r2*.cc3 -. s3*.ss3; i0r := i0 + !id done; - is := 2 * !id - !n2 + j; + is := 2 * !id - !n2 + j; id := 4 * !id done done @@ -89,7 +89,7 @@ let fft px py np = let is = ref 1 in let id = ref 4 in - + while !is < n do let i0r = ref !is in while !i0r <= n do @@ -103,7 +103,7 @@ let fft px py np = py.(i1) <- r1 -. py.(i1); i0r := i0 + !id done; - is := 2 * !id - 1; + is := 2 * !id - 1; id := 4 * !id done; @@ -112,11 +112,11 @@ let fft px py np = (*************************) let j = ref 1 in - + for i = 1 to n - 1 do if i < !j then begin let xt = px.(!j) in - px.(!j) <- px.(i); + px.(!j) <- px.(i); px.(i) <- xt; let xt = py.(!j) in py.(!j) <- py.(i); @@ -124,7 +124,7 @@ let fft px py np = end; let k = ref(n / 2) in while !k < !j do - j := !j - !k; + j := !j - !k; k := !k / 2 done; j := !j + !k @@ -170,12 +170,12 @@ let test np = for i = 0 to np-1 do let a = abs_float(pxr.(i+1) -. float i) in if !zr < a then begin - zr := a; + zr := a; kr := i end; let a = abs_float(pxi.(i+1)) in if !zi < a then begin - zi := a; + zi := a; ki := i end done; @@ -186,4 +186,3 @@ let test np = let _ = let np = ref 16 in for i = 1 to 16 do test !np; np := !np*2 done - diff --git a/testsuite/tests/misc/bdd.ml b/testsuite/tests/misc/bdd.ml index 70c0c1f6..5cc88a0e 100644 --- a/testsuite/tests/misc/bdd.ml +++ b/testsuite/tests/misc/bdd.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: bdd.ml 12149 2012-02-10 16:15:24Z doligez $ *) +(* $Id: bdd.ml 12800 2012-07-30 18:59:07Z doligez $ *) (* Translated to OCaml by Xavier Leroy *) (* Original code written in SML by ... *) @@ -24,8 +24,8 @@ let rec eval bdd vars = | Node(l, v, _, h) -> if vars.(v) then eval h vars else eval l vars -let getId bdd = - match bdd with +let getId bdd = + match bdd with Node(_,_,id,_) -> id | Zero -> 0 | One -> 1 @@ -42,10 +42,10 @@ let resize newSize = let newSz_1 = newSize-1 in let newArr = Array.create newSize [] in let rec copyBucket bucket = - match bucket with + match bucket with [] -> () - | n :: ns -> - match n with + | n :: ns -> + match n with | Node(l,v,_,h) -> let ind = hashVal (getId l) (getId h) v land newSz_1 in @@ -80,18 +80,18 @@ let resetUnique () = ( let mkNode low v high = let idl = getId low in - let idh = getId high + let idh = getId high in if idl = idh then low else let ind = hashVal idl idh v land (!sz_1) in let bucket = (!htab).(ind) in - let rec lookup b = - match b with + let rec lookup b = + match b with [] -> let n = Node(low, v, (incr nodeC; !nodeC), high) in insert (getId low) (getId high) v ind bucket n; n - | n :: ns -> + | n :: ns -> match n with | Node(l,v',id,h) -> if v = v' && idl = getId l && idh = getId h @@ -104,7 +104,7 @@ let mkNode low v high = type ordering = LESS | EQUAL | GREATER let cmpVar (x : int) (y : int) = - if xy then GREATER else EQUAL + if xy then GREATER else EQUAL let zero = Zero let one = One @@ -123,7 +123,7 @@ let notslot1 = Array.create cacheSize 0 let notslot2 = Array.create cacheSize one let hash x y = ((x lsl 1)+y) mod cacheSize -let rec not n = +let rec not n = match n with Zero -> One | One -> Zero @@ -134,9 +134,9 @@ match n with in notslot1.(h) <- id; notslot2.(h) <- f; f -let rec and2 n1 n2 = +let rec and2 n1 n2 = match n1 with - Node(l1, v1, i1, r1) + Node(l1, v1, i1, r1) -> (match n2 with Node(l2, v2, i2, r2) -> let h = hash i1 i2 @@ -147,8 +147,8 @@ match n1 with | LESS -> mkNode (and2 l1 n2) v1 (and2 r1 n2) | GREATER -> mkNode (and2 n1 l2) v2 (and2 n1 r2) in - andslot1.(h) <- i1; - andslot2.(h) <- i2; + andslot1.(h) <- i1; + andslot2.(h) <- i2; andslot3.(h) <- f; f | Zero -> Zero @@ -157,9 +157,9 @@ match n1 with | One -> n2 -let rec xor n1 n2 = +let rec xor n1 n2 = match n1 with - Node(l1, v1, i1, r1) + Node(l1, v1, i1, r1) -> (match n2 with Node(l2, v2, i2, r2) -> let h = hash i1 i2 @@ -174,19 +174,19 @@ match n1 with andslot2.(h) <- i2; andslot3.(h) <- f; f - | Zero -> n1 + | Zero -> n1 | One -> not n1) | Zero -> n2 | One -> not n2 -let hwb n = +let hwb n = let rec h i j = if i=j then mkVar i else xor (and2 (not(mkVar j)) (h i (j-1))) (and2 (mkVar j) (g i (j-1))) and g i j = if i=j then mkVar i - else xor (and2 (not(mkVar i)) (h (i+1) j)) + else xor (and2 (not(mkVar i)) (h (i+1) j)) (and2 (mkVar i) (g (i+1) j)) in h 0 (n-1) diff --git a/testsuite/tests/misc/boyer.ml b/testsuite/tests/misc/boyer.ml index e3dafa38..6b6e3f2e 100644 --- a/testsuite/tests/misc/boyer.ml +++ b/testsuite/tests/misc/boyer.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: boyer.ml 11156 2011-07-27 14:17:02Z doligez $ *) +(* $Id: boyer.ml 12800 2012-07-30 18:59:07Z doligez $ *) (* Manipulations over terms *) @@ -29,7 +29,7 @@ let rec print_term = function print_string head.name; List.iter (fun t -> print_string " "; print_term t) argl; print_string ")" - + let lemmas = ref ([] : head list) (* Replacement for property lists *) @@ -120,13 +120,13 @@ let add t = add_lemma (cterm_to_term t) let _ = add (CProp ("equal", - [CProp ("compile",[CVar 5]); + [CProp ("compile",[CVar 5]); CProp ("reverse", [CProp ("codegen",[CProp ("optimize",[CVar 5]); CProp ("nil",[])])])])); add (CProp ("equal", - [CProp ("eqp",[CVar 23; CVar 24]); + [CProp ("eqp",[CVar 23; CVar 24]); CProp ("equal",[CProp ("fix",[CVar 23]); CProp ("fix",[CVar 24])])])); add (CProp ("equal", @@ -139,120 +139,120 @@ add (CProp [CProp ("ge",[CVar 23; CVar 24]); CProp ("le",[CVar 24; CVar 23])])); add (CProp ("equal", - [CProp ("boolean",[CVar 23]); + [CProp ("boolean",[CVar 23]); CProp ("or", - [CProp ("equal",[CVar 23; CProp ("true",[])]); + [CProp ("equal",[CVar 23; CProp ("true",[])]); CProp ("equal",[CVar 23; CProp ("false",[])])])])); add (CProp ("equal", - [CProp ("iff",[CVar 23; CVar 24]); + [CProp ("iff",[CVar 23; CVar 24]); CProp ("and", - [CProp ("implies",[CVar 23; CVar 24]); + [CProp ("implies",[CVar 23; CVar 24]); CProp ("implies",[CVar 24; CVar 23])])])); add (CProp ("equal", - [CProp ("even1",[CVar 23]); + [CProp ("even1",[CVar 23]); CProp ("if", - [CProp ("zerop",[CVar 23]); CProp ("true",[]); + [CProp ("zerop",[CVar 23]); CProp ("true",[]); CProp ("odd",[CProp ("sub1",[CVar 23])])])])); add (CProp ("equal", - [CProp ("countps_",[CVar 11; CVar 15]); + [CProp ("countps_",[CVar 11; CVar 15]); CProp ("countps_loop",[CVar 11; CVar 15; CProp ("zero",[])])])); add (CProp ("equal", - [CProp ("fact_",[CVar 8]); + [CProp ("fact_",[CVar 8]); CProp ("fact_loop",[CVar 8; CProp ("one",[])])])); add (CProp ("equal", - [CProp ("reverse_",[CVar 23]); + [CProp ("reverse_",[CVar 23]); CProp ("reverse_loop",[CVar 23; CProp ("nil",[])])])); add (CProp ("equal", - [CProp ("divides",[CVar 23; CVar 24]); + [CProp ("divides",[CVar 23; CVar 24]); CProp ("zerop",[CProp ("remainder",[CVar 24; CVar 23])])])); add (CProp ("equal", - [CProp ("assume_true",[CVar 21; CVar 0]); + [CProp ("assume_true",[CVar 21; CVar 0]); CProp ("cons",[CProp ("cons",[CVar 21; CProp ("true",[])]); CVar 0])])); add (CProp ("equal", - [CProp ("assume_false",[CVar 21; CVar 0]); + [CProp ("assume_false",[CVar 21; CVar 0]); CProp ("cons",[CProp ("cons",[CVar 21; CProp ("false",[])]); CVar 0])])); add (CProp ("equal", - [CProp ("tautology_checker",[CVar 23]); + [CProp ("tautology_checker",[CVar 23]); CProp ("tautologyp",[CProp ("normalize",[CVar 23]); CProp ("nil",[])])])); add (CProp ("equal", - [CProp ("falsify",[CVar 23]); + [CProp ("falsify",[CVar 23]); CProp ("falsify1",[CProp ("normalize",[CVar 23]); CProp ("nil",[])])])); add (CProp ("equal", - [CProp ("prime",[CVar 23]); + [CProp ("prime",[CVar 23]); CProp ("and", - [CProp ("not",[CProp ("zerop",[CVar 23])]); + [CProp ("not",[CProp ("zerop",[CVar 23])]); CProp ("not", - [CProp ("equal",[CVar 23; CProp ("add1",[CProp ("zero",[])])])]); + [CProp ("equal",[CVar 23; CProp ("add1",[CProp ("zero",[])])])]); CProp ("prime1",[CVar 23; CProp ("sub1",[CVar 23])])])])); add (CProp ("equal", - [CProp ("and",[CVar 15; CVar 16]); + [CProp ("and",[CVar 15; CVar 16]); CProp ("if", - [CVar 15; - CProp ("if",[CVar 16; CProp ("true",[]); CProp ("false",[])]); + [CVar 15; + CProp ("if",[CVar 16; CProp ("true",[]); CProp ("false",[])]); CProp ("false",[])])])); add (CProp ("equal", - [CProp ("or",[CVar 15; CVar 16]); + [CProp ("or",[CVar 15; CVar 16]); CProp ("if", - [CVar 15; CProp ("true",[]); - CProp ("if",[CVar 16; CProp ("true",[]); CProp ("false",[])]); + [CVar 15; CProp ("true",[]); + CProp ("if",[CVar 16; CProp ("true",[]); CProp ("false",[])]); CProp ("false",[])])])); add (CProp ("equal", - [CProp ("not",[CVar 15]); + [CProp ("not",[CVar 15]); CProp ("if",[CVar 15; CProp ("false",[]); CProp ("true",[])])])); add (CProp ("equal", - [CProp ("implies",[CVar 15; CVar 16]); + [CProp ("implies",[CVar 15; CVar 16]); CProp ("if", - [CVar 15; - CProp ("if",[CVar 16; CProp ("true",[]); CProp ("false",[])]); + [CVar 15; + CProp ("if",[CVar 16; CProp ("true",[]); CProp ("false",[])]); CProp ("true",[])])])); add (CProp ("equal", - [CProp ("fix",[CVar 23]); + [CProp ("fix",[CVar 23]); CProp ("if",[CProp ("numberp",[CVar 23]); CVar 23; CProp ("zero",[])])])); add (CProp ("equal", - [CProp ("if",[CProp ("if",[CVar 0; CVar 1; CVar 2]); CVar 3; CVar 4]); + [CProp ("if",[CProp ("if",[CVar 0; CVar 1; CVar 2]); CVar 3; CVar 4]); CProp ("if", - [CVar 0; CProp ("if",[CVar 1; CVar 3; CVar 4]); + [CVar 0; CProp ("if",[CVar 1; CVar 3; CVar 4]); CProp ("if",[CVar 2; CVar 3; CVar 4])])])); add (CProp ("equal", - [CProp ("zerop",[CVar 23]); + [CProp ("zerop",[CVar 23]); CProp ("or", - [CProp ("equal",[CVar 23; CProp ("zero",[])]); + [CProp ("equal",[CVar 23; CProp ("zero",[])]); CProp ("not",[CProp ("numberp",[CVar 23])])])])); add (CProp ("equal", - [CProp ("plus",[CProp ("plus",[CVar 23; CVar 24]); CVar 25]); + [CProp ("plus",[CProp ("plus",[CVar 23; CVar 24]); CVar 25]); CProp ("plus",[CVar 23; CProp ("plus",[CVar 24; CVar 25])])])); add (CProp ("equal", - [CProp ("equal",[CProp ("plus",[CVar 0; CVar 1]); CProp ("zero",[])]); + [CProp ("equal",[CProp ("plus",[CVar 0; CVar 1]); CProp ("zero",[])]); CProp ("and",[CProp ("zerop",[CVar 0]); CProp ("zerop",[CVar 1])])])); add (CProp ("equal",[CProp ("difference",[CVar 23; CVar 23]); CProp ("zero",[])])); @@ -260,90 +260,90 @@ add (CProp ("equal", [CProp ("equal", - [CProp ("plus",[CVar 0; CVar 1]); CProp ("plus",[CVar 0; CVar 2])]); + [CProp ("plus",[CVar 0; CVar 1]); CProp ("plus",[CVar 0; CVar 2])]); CProp ("equal",[CProp ("fix",[CVar 1]); CProp ("fix",[CVar 2])])])); add (CProp ("equal", [CProp - ("equal",[CProp ("zero",[]); CProp ("difference",[CVar 23; CVar 24])]); + ("equal",[CProp ("zero",[]); CProp ("difference",[CVar 23; CVar 24])]); CProp ("not",[CProp ("gt",[CVar 24; CVar 23])])])); add (CProp ("equal", - [CProp ("equal",[CVar 23; CProp ("difference",[CVar 23; CVar 24])]); + [CProp ("equal",[CVar 23; CProp ("difference",[CVar 23; CVar 24])]); CProp ("and", - [CProp ("numberp",[CVar 23]); + [CProp ("numberp",[CVar 23]); CProp ("or", - [CProp ("equal",[CVar 23; CProp ("zero",[])]); + [CProp ("equal",[CVar 23; CProp ("zero",[])]); CProp ("zerop",[CVar 24])])])])); add (CProp ("equal", [CProp ("meaning", - [CProp ("plus_tree",[CProp ("append",[CVar 23; CVar 24])]); CVar 0]); + [CProp ("plus_tree",[CProp ("append",[CVar 23; CVar 24])]); CVar 0]); CProp ("plus", - [CProp ("meaning",[CProp ("plus_tree",[CVar 23]); CVar 0]); + [CProp ("meaning",[CProp ("plus_tree",[CVar 23]); CVar 0]); CProp ("meaning",[CProp ("plus_tree",[CVar 24]); CVar 0])])])); add (CProp ("equal", [CProp ("meaning", - [CProp ("plus_tree",[CProp ("plus_fringe",[CVar 23])]); CVar 0]); + [CProp ("plus_tree",[CProp ("plus_fringe",[CVar 23])]); CVar 0]); CProp ("fix",[CProp ("meaning",[CVar 23; CVar 0])])])); add (CProp ("equal", - [CProp ("append",[CProp ("append",[CVar 23; CVar 24]); CVar 25]); + [CProp ("append",[CProp ("append",[CVar 23; CVar 24]); CVar 25]); CProp ("append",[CVar 23; CProp ("append",[CVar 24; CVar 25])])])); add (CProp ("equal", - [CProp ("reverse",[CProp ("append",[CVar 0; CVar 1])]); + [CProp ("reverse",[CProp ("append",[CVar 0; CVar 1])]); CProp ("append",[CProp ("reverse",[CVar 1]); CProp ("reverse",[CVar 0])])])); add (CProp ("equal", - [CProp ("times",[CVar 23; CProp ("plus",[CVar 24; CVar 25])]); + [CProp ("times",[CVar 23; CProp ("plus",[CVar 24; CVar 25])]); CProp ("plus", - [CProp ("times",[CVar 23; CVar 24]); + [CProp ("times",[CVar 23; CVar 24]); CProp ("times",[CVar 23; CVar 25])])])); add (CProp ("equal", - [CProp ("times",[CProp ("times",[CVar 23; CVar 24]); CVar 25]); + [CProp ("times",[CProp ("times",[CVar 23; CVar 24]); CVar 25]); CProp ("times",[CVar 23; CProp ("times",[CVar 24; CVar 25])])])); add (CProp ("equal", [CProp - ("equal",[CProp ("times",[CVar 23; CVar 24]); CProp ("zero",[])]); + ("equal",[CProp ("times",[CVar 23; CVar 24]); CProp ("zero",[])]); CProp ("or",[CProp ("zerop",[CVar 23]); CProp ("zerop",[CVar 24])])])); add (CProp ("equal", - [CProp ("exec",[CProp ("append",[CVar 23; CVar 24]); CVar 15; CVar 4]); + [CProp ("exec",[CProp ("append",[CVar 23; CVar 24]); CVar 15; CVar 4]); CProp ("exec",[CVar 24; CProp ("exec",[CVar 23; CVar 15; CVar 4]); CVar 4])])); add (CProp ("equal", - [CProp ("mc_flatten",[CVar 23; CVar 24]); + [CProp ("mc_flatten",[CVar 23; CVar 24]); CProp ("append",[CProp ("flatten",[CVar 23]); CVar 24])])); add (CProp ("equal", - [CProp ("member",[CVar 23; CProp ("append",[CVar 0; CVar 1])]); + [CProp ("member",[CVar 23; CProp ("append",[CVar 0; CVar 1])]); CProp ("or", - [CProp ("member",[CVar 23; CVar 0]); + [CProp ("member",[CVar 23; CVar 0]); CProp ("member",[CVar 23; CVar 1])])])); add (CProp ("equal", - [CProp ("member",[CVar 23; CProp ("reverse",[CVar 24])]); + [CProp ("member",[CVar 23; CProp ("reverse",[CVar 24])]); CProp ("member",[CVar 23; CVar 24])])); add (CProp ("equal", - [CProp ("length",[CProp ("reverse",[CVar 23])]); + [CProp ("length",[CProp ("reverse",[CVar 23])]); CProp ("length",[CVar 23])])); add (CProp ("equal", - [CProp ("member",[CVar 0; CProp ("intersect",[CVar 1; CVar 2])]); + [CProp ("member",[CVar 0; CProp ("intersect",[CVar 1; CVar 2])]); CProp ("and", [CProp ("member",[CVar 0; CVar 1]); CProp ("member",[CVar 0; CVar 2])])])); @@ -351,89 +351,89 @@ add (CProp ("equal",[CProp ("nth",[CProp ("zero",[]); CVar 8]); CProp ("zero",[])])); add (CProp ("equal", - [CProp ("exp",[CVar 8; CProp ("plus",[CVar 9; CVar 10])]); + [CProp ("exp",[CVar 8; CProp ("plus",[CVar 9; CVar 10])]); CProp ("times", [CProp ("exp",[CVar 8; CVar 9]); CProp ("exp",[CVar 8; CVar 10])])])); add (CProp ("equal", - [CProp ("exp",[CVar 8; CProp ("times",[CVar 9; CVar 10])]); + [CProp ("exp",[CVar 8; CProp ("times",[CVar 9; CVar 10])]); CProp ("exp",[CProp ("exp",[CVar 8; CVar 9]); CVar 10])])); add (CProp ("equal", - [CProp ("reverse_loop",[CVar 23; CVar 24]); + [CProp ("reverse_loop",[CVar 23; CVar 24]); CProp ("append",[CProp ("reverse",[CVar 23]); CVar 24])])); add (CProp ("equal", - [CProp ("reverse_loop",[CVar 23; CProp ("nil",[])]); + [CProp ("reverse_loop",[CVar 23; CProp ("nil",[])]); CProp ("reverse",[CVar 23])])); add (CProp ("equal", - [CProp ("count_list",[CVar 25; CProp ("sort_lp",[CVar 23; CVar 24])]); + [CProp ("count_list",[CVar 25; CProp ("sort_lp",[CVar 23; CVar 24])]); CProp ("plus", - [CProp ("count_list",[CVar 25; CVar 23]); + [CProp ("count_list",[CVar 25; CVar 23]); CProp ("count_list",[CVar 25; CVar 24])])])); add (CProp ("equal", [CProp ("equal", - [CProp ("append",[CVar 0; CVar 1]); CProp ("append",[CVar 0; CVar 2])]); + [CProp ("append",[CVar 0; CVar 1]); CProp ("append",[CVar 0; CVar 2])]); CProp ("equal",[CVar 1; CVar 2])])); add (CProp ("equal", [CProp ("plus", - [CProp ("remainder",[CVar 23; CVar 24]); - CProp ("times",[CVar 24; CProp ("quotient",[CVar 23; CVar 24])])]); + [CProp ("remainder",[CVar 23; CVar 24]); + CProp ("times",[CVar 24; CProp ("quotient",[CVar 23; CVar 24])])]); CProp ("fix",[CVar 23])])); add (CProp ("equal", [CProp - ("power_eval",[CProp ("big_plus",[CVar 11; CVar 8; CVar 1]); CVar 1]); + ("power_eval",[CProp ("big_plus",[CVar 11; CVar 8; CVar 1]); CVar 1]); CProp ("plus",[CProp ("power_eval",[CVar 11; CVar 1]); CVar 8])])); add (CProp ("equal", [CProp ("power_eval", - [CProp ("big_plus",[CVar 23; CVar 24; CVar 8; CVar 1]); CVar 1]); + [CProp ("big_plus",[CVar 23; CVar 24; CVar 8; CVar 1]); CVar 1]); CProp ("plus", - [CVar 8; + [CVar 8; CProp ("plus", - [CProp ("power_eval",[CVar 23; CVar 1]); + [CProp ("power_eval",[CVar 23; CVar 1]); CProp ("power_eval",[CVar 24; CVar 1])])])])); add (CProp ("equal", [CProp ("remainder",[CVar 24; CProp ("one",[])]); CProp ("zero",[])])); add (CProp ("equal", - [CProp ("lt",[CProp ("remainder",[CVar 23; CVar 24]); CVar 24]); + [CProp ("lt",[CProp ("remainder",[CVar 23; CVar 24]); CVar 24]); CProp ("not",[CProp ("zerop",[CVar 24])])])); add (CProp ("equal",[CProp ("remainder",[CVar 23; CVar 23]); CProp ("zero",[])])); add (CProp ("equal", - [CProp ("lt",[CProp ("quotient",[CVar 8; CVar 9]); CVar 8]); + [CProp ("lt",[CProp ("quotient",[CVar 8; CVar 9]); CVar 8]); CProp ("and", - [CProp ("not",[CProp ("zerop",[CVar 8])]); + [CProp ("not",[CProp ("zerop",[CVar 8])]); CProp ("or", - [CProp ("zerop",[CVar 9]); + [CProp ("zerop",[CVar 9]); CProp ("not",[CProp ("equal",[CVar 9; CProp ("one",[])])])])])])); add (CProp ("equal", - [CProp ("lt",[CProp ("remainder",[CVar 23; CVar 24]); CVar 23]); + [CProp ("lt",[CProp ("remainder",[CVar 23; CVar 24]); CVar 23]); CProp ("and", - [CProp ("not",[CProp ("zerop",[CVar 24])]); - CProp ("not",[CProp ("zerop",[CVar 23])]); + [CProp ("not",[CProp ("zerop",[CVar 24])]); + CProp ("not",[CProp ("zerop",[CVar 23])]); CProp ("not",[CProp ("lt",[CVar 23; CVar 24])])])])); add (CProp ("equal", - [CProp ("power_eval",[CProp ("power_rep",[CVar 8; CVar 1]); CVar 1]); + [CProp ("power_eval",[CProp ("power_rep",[CVar 8; CVar 1]); CVar 1]); CProp ("fix",[CVar 8])])); add (CProp ("equal", @@ -441,199 +441,199 @@ add (CProp ("power_eval", [CProp ("big_plus", - [CProp ("power_rep",[CVar 8; CVar 1]); - CProp ("power_rep",[CVar 9; CVar 1]); CProp ("zero",[]); - CVar 1]); - CVar 1]); + [CProp ("power_rep",[CVar 8; CVar 1]); + CProp ("power_rep",[CVar 9; CVar 1]); CProp ("zero",[]); + CVar 1]); + CVar 1]); CProp ("plus",[CVar 8; CVar 9])])); add (CProp ("equal", [CProp ("gcd",[CVar 23; CVar 24]); CProp ("gcd",[CVar 24; CVar 23])])); add (CProp ("equal", - [CProp ("nth",[CProp ("append",[CVar 0; CVar 1]); CVar 8]); + [CProp ("nth",[CProp ("append",[CVar 0; CVar 1]); CVar 8]); CProp ("append", - [CProp ("nth",[CVar 0; CVar 8]); + [CProp ("nth",[CVar 0; CVar 8]); CProp ("nth", [CVar 1; CProp ("difference",[CVar 8; CProp ("length",[CVar 0])])])])])); add (CProp ("equal", - [CProp ("difference",[CProp ("plus",[CVar 23; CVar 24]); CVar 23]); + [CProp ("difference",[CProp ("plus",[CVar 23; CVar 24]); CVar 23]); CProp ("fix",[CVar 24])])); add (CProp ("equal", - [CProp ("difference",[CProp ("plus",[CVar 24; CVar 23]); CVar 23]); + [CProp ("difference",[CProp ("plus",[CVar 24; CVar 23]); CVar 23]); CProp ("fix",[CVar 24])])); add (CProp ("equal", [CProp ("difference", - [CProp ("plus",[CVar 23; CVar 24]); CProp ("plus",[CVar 23; CVar 25])]); + [CProp ("plus",[CVar 23; CVar 24]); CProp ("plus",[CVar 23; CVar 25])]); CProp ("difference",[CVar 24; CVar 25])])); add (CProp ("equal", - [CProp ("times",[CVar 23; CProp ("difference",[CVar 2; CVar 22])]); + [CProp ("times",[CVar 23; CProp ("difference",[CVar 2; CVar 22])]); CProp ("difference", - [CProp ("times",[CVar 2; CVar 23]); + [CProp ("times",[CVar 2; CVar 23]); CProp ("times",[CVar 22; CVar 23])])])); add (CProp ("equal", - [CProp ("remainder",[CProp ("times",[CVar 23; CVar 25]); CVar 25]); + [CProp ("remainder",[CProp ("times",[CVar 23; CVar 25]); CVar 25]); CProp ("zero",[])])); add (CProp ("equal", [CProp ("difference", - [CProp ("plus",[CVar 1; CProp ("plus",[CVar 0; CVar 2])]); CVar 0]); + [CProp ("plus",[CVar 1; CProp ("plus",[CVar 0; CVar 2])]); CVar 0]); CProp ("plus",[CVar 1; CVar 2])])); add (CProp ("equal", [CProp ("difference", - [CProp ("add1",[CProp ("plus",[CVar 24; CVar 25])]); CVar 25]); + [CProp ("add1",[CProp ("plus",[CVar 24; CVar 25])]); CVar 25]); CProp ("add1",[CVar 24])])); add (CProp ("equal", [CProp ("lt", - [CProp ("plus",[CVar 23; CVar 24]); CProp ("plus",[CVar 23; CVar 25])]); + [CProp ("plus",[CVar 23; CVar 24]); CProp ("plus",[CVar 23; CVar 25])]); CProp ("lt",[CVar 24; CVar 25])])); add (CProp ("equal", [CProp ("lt", - [CProp ("times",[CVar 23; CVar 25]); - CProp ("times",[CVar 24; CVar 25])]); + [CProp ("times",[CVar 23; CVar 25]); + CProp ("times",[CVar 24; CVar 25])]); CProp ("and", - [CProp ("not",[CProp ("zerop",[CVar 25])]); + [CProp ("not",[CProp ("zerop",[CVar 25])]); CProp ("lt",[CVar 23; CVar 24])])])); add (CProp ("equal", - [CProp ("lt",[CVar 24; CProp ("plus",[CVar 23; CVar 24])]); + [CProp ("lt",[CVar 24; CProp ("plus",[CVar 23; CVar 24])]); CProp ("not",[CProp ("zerop",[CVar 23])])])); add (CProp ("equal", [CProp ("gcd", - [CProp ("times",[CVar 23; CVar 25]); - CProp ("times",[CVar 24; CVar 25])]); + [CProp ("times",[CVar 23; CVar 25]); + CProp ("times",[CVar 24; CVar 25])]); CProp ("times",[CVar 25; CProp ("gcd",[CVar 23; CVar 24])])])); add (CProp ("equal", - [CProp ("value",[CProp ("normalize",[CVar 23]); CVar 0]); + [CProp ("value",[CProp ("normalize",[CVar 23]); CVar 0]); CProp ("value",[CVar 23; CVar 0])])); add (CProp ("equal", [CProp ("equal", - [CProp ("flatten",[CVar 23]); - CProp ("cons",[CVar 24; CProp ("nil",[])])]); + [CProp ("flatten",[CVar 23]); + CProp ("cons",[CVar 24; CProp ("nil",[])])]); CProp ("and", [CProp ("nlistp",[CVar 23]); CProp ("equal",[CVar 23; CVar 24])])])); add (CProp ("equal", - [CProp ("listp",[CProp ("gother",[CVar 23])]); + [CProp ("listp",[CProp ("gother",[CVar 23])]); CProp ("listp",[CVar 23])])); add (CProp ("equal", - [CProp ("samefringe",[CVar 23; CVar 24]); + [CProp ("samefringe",[CVar 23; CVar 24]); CProp ("equal",[CProp ("flatten",[CVar 23]); CProp ("flatten",[CVar 24])])])); add (CProp ("equal", [CProp ("equal", - [CProp ("greatest_factor",[CVar 23; CVar 24]); CProp ("zero",[])]); + [CProp ("greatest_factor",[CVar 23; CVar 24]); CProp ("zero",[])]); CProp ("and", [CProp ("or", - [CProp ("zerop",[CVar 24]); - CProp ("equal",[CVar 24; CProp ("one",[])])]); + [CProp ("zerop",[CVar 24]); + CProp ("equal",[CVar 24; CProp ("one",[])])]); CProp ("equal",[CVar 23; CProp ("zero",[])])])])); add (CProp ("equal", [CProp ("equal", - [CProp ("greatest_factor",[CVar 23; CVar 24]); CProp ("one",[])]); + [CProp ("greatest_factor",[CVar 23; CVar 24]); CProp ("one",[])]); CProp ("equal",[CVar 23; CProp ("one",[])])])); add (CProp ("equal", - [CProp ("numberp",[CProp ("greatest_factor",[CVar 23; CVar 24])]); + [CProp ("numberp",[CProp ("greatest_factor",[CVar 23; CVar 24])]); CProp ("not", [CProp ("and", [CProp ("or", - [CProp ("zerop",[CVar 24]); - CProp ("equal",[CVar 24; CProp ("one",[])])]); + [CProp ("zerop",[CVar 24]); + CProp ("equal",[CVar 24; CProp ("one",[])])]); CProp ("not",[CProp ("numberp",[CVar 23])])])])])); add (CProp ("equal", - [CProp ("times_list",[CProp ("append",[CVar 23; CVar 24])]); + [CProp ("times_list",[CProp ("append",[CVar 23; CVar 24])]); CProp ("times", [CProp ("times_list",[CVar 23]); CProp ("times_list",[CVar 24])])])); add (CProp ("equal", - [CProp ("prime_list",[CProp ("append",[CVar 23; CVar 24])]); + [CProp ("prime_list",[CProp ("append",[CVar 23; CVar 24])]); CProp ("and", [CProp ("prime_list",[CVar 23]); CProp ("prime_list",[CVar 24])])])); add (CProp ("equal", - [CProp ("equal",[CVar 25; CProp ("times",[CVar 22; CVar 25])]); + [CProp ("equal",[CVar 25; CProp ("times",[CVar 22; CVar 25])]); CProp ("and", - [CProp ("numberp",[CVar 25]); + [CProp ("numberp",[CVar 25]); CProp ("or", - [CProp ("equal",[CVar 25; CProp ("zero",[])]); + [CProp ("equal",[CVar 25; CProp ("zero",[])]); CProp ("equal",[CVar 22; CProp ("one",[])])])])])); add (CProp ("equal", - [CProp ("ge",[CVar 23; CVar 24]); + [CProp ("ge",[CVar 23; CVar 24]); CProp ("not",[CProp ("lt",[CVar 23; CVar 24])])])); add (CProp ("equal", - [CProp ("equal",[CVar 23; CProp ("times",[CVar 23; CVar 24])]); + [CProp ("equal",[CVar 23; CProp ("times",[CVar 23; CVar 24])]); CProp ("or", - [CProp ("equal",[CVar 23; CProp ("zero",[])]); + [CProp ("equal",[CVar 23; CProp ("zero",[])]); CProp ("and", - [CProp ("numberp",[CVar 23]); + [CProp ("numberp",[CVar 23]); CProp ("equal",[CVar 24; CProp ("one",[])])])])])); add (CProp ("equal", - [CProp ("remainder",[CProp ("times",[CVar 24; CVar 23]); CVar 24]); + [CProp ("remainder",[CProp ("times",[CVar 24; CVar 23]); CVar 24]); CProp ("zero",[])])); add (CProp ("equal", - [CProp ("equal",[CProp ("times",[CVar 0; CVar 1]); CProp ("one",[])]); + [CProp ("equal",[CProp ("times",[CVar 0; CVar 1]); CProp ("one",[])]); CProp ("and", - [CProp ("not",[CProp ("equal",[CVar 0; CProp ("zero",[])])]); - CProp ("not",[CProp ("equal",[CVar 1; CProp ("zero",[])])]); - CProp ("numberp",[CVar 0]); CProp ("numberp",[CVar 1]); - CProp ("equal",[CProp ("sub1",[CVar 0]); CProp ("zero",[])]); + [CProp ("not",[CProp ("equal",[CVar 0; CProp ("zero",[])])]); + CProp ("not",[CProp ("equal",[CVar 1; CProp ("zero",[])])]); + CProp ("numberp",[CVar 0]); CProp ("numberp",[CVar 1]); + CProp ("equal",[CProp ("sub1",[CVar 0]); CProp ("zero",[])]); CProp ("equal",[CProp ("sub1",[CVar 1]); CProp ("zero",[])])])])); add (CProp ("equal", [CProp ("lt", - [CProp ("length",[CProp ("delete",[CVar 23; CVar 11])]); - CProp ("length",[CVar 11])]); + [CProp ("length",[CProp ("delete",[CVar 23; CVar 11])]); + CProp ("length",[CVar 11])]); CProp ("member",[CVar 23; CVar 11])])); add (CProp ("equal", - [CProp ("sort2",[CProp ("delete",[CVar 23; CVar 11])]); + [CProp ("sort2",[CProp ("delete",[CVar 23; CVar 11])]); CProp ("delete",[CVar 23; CProp ("sort2",[CVar 11])])])); add (CProp ("equal",[CProp ("dsort",[CVar 23]); CProp ("sort2",[CVar 23])])); add (CProp @@ -642,145 +642,145 @@ add (CProp ("length", [CProp ("cons", - [CVar 0; + [CVar 0; CProp ("cons", - [CVar 1; + [CVar 1; CProp ("cons", - [CVar 2; + [CVar 2; CProp ("cons", - [CVar 3; + [CVar 3; CProp ("cons",[CVar 4; CProp ("cons",[CVar 5; CVar 6])])])])])])]) ; CProp ("plus",[CProp ("six",[]); CProp ("length",[CVar 6])])])); add (CProp ("equal", [CProp ("difference", - [CProp ("add1",[CProp ("add1",[CVar 23])]); CProp ("two",[])]); + [CProp ("add1",[CProp ("add1",[CVar 23])]); CProp ("two",[])]); CProp ("fix",[CVar 23])])); add (CProp ("equal", [CProp ("quotient", - [CProp ("plus",[CVar 23; CProp ("plus",[CVar 23; CVar 24])]); - CProp ("two",[])]); + [CProp ("plus",[CVar 23; CProp ("plus",[CVar 23; CVar 24])]); + CProp ("two",[])]); CProp ("plus",[CVar 23; CProp ("quotient",[CVar 24; CProp ("two",[])])])])); add (CProp ("equal", - [CProp ("sigma",[CProp ("zero",[]); CVar 8]); + [CProp ("sigma",[CProp ("zero",[]); CVar 8]); CProp ("quotient", [CProp ("times",[CVar 8; CProp ("add1",[CVar 8])]); CProp ("two",[])])])); add (CProp ("equal", - [CProp ("plus",[CVar 23; CProp ("add1",[CVar 24])]); + [CProp ("plus",[CVar 23; CProp ("add1",[CVar 24])]); CProp ("if", - [CProp ("numberp",[CVar 24]); - CProp ("add1",[CProp ("plus",[CVar 23; CVar 24])]); + [CProp ("numberp",[CVar 24]); + CProp ("add1",[CProp ("plus",[CVar 23; CVar 24])]); CProp ("add1",[CVar 23])])])); add (CProp ("equal", [CProp ("equal", - [CProp ("difference",[CVar 23; CVar 24]); - CProp ("difference",[CVar 25; CVar 24])]); + [CProp ("difference",[CVar 23; CVar 24]); + CProp ("difference",[CVar 25; CVar 24])]); CProp ("if", - [CProp ("lt",[CVar 23; CVar 24]); - CProp ("not",[CProp ("lt",[CVar 24; CVar 25])]); + [CProp ("lt",[CVar 23; CVar 24]); + CProp ("not",[CProp ("lt",[CVar 24; CVar 25])]); CProp ("if", - [CProp ("lt",[CVar 25; CVar 24]); - CProp ("not",[CProp ("lt",[CVar 24; CVar 23])]); + [CProp ("lt",[CVar 25; CVar 24]); + CProp ("not",[CProp ("lt",[CVar 24; CVar 23])]); CProp ("equal",[CProp ("fix",[CVar 23]); CProp ("fix",[CVar 25])])])])]) ); add (CProp ("equal", [CProp ("meaning", - [CProp ("plus_tree",[CProp ("delete",[CVar 23; CVar 24])]); CVar 0]); + [CProp ("plus_tree",[CProp ("delete",[CVar 23; CVar 24])]); CVar 0]); CProp ("if", - [CProp ("member",[CVar 23; CVar 24]); + [CProp ("member",[CVar 23; CVar 24]); CProp ("difference", - [CProp ("meaning",[CProp ("plus_tree",[CVar 24]); CVar 0]); - CProp ("meaning",[CVar 23; CVar 0])]); + [CProp ("meaning",[CProp ("plus_tree",[CVar 24]); CVar 0]); + CProp ("meaning",[CVar 23; CVar 0])]); CProp ("meaning",[CProp ("plus_tree",[CVar 24]); CVar 0])])])); add (CProp ("equal", - [CProp ("times",[CVar 23; CProp ("add1",[CVar 24])]); + [CProp ("times",[CVar 23; CProp ("add1",[CVar 24])]); CProp ("if", - [CProp ("numberp",[CVar 24]); + [CProp ("numberp",[CVar 24]); CProp ("plus", - [CVar 23; CProp ("times",[CVar 23; CVar 24]); + [CVar 23; CProp ("times",[CVar 23; CVar 24]); CProp ("fix",[CVar 23])])])])); add (CProp ("equal", - [CProp ("nth",[CProp ("nil",[]); CVar 8]); + [CProp ("nth",[CProp ("nil",[]); CVar 8]); CProp ("if",[CProp ("zerop",[CVar 8]); CProp ("nil",[]); CProp ("zero",[])])])); add (CProp ("equal", - [CProp ("last",[CProp ("append",[CVar 0; CVar 1])]); + [CProp ("last",[CProp ("append",[CVar 0; CVar 1])]); CProp ("if", - [CProp ("listp",[CVar 1]); CProp ("last",[CVar 1]); + [CProp ("listp",[CVar 1]); CProp ("last",[CVar 1]); CProp ("if", - [CProp ("listp",[CVar 0]); - CProp ("cons",[CProp ("car",[CProp ("last",[CVar 0])]); CVar 1]); + [CProp ("listp",[CVar 0]); + CProp ("cons",[CProp ("car",[CProp ("last",[CVar 0])]); CVar 1]); CVar 1])])])); add (CProp ("equal", - [CProp ("equal",[CProp ("lt",[CVar 23; CVar 24]); CVar 25]); + [CProp ("equal",[CProp ("lt",[CVar 23; CVar 24]); CVar 25]); CProp ("if", - [CProp ("lt",[CVar 23; CVar 24]); - CProp ("equal",[CProp ("true",[]); CVar 25]); + [CProp ("lt",[CVar 23; CVar 24]); + CProp ("equal",[CProp ("true",[]); CVar 25]); CProp ("equal",[CProp ("false",[]); CVar 25])])])); add (CProp ("equal", - [CProp ("assignment",[CVar 23; CProp ("append",[CVar 0; CVar 1])]); + [CProp ("assignment",[CVar 23; CProp ("append",[CVar 0; CVar 1])]); CProp ("if", - [CProp ("assignedp",[CVar 23; CVar 0]); - CProp ("assignment",[CVar 23; CVar 0]); + [CProp ("assignedp",[CVar 23; CVar 0]); + CProp ("assignment",[CVar 23; CVar 0]); CProp ("assignment",[CVar 23; CVar 1])])])); add (CProp ("equal", - [CProp ("car",[CProp ("gother",[CVar 23])]); + [CProp ("car",[CProp ("gother",[CVar 23])]); CProp ("if", - [CProp ("listp",[CVar 23]); + [CProp ("listp",[CVar 23]); CProp ("car",[CProp ("flatten",[CVar 23])]); CProp ("zero",[])])])); add (CProp ("equal", - [CProp ("flatten",[CProp ("cdr",[CProp ("gother",[CVar 23])])]); + [CProp ("flatten",[CProp ("cdr",[CProp ("gother",[CVar 23])])]); CProp ("if", - [CProp ("listp",[CVar 23]); - CProp ("cdr",[CProp ("flatten",[CVar 23])]); + [CProp ("listp",[CVar 23]); + CProp ("cdr",[CProp ("flatten",[CVar 23])]); CProp ("cons",[CProp ("zero",[]); CProp ("nil",[])])])])); add (CProp ("equal", - [CProp ("quotient",[CProp ("times",[CVar 24; CVar 23]); CVar 24]); + [CProp ("quotient",[CProp ("times",[CVar 24; CVar 23]); CVar 24]); CProp ("if", - [CProp ("zerop",[CVar 24]); CProp ("zero",[]); + [CProp ("zerop",[CVar 24]); CProp ("zero",[]); CProp ("fix",[CVar 23])])])); add (CProp ("equal", - [CProp ("get",[CVar 9; CProp ("set",[CVar 8; CVar 21; CVar 12])]); + [CProp ("get",[CVar 9; CProp ("set",[CVar 8; CVar 21; CVar 12])]); CProp ("if", - [CProp ("eqp",[CVar 9; CVar 8]); CVar 21; + [CProp ("eqp",[CVar 9; CVar 8]); CVar 21; CProp ("get",[CVar 9; CVar 12])])])) (* Tautology checker *) @@ -822,7 +822,7 @@ let rec tautologyp x true_lst false_lst = end -let tautp x = +let tautp x = (* print_term x; print_string"\n"; *) let y = rewrite x in (* print_term y; print_string "\n"; *) diff --git a/testsuite/tests/misc/fib.ml b/testsuite/tests/misc/fib.ml index 7919670c..71fe1610 100644 --- a/testsuite/tests/misc/fib.ml +++ b/testsuite/tests/misc/fib.ml @@ -10,15 +10,14 @@ (* *) (***********************************************************************) -(* $Id: fib.ml 11156 2011-07-27 14:17:02Z doligez $ *) +(* $Id: fib.ml 12800 2012-07-30 18:59:07Z doligez $ *) let rec fib n = if n < 2 then 1 else fib(n-1) + fib(n-2) let _ = let n = - if Array.length Sys.argv >= 2 + if Array.length Sys.argv >= 2 then int_of_string Sys.argv.(1) else 40 in print_int(fib n); print_newline(); exit 0 - diff --git a/testsuite/tests/misc/nucleic.ml b/testsuite/tests/misc/nucleic.ml index 542c9579..09c8c483 100644 --- a/testsuite/tests/misc/nucleic.ml +++ b/testsuite/tests/misc/nucleic.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: nucleic.ml 11156 2011-07-27 14:17:02Z doligez $ *) +(* $Id: nucleic.ml 12800 2012-07-30 18:59:07Z doligez $ *) (* Use floating-point arithmetic *) @@ -60,14 +60,14 @@ pt_theta p matrices don't have the perspective terms and are the transpose of Paul's one. See also "M\"antyl\"a, M. (1985) An Introduction to Solid Modeling, Computer Science Press" Appendix A. - + The components of a transformation matrix are named like this: - + a b c d e f g h i tx ty tz - + The components tx, ty, and tz are the translation vector. *) @@ -208,7 +208,7 @@ tfo_align p1 p2 p3 (* Numbering of atoms follows the paper: - + IUPAC-IUB Joint Commission on Biochemical Nomenclature (JCBN) (1983) Abbreviations and Symbols for the Description of Conformations of Polynucleotide Chains. Eur. J. Biochem 131, @@ -273,7 +273,7 @@ nuc_C1' = c1' let -nuc_C2 +nuc_C2 (N(dgf_base_tfo,p_o3'_275_tfo,p_o3'_180_tfo,p_o3'_60_tfo, p,o1p,o2p,o5',c5',h5',h5'',c4',h4',o4',c1',h1',c2',h2'',o2',h2', c3',h3',o3',n1,n3,c2,c4,c5,c6,_)) @@ -287,7 +287,7 @@ nuc_C3' = c3' let -nuc_C4 +nuc_C4 (N(dgf_base_tfo,p_o3'_275_tfo,p_o3'_180_tfo,p_o3'_60_tfo, p,o1p,o2p,o5',c5',h5',h5'',c4',h4',o4',c1',h1',c2',h2'',o2',h2', c3',h3',o3',n1,n3,c2,c4,c5,c6,_)) @@ -301,7 +301,7 @@ nuc_C4' = c4' let -nuc_N1 +nuc_N1 (N(dgf_base_tfo,p_o3'_275_tfo,p_o3'_180_tfo,p_o3'_60_tfo, p,o1p,o2p,o5',c5',h5',h5'',c4',h4',o4',c1',h1',c2',h2'',o2',h2', c3',h3',o3',n1,n3,c2,c4,c5,c6,_)) @@ -2896,13 +2896,13 @@ let rec search (partial_inst : variable list) l constr = (* -- DOMAINS ---------------------------------------------------------------*) (* Primary structure: strand A CUGCCACGUCUG, strand B CAGACGUGGCAG - + Secondary structure: strand A CUGCCACGUCUG |||||||||||| GACGGUGCAGAC strand B - + Tertiary structure: - + 5' end of strand A C1----G12 3' end of strand B U2-------A11 G3-------C10 @@ -2915,13 +2915,13 @@ let rec search (partial_inst : variable list) l constr = G3--------C10 A2-------U11 5' end of strand B C1----G12 3' end of strand A - + "helix", "stacked" and "connected" describe the spatial relationship between two consecutive nucleotides. E.g. the nucleotides C1 and U2 from the strand A. - + "wc" (stands for Watson-Crick and is a type of base-pairing), - and "wc-dumas" describe the spatial relationship between + and "wc-dumas" describe the spatial relationship between nucleotides from two chains that are growing in opposite directions. E.g. the nucleotides C1 from strand A and G12 from strand B. *) @@ -2965,7 +2965,7 @@ let reference n i partial_inst = [ mk_var i tfo_id n ] (* The transformation matrix for wc is from: - + Chandrasekaran R. et al (1989) A Re-Examination of the Crystal Structure of A-DNA Using Fiber Diffraction Data. J. Biomol. Struct. & Dynamics 6(6):1189-1202. @@ -3047,7 +3047,7 @@ let a38_g37 nucl i j partial_inst = mk_var i (dgf_base a38_g37_tfo (get_var j partial_inst) nucl) nucl -let +let stacked3' nucl i j partial_inst = (a38_g37 nucl i j partial_inst) :: (helix3' nucl i j partial_inst) @@ -3146,7 +3146,7 @@ pseudoknot_domains stacked5' rU 5 4; (* | 4.5 Angstroms *) stacked5' rC 6 5 (* <-' *) ] - + (* Pseudoknot constraint *) let @@ -3212,7 +3212,7 @@ var_most_distant_atom v = let max_dist = ref 0.0 in for i = 0 to pred (Array.length atoms) do let p = atoms.(i) in - let distance = + let distance = let pos = absolute_pos v p in sqrt ((pos.x * pos.x) + (pos.y * pos.y) + (pos.z * pos.z)) in if distance > !max_dist then max_dist := distance diff --git a/testsuite/tests/misc/sieve.ml b/testsuite/tests/misc/sieve.ml index c36f304d..0e8685f1 100644 --- a/testsuite/tests/misc/sieve.ml +++ b/testsuite/tests/misc/sieve.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: sieve.ml 11156 2011-07-27 14:17:02Z doligez $ *) +(* $Id: sieve.ml 12800 2012-07-30 18:59:07Z doligez $ *) (* Eratosthene's sieve *) @@ -51,6 +51,6 @@ let rec do_list f = function let _ = - do_list (fun n -> print_int n; print_string " ") (sieve 50000); + do_list (fun n -> print_string " "; print_int n) (sieve 50000); print_newline(); exit 0 diff --git a/testsuite/tests/misc/sieve.reference b/testsuite/tests/misc/sieve.reference index eb96be00..24f5cc54 100644 --- a/testsuite/tests/misc/sieve.reference +++ b/testsuite/tests/misc/sieve.reference @@ -1 +1 @@ -2 3 5 7 11 13 17 19 23 29 31 37 41 43 47 53 59 61 67 71 73 79 83 89 97 101 103 107 109 113 127 131 137 139 149 151 157 163 167 173 179 181 191 193 197 199 211 223 227 229 233 239 241 251 257 263 269 271 277 281 283 293 307 311 313 317 331 337 347 349 353 359 367 373 379 383 389 397 401 409 419 421 431 433 439 443 449 457 461 463 467 479 487 491 499 503 509 521 523 541 547 557 563 569 571 577 587 593 599 601 607 613 617 619 631 641 643 647 653 659 661 673 677 683 691 701 709 719 727 733 739 743 751 757 761 769 773 787 797 809 811 821 823 827 829 839 853 857 859 863 877 881 883 887 907 911 919 929 937 941 947 953 967 971 977 983 991 997 1009 1013 1019 1021 1031 1033 1039 1049 1051 1061 1063 1069 1087 1091 1093 1097 1103 1109 1117 1123 1129 1151 1153 1163 1171 1181 1187 1193 1201 1213 1217 1223 1229 1231 1237 1249 1259 1277 1279 1283 1289 1291 1297 1301 1303 1307 1319 1321 1327 1361 1367 1373 1381 1399 1409 1423 1427 1429 1433 1439 1447 1451 1453 1459 1471 1481 1483 1487 1489 1493 1499 1511 1523 1531 1543 1549 1553 1559 1567 1571 1579 1583 1597 1601 1607 1609 1613 1619 1621 1627 1637 1657 1663 1667 1669 1693 1697 1699 1709 1721 1723 1733 1741 1747 1753 1759 1777 1783 1787 1789 1801 1811 1823 1831 1847 1861 1867 1871 1873 1877 1879 1889 1901 1907 1913 1931 1933 1949 1951 1973 1979 1987 1993 1997 1999 2003 2011 2017 2027 2029 2039 2053 2063 2069 2081 2083 2087 2089 2099 2111 2113 2129 2131 2137 2141 2143 2153 2161 2179 2203 2207 2213 2221 2237 2239 2243 2251 2267 2269 2273 2281 2287 2293 2297 2309 2311 2333 2339 2341 2347 2351 2357 2371 2377 2381 2383 2389 2393 2399 2411 2417 2423 2437 2441 2447 2459 2467 2473 2477 2503 2521 2531 2539 2543 2549 2551 2557 2579 2591 2593 2609 2617 2621 2633 2647 2657 2659 2663 2671 2677 2683 2687 2689 2693 2699 2707 2711 2713 2719 2729 2731 2741 2749 2753 2767 2777 2789 2791 2797 2801 2803 2819 2833 2837 2843 2851 2857 2861 2879 2887 2897 2903 2909 2917 2927 2939 2953 2957 2963 2969 2971 2999 3001 3011 3019 3023 3037 3041 3049 3061 3067 3079 3083 3089 3109 3119 3121 3137 3163 3167 3169 3181 3187 3191 3203 3209 3217 3221 3229 3251 3253 3257 3259 3271 3299 3301 3307 3313 3319 3323 3329 3331 3343 3347 3359 3361 3371 3373 3389 3391 3407 3413 3433 3449 3457 3461 3463 3467 3469 3491 3499 3511 3517 3527 3529 3533 3539 3541 3547 3557 3559 3571 3581 3583 3593 3607 3613 3617 3623 3631 3637 3643 3659 3671 3673 3677 3691 3697 3701 3709 3719 3727 3733 3739 3761 3767 3769 3779 3793 3797 3803 3821 3823 3833 3847 3851 3853 3863 3877 3881 3889 3907 3911 3917 3919 3923 3929 3931 3943 3947 3967 3989 4001 4003 4007 4013 4019 4021 4027 4049 4051 4057 4073 4079 4091 4093 4099 4111 4127 4129 4133 4139 4153 4157 4159 4177 4201 4211 4217 4219 4229 4231 4241 4243 4253 4259 4261 4271 4273 4283 4289 4297 4327 4337 4339 4349 4357 4363 4373 4391 4397 4409 4421 4423 4441 4447 4451 4457 4463 4481 4483 4493 4507 4513 4517 4519 4523 4547 4549 4561 4567 4583 4591 4597 4603 4621 4637 4639 4643 4649 4651 4657 4663 4673 4679 4691 4703 4721 4723 4729 4733 4751 4759 4783 4787 4789 4793 4799 4801 4813 4817 4831 4861 4871 4877 4889 4903 4909 4919 4931 4933 4937 4943 4951 4957 4967 4969 4973 4987 4993 4999 5003 5009 5011 5021 5023 5039 5051 5059 5077 5081 5087 5099 5101 5107 5113 5119 5147 5153 5167 5171 5179 5189 5197 5209 5227 5231 5233 5237 5261 5273 5279 5281 5297 5303 5309 5323 5333 5347 5351 5381 5387 5393 5399 5407 5413 5417 5419 5431 5437 5441 5443 5449 5471 5477 5479 5483 5501 5503 5507 5519 5521 5527 5531 5557 5563 5569 5573 5581 5591 5623 5639 5641 5647 5651 5653 5657 5659 5669 5683 5689 5693 5701 5711 5717 5737 5741 5743 5749 5779 5783 5791 5801 5807 5813 5821 5827 5839 5843 5849 5851 5857 5861 5867 5869 5879 5881 5897 5903 5923 5927 5939 5953 5981 5987 6007 6011 6029 6037 6043 6047 6053 6067 6073 6079 6089 6091 6101 6113 6121 6131 6133 6143 6151 6163 6173 6197 6199 6203 6211 6217 6221 6229 6247 6257 6263 6269 6271 6277 6287 6299 6301 6311 6317 6323 6329 6337 6343 6353 6359 6361 6367 6373 6379 6389 6397 6421 6427 6449 6451 6469 6473 6481 6491 6521 6529 6547 6551 6553 6563 6569 6571 6577 6581 6599 6607 6619 6637 6653 6659 6661 6673 6679 6689 6691 6701 6703 6709 6719 6733 6737 6761 6763 6779 6781 6791 6793 6803 6823 6827 6829 6833 6841 6857 6863 6869 6871 6883 6899 6907 6911 6917 6947 6949 6959 6961 6967 6971 6977 6983 6991 6997 7001 7013 7019 7027 7039 7043 7057 7069 7079 7103 7109 7121 7127 7129 7151 7159 7177 7187 7193 7207 7211 7213 7219 7229 7237 7243 7247 7253 7283 7297 7307 7309 7321 7331 7333 7349 7351 7369 7393 7411 7417 7433 7451 7457 7459 7477 7481 7487 7489 7499 7507 7517 7523 7529 7537 7541 7547 7549 7559 7561 7573 7577 7583 7589 7591 7603 7607 7621 7639 7643 7649 7669 7673 7681 7687 7691 7699 7703 7717 7723 7727 7741 7753 7757 7759 7789 7793 7817 7823 7829 7841 7853 7867 7873 7877 7879 7883 7901 7907 7919 7927 7933 7937 7949 7951 7963 7993 8009 8011 8017 8039 8053 8059 8069 8081 8087 8089 8093 8101 8111 8117 8123 8147 8161 8167 8171 8179 8191 8209 8219 8221 8231 8233 8237 8243 8263 8269 8273 8287 8291 8293 8297 8311 8317 8329 8353 8363 8369 8377 8387 8389 8419 8423 8429 8431 8443 8447 8461 8467 8501 8513 8521 8527 8537 8539 8543 8563 8573 8581 8597 8599 8609 8623 8627 8629 8641 8647 8663 8669 8677 8681 8689 8693 8699 8707 8713 8719 8731 8737 8741 8747 8753 8761 8779 8783 8803 8807 8819 8821 8831 8837 8839 8849 8861 8863 8867 8887 8893 8923 8929 8933 8941 8951 8963 8969 8971 8999 9001 9007 9011 9013 9029 9041 9043 9049 9059 9067 9091 9103 9109 9127 9133 9137 9151 9157 9161 9173 9181 9187 9199 9203 9209 9221 9227 9239 9241 9257 9277 9281 9283 9293 9311 9319 9323 9337 9341 9343 9349 9371 9377 9391 9397 9403 9413 9419 9421 9431 9433 9437 9439 9461 9463 9467 9473 9479 9491 9497 9511 9521 9533 9539 9547 9551 9587 9601 9613 9619 9623 9629 9631 9643 9649 9661 9677 9679 9689 9697 9719 9721 9733 9739 9743 9749 9767 9769 9781 9787 9791 9803 9811 9817 9829 9833 9839 9851 9857 9859 9871 9883 9887 9901 9907 9923 9929 9931 9941 9949 9967 9973 10007 10009 10037 10039 10061 10067 10069 10079 10091 10093 10099 10103 10111 10133 10139 10141 10151 10159 10163 10169 10177 10181 10193 10211 10223 10243 10247 10253 10259 10267 10271 10273 10289 10301 10303 10313 10321 10331 10333 10337 10343 10357 10369 10391 10399 10427 10429 10433 10453 10457 10459 10463 10477 10487 10499 10501 10513 10529 10531 10559 10567 10589 10597 10601 10607 10613 10627 10631 10639 10651 10657 10663 10667 10687 10691 10709 10711 10723 10729 10733 10739 10753 10771 10781 10789 10799 10831 10837 10847 10853 10859 10861 10867 10883 10889 10891 10903 10909 10937 10939 10949 10957 10973 10979 10987 10993 11003 11027 11047 11057 11059 11069 11071 11083 11087 11093 11113 11117 11119 11131 11149 11159 11161 11171 11173 11177 11197 11213 11239 11243 11251 11257 11261 11273 11279 11287 11299 11311 11317 11321 11329 11351 11353 11369 11383 11393 11399 11411 11423 11437 11443 11447 11467 11471 11483 11489 11491 11497 11503 11519 11527 11549 11551 11579 11587 11593 11597 11617 11621 11633 11657 11677 11681 11689 11699 11701 11717 11719 11731 11743 11777 11779 11783 11789 11801 11807 11813 11821 11827 11831 11833 11839 11863 11867 11887 11897 11903 11909 11923 11927 11933 11939 11941 11953 11959 11969 11971 11981 11987 12007 12011 12037 12041 12043 12049 12071 12073 12097 12101 12107 12109 12113 12119 12143 12149 12157 12161 12163 12197 12203 12211 12227 12239 12241 12251 12253 12263 12269 12277 12281 12289 12301 12323 12329 12343 12347 12373 12377 12379 12391 12401 12409 12413 12421 12433 12437 12451 12457 12473 12479 12487 12491 12497 12503 12511 12517 12527 12539 12541 12547 12553 12569 12577 12583 12589 12601 12611 12613 12619 12637 12641 12647 12653 12659 12671 12689 12697 12703 12713 12721 12739 12743 12757 12763 12781 12791 12799 12809 12821 12823 12829 12841 12853 12889 12893 12899 12907 12911 12917 12919 12923 12941 12953 12959 12967 12973 12979 12983 13001 13003 13007 13009 13033 13037 13043 13049 13063 13093 13099 13103 13109 13121 13127 13147 13151 13159 13163 13171 13177 13183 13187 13217 13219 13229 13241 13249 13259 13267 13291 13297 13309 13313 13327 13331 13337 13339 13367 13381 13397 13399 13411 13417 13421 13441 13451 13457 13463 13469 13477 13487 13499 13513 13523 13537 13553 13567 13577 13591 13597 13613 13619 13627 13633 13649 13669 13679 13681 13687 13691 13693 13697 13709 13711 13721 13723 13729 13751 13757 13759 13763 13781 13789 13799 13807 13829 13831 13841 13859 13873 13877 13879 13883 13901 13903 13907 13913 13921 13931 13933 13963 13967 13997 13999 14009 14011 14029 14033 14051 14057 14071 14081 14083 14087 14107 14143 14149 14153 14159 14173 14177 14197 14207 14221 14243 14249 14251 14281 14293 14303 14321 14323 14327 14341 14347 14369 14387 14389 14401 14407 14411 14419 14423 14431 14437 14447 14449 14461 14479 14489 14503 14519 14533 14537 14543 14549 14551 14557 14561 14563 14591 14593 14621 14627 14629 14633 14639 14653 14657 14669 14683 14699 14713 14717 14723 14731 14737 14741 14747 14753 14759 14767 14771 14779 14783 14797 14813 14821 14827 14831 14843 14851 14867 14869 14879 14887 14891 14897 14923 14929 14939 14947 14951 14957 14969 14983 15013 15017 15031 15053 15061 15073 15077 15083 15091 15101 15107 15121 15131 15137 15139 15149 15161 15173 15187 15193 15199 15217 15227 15233 15241 15259 15263 15269 15271 15277 15287 15289 15299 15307 15313 15319 15329 15331 15349 15359 15361 15373 15377 15383 15391 15401 15413 15427 15439 15443 15451 15461 15467 15473 15493 15497 15511 15527 15541 15551 15559 15569 15581 15583 15601 15607 15619 15629 15641 15643 15647 15649 15661 15667 15671 15679 15683 15727 15731 15733 15737 15739 15749 15761 15767 15773 15787 15791 15797 15803 15809 15817 15823 15859 15877 15881 15887 15889 15901 15907 15913 15919 15923 15937 15959 15971 15973 15991 16001 16007 16033 16057 16061 16063 16067 16069 16073 16087 16091 16097 16103 16111 16127 16139 16141 16183 16187 16189 16193 16217 16223 16229 16231 16249 16253 16267 16273 16301 16319 16333 16339 16349 16361 16363 16369 16381 16411 16417 16421 16427 16433 16447 16451 16453 16477 16481 16487 16493 16519 16529 16547 16553 16561 16567 16573 16603 16607 16619 16631 16633 16649 16651 16657 16661 16673 16691 16693 16699 16703 16729 16741 16747 16759 16763 16787 16811 16823 16829 16831 16843 16871 16879 16883 16889 16901 16903 16921 16927 16931 16937 16943 16963 16979 16981 16987 16993 17011 17021 17027 17029 17033 17041 17047 17053 17077 17093 17099 17107 17117 17123 17137 17159 17167 17183 17189 17191 17203 17207 17209 17231 17239 17257 17291 17293 17299 17317 17321 17327 17333 17341 17351 17359 17377 17383 17387 17389 17393 17401 17417 17419 17431 17443 17449 17467 17471 17477 17483 17489 17491 17497 17509 17519 17539 17551 17569 17573 17579 17581 17597 17599 17609 17623 17627 17657 17659 17669 17681 17683 17707 17713 17729 17737 17747 17749 17761 17783 17789 17791 17807 17827 17837 17839 17851 17863 17881 17891 17903 17909 17911 17921 17923 17929 17939 17957 17959 17971 17977 17981 17987 17989 18013 18041 18043 18047 18049 18059 18061 18077 18089 18097 18119 18121 18127 18131 18133 18143 18149 18169 18181 18191 18199 18211 18217 18223 18229 18233 18251 18253 18257 18269 18287 18289 18301 18307 18311 18313 18329 18341 18353 18367 18371 18379 18397 18401 18413 18427 18433 18439 18443 18451 18457 18461 18481 18493 18503 18517 18521 18523 18539 18541 18553 18583 18587 18593 18617 18637 18661 18671 18679 18691 18701 18713 18719 18731 18743 18749 18757 18773 18787 18793 18797 18803 18839 18859 18869 18899 18911 18913 18917 18919 18947 18959 18973 18979 19001 19009 19013 19031 19037 19051 19069 19073 19079 19081 19087 19121 19139 19141 19157 19163 19181 19183 19207 19211 19213 19219 19231 19237 19249 19259 19267 19273 19289 19301 19309 19319 19333 19373 19379 19381 19387 19391 19403 19417 19421 19423 19427 19429 19433 19441 19447 19457 19463 19469 19471 19477 19483 19489 19501 19507 19531 19541 19543 19553 19559 19571 19577 19583 19597 19603 19609 19661 19681 19687 19697 19699 19709 19717 19727 19739 19751 19753 19759 19763 19777 19793 19801 19813 19819 19841 19843 19853 19861 19867 19889 19891 19913 19919 19927 19937 19949 19961 19963 19973 19979 19991 19993 19997 20011 20021 20023 20029 20047 20051 20063 20071 20089 20101 20107 20113 20117 20123 20129 20143 20147 20149 20161 20173 20177 20183 20201 20219 20231 20233 20249 20261 20269 20287 20297 20323 20327 20333 20341 20347 20353 20357 20359 20369 20389 20393 20399 20407 20411 20431 20441 20443 20477 20479 20483 20507 20509 20521 20533 20543 20549 20551 20563 20593 20599 20611 20627 20639 20641 20663 20681 20693 20707 20717 20719 20731 20743 20747 20749 20753 20759 20771 20773 20789 20807 20809 20849 20857 20873 20879 20887 20897 20899 20903 20921 20929 20939 20947 20959 20963 20981 20983 21001 21011 21013 21017 21019 21023 21031 21059 21061 21067 21089 21101 21107 21121 21139 21143 21149 21157 21163 21169 21179 21187 21191 21193 21211 21221 21227 21247 21269 21277 21283 21313 21317 21319 21323 21341 21347 21377 21379 21383 21391 21397 21401 21407 21419 21433 21467 21481 21487 21491 21493 21499 21503 21517 21521 21523 21529 21557 21559 21563 21569 21577 21587 21589 21599 21601 21611 21613 21617 21647 21649 21661 21673 21683 21701 21713 21727 21737 21739 21751 21757 21767 21773 21787 21799 21803 21817 21821 21839 21841 21851 21859 21863 21871 21881 21893 21911 21929 21937 21943 21961 21977 21991 21997 22003 22013 22027 22031 22037 22039 22051 22063 22067 22073 22079 22091 22093 22109 22111 22123 22129 22133 22147 22153 22157 22159 22171 22189 22193 22229 22247 22259 22271 22273 22277 22279 22283 22291 22303 22307 22343 22349 22367 22369 22381 22391 22397 22409 22433 22441 22447 22453 22469 22481 22483 22501 22511 22531 22541 22543 22549 22567 22571 22573 22613 22619 22621 22637 22639 22643 22651 22669 22679 22691 22697 22699 22709 22717 22721 22727 22739 22741 22751 22769 22777 22783 22787 22807 22811 22817 22853 22859 22861 22871 22877 22901 22907 22921 22937 22943 22961 22963 22973 22993 23003 23011 23017 23021 23027 23029 23039 23041 23053 23057 23059 23063 23071 23081 23087 23099 23117 23131 23143 23159 23167 23173 23189 23197 23201 23203 23209 23227 23251 23269 23279 23291 23293 23297 23311 23321 23327 23333 23339 23357 23369 23371 23399 23417 23431 23447 23459 23473 23497 23509 23531 23537 23539 23549 23557 23561 23563 23567 23581 23593 23599 23603 23609 23623 23627 23629 23633 23663 23669 23671 23677 23687 23689 23719 23741 23743 23747 23753 23761 23767 23773 23789 23801 23813 23819 23827 23831 23833 23857 23869 23873 23879 23887 23893 23899 23909 23911 23917 23929 23957 23971 23977 23981 23993 24001 24007 24019 24023 24029 24043 24049 24061 24071 24077 24083 24091 24097 24103 24107 24109 24113 24121 24133 24137 24151 24169 24179 24181 24197 24203 24223 24229 24239 24247 24251 24281 24317 24329 24337 24359 24371 24373 24379 24391 24407 24413 24419 24421 24439 24443 24469 24473 24481 24499 24509 24517 24527 24533 24547 24551 24571 24593 24611 24623 24631 24659 24671 24677 24683 24691 24697 24709 24733 24749 24763 24767 24781 24793 24799 24809 24821 24841 24847 24851 24859 24877 24889 24907 24917 24919 24923 24943 24953 24967 24971 24977 24979 24989 25013 25031 25033 25037 25057 25073 25087 25097 25111 25117 25121 25127 25147 25153 25163 25169 25171 25183 25189 25219 25229 25237 25243 25247 25253 25261 25301 25303 25307 25309 25321 25339 25343 25349 25357 25367 25373 25391 25409 25411 25423 25439 25447 25453 25457 25463 25469 25471 25523 25537 25541 25561 25577 25579 25583 25589 25601 25603 25609 25621 25633 25639 25643 25657 25667 25673 25679 25693 25703 25717 25733 25741 25747 25759 25763 25771 25793 25799 25801 25819 25841 25847 25849 25867 25873 25889 25903 25913 25919 25931 25933 25939 25943 25951 25969 25981 25997 25999 26003 26017 26021 26029 26041 26053 26083 26099 26107 26111 26113 26119 26141 26153 26161 26171 26177 26183 26189 26203 26209 26227 26237 26249 26251 26261 26263 26267 26293 26297 26309 26317 26321 26339 26347 26357 26371 26387 26393 26399 26407 26417 26423 26431 26437 26449 26459 26479 26489 26497 26501 26513 26539 26557 26561 26573 26591 26597 26627 26633 26641 26647 26669 26681 26683 26687 26693 26699 26701 26711 26713 26717 26723 26729 26731 26737 26759 26777 26783 26801 26813 26821 26833 26839 26849 26861 26863 26879 26881 26891 26893 26903 26921 26927 26947 26951 26953 26959 26981 26987 26993 27011 27017 27031 27043 27059 27061 27067 27073 27077 27091 27103 27107 27109 27127 27143 27179 27191 27197 27211 27239 27241 27253 27259 27271 27277 27281 27283 27299 27329 27337 27361 27367 27397 27407 27409 27427 27431 27437 27449 27457 27479 27481 27487 27509 27527 27529 27539 27541 27551 27581 27583 27611 27617 27631 27647 27653 27673 27689 27691 27697 27701 27733 27737 27739 27743 27749 27751 27763 27767 27773 27779 27791 27793 27799 27803 27809 27817 27823 27827 27847 27851 27883 27893 27901 27917 27919 27941 27943 27947 27953 27961 27967 27983 27997 28001 28019 28027 28031 28051 28057 28069 28081 28087 28097 28099 28109 28111 28123 28151 28163 28181 28183 28201 28211 28219 28229 28277 28279 28283 28289 28297 28307 28309 28319 28349 28351 28387 28393 28403 28409 28411 28429 28433 28439 28447 28463 28477 28493 28499 28513 28517 28537 28541 28547 28549 28559 28571 28573 28579 28591 28597 28603 28607 28619 28621 28627 28631 28643 28649 28657 28661 28663 28669 28687 28697 28703 28711 28723 28729 28751 28753 28759 28771 28789 28793 28807 28813 28817 28837 28843 28859 28867 28871 28879 28901 28909 28921 28927 28933 28949 28961 28979 29009 29017 29021 29023 29027 29033 29059 29063 29077 29101 29123 29129 29131 29137 29147 29153 29167 29173 29179 29191 29201 29207 29209 29221 29231 29243 29251 29269 29287 29297 29303 29311 29327 29333 29339 29347 29363 29383 29387 29389 29399 29401 29411 29423 29429 29437 29443 29453 29473 29483 29501 29527 29531 29537 29567 29569 29573 29581 29587 29599 29611 29629 29633 29641 29663 29669 29671 29683 29717 29723 29741 29753 29759 29761 29789 29803 29819 29833 29837 29851 29863 29867 29873 29879 29881 29917 29921 29927 29947 29959 29983 29989 30011 30013 30029 30047 30059 30071 30089 30091 30097 30103 30109 30113 30119 30133 30137 30139 30161 30169 30181 30187 30197 30203 30211 30223 30241 30253 30259 30269 30271 30293 30307 30313 30319 30323 30341 30347 30367 30389 30391 30403 30427 30431 30449 30467 30469 30491 30493 30497 30509 30517 30529 30539 30553 30557 30559 30577 30593 30631 30637 30643 30649 30661 30671 30677 30689 30697 30703 30707 30713 30727 30757 30763 30773 30781 30803 30809 30817 30829 30839 30841 30851 30853 30859 30869 30871 30881 30893 30911 30931 30937 30941 30949 30971 30977 30983 31013 31019 31033 31039 31051 31063 31069 31079 31081 31091 31121 31123 31139 31147 31151 31153 31159 31177 31181 31183 31189 31193 31219 31223 31231 31237 31247 31249 31253 31259 31267 31271 31277 31307 31319 31321 31327 31333 31337 31357 31379 31387 31391 31393 31397 31469 31477 31481 31489 31511 31513 31517 31531 31541 31543 31547 31567 31573 31583 31601 31607 31627 31643 31649 31657 31663 31667 31687 31699 31721 31723 31727 31729 31741 31751 31769 31771 31793 31799 31817 31847 31849 31859 31873 31883 31891 31907 31957 31963 31973 31981 31991 32003 32009 32027 32029 32051 32057 32059 32063 32069 32077 32083 32089 32099 32117 32119 32141 32143 32159 32173 32183 32189 32191 32203 32213 32233 32237 32251 32257 32261 32297 32299 32303 32309 32321 32323 32327 32341 32353 32359 32363 32369 32371 32377 32381 32401 32411 32413 32423 32429 32441 32443 32467 32479 32491 32497 32503 32507 32531 32533 32537 32561 32563 32569 32573 32579 32587 32603 32609 32611 32621 32633 32647 32653 32687 32693 32707 32713 32717 32719 32749 32771 32779 32783 32789 32797 32801 32803 32831 32833 32839 32843 32869 32887 32909 32911 32917 32933 32939 32941 32957 32969 32971 32983 32987 32993 32999 33013 33023 33029 33037 33049 33053 33071 33073 33083 33091 33107 33113 33119 33149 33151 33161 33179 33181 33191 33199 33203 33211 33223 33247 33287 33289 33301 33311 33317 33329 33331 33343 33347 33349 33353 33359 33377 33391 33403 33409 33413 33427 33457 33461 33469 33479 33487 33493 33503 33521 33529 33533 33547 33563 33569 33577 33581 33587 33589 33599 33601 33613 33617 33619 33623 33629 33637 33641 33647 33679 33703 33713 33721 33739 33749 33751 33757 33767 33769 33773 33791 33797 33809 33811 33827 33829 33851 33857 33863 33871 33889 33893 33911 33923 33931 33937 33941 33961 33967 33997 34019 34031 34033 34039 34057 34061 34123 34127 34129 34141 34147 34157 34159 34171 34183 34211 34213 34217 34231 34253 34259 34261 34267 34273 34283 34297 34301 34303 34313 34319 34327 34337 34351 34361 34367 34369 34381 34403 34421 34429 34439 34457 34469 34471 34483 34487 34499 34501 34511 34513 34519 34537 34543 34549 34583 34589 34591 34603 34607 34613 34631 34649 34651 34667 34673 34679 34687 34693 34703 34721 34729 34739 34747 34757 34759 34763 34781 34807 34819 34841 34843 34847 34849 34871 34877 34883 34897 34913 34919 34939 34949 34961 34963 34981 35023 35027 35051 35053 35059 35069 35081 35083 35089 35099 35107 35111 35117 35129 35141 35149 35153 35159 35171 35201 35221 35227 35251 35257 35267 35279 35281 35291 35311 35317 35323 35327 35339 35353 35363 35381 35393 35401 35407 35419 35423 35437 35447 35449 35461 35491 35507 35509 35521 35527 35531 35533 35537 35543 35569 35573 35591 35593 35597 35603 35617 35671 35677 35729 35731 35747 35753 35759 35771 35797 35801 35803 35809 35831 35837 35839 35851 35863 35869 35879 35897 35899 35911 35923 35933 35951 35963 35969 35977 35983 35993 35999 36007 36011 36013 36017 36037 36061 36067 36073 36083 36097 36107 36109 36131 36137 36151 36161 36187 36191 36209 36217 36229 36241 36251 36263 36269 36277 36293 36299 36307 36313 36319 36341 36343 36353 36373 36383 36389 36433 36451 36457 36467 36469 36473 36479 36493 36497 36523 36527 36529 36541 36551 36559 36563 36571 36583 36587 36599 36607 36629 36637 36643 36653 36671 36677 36683 36691 36697 36709 36713 36721 36739 36749 36761 36767 36779 36781 36787 36791 36793 36809 36821 36833 36847 36857 36871 36877 36887 36899 36901 36913 36919 36923 36929 36931 36943 36947 36973 36979 36997 37003 37013 37019 37021 37039 37049 37057 37061 37087 37097 37117 37123 37139 37159 37171 37181 37189 37199 37201 37217 37223 37243 37253 37273 37277 37307 37309 37313 37321 37337 37339 37357 37361 37363 37369 37379 37397 37409 37423 37441 37447 37463 37483 37489 37493 37501 37507 37511 37517 37529 37537 37547 37549 37561 37567 37571 37573 37579 37589 37591 37607 37619 37633 37643 37649 37657 37663 37691 37693 37699 37717 37747 37781 37783 37799 37811 37813 37831 37847 37853 37861 37871 37879 37889 37897 37907 37951 37957 37963 37967 37987 37991 37993 37997 38011 38039 38047 38053 38069 38083 38113 38119 38149 38153 38167 38177 38183 38189 38197 38201 38219 38231 38237 38239 38261 38273 38281 38287 38299 38303 38317 38321 38327 38329 38333 38351 38371 38377 38393 38431 38447 38449 38453 38459 38461 38501 38543 38557 38561 38567 38569 38593 38603 38609 38611 38629 38639 38651 38653 38669 38671 38677 38693 38699 38707 38711 38713 38723 38729 38737 38747 38749 38767 38783 38791 38803 38821 38833 38839 38851 38861 38867 38873 38891 38903 38917 38921 38923 38933 38953 38959 38971 38977 38993 39019 39023 39041 39043 39047 39079 39089 39097 39103 39107 39113 39119 39133 39139 39157 39161 39163 39181 39191 39199 39209 39217 39227 39229 39233 39239 39241 39251 39293 39301 39313 39317 39323 39341 39343 39359 39367 39371 39373 39383 39397 39409 39419 39439 39443 39451 39461 39499 39503 39509 39511 39521 39541 39551 39563 39569 39581 39607 39619 39623 39631 39659 39667 39671 39679 39703 39709 39719 39727 39733 39749 39761 39769 39779 39791 39799 39821 39827 39829 39839 39841 39847 39857 39863 39869 39877 39883 39887 39901 39929 39937 39953 39971 39979 39983 39989 40009 40013 40031 40037 40039 40063 40087 40093 40099 40111 40123 40127 40129 40151 40153 40163 40169 40177 40189 40193 40213 40231 40237 40241 40253 40277 40283 40289 40343 40351 40357 40361 40387 40423 40427 40429 40433 40459 40471 40483 40487 40493 40499 40507 40519 40529 40531 40543 40559 40577 40583 40591 40597 40609 40627 40637 40639 40693 40697 40699 40709 40739 40751 40759 40763 40771 40787 40801 40813 40819 40823 40829 40841 40847 40849 40853 40867 40879 40883 40897 40903 40927 40933 40939 40949 40961 40973 40993 41011 41017 41023 41039 41047 41051 41057 41077 41081 41113 41117 41131 41141 41143 41149 41161 41177 41179 41183 41189 41201 41203 41213 41221 41227 41231 41233 41243 41257 41263 41269 41281 41299 41333 41341 41351 41357 41381 41387 41389 41399 41411 41413 41443 41453 41467 41479 41491 41507 41513 41519 41521 41539 41543 41549 41579 41593 41597 41603 41609 41611 41617 41621 41627 41641 41647 41651 41659 41669 41681 41687 41719 41729 41737 41759 41761 41771 41777 41801 41809 41813 41843 41849 41851 41863 41879 41887 41893 41897 41903 41911 41927 41941 41947 41953 41957 41959 41969 41981 41983 41999 42013 42017 42019 42023 42043 42061 42071 42073 42083 42089 42101 42131 42139 42157 42169 42179 42181 42187 42193 42197 42209 42221 42223 42227 42239 42257 42281 42283 42293 42299 42307 42323 42331 42337 42349 42359 42373 42379 42391 42397 42403 42407 42409 42433 42437 42443 42451 42457 42461 42463 42467 42473 42487 42491 42499 42509 42533 42557 42569 42571 42577 42589 42611 42641 42643 42649 42667 42677 42683 42689 42697 42701 42703 42709 42719 42727 42737 42743 42751 42767 42773 42787 42793 42797 42821 42829 42839 42841 42853 42859 42863 42899 42901 42923 42929 42937 42943 42953 42961 42967 42979 42989 43003 43013 43019 43037 43049 43051 43063 43067 43093 43103 43117 43133 43151 43159 43177 43189 43201 43207 43223 43237 43261 43271 43283 43291 43313 43319 43321 43331 43391 43397 43399 43403 43411 43427 43441 43451 43457 43481 43487 43499 43517 43541 43543 43573 43577 43579 43591 43597 43607 43609 43613 43627 43633 43649 43651 43661 43669 43691 43711 43717 43721 43753 43759 43777 43781 43783 43787 43789 43793 43801 43853 43867 43889 43891 43913 43933 43943 43951 43961 43963 43969 43973 43987 43991 43997 44017 44021 44027 44029 44041 44053 44059 44071 44087 44089 44101 44111 44119 44123 44129 44131 44159 44171 44179 44189 44201 44203 44207 44221 44249 44257 44263 44267 44269 44273 44279 44281 44293 44351 44357 44371 44381 44383 44389 44417 44449 44453 44483 44491 44497 44501 44507 44519 44531 44533 44537 44543 44549 44563 44579 44587 44617 44621 44623 44633 44641 44647 44651 44657 44683 44687 44699 44701 44711 44729 44741 44753 44771 44773 44777 44789 44797 44809 44819 44839 44843 44851 44867 44879 44887 44893 44909 44917 44927 44939 44953 44959 44963 44971 44983 44987 45007 45013 45053 45061 45077 45083 45119 45121 45127 45131 45137 45139 45161 45179 45181 45191 45197 45233 45247 45259 45263 45281 45289 45293 45307 45317 45319 45329 45337 45341 45343 45361 45377 45389 45403 45413 45427 45433 45439 45481 45491 45497 45503 45523 45533 45541 45553 45557 45569 45587 45589 45599 45613 45631 45641 45659 45667 45673 45677 45691 45697 45707 45737 45751 45757 45763 45767 45779 45817 45821 45823 45827 45833 45841 45853 45863 45869 45887 45893 45943 45949 45953 45959 45971 45979 45989 46021 46027 46049 46051 46061 46073 46091 46093 46099 46103 46133 46141 46147 46153 46171 46181 46183 46187 46199 46219 46229 46237 46261 46271 46273 46279 46301 46307 46309 46327 46337 46349 46351 46381 46399 46411 46439 46441 46447 46451 46457 46471 46477 46489 46499 46507 46511 46523 46549 46559 46567 46573 46589 46591 46601 46619 46633 46639 46643 46649 46663 46679 46681 46687 46691 46703 46723 46727 46747 46751 46757 46769 46771 46807 46811 46817 46819 46829 46831 46853 46861 46867 46877 46889 46901 46919 46933 46957 46993 46997 47017 47041 47051 47057 47059 47087 47093 47111 47119 47123 47129 47137 47143 47147 47149 47161 47189 47207 47221 47237 47251 47269 47279 47287 47293 47297 47303 47309 47317 47339 47351 47353 47363 47381 47387 47389 47407 47417 47419 47431 47441 47459 47491 47497 47501 47507 47513 47521 47527 47533 47543 47563 47569 47581 47591 47599 47609 47623 47629 47639 47653 47657 47659 47681 47699 47701 47711 47713 47717 47737 47741 47743 47777 47779 47791 47797 47807 47809 47819 47837 47843 47857 47869 47881 47903 47911 47917 47933 47939 47947 47951 47963 47969 47977 47981 48017 48023 48029 48049 48073 48079 48091 48109 48119 48121 48131 48157 48163 48179 48187 48193 48197 48221 48239 48247 48259 48271 48281 48299 48311 48313 48337 48341 48353 48371 48383 48397 48407 48409 48413 48437 48449 48463 48473 48479 48481 48487 48491 48497 48523 48527 48533 48539 48541 48563 48571 48589 48593 48611 48619 48623 48647 48649 48661 48673 48677 48679 48731 48733 48751 48757 48761 48767 48779 48781 48787 48799 48809 48817 48821 48823 48847 48857 48859 48869 48871 48883 48889 48907 48947 48953 48973 48989 48991 49003 49009 49019 49031 49033 49037 49043 49057 49069 49081 49103 49109 49117 49121 49123 49139 49157 49169 49171 49177 49193 49199 49201 49207 49211 49223 49253 49261 49277 49279 49297 49307 49331 49333 49339 49363 49367 49369 49391 49393 49409 49411 49417 49429 49433 49451 49459 49463 49477 49481 49499 49523 49529 49531 49537 49547 49549 49559 49597 49603 49613 49627 49633 49639 49663 49667 49669 49681 49697 49711 49727 49739 49741 49747 49757 49783 49787 49789 49801 49807 49811 49823 49831 49843 49853 49871 49877 49891 49919 49921 49927 49937 49939 49943 49957 49991 49993 49999 + 2 3 5 7 11 13 17 19 23 29 31 37 41 43 47 53 59 61 67 71 73 79 83 89 97 101 103 107 109 113 127 131 137 139 149 151 157 163 167 173 179 181 191 193 197 199 211 223 227 229 233 239 241 251 257 263 269 271 277 281 283 293 307 311 313 317 331 337 347 349 353 359 367 373 379 383 389 397 401 409 419 421 431 433 439 443 449 457 461 463 467 479 487 491 499 503 509 521 523 541 547 557 563 569 571 577 587 593 599 601 607 613 617 619 631 641 643 647 653 659 661 673 677 683 691 701 709 719 727 733 739 743 751 757 761 769 773 787 797 809 811 821 823 827 829 839 853 857 859 863 877 881 883 887 907 911 919 929 937 941 947 953 967 971 977 983 991 997 1009 1013 1019 1021 1031 1033 1039 1049 1051 1061 1063 1069 1087 1091 1093 1097 1103 1109 1117 1123 1129 1151 1153 1163 1171 1181 1187 1193 1201 1213 1217 1223 1229 1231 1237 1249 1259 1277 1279 1283 1289 1291 1297 1301 1303 1307 1319 1321 1327 1361 1367 1373 1381 1399 1409 1423 1427 1429 1433 1439 1447 1451 1453 1459 1471 1481 1483 1487 1489 1493 1499 1511 1523 1531 1543 1549 1553 1559 1567 1571 1579 1583 1597 1601 1607 1609 1613 1619 1621 1627 1637 1657 1663 1667 1669 1693 1697 1699 1709 1721 1723 1733 1741 1747 1753 1759 1777 1783 1787 1789 1801 1811 1823 1831 1847 1861 1867 1871 1873 1877 1879 1889 1901 1907 1913 1931 1933 1949 1951 1973 1979 1987 1993 1997 1999 2003 2011 2017 2027 2029 2039 2053 2063 2069 2081 2083 2087 2089 2099 2111 2113 2129 2131 2137 2141 2143 2153 2161 2179 2203 2207 2213 2221 2237 2239 2243 2251 2267 2269 2273 2281 2287 2293 2297 2309 2311 2333 2339 2341 2347 2351 2357 2371 2377 2381 2383 2389 2393 2399 2411 2417 2423 2437 2441 2447 2459 2467 2473 2477 2503 2521 2531 2539 2543 2549 2551 2557 2579 2591 2593 2609 2617 2621 2633 2647 2657 2659 2663 2671 2677 2683 2687 2689 2693 2699 2707 2711 2713 2719 2729 2731 2741 2749 2753 2767 2777 2789 2791 2797 2801 2803 2819 2833 2837 2843 2851 2857 2861 2879 2887 2897 2903 2909 2917 2927 2939 2953 2957 2963 2969 2971 2999 3001 3011 3019 3023 3037 3041 3049 3061 3067 3079 3083 3089 3109 3119 3121 3137 3163 3167 3169 3181 3187 3191 3203 3209 3217 3221 3229 3251 3253 3257 3259 3271 3299 3301 3307 3313 3319 3323 3329 3331 3343 3347 3359 3361 3371 3373 3389 3391 3407 3413 3433 3449 3457 3461 3463 3467 3469 3491 3499 3511 3517 3527 3529 3533 3539 3541 3547 3557 3559 3571 3581 3583 3593 3607 3613 3617 3623 3631 3637 3643 3659 3671 3673 3677 3691 3697 3701 3709 3719 3727 3733 3739 3761 3767 3769 3779 3793 3797 3803 3821 3823 3833 3847 3851 3853 3863 3877 3881 3889 3907 3911 3917 3919 3923 3929 3931 3943 3947 3967 3989 4001 4003 4007 4013 4019 4021 4027 4049 4051 4057 4073 4079 4091 4093 4099 4111 4127 4129 4133 4139 4153 4157 4159 4177 4201 4211 4217 4219 4229 4231 4241 4243 4253 4259 4261 4271 4273 4283 4289 4297 4327 4337 4339 4349 4357 4363 4373 4391 4397 4409 4421 4423 4441 4447 4451 4457 4463 4481 4483 4493 4507 4513 4517 4519 4523 4547 4549 4561 4567 4583 4591 4597 4603 4621 4637 4639 4643 4649 4651 4657 4663 4673 4679 4691 4703 4721 4723 4729 4733 4751 4759 4783 4787 4789 4793 4799 4801 4813 4817 4831 4861 4871 4877 4889 4903 4909 4919 4931 4933 4937 4943 4951 4957 4967 4969 4973 4987 4993 4999 5003 5009 5011 5021 5023 5039 5051 5059 5077 5081 5087 5099 5101 5107 5113 5119 5147 5153 5167 5171 5179 5189 5197 5209 5227 5231 5233 5237 5261 5273 5279 5281 5297 5303 5309 5323 5333 5347 5351 5381 5387 5393 5399 5407 5413 5417 5419 5431 5437 5441 5443 5449 5471 5477 5479 5483 5501 5503 5507 5519 5521 5527 5531 5557 5563 5569 5573 5581 5591 5623 5639 5641 5647 5651 5653 5657 5659 5669 5683 5689 5693 5701 5711 5717 5737 5741 5743 5749 5779 5783 5791 5801 5807 5813 5821 5827 5839 5843 5849 5851 5857 5861 5867 5869 5879 5881 5897 5903 5923 5927 5939 5953 5981 5987 6007 6011 6029 6037 6043 6047 6053 6067 6073 6079 6089 6091 6101 6113 6121 6131 6133 6143 6151 6163 6173 6197 6199 6203 6211 6217 6221 6229 6247 6257 6263 6269 6271 6277 6287 6299 6301 6311 6317 6323 6329 6337 6343 6353 6359 6361 6367 6373 6379 6389 6397 6421 6427 6449 6451 6469 6473 6481 6491 6521 6529 6547 6551 6553 6563 6569 6571 6577 6581 6599 6607 6619 6637 6653 6659 6661 6673 6679 6689 6691 6701 6703 6709 6719 6733 6737 6761 6763 6779 6781 6791 6793 6803 6823 6827 6829 6833 6841 6857 6863 6869 6871 6883 6899 6907 6911 6917 6947 6949 6959 6961 6967 6971 6977 6983 6991 6997 7001 7013 7019 7027 7039 7043 7057 7069 7079 7103 7109 7121 7127 7129 7151 7159 7177 7187 7193 7207 7211 7213 7219 7229 7237 7243 7247 7253 7283 7297 7307 7309 7321 7331 7333 7349 7351 7369 7393 7411 7417 7433 7451 7457 7459 7477 7481 7487 7489 7499 7507 7517 7523 7529 7537 7541 7547 7549 7559 7561 7573 7577 7583 7589 7591 7603 7607 7621 7639 7643 7649 7669 7673 7681 7687 7691 7699 7703 7717 7723 7727 7741 7753 7757 7759 7789 7793 7817 7823 7829 7841 7853 7867 7873 7877 7879 7883 7901 7907 7919 7927 7933 7937 7949 7951 7963 7993 8009 8011 8017 8039 8053 8059 8069 8081 8087 8089 8093 8101 8111 8117 8123 8147 8161 8167 8171 8179 8191 8209 8219 8221 8231 8233 8237 8243 8263 8269 8273 8287 8291 8293 8297 8311 8317 8329 8353 8363 8369 8377 8387 8389 8419 8423 8429 8431 8443 8447 8461 8467 8501 8513 8521 8527 8537 8539 8543 8563 8573 8581 8597 8599 8609 8623 8627 8629 8641 8647 8663 8669 8677 8681 8689 8693 8699 8707 8713 8719 8731 8737 8741 8747 8753 8761 8779 8783 8803 8807 8819 8821 8831 8837 8839 8849 8861 8863 8867 8887 8893 8923 8929 8933 8941 8951 8963 8969 8971 8999 9001 9007 9011 9013 9029 9041 9043 9049 9059 9067 9091 9103 9109 9127 9133 9137 9151 9157 9161 9173 9181 9187 9199 9203 9209 9221 9227 9239 9241 9257 9277 9281 9283 9293 9311 9319 9323 9337 9341 9343 9349 9371 9377 9391 9397 9403 9413 9419 9421 9431 9433 9437 9439 9461 9463 9467 9473 9479 9491 9497 9511 9521 9533 9539 9547 9551 9587 9601 9613 9619 9623 9629 9631 9643 9649 9661 9677 9679 9689 9697 9719 9721 9733 9739 9743 9749 9767 9769 9781 9787 9791 9803 9811 9817 9829 9833 9839 9851 9857 9859 9871 9883 9887 9901 9907 9923 9929 9931 9941 9949 9967 9973 10007 10009 10037 10039 10061 10067 10069 10079 10091 10093 10099 10103 10111 10133 10139 10141 10151 10159 10163 10169 10177 10181 10193 10211 10223 10243 10247 10253 10259 10267 10271 10273 10289 10301 10303 10313 10321 10331 10333 10337 10343 10357 10369 10391 10399 10427 10429 10433 10453 10457 10459 10463 10477 10487 10499 10501 10513 10529 10531 10559 10567 10589 10597 10601 10607 10613 10627 10631 10639 10651 10657 10663 10667 10687 10691 10709 10711 10723 10729 10733 10739 10753 10771 10781 10789 10799 10831 10837 10847 10853 10859 10861 10867 10883 10889 10891 10903 10909 10937 10939 10949 10957 10973 10979 10987 10993 11003 11027 11047 11057 11059 11069 11071 11083 11087 11093 11113 11117 11119 11131 11149 11159 11161 11171 11173 11177 11197 11213 11239 11243 11251 11257 11261 11273 11279 11287 11299 11311 11317 11321 11329 11351 11353 11369 11383 11393 11399 11411 11423 11437 11443 11447 11467 11471 11483 11489 11491 11497 11503 11519 11527 11549 11551 11579 11587 11593 11597 11617 11621 11633 11657 11677 11681 11689 11699 11701 11717 11719 11731 11743 11777 11779 11783 11789 11801 11807 11813 11821 11827 11831 11833 11839 11863 11867 11887 11897 11903 11909 11923 11927 11933 11939 11941 11953 11959 11969 11971 11981 11987 12007 12011 12037 12041 12043 12049 12071 12073 12097 12101 12107 12109 12113 12119 12143 12149 12157 12161 12163 12197 12203 12211 12227 12239 12241 12251 12253 12263 12269 12277 12281 12289 12301 12323 12329 12343 12347 12373 12377 12379 12391 12401 12409 12413 12421 12433 12437 12451 12457 12473 12479 12487 12491 12497 12503 12511 12517 12527 12539 12541 12547 12553 12569 12577 12583 12589 12601 12611 12613 12619 12637 12641 12647 12653 12659 12671 12689 12697 12703 12713 12721 12739 12743 12757 12763 12781 12791 12799 12809 12821 12823 12829 12841 12853 12889 12893 12899 12907 12911 12917 12919 12923 12941 12953 12959 12967 12973 12979 12983 13001 13003 13007 13009 13033 13037 13043 13049 13063 13093 13099 13103 13109 13121 13127 13147 13151 13159 13163 13171 13177 13183 13187 13217 13219 13229 13241 13249 13259 13267 13291 13297 13309 13313 13327 13331 13337 13339 13367 13381 13397 13399 13411 13417 13421 13441 13451 13457 13463 13469 13477 13487 13499 13513 13523 13537 13553 13567 13577 13591 13597 13613 13619 13627 13633 13649 13669 13679 13681 13687 13691 13693 13697 13709 13711 13721 13723 13729 13751 13757 13759 13763 13781 13789 13799 13807 13829 13831 13841 13859 13873 13877 13879 13883 13901 13903 13907 13913 13921 13931 13933 13963 13967 13997 13999 14009 14011 14029 14033 14051 14057 14071 14081 14083 14087 14107 14143 14149 14153 14159 14173 14177 14197 14207 14221 14243 14249 14251 14281 14293 14303 14321 14323 14327 14341 14347 14369 14387 14389 14401 14407 14411 14419 14423 14431 14437 14447 14449 14461 14479 14489 14503 14519 14533 14537 14543 14549 14551 14557 14561 14563 14591 14593 14621 14627 14629 14633 14639 14653 14657 14669 14683 14699 14713 14717 14723 14731 14737 14741 14747 14753 14759 14767 14771 14779 14783 14797 14813 14821 14827 14831 14843 14851 14867 14869 14879 14887 14891 14897 14923 14929 14939 14947 14951 14957 14969 14983 15013 15017 15031 15053 15061 15073 15077 15083 15091 15101 15107 15121 15131 15137 15139 15149 15161 15173 15187 15193 15199 15217 15227 15233 15241 15259 15263 15269 15271 15277 15287 15289 15299 15307 15313 15319 15329 15331 15349 15359 15361 15373 15377 15383 15391 15401 15413 15427 15439 15443 15451 15461 15467 15473 15493 15497 15511 15527 15541 15551 15559 15569 15581 15583 15601 15607 15619 15629 15641 15643 15647 15649 15661 15667 15671 15679 15683 15727 15731 15733 15737 15739 15749 15761 15767 15773 15787 15791 15797 15803 15809 15817 15823 15859 15877 15881 15887 15889 15901 15907 15913 15919 15923 15937 15959 15971 15973 15991 16001 16007 16033 16057 16061 16063 16067 16069 16073 16087 16091 16097 16103 16111 16127 16139 16141 16183 16187 16189 16193 16217 16223 16229 16231 16249 16253 16267 16273 16301 16319 16333 16339 16349 16361 16363 16369 16381 16411 16417 16421 16427 16433 16447 16451 16453 16477 16481 16487 16493 16519 16529 16547 16553 16561 16567 16573 16603 16607 16619 16631 16633 16649 16651 16657 16661 16673 16691 16693 16699 16703 16729 16741 16747 16759 16763 16787 16811 16823 16829 16831 16843 16871 16879 16883 16889 16901 16903 16921 16927 16931 16937 16943 16963 16979 16981 16987 16993 17011 17021 17027 17029 17033 17041 17047 17053 17077 17093 17099 17107 17117 17123 17137 17159 17167 17183 17189 17191 17203 17207 17209 17231 17239 17257 17291 17293 17299 17317 17321 17327 17333 17341 17351 17359 17377 17383 17387 17389 17393 17401 17417 17419 17431 17443 17449 17467 17471 17477 17483 17489 17491 17497 17509 17519 17539 17551 17569 17573 17579 17581 17597 17599 17609 17623 17627 17657 17659 17669 17681 17683 17707 17713 17729 17737 17747 17749 17761 17783 17789 17791 17807 17827 17837 17839 17851 17863 17881 17891 17903 17909 17911 17921 17923 17929 17939 17957 17959 17971 17977 17981 17987 17989 18013 18041 18043 18047 18049 18059 18061 18077 18089 18097 18119 18121 18127 18131 18133 18143 18149 18169 18181 18191 18199 18211 18217 18223 18229 18233 18251 18253 18257 18269 18287 18289 18301 18307 18311 18313 18329 18341 18353 18367 18371 18379 18397 18401 18413 18427 18433 18439 18443 18451 18457 18461 18481 18493 18503 18517 18521 18523 18539 18541 18553 18583 18587 18593 18617 18637 18661 18671 18679 18691 18701 18713 18719 18731 18743 18749 18757 18773 18787 18793 18797 18803 18839 18859 18869 18899 18911 18913 18917 18919 18947 18959 18973 18979 19001 19009 19013 19031 19037 19051 19069 19073 19079 19081 19087 19121 19139 19141 19157 19163 19181 19183 19207 19211 19213 19219 19231 19237 19249 19259 19267 19273 19289 19301 19309 19319 19333 19373 19379 19381 19387 19391 19403 19417 19421 19423 19427 19429 19433 19441 19447 19457 19463 19469 19471 19477 19483 19489 19501 19507 19531 19541 19543 19553 19559 19571 19577 19583 19597 19603 19609 19661 19681 19687 19697 19699 19709 19717 19727 19739 19751 19753 19759 19763 19777 19793 19801 19813 19819 19841 19843 19853 19861 19867 19889 19891 19913 19919 19927 19937 19949 19961 19963 19973 19979 19991 19993 19997 20011 20021 20023 20029 20047 20051 20063 20071 20089 20101 20107 20113 20117 20123 20129 20143 20147 20149 20161 20173 20177 20183 20201 20219 20231 20233 20249 20261 20269 20287 20297 20323 20327 20333 20341 20347 20353 20357 20359 20369 20389 20393 20399 20407 20411 20431 20441 20443 20477 20479 20483 20507 20509 20521 20533 20543 20549 20551 20563 20593 20599 20611 20627 20639 20641 20663 20681 20693 20707 20717 20719 20731 20743 20747 20749 20753 20759 20771 20773 20789 20807 20809 20849 20857 20873 20879 20887 20897 20899 20903 20921 20929 20939 20947 20959 20963 20981 20983 21001 21011 21013 21017 21019 21023 21031 21059 21061 21067 21089 21101 21107 21121 21139 21143 21149 21157 21163 21169 21179 21187 21191 21193 21211 21221 21227 21247 21269 21277 21283 21313 21317 21319 21323 21341 21347 21377 21379 21383 21391 21397 21401 21407 21419 21433 21467 21481 21487 21491 21493 21499 21503 21517 21521 21523 21529 21557 21559 21563 21569 21577 21587 21589 21599 21601 21611 21613 21617 21647 21649 21661 21673 21683 21701 21713 21727 21737 21739 21751 21757 21767 21773 21787 21799 21803 21817 21821 21839 21841 21851 21859 21863 21871 21881 21893 21911 21929 21937 21943 21961 21977 21991 21997 22003 22013 22027 22031 22037 22039 22051 22063 22067 22073 22079 22091 22093 22109 22111 22123 22129 22133 22147 22153 22157 22159 22171 22189 22193 22229 22247 22259 22271 22273 22277 22279 22283 22291 22303 22307 22343 22349 22367 22369 22381 22391 22397 22409 22433 22441 22447 22453 22469 22481 22483 22501 22511 22531 22541 22543 22549 22567 22571 22573 22613 22619 22621 22637 22639 22643 22651 22669 22679 22691 22697 22699 22709 22717 22721 22727 22739 22741 22751 22769 22777 22783 22787 22807 22811 22817 22853 22859 22861 22871 22877 22901 22907 22921 22937 22943 22961 22963 22973 22993 23003 23011 23017 23021 23027 23029 23039 23041 23053 23057 23059 23063 23071 23081 23087 23099 23117 23131 23143 23159 23167 23173 23189 23197 23201 23203 23209 23227 23251 23269 23279 23291 23293 23297 23311 23321 23327 23333 23339 23357 23369 23371 23399 23417 23431 23447 23459 23473 23497 23509 23531 23537 23539 23549 23557 23561 23563 23567 23581 23593 23599 23603 23609 23623 23627 23629 23633 23663 23669 23671 23677 23687 23689 23719 23741 23743 23747 23753 23761 23767 23773 23789 23801 23813 23819 23827 23831 23833 23857 23869 23873 23879 23887 23893 23899 23909 23911 23917 23929 23957 23971 23977 23981 23993 24001 24007 24019 24023 24029 24043 24049 24061 24071 24077 24083 24091 24097 24103 24107 24109 24113 24121 24133 24137 24151 24169 24179 24181 24197 24203 24223 24229 24239 24247 24251 24281 24317 24329 24337 24359 24371 24373 24379 24391 24407 24413 24419 24421 24439 24443 24469 24473 24481 24499 24509 24517 24527 24533 24547 24551 24571 24593 24611 24623 24631 24659 24671 24677 24683 24691 24697 24709 24733 24749 24763 24767 24781 24793 24799 24809 24821 24841 24847 24851 24859 24877 24889 24907 24917 24919 24923 24943 24953 24967 24971 24977 24979 24989 25013 25031 25033 25037 25057 25073 25087 25097 25111 25117 25121 25127 25147 25153 25163 25169 25171 25183 25189 25219 25229 25237 25243 25247 25253 25261 25301 25303 25307 25309 25321 25339 25343 25349 25357 25367 25373 25391 25409 25411 25423 25439 25447 25453 25457 25463 25469 25471 25523 25537 25541 25561 25577 25579 25583 25589 25601 25603 25609 25621 25633 25639 25643 25657 25667 25673 25679 25693 25703 25717 25733 25741 25747 25759 25763 25771 25793 25799 25801 25819 25841 25847 25849 25867 25873 25889 25903 25913 25919 25931 25933 25939 25943 25951 25969 25981 25997 25999 26003 26017 26021 26029 26041 26053 26083 26099 26107 26111 26113 26119 26141 26153 26161 26171 26177 26183 26189 26203 26209 26227 26237 26249 26251 26261 26263 26267 26293 26297 26309 26317 26321 26339 26347 26357 26371 26387 26393 26399 26407 26417 26423 26431 26437 26449 26459 26479 26489 26497 26501 26513 26539 26557 26561 26573 26591 26597 26627 26633 26641 26647 26669 26681 26683 26687 26693 26699 26701 26711 26713 26717 26723 26729 26731 26737 26759 26777 26783 26801 26813 26821 26833 26839 26849 26861 26863 26879 26881 26891 26893 26903 26921 26927 26947 26951 26953 26959 26981 26987 26993 27011 27017 27031 27043 27059 27061 27067 27073 27077 27091 27103 27107 27109 27127 27143 27179 27191 27197 27211 27239 27241 27253 27259 27271 27277 27281 27283 27299 27329 27337 27361 27367 27397 27407 27409 27427 27431 27437 27449 27457 27479 27481 27487 27509 27527 27529 27539 27541 27551 27581 27583 27611 27617 27631 27647 27653 27673 27689 27691 27697 27701 27733 27737 27739 27743 27749 27751 27763 27767 27773 27779 27791 27793 27799 27803 27809 27817 27823 27827 27847 27851 27883 27893 27901 27917 27919 27941 27943 27947 27953 27961 27967 27983 27997 28001 28019 28027 28031 28051 28057 28069 28081 28087 28097 28099 28109 28111 28123 28151 28163 28181 28183 28201 28211 28219 28229 28277 28279 28283 28289 28297 28307 28309 28319 28349 28351 28387 28393 28403 28409 28411 28429 28433 28439 28447 28463 28477 28493 28499 28513 28517 28537 28541 28547 28549 28559 28571 28573 28579 28591 28597 28603 28607 28619 28621 28627 28631 28643 28649 28657 28661 28663 28669 28687 28697 28703 28711 28723 28729 28751 28753 28759 28771 28789 28793 28807 28813 28817 28837 28843 28859 28867 28871 28879 28901 28909 28921 28927 28933 28949 28961 28979 29009 29017 29021 29023 29027 29033 29059 29063 29077 29101 29123 29129 29131 29137 29147 29153 29167 29173 29179 29191 29201 29207 29209 29221 29231 29243 29251 29269 29287 29297 29303 29311 29327 29333 29339 29347 29363 29383 29387 29389 29399 29401 29411 29423 29429 29437 29443 29453 29473 29483 29501 29527 29531 29537 29567 29569 29573 29581 29587 29599 29611 29629 29633 29641 29663 29669 29671 29683 29717 29723 29741 29753 29759 29761 29789 29803 29819 29833 29837 29851 29863 29867 29873 29879 29881 29917 29921 29927 29947 29959 29983 29989 30011 30013 30029 30047 30059 30071 30089 30091 30097 30103 30109 30113 30119 30133 30137 30139 30161 30169 30181 30187 30197 30203 30211 30223 30241 30253 30259 30269 30271 30293 30307 30313 30319 30323 30341 30347 30367 30389 30391 30403 30427 30431 30449 30467 30469 30491 30493 30497 30509 30517 30529 30539 30553 30557 30559 30577 30593 30631 30637 30643 30649 30661 30671 30677 30689 30697 30703 30707 30713 30727 30757 30763 30773 30781 30803 30809 30817 30829 30839 30841 30851 30853 30859 30869 30871 30881 30893 30911 30931 30937 30941 30949 30971 30977 30983 31013 31019 31033 31039 31051 31063 31069 31079 31081 31091 31121 31123 31139 31147 31151 31153 31159 31177 31181 31183 31189 31193 31219 31223 31231 31237 31247 31249 31253 31259 31267 31271 31277 31307 31319 31321 31327 31333 31337 31357 31379 31387 31391 31393 31397 31469 31477 31481 31489 31511 31513 31517 31531 31541 31543 31547 31567 31573 31583 31601 31607 31627 31643 31649 31657 31663 31667 31687 31699 31721 31723 31727 31729 31741 31751 31769 31771 31793 31799 31817 31847 31849 31859 31873 31883 31891 31907 31957 31963 31973 31981 31991 32003 32009 32027 32029 32051 32057 32059 32063 32069 32077 32083 32089 32099 32117 32119 32141 32143 32159 32173 32183 32189 32191 32203 32213 32233 32237 32251 32257 32261 32297 32299 32303 32309 32321 32323 32327 32341 32353 32359 32363 32369 32371 32377 32381 32401 32411 32413 32423 32429 32441 32443 32467 32479 32491 32497 32503 32507 32531 32533 32537 32561 32563 32569 32573 32579 32587 32603 32609 32611 32621 32633 32647 32653 32687 32693 32707 32713 32717 32719 32749 32771 32779 32783 32789 32797 32801 32803 32831 32833 32839 32843 32869 32887 32909 32911 32917 32933 32939 32941 32957 32969 32971 32983 32987 32993 32999 33013 33023 33029 33037 33049 33053 33071 33073 33083 33091 33107 33113 33119 33149 33151 33161 33179 33181 33191 33199 33203 33211 33223 33247 33287 33289 33301 33311 33317 33329 33331 33343 33347 33349 33353 33359 33377 33391 33403 33409 33413 33427 33457 33461 33469 33479 33487 33493 33503 33521 33529 33533 33547 33563 33569 33577 33581 33587 33589 33599 33601 33613 33617 33619 33623 33629 33637 33641 33647 33679 33703 33713 33721 33739 33749 33751 33757 33767 33769 33773 33791 33797 33809 33811 33827 33829 33851 33857 33863 33871 33889 33893 33911 33923 33931 33937 33941 33961 33967 33997 34019 34031 34033 34039 34057 34061 34123 34127 34129 34141 34147 34157 34159 34171 34183 34211 34213 34217 34231 34253 34259 34261 34267 34273 34283 34297 34301 34303 34313 34319 34327 34337 34351 34361 34367 34369 34381 34403 34421 34429 34439 34457 34469 34471 34483 34487 34499 34501 34511 34513 34519 34537 34543 34549 34583 34589 34591 34603 34607 34613 34631 34649 34651 34667 34673 34679 34687 34693 34703 34721 34729 34739 34747 34757 34759 34763 34781 34807 34819 34841 34843 34847 34849 34871 34877 34883 34897 34913 34919 34939 34949 34961 34963 34981 35023 35027 35051 35053 35059 35069 35081 35083 35089 35099 35107 35111 35117 35129 35141 35149 35153 35159 35171 35201 35221 35227 35251 35257 35267 35279 35281 35291 35311 35317 35323 35327 35339 35353 35363 35381 35393 35401 35407 35419 35423 35437 35447 35449 35461 35491 35507 35509 35521 35527 35531 35533 35537 35543 35569 35573 35591 35593 35597 35603 35617 35671 35677 35729 35731 35747 35753 35759 35771 35797 35801 35803 35809 35831 35837 35839 35851 35863 35869 35879 35897 35899 35911 35923 35933 35951 35963 35969 35977 35983 35993 35999 36007 36011 36013 36017 36037 36061 36067 36073 36083 36097 36107 36109 36131 36137 36151 36161 36187 36191 36209 36217 36229 36241 36251 36263 36269 36277 36293 36299 36307 36313 36319 36341 36343 36353 36373 36383 36389 36433 36451 36457 36467 36469 36473 36479 36493 36497 36523 36527 36529 36541 36551 36559 36563 36571 36583 36587 36599 36607 36629 36637 36643 36653 36671 36677 36683 36691 36697 36709 36713 36721 36739 36749 36761 36767 36779 36781 36787 36791 36793 36809 36821 36833 36847 36857 36871 36877 36887 36899 36901 36913 36919 36923 36929 36931 36943 36947 36973 36979 36997 37003 37013 37019 37021 37039 37049 37057 37061 37087 37097 37117 37123 37139 37159 37171 37181 37189 37199 37201 37217 37223 37243 37253 37273 37277 37307 37309 37313 37321 37337 37339 37357 37361 37363 37369 37379 37397 37409 37423 37441 37447 37463 37483 37489 37493 37501 37507 37511 37517 37529 37537 37547 37549 37561 37567 37571 37573 37579 37589 37591 37607 37619 37633 37643 37649 37657 37663 37691 37693 37699 37717 37747 37781 37783 37799 37811 37813 37831 37847 37853 37861 37871 37879 37889 37897 37907 37951 37957 37963 37967 37987 37991 37993 37997 38011 38039 38047 38053 38069 38083 38113 38119 38149 38153 38167 38177 38183 38189 38197 38201 38219 38231 38237 38239 38261 38273 38281 38287 38299 38303 38317 38321 38327 38329 38333 38351 38371 38377 38393 38431 38447 38449 38453 38459 38461 38501 38543 38557 38561 38567 38569 38593 38603 38609 38611 38629 38639 38651 38653 38669 38671 38677 38693 38699 38707 38711 38713 38723 38729 38737 38747 38749 38767 38783 38791 38803 38821 38833 38839 38851 38861 38867 38873 38891 38903 38917 38921 38923 38933 38953 38959 38971 38977 38993 39019 39023 39041 39043 39047 39079 39089 39097 39103 39107 39113 39119 39133 39139 39157 39161 39163 39181 39191 39199 39209 39217 39227 39229 39233 39239 39241 39251 39293 39301 39313 39317 39323 39341 39343 39359 39367 39371 39373 39383 39397 39409 39419 39439 39443 39451 39461 39499 39503 39509 39511 39521 39541 39551 39563 39569 39581 39607 39619 39623 39631 39659 39667 39671 39679 39703 39709 39719 39727 39733 39749 39761 39769 39779 39791 39799 39821 39827 39829 39839 39841 39847 39857 39863 39869 39877 39883 39887 39901 39929 39937 39953 39971 39979 39983 39989 40009 40013 40031 40037 40039 40063 40087 40093 40099 40111 40123 40127 40129 40151 40153 40163 40169 40177 40189 40193 40213 40231 40237 40241 40253 40277 40283 40289 40343 40351 40357 40361 40387 40423 40427 40429 40433 40459 40471 40483 40487 40493 40499 40507 40519 40529 40531 40543 40559 40577 40583 40591 40597 40609 40627 40637 40639 40693 40697 40699 40709 40739 40751 40759 40763 40771 40787 40801 40813 40819 40823 40829 40841 40847 40849 40853 40867 40879 40883 40897 40903 40927 40933 40939 40949 40961 40973 40993 41011 41017 41023 41039 41047 41051 41057 41077 41081 41113 41117 41131 41141 41143 41149 41161 41177 41179 41183 41189 41201 41203 41213 41221 41227 41231 41233 41243 41257 41263 41269 41281 41299 41333 41341 41351 41357 41381 41387 41389 41399 41411 41413 41443 41453 41467 41479 41491 41507 41513 41519 41521 41539 41543 41549 41579 41593 41597 41603 41609 41611 41617 41621 41627 41641 41647 41651 41659 41669 41681 41687 41719 41729 41737 41759 41761 41771 41777 41801 41809 41813 41843 41849 41851 41863 41879 41887 41893 41897 41903 41911 41927 41941 41947 41953 41957 41959 41969 41981 41983 41999 42013 42017 42019 42023 42043 42061 42071 42073 42083 42089 42101 42131 42139 42157 42169 42179 42181 42187 42193 42197 42209 42221 42223 42227 42239 42257 42281 42283 42293 42299 42307 42323 42331 42337 42349 42359 42373 42379 42391 42397 42403 42407 42409 42433 42437 42443 42451 42457 42461 42463 42467 42473 42487 42491 42499 42509 42533 42557 42569 42571 42577 42589 42611 42641 42643 42649 42667 42677 42683 42689 42697 42701 42703 42709 42719 42727 42737 42743 42751 42767 42773 42787 42793 42797 42821 42829 42839 42841 42853 42859 42863 42899 42901 42923 42929 42937 42943 42953 42961 42967 42979 42989 43003 43013 43019 43037 43049 43051 43063 43067 43093 43103 43117 43133 43151 43159 43177 43189 43201 43207 43223 43237 43261 43271 43283 43291 43313 43319 43321 43331 43391 43397 43399 43403 43411 43427 43441 43451 43457 43481 43487 43499 43517 43541 43543 43573 43577 43579 43591 43597 43607 43609 43613 43627 43633 43649 43651 43661 43669 43691 43711 43717 43721 43753 43759 43777 43781 43783 43787 43789 43793 43801 43853 43867 43889 43891 43913 43933 43943 43951 43961 43963 43969 43973 43987 43991 43997 44017 44021 44027 44029 44041 44053 44059 44071 44087 44089 44101 44111 44119 44123 44129 44131 44159 44171 44179 44189 44201 44203 44207 44221 44249 44257 44263 44267 44269 44273 44279 44281 44293 44351 44357 44371 44381 44383 44389 44417 44449 44453 44483 44491 44497 44501 44507 44519 44531 44533 44537 44543 44549 44563 44579 44587 44617 44621 44623 44633 44641 44647 44651 44657 44683 44687 44699 44701 44711 44729 44741 44753 44771 44773 44777 44789 44797 44809 44819 44839 44843 44851 44867 44879 44887 44893 44909 44917 44927 44939 44953 44959 44963 44971 44983 44987 45007 45013 45053 45061 45077 45083 45119 45121 45127 45131 45137 45139 45161 45179 45181 45191 45197 45233 45247 45259 45263 45281 45289 45293 45307 45317 45319 45329 45337 45341 45343 45361 45377 45389 45403 45413 45427 45433 45439 45481 45491 45497 45503 45523 45533 45541 45553 45557 45569 45587 45589 45599 45613 45631 45641 45659 45667 45673 45677 45691 45697 45707 45737 45751 45757 45763 45767 45779 45817 45821 45823 45827 45833 45841 45853 45863 45869 45887 45893 45943 45949 45953 45959 45971 45979 45989 46021 46027 46049 46051 46061 46073 46091 46093 46099 46103 46133 46141 46147 46153 46171 46181 46183 46187 46199 46219 46229 46237 46261 46271 46273 46279 46301 46307 46309 46327 46337 46349 46351 46381 46399 46411 46439 46441 46447 46451 46457 46471 46477 46489 46499 46507 46511 46523 46549 46559 46567 46573 46589 46591 46601 46619 46633 46639 46643 46649 46663 46679 46681 46687 46691 46703 46723 46727 46747 46751 46757 46769 46771 46807 46811 46817 46819 46829 46831 46853 46861 46867 46877 46889 46901 46919 46933 46957 46993 46997 47017 47041 47051 47057 47059 47087 47093 47111 47119 47123 47129 47137 47143 47147 47149 47161 47189 47207 47221 47237 47251 47269 47279 47287 47293 47297 47303 47309 47317 47339 47351 47353 47363 47381 47387 47389 47407 47417 47419 47431 47441 47459 47491 47497 47501 47507 47513 47521 47527 47533 47543 47563 47569 47581 47591 47599 47609 47623 47629 47639 47653 47657 47659 47681 47699 47701 47711 47713 47717 47737 47741 47743 47777 47779 47791 47797 47807 47809 47819 47837 47843 47857 47869 47881 47903 47911 47917 47933 47939 47947 47951 47963 47969 47977 47981 48017 48023 48029 48049 48073 48079 48091 48109 48119 48121 48131 48157 48163 48179 48187 48193 48197 48221 48239 48247 48259 48271 48281 48299 48311 48313 48337 48341 48353 48371 48383 48397 48407 48409 48413 48437 48449 48463 48473 48479 48481 48487 48491 48497 48523 48527 48533 48539 48541 48563 48571 48589 48593 48611 48619 48623 48647 48649 48661 48673 48677 48679 48731 48733 48751 48757 48761 48767 48779 48781 48787 48799 48809 48817 48821 48823 48847 48857 48859 48869 48871 48883 48889 48907 48947 48953 48973 48989 48991 49003 49009 49019 49031 49033 49037 49043 49057 49069 49081 49103 49109 49117 49121 49123 49139 49157 49169 49171 49177 49193 49199 49201 49207 49211 49223 49253 49261 49277 49279 49297 49307 49331 49333 49339 49363 49367 49369 49391 49393 49409 49411 49417 49429 49433 49451 49459 49463 49477 49481 49499 49523 49529 49531 49537 49547 49549 49559 49597 49603 49613 49627 49633 49639 49663 49667 49669 49681 49697 49711 49727 49739 49741 49747 49757 49783 49787 49789 49801 49807 49811 49823 49831 49843 49853 49871 49877 49891 49919 49921 49927 49937 49939 49943 49957 49991 49993 49999 diff --git a/testsuite/tests/misc/takc.ml b/testsuite/tests/misc/takc.ml index deec040c..f7b244c9 100644 --- a/testsuite/tests/misc/takc.ml +++ b/testsuite/tests/misc/takc.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: takc.ml 11156 2011-07-27 14:17:02Z doligez $ *) +(* $Id: takc.ml 12800 2012-07-30 18:59:07Z doligez $ *) let rec tak x y z = if x > y then tak (tak (x-1) y z) (tak (y-1) z x) (tak (z-1) x y) @@ -20,4 +20,3 @@ let rec repeat n = if n <= 0 then 0 else tak 18 12 6 + repeat(n-1) let _ = print_int (repeat 2000); print_newline(); exit 0 - diff --git a/testsuite/tests/regression/pr5757/Makefile b/testsuite/tests/regression/pr5757/Makefile new file mode 100644 index 00000000..a31a394e --- /dev/null +++ b/testsuite/tests/regression/pr5757/Makefile @@ -0,0 +1,4 @@ +MAIN_MODULE=pr5757 + +include ../../../makefiles/Makefile.one +include ../../../makefiles/Makefile.common diff --git a/testsuite/tests/regression/pr5757/pr5757.ml b/testsuite/tests/regression/pr5757/pr5757.ml new file mode 100644 index 00000000..22b36d73 --- /dev/null +++ b/testsuite/tests/regression/pr5757/pr5757.ml @@ -0,0 +1,5 @@ +Random.init 3;; +for i = 0 to 100_000 do + ignore (String.create (Random.int 1_000_000)) +done;; +Printf.printf "hello world\n";; diff --git a/testsuite/tests/regression/pr5757/pr5757.reference b/testsuite/tests/regression/pr5757/pr5757.reference new file mode 100644 index 00000000..3b18e512 --- /dev/null +++ b/testsuite/tests/regression/pr5757/pr5757.reference @@ -0,0 +1 @@ +hello world diff --git a/testsuite/tests/tool-lexyacc/gram_aux.ml b/testsuite/tests/tool-lexyacc/gram_aux.ml index c382320b..3f8efd95 100644 --- a/testsuite/tests/tool-lexyacc/gram_aux.ml +++ b/testsuite/tests/tool-lexyacc/gram_aux.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: gram_aux.ml 11156 2011-07-27 14:17:02Z doligez $ *) +(* $Id: gram_aux.ml 12800 2012-07-30 18:59:07Z doligez $ *) (* Auxiliaries for the parser. *) @@ -44,4 +44,3 @@ let rec subtract l1 l2 = match l1 with [] -> [] | a::l -> if List.mem a l2 then subtract l l2 else a :: subtract l l2 - diff --git a/testsuite/tests/tool-lexyacc/grammar.mly b/testsuite/tests/tool-lexyacc/grammar.mly index 7e5a1dce..20602988 100644 --- a/testsuite/tests/tool-lexyacc/grammar.mly +++ b/testsuite/tests/tool-lexyacc/grammar.mly @@ -10,7 +10,7 @@ /* */ /***********************************************************************/ -/* $Id: grammar.mly 11156 2011-07-27 14:17:02Z doligez $ */ +/* $Id: grammar.mly 12800 2012-07-30 18:59:07Z doligez $ */ /* The grammar for lexer definitions */ @@ -50,7 +50,7 @@ header: other_definitions: other_definitions Tand definition { $3::$1 } - | + | { [] } ; definition: @@ -111,4 +111,3 @@ char_class1: ; %% - diff --git a/testsuite/tests/tool-lexyacc/input b/testsuite/tests/tool-lexyacc/input index 2381a989..2485d39b 100644 --- a/testsuite/tests/tool-lexyacc/input +++ b/testsuite/tests/tool-lexyacc/input @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: input 11156 2011-07-27 14:17:02Z doligez $ *) +(* $Id: input 12800 2012-07-30 18:59:07Z doligez $ *) (* The lexical analyzer for lexer definitions. *) @@ -21,27 +21,27 @@ open Scan_aux } rule main = parse - [' ' '\010' '\013' '\009' ] + + [' ' '\010' '\013' '\009' ] + { main lexbuf } - | "(*" + | "(*" { comment_depth := 1; comment lexbuf; main lexbuf } | (['A'-'Z' 'a'-'z'] | '_' ['A'-'Z' 'a'-'z' '\'' '0'-'9']) - ( '_' ? ['A'-'Z' 'a'-'z' ''' '0'-'9'] ) * + ( '_' ? ['A'-'Z' 'a'-'z' ''' '0'-'9'] ) * { match Lexing.lexeme lexbuf with "rule" -> Trule | "parse" -> Tparse | "and" -> Tand | "eof" -> Teof | s -> Tident s } - | '"' + | '"' { reset_string_buffer(); string lexbuf; Tstring(get_stored_string()) } - | "'" + | "'" { Tchar(char lexbuf) } - | '{' + | '{' { let n1 = Lexing.lexeme_end lexbuf in brace_depth := 1; let n2 = action lexbuf in @@ -66,68 +66,68 @@ rule main = parse { raise(Lexical_error("illegal character " ^ Lexing.lexeme lexbuf)) } and action = parse - '{' + '{' { incr brace_depth; action lexbuf } - | '}' + | '}' { decr brace_depth; if !brace_depth = 0 then Lexing.lexeme_start lexbuf else action lexbuf } - | '"' + | '"' { reset_string_buffer(); string lexbuf; reset_string_buffer(); action lexbuf } | '\'' { let _ = char lexbuf in action lexbuf } - | "(*" + | "(*" { comment_depth := 1; comment lexbuf; action lexbuf } - | eof + | eof { raise (Lexical_error "unterminated action") } - | _ + | _ { action lexbuf } - + and string = parse - '"' + '"' { () } | '\\' [' ' '\010' '\013' '\009' '\026' '\012'] + { string lexbuf } - | '\\' ['\\' '"' 'n' 't' 'b' 'r'] + | '\\' ['\\' '"' 'n' 't' 'b' 'r'] { store_string_char(char_for_backslash(Lexing.lexeme_char lexbuf 1)); string lexbuf } - | '\\' ['0'-'9'] ['0'-'9'] ['0'-'9'] + | '\\' ['0'-'9'] ['0'-'9'] ['0'-'9'] { store_string_char(char_for_decimal_code lexbuf 1); string lexbuf } - | eof + | eof { raise(Lexical_error "unterminated string") } - | _ + | _ { store_string_char(Lexing.lexeme_char lexbuf 0); string lexbuf } and char = parse - [^ '\\'] "'" + [^ '\\'] "'" { Lexing.lexeme_char lexbuf 0 } - | '\\' ['\\' '\'' 'n' 't' 'b' 'r'] "'" + | '\\' ['\\' '\'' 'n' 't' 'b' 'r'] "'" { char_for_backslash (Lexing.lexeme_char lexbuf 1) } - | '\\' ['0'-'9'] ['0'-'9'] ['0'-'9'] "'" + | '\\' ['0'-'9'] ['0'-'9'] ['0'-'9'] "'" { char_for_decimal_code lexbuf 1 } - | _ + | _ { raise(Lexical_error "bad character constant") } and comment = parse - "(*" + "(*" { incr comment_depth; comment lexbuf } - | "*)" + | "*)" { decr comment_depth; if !comment_depth = 0 then () else comment lexbuf } - | '"' + | '"' { reset_string_buffer(); string lexbuf; reset_string_buffer(); comment lexbuf } - | eof + | eof { raise(Lexical_error "unterminated comment") } - | _ + | _ { comment lexbuf } ;; diff --git a/testsuite/tests/tool-lexyacc/input.ml b/testsuite/tests/tool-lexyacc/input.ml index 57d17c08..002bf72c 100644 --- a/testsuite/tests/tool-lexyacc/input.ml +++ b/testsuite/tests/tool-lexyacc/input.ml @@ -309,4 +309,3 @@ and char lexbuf = and comment lexbuf = Lexing.init lexbuf; state_4 lexbuf - diff --git a/testsuite/tests/tool-lexyacc/lexgen.ml b/testsuite/tests/tool-lexyacc/lexgen.ml index a4eb6a96..7b00ec92 100644 --- a/testsuite/tests/tool-lexyacc/lexgen.ml +++ b/testsuite/tests/tool-lexyacc/lexgen.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: lexgen.ml 11156 2011-07-27 14:17:02Z doligez $ *) +(* $Id: lexgen.ml 12800 2012-07-30 18:59:07Z doligez $ *) (* Compiling a lexer definition *) @@ -200,7 +200,7 @@ let memory = (Hashtbl.create 131 : (transition list, int) Hashtbl.t) let todo = ref ([] : (transition list * int) list) let next = ref 0 -let get_state st = +let get_state st = try Hashtbl.find memory st with Not_found -> @@ -222,7 +222,7 @@ let goto_state = function | ps -> Goto (get_state ps) -let transition_from chars follow pos_set = +let transition_from chars follow pos_set = let tr = Array.create 256 [] and shift = Array.create 256 Backtrack in List.iter @@ -263,4 +263,3 @@ let make_dfa lexdef = Array.create (number_of_states()) (Perform 0) in List.iter (fun (auto, i) -> v.(i) <- auto) states; (initial_states, v, actions) - diff --git a/testsuite/tests/tool-lexyacc/main.reference b/testsuite/tests/tool-lexyacc/main.reference index 7711833a..f3dac422 100644 --- a/testsuite/tests/tool-lexyacc/main.reference +++ b/testsuite/tests/tool-lexyacc/main.reference @@ -310,4 +310,3 @@ and char lexbuf = and comment lexbuf = Lexing.init lexbuf; state_4 lexbuf - diff --git a/testsuite/tests/tool-lexyacc/output.ml b/testsuite/tests/tool-lexyacc/output.ml index 9d3948a8..44334b80 100644 --- a/testsuite/tests/tool-lexyacc/output.ml +++ b/testsuite/tests/tool-lexyacc/output.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: output.ml 11156 2011-07-27 14:17:02Z doligez $ *) +(* $Id: output.ml 12800 2012-07-30 18:59:07Z doligez $ *) (* Generating a DFA as a set of mutually recursive functions *) @@ -137,7 +137,7 @@ let output_state state_num = function (* 3- Generating the entry points *) - + let rec output_entries = function [] -> failwith "output_entries" | (name,state_num) :: rest -> @@ -146,7 +146,7 @@ let rec output_entries = function output_string !oc (" state_" ^ string_of_int state_num ^ " lexbuf\n"); match rest with - [] -> output_string !oc "\n"; () + [] -> () | _ -> output_string !oc "\nand "; output_entries rest @@ -164,6 +164,3 @@ let output_lexdef header (initial_st, st, actions) = output_state i st.(i) done; output_entries initial_st - - - diff --git a/testsuite/tests/tool-lexyacc/scan_aux.ml b/testsuite/tests/tool-lexyacc/scan_aux.ml index cdadcfe8..25b48b36 100644 --- a/testsuite/tests/tool-lexyacc/scan_aux.ml +++ b/testsuite/tests/tool-lexyacc/scan_aux.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: scan_aux.ml 11156 2011-07-27 14:17:02Z doligez $ *) +(* $Id: scan_aux.ml 12800 2012-07-30 18:59:07Z doligez $ *) (* Auxiliaries for the lexical analyzer *) @@ -57,4 +57,3 @@ let char_for_decimal_code lexbuf i = Char.chr(100 * (Char.code(Lexing.lexeme_char lexbuf i) - 48) + 10 * (Char.code(Lexing.lexeme_char lexbuf (i+1)) - 48) + (Char.code(Lexing.lexeme_char lexbuf (i+2)) - 48)) - diff --git a/testsuite/tests/tool-lexyacc/scanner.mll b/testsuite/tests/tool-lexyacc/scanner.mll index 251f04c2..2fc897db 100644 --- a/testsuite/tests/tool-lexyacc/scanner.mll +++ b/testsuite/tests/tool-lexyacc/scanner.mll @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: scanner.mll 11156 2011-07-27 14:17:02Z doligez $ *) +(* $Id: scanner.mll 12800 2012-07-30 18:59:07Z doligez $ *) (* The lexical analyzer for lexer definitions. *) @@ -21,27 +21,27 @@ open Scan_aux } rule main = parse - [' ' '\010' '\013' '\009' ] + + [' ' '\010' '\013' '\009' ] + { main lexbuf } - | "(*" + | "(*" { comment_depth := 1; comment lexbuf; main lexbuf } | (['A'-'Z' 'a'-'z'] | '_' ['A'-'Z' 'a'-'z' '\'' '0'-'9']) - ( '_' ? ['A'-'Z' 'a'-'z' ''' '0'-'9'] ) * + ( '_' ? ['A'-'Z' 'a'-'z' ''' '0'-'9'] ) * { match Lexing.lexeme lexbuf with "rule" -> Trule | "parse" -> Tparse | "and" -> Tand | "eof" -> Teof | s -> Tident s } - | '"' + | '"' { reset_string_buffer(); string lexbuf; Tstring(get_stored_string()) } - | "'" + | "'" { Tchar(char lexbuf) } - | '{' + | '{' { let n1 = Lexing.lexeme_end lexbuf in brace_depth := 1; let n2 = action lexbuf in @@ -66,67 +66,67 @@ rule main = parse { raise(Lexical_error("illegal character " ^ Lexing.lexeme lexbuf)) } and action = parse - '{' + '{' { incr brace_depth; action lexbuf } - | '}' + | '}' { decr brace_depth; if !brace_depth = 0 then Lexing.lexeme_start lexbuf else action lexbuf } - | '"' + | '"' { reset_string_buffer(); string lexbuf; reset_string_buffer(); action lexbuf } | '\'' { let _ = char lexbuf in action lexbuf } - | "(*" + | "(*" { comment_depth := 1; comment lexbuf; action lexbuf } - | eof + | eof { raise (Lexical_error "unterminated action") } - | _ + | _ { action lexbuf } - + and string = parse - '"' + '"' { () } | '\\' [' ' '\010' '\013' '\009' '\026' '\012'] + { string lexbuf } - | '\\' ['\\' '"' 'n' 't' 'b' 'r'] + | '\\' ['\\' '"' 'n' 't' 'b' 'r'] { store_string_char(char_for_backslash(Lexing.lexeme_char lexbuf 1)); string lexbuf } - | '\\' ['0'-'9'] ['0'-'9'] ['0'-'9'] + | '\\' ['0'-'9'] ['0'-'9'] ['0'-'9'] { store_string_char(char_for_decimal_code lexbuf 1); string lexbuf } - | eof + | eof { raise(Lexical_error "unterminated string") } - | _ + | _ { store_string_char(Lexing.lexeme_char lexbuf 0); string lexbuf } and char = parse - [^ '\\'] "'" + [^ '\\'] "'" { Lexing.lexeme_char lexbuf 0 } - | '\\' ['\\' '\'' 'n' 't' 'b' 'r'] "'" + | '\\' ['\\' '\'' 'n' 't' 'b' 'r'] "'" { char_for_backslash (Lexing.lexeme_char lexbuf 1) } - | '\\' ['0'-'9'] ['0'-'9'] ['0'-'9'] "'" + | '\\' ['0'-'9'] ['0'-'9'] ['0'-'9'] "'" { char_for_decimal_code lexbuf 1 } - | _ + | _ { raise(Lexical_error "bad character constant") } and comment = parse - "(*" + "(*" { incr comment_depth; comment lexbuf } - | "*)" + | "*)" { decr comment_depth; if !comment_depth = 0 then () else comment lexbuf } - | '"' + | '"' { reset_string_buffer(); string lexbuf; reset_string_buffer(); comment lexbuf } - | eof + | eof { raise(Lexical_error "unterminated comment") } - | _ + | _ { comment lexbuf } diff --git a/testsuite/tests/tool-ocaml/t301-object.ml b/testsuite/tests/tool-ocaml/t301-object.ml index 59a15398..11aadaa9 100644 --- a/testsuite/tests/tool-ocaml/t301-object.ml +++ b/testsuite/tests/tool-ocaml/t301-object.ml @@ -7,7 +7,7 @@ ocamlc -nostdlib -I ../../stdlib \ t301-object.ml -o t301-object.byte ***) -(* $Id: t301-object.ml 11123 2011-07-20 09:17:07Z doligez $ *) +(* $Id: t301-object.ml 12800 2012-07-30 18:59:07Z doligez $ *) class c = object (self) @@ -26,4 +26,4 @@ let (x,y,z) = f () in if y <> 2 then raise Not_found; if z <> 4 then raise Not_found;; -(**** eof $Id: t301-object.ml 11123 2011-07-20 09:17:07Z doligez $ *) +(**** eof $Id: t301-object.ml 12800 2012-07-30 18:59:07Z doligez $ *) diff --git a/testsuite/tests/tool-ocamldoc/odoc_test.ml b/testsuite/tests/tool-ocamldoc/odoc_test.ml index 4dd76258..aef0d33d 100644 --- a/testsuite/tests/tool-ocamldoc/odoc_test.ml +++ b/testsuite/tests/tool-ocamldoc/odoc_test.ml @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_test.ml 12354 2012-04-13 13:49:23Z doligez $ *) +(* $Id: odoc_test.ml 12800 2012-07-30 18:59:07Z doligez $ *) (** Custom generator to perform test on ocamldoc. *) @@ -27,64 +27,64 @@ class string_gen = inherit Odoc_info.Scan.scanner val mutable test_kinds = [] - val mutable fmt = Format.str_formatter + val mutable fmt = Format.str_formatter method must_display_types = List.mem Types_display test_kinds method set_test_kinds_from_module m = test_kinds <- List.fold_left - (fun acc (s, _) -> - match s with - "test_types_display" -> Types_display :: acc - | _ -> acc - ) - [] - ( - match m.m_info with - None -> [] - | Some i -> i.i_custom - ) + (fun acc (s, _) -> + match s with + "test_types_display" -> Types_display :: acc + | _ -> acc + ) + [] + ( + match m.m_info with + None -> [] + | Some i -> i.i_custom + ) method! scan_type t = match test_kinds with - [] -> () - | _ -> - p fmt "# type %s:\n" t.ty_name; - if self#must_display_types then - ( - p fmt "# manifest (Odoc_info.string_of_type_expr):\n<[%s]>\n" - (match t.ty_manifest with - None -> "None" - | Some e -> Odoc_info.string_of_type_expr e - ); - ); + [] -> () + | _ -> + p fmt "# type %s:\n" t.ty_name; + if self#must_display_types then + ( + p fmt "# manifest (Odoc_info.string_of_type_expr):\n<[%s]>\n" + (match t.ty_manifest with + None -> "None" + | Some e -> Odoc_info.string_of_type_expr e + ); + ); method! scan_module_pre m = p fmt "#\n# module %s:\n" m.m_name ; if self#must_display_types then - ( - p fmt "# Odoc_info.string_of_module_type:\n<[%s]>\n" - (Odoc_info.string_of_module_type m.m_type); - p fmt "# Odoc_info.string_of_module_type ~complete: true :\n<[%s]>\n" - (Odoc_info.string_of_module_type ~complete: true m.m_type); - ); + ( + p fmt "# Odoc_info.string_of_module_type:\n<[%s]>\n" + (Odoc_info.string_of_module_type m.m_type); + p fmt "# Odoc_info.string_of_module_type ~complete: true :\n<[%s]>\n" + (Odoc_info.string_of_module_type ~complete: true m.m_type); + ); true method! scan_module_type_pre m = p fmt "#\n# module type %s:\n" m.mt_name ; if self#must_display_types then - ( - p fmt "# Odoc_info.string_of_module_type:\n<[%s]>\n" - (match m.mt_type with - None -> "None" - | Some t -> Odoc_info.string_of_module_type t - ); - p fmt "# Odoc_info.string_of_module_type ~complete: true :\n<[%s]>\n" - (match m.mt_type with - None -> "None" - | Some t -> Odoc_info.string_of_module_type ~complete: true t - ); - ); + ( + p fmt "# Odoc_info.string_of_module_type:\n<[%s]>\n" + (match m.mt_type with + None -> "None" + | Some t -> Odoc_info.string_of_module_type t + ); + p fmt "# Odoc_info.string_of_module_type ~complete: true :\n<[%s]>\n" + (match m.mt_type with + None -> "None" + | Some t -> Odoc_info.string_of_module_type ~complete: true t + ); + ); true method generate (module_list: Odoc_info.Module.t_module list) = @@ -92,15 +92,15 @@ class string_gen = fmt <- Format.formatter_of_out_channel oc; ( try - List.iter - (fun m -> - self#set_test_kinds_from_module m; - self#scan_module_list [m]; - ) - module_list + List.iter + (fun m -> + self#set_test_kinds_from_module m; + self#scan_module_list [m]; + ) + module_list with - e -> - prerr_endline (Printexc.to_string e) + e -> + prerr_endline (Printexc.to_string e) ); Format.pp_print_flush fmt (); close_out oc diff --git a/testsuite/tests/tool-ocamldoc/t01.ml b/testsuite/tests/tool-ocamldoc/t01.ml index 6caf3d7a..d253be43 100644 --- a/testsuite/tests/tool-ocamldoc/t01.ml +++ b/testsuite/tests/tool-ocamldoc/t01.ml @@ -7,7 +7,7 @@ let x = 1 module M = struct - let y = 2 + let y = 2 end diff --git a/testsuite/tests/tool-ocamldoc/t03.ml b/testsuite/tests/tool-ocamldoc/t03.ml index 43f1857d..3d06cc59 100644 --- a/testsuite/tests/tool-ocamldoc/t03.ml +++ b/testsuite/tests/tool-ocamldoc/t03.ml @@ -4,4 +4,4 @@ module Bar = struct type t = int let x = 2 end;; module type MT2 = sig type t val x : t end;; module type Gee = MT2 with type t = float ;; -module T = (val (if true then (module Foo:MT2 with type t = int) else (module Bar: MT2 with type t = int)) : MT2 with type t = int);; \ No newline at end of file +module T = (val (if true then (module Foo:MT2 with type t = int) else (module Bar: MT2 with type t = int)) : MT2 with type t = int);; diff --git a/testsuite/tests/typing-fstclassmod/fstclassmod.ml b/testsuite/tests/typing-fstclassmod/fstclassmod.ml index 905af534..268d35d4 100644 --- a/testsuite/tests/typing-fstclassmod/fstclassmod.ml +++ b/testsuite/tests/typing-fstclassmod/fstclassmod.ml @@ -139,4 +139,3 @@ end let () = print_endline (Print.to_string int 10); print_endline (Print.to_string (pair int (pair str int)) (123, ("A", 456))) - diff --git a/testsuite/tests/typing-gadts/Makefile b/testsuite/tests/typing-gadts/Makefile index 5f42b705..9625a3fb 100644 --- a/testsuite/tests/typing-gadts/Makefile +++ b/testsuite/tests/typing-gadts/Makefile @@ -1,4 +1,3 @@ BASEDIR=../.. include $(BASEDIR)/makefiles/Makefile.toplevel include $(BASEDIR)/makefiles/Makefile.common - diff --git a/testsuite/tests/typing-gadts/dynamic_frisch.ml b/testsuite/tests/typing-gadts/dynamic_frisch.ml index 895be5a0..2636d5b4 100644 --- a/testsuite/tests/typing-gadts/dynamic_frisch.ml +++ b/testsuite/tests/typing-gadts/dynamic_frisch.ml @@ -18,7 +18,7 @@ type variant = | VString of string | VList of variant list | VPair of variant * variant - + let rec variantize: type t. t ty -> t -> variant = fun ty x -> (* type t is abstract here *) @@ -31,9 +31,9 @@ let rec variantize: type t. t ty -> t -> variant = | Pair (ty1, ty2) -> VPair (variantize ty1 (fst x), variantize ty2 (snd x)) (* t = ('a, 'b) for some 'a and 'b *) - + exception VariantMismatch - + let rec devariantize: type t. t ty -> variant -> t = fun ty v -> match ty, v with @@ -54,16 +54,16 @@ type 'a ty = | List: 'a ty -> 'a list ty | Pair: ('a ty * 'b ty) -> ('a * 'b) ty | Record: 'a record -> 'a ty - + and 'a record = { path: string; fields: 'a field_ list; } - + and 'a field_ = | Field: ('a, 'b) field -> 'a field_ - + and ('a, 'b) field = { label: string; @@ -98,7 +98,7 @@ let rec variantize: type t. t ty -> t -> variant = (List.map (fun (Field{field_type; label; get}) -> (label, variantize field_type (get x))) fields) ;; - + (* Extraction *) type 'a ty = @@ -107,7 +107,7 @@ type 'a ty = | List: 'a ty -> 'a list ty | Pair: ('a ty * 'b ty) -> ('a * 'b) ty | Record: ('a, 'builder) record -> 'a ty - + and ('a, 'builder) record = { path: string; @@ -115,10 +115,10 @@ and ('a, 'builder) record = create_builder: (unit -> 'builder); of_builder: ('builder -> 'a); } - + and ('a, 'builder) field = | Field: ('a, 'builder, 'b) field_ -> ('a, 'builder) field - + and ('a, 'builder, 'b) field_ = { label: string; @@ -126,7 +126,7 @@ and ('a, 'builder, 'b) field_ = get: ('a -> 'b); set: ('builder -> 'b -> unit); } - + let rec devariantize: type t. t ty -> variant -> t = fun ty v -> match ty, v with @@ -154,7 +154,7 @@ type my_record = a: int; b: string list; } - + let my_record = let fields = [ diff --git a/testsuite/tests/typing-gadts/test.ml b/testsuite/tests/typing-gadts/test.ml index 3fb5730a..3ba7cc8b 100644 --- a/testsuite/tests/typing-gadts/test.ml +++ b/testsuite/tests/typing-gadts/test.ml @@ -1,23 +1,23 @@ -module Exp = +module Exp = struct - type _ t = + type _ t = | IntLit : int -> int t | BoolLit : bool -> bool t | Pair : 'a t * 'b t -> ('a * 'b) t | App : ('a -> 'b) t * 'a t -> 'b t - | Abs : ('a -> 'b) -> ('a -> 'b) t + | Abs : ('a -> 'b) -> ('a -> 'b) t - let rec eval : type s . s t -> s = + let rec eval : type s . s t -> s = function - | IntLit x -> x - | BoolLit y -> y - | Pair (x,y) -> + | IntLit x -> x + | BoolLit y -> y + | Pair (x,y) -> (eval x,eval y) - | App (f,a) -> - (eval f) (eval a) - | Abs f -> f + | App (f,a) -> + (eval f) (eval a) + | Abs f -> f let discern : type a. a t -> _ = function IntLit _ -> 1 @@ -28,70 +28,70 @@ module Exp = end ;; -module List = +module List = struct type zero - type _ t = + type _ t = | Nil : zero t | Cons : 'a * 'b t -> ('a * 'b) t let head = function - | Cons (a,b) -> a + | Cons (a,b) -> a let tail = function - | Cons (a,b) -> b - let rec length : type a . a t -> int = + | Cons (a,b) -> b + let rec length : type a . a t -> int = function - | Nil -> 0 - | Cons (a,b) -> length b + | Nil -> 0 + | Cons (a,b) -> length b end ;; -module Nonexhaustive = +module Nonexhaustive = struct - type 'a u = - | C1 : int -> int u + type 'a u = + | C1 : int -> int u | C2 : bool -> bool u - - type 'a v = + + type 'a v = | C1 : int -> int v - let unexhaustive : type s . s u -> s = + let unexhaustive : type s . s u -> s = function - | C2 x -> x + | C2 x -> x - module M : sig type t type u end = + module M : sig type t type u end = struct type t = int type u = bool - end - type 'a t = - | Foo : M.t -> M.t t + end + type 'a t = + | Foo : M.t -> M.t t | Bar : M.u -> M.u t let same_type : type s . s t * s t -> bool = function - | Foo _ , Foo _ -> true - | Bar _, Bar _ -> true + | Foo _ , Foo _ -> true + | Bar _, Bar _ -> true end ;; -module Exhaustive = +module Exhaustive = struct type t = int type u = bool - type 'a v = - | Foo : t -> t v + type 'a v = + | Foo : t -> t v | Bar : u -> u v let same_type : type s . s v * s v -> bool = function - | Foo _ , Foo _ -> true - | Bar _, Bar _ -> true + | Foo _ , Foo _ -> true + | Bar _, Bar _ -> true end ;; -module Existential_escape = +module Existential_escape = struct type _ t = C : int -> int t type u = D : 'a t -> u @@ -99,46 +99,46 @@ module Existential_escape = end ;; -module Rectype = +module Rectype = struct - type (_,_) t = C : ('a,'a) t - let _ = + type (_,_) t = C : ('a,'a) t + let _ = fun (type s) -> - let a : (s, s * s) t = failwith "foo" in - match a with - C -> - () + let a : (s, s * s) t = failwith "foo" in + match a with + C -> + () end ;; -module Or_patterns = +module Or_patterns = struct - type _ t = + type _ t = | IntLit : int -> int t | BoolLit : bool -> bool t - let rec eval : type s . s t -> unit = + let rec eval : type s . s t -> unit = function - | (IntLit _ | BoolLit _) -> () + | (IntLit _ | BoolLit _) -> () end ;; -module Polymorphic_variants = +module Polymorphic_variants = struct - type _ t = + type _ t = | IntLit : int -> int t | BoolLit : bool -> bool t - let rec eval : type s . [`A] * s t -> unit = + let rec eval : type s . [`A] * s t -> unit = function - | `A, IntLit _ -> () - | `A, BoolLit _ -> () - end + | `A, IntLit _ -> () + | `A, BoolLit _ -> () + end ;; module Propagation = struct - type _ t = + type _ t = IntLit : int -> int t | BoolLit : bool -> bool t @@ -473,7 +473,7 @@ f V1;; type _ int_foo = | IF_constr : int_foo -type _ int_bar = +type _ int_bar = | IB_constr : int_bar ;; diff --git a/testsuite/tests/typing-gadts/test.ml.principal.reference b/testsuite/tests/typing-gadts/test.ml.principal.reference index 3125e1e6..b5dcb790 100644 --- a/testsuite/tests/typing-gadts/test.ml.principal.reference +++ b/testsuite/tests/typing-gadts/test.ml.principal.reference @@ -18,16 +18,16 @@ val tail : ('a * 'b) t -> 'b t val length : 'a t -> int end -# Characters 206-227: +# Characters 196-224: ......function - | C2 x -> x + | C2 x -> x Warning 8: this pattern-matching is not exhaustive. Here is an example of a value that is not matched: C1 _ -Characters 469-526: +Characters 458-529: ......function - | Foo _ , Foo _ -> true - | Bar _, Bar _ -> true + | Foo _ , Foo _ -> true + | Bar _, Bar _ -> true Warning 8: this pattern-matching is not exhaustive. Here is an example of a value that is not matched: (Bar _, Foo _) @@ -47,27 +47,27 @@ module Nonexhaustive : type 'a v = Foo : t -> t v | Bar : u -> u v val same_type : 's v * 's v -> bool end -# Characters 119-120: +# Characters 118-119: let eval (D x) = x ^ Error: This expression has type ex#16 t but an expression was expected of type ex#16 t The type constructor ex#16 would escape its scope -# Characters 157-158: - C -> - ^ +# Characters 174-175: + C -> + ^ Error: Recursive local constraint when unifying (s, s) t with (s, s * s) t -# Characters 174-182: - | (IntLit _ | BoolLit _) -> () - ^^^^^^^^ +# Characters 178-186: + | (IntLit _ | BoolLit _) -> () + ^^^^^^^^ Error: This pattern matches values of type int t but a pattern was expected which matches values of type s t -# Characters 213-226: - | `A, BoolLit _ -> () - ^^^^^^^^^^^^^ +# Characters 224-237: + | `A, BoolLit _ -> () + ^^^^^^^^^^^^^ Error: This pattern matches values of type ([? `A ] as 'a) * bool t but a pattern was expected which matches values of type 'a * int t -# Characters 300-301: +# Characters 299-300: | BoolLit b -> b ^ Error: This expression has type bool but an expression was expected of type s diff --git a/testsuite/tests/typing-gadts/test.ml.reference b/testsuite/tests/typing-gadts/test.ml.reference index 36401d16..5406ed2a 100644 --- a/testsuite/tests/typing-gadts/test.ml.reference +++ b/testsuite/tests/typing-gadts/test.ml.reference @@ -18,16 +18,16 @@ val tail : ('a * 'b) t -> 'b t val length : 'a t -> int end -# Characters 206-227: +# Characters 196-224: ......function - | C2 x -> x + | C2 x -> x Warning 8: this pattern-matching is not exhaustive. Here is an example of a value that is not matched: C1 _ -Characters 469-526: +Characters 458-529: ......function - | Foo _ , Foo _ -> true - | Bar _, Bar _ -> true + | Foo _ , Foo _ -> true + | Bar _, Bar _ -> true Warning 8: this pattern-matching is not exhaustive. Here is an example of a value that is not matched: (Bar _, Foo _) @@ -47,24 +47,24 @@ module Nonexhaustive : type 'a v = Foo : t -> t v | Bar : u -> u v val same_type : 's v * 's v -> bool end -# Characters 119-120: +# Characters 118-119: let eval (D x) = x ^ Error: This expression has type ex#16 t but an expression was expected of type ex#16 t The type constructor ex#16 would escape its scope -# Characters 157-158: - C -> - ^ +# Characters 174-175: + C -> + ^ Error: Recursive local constraint when unifying (s, s) t with (s, s * s) t -# Characters 174-182: - | (IntLit _ | BoolLit _) -> () - ^^^^^^^^ +# Characters 178-186: + | (IntLit _ | BoolLit _) -> () + ^^^^^^^^ Error: This pattern matches values of type int t but a pattern was expected which matches values of type s t -# Characters 213-226: - | `A, BoolLit _ -> () - ^^^^^^^^^^^^^ +# Characters 224-237: + | `A, BoolLit _ -> () + ^^^^^^^^^^^^^ Error: This pattern matches values of type ([? `A ] as 'a) * bool t but a pattern was expected which matches values of type 'a * int t # module Propagation : diff --git a/testsuite/tests/typing-implicit_unpack/Makefile b/testsuite/tests/typing-implicit_unpack/Makefile index 5f42b705..9625a3fb 100644 --- a/testsuite/tests/typing-implicit_unpack/Makefile +++ b/testsuite/tests/typing-implicit_unpack/Makefile @@ -1,4 +1,3 @@ BASEDIR=../.. include $(BASEDIR)/makefiles/Makefile.toplevel include $(BASEDIR)/makefiles/Makefile.common - diff --git a/testsuite/tests/typing-implicit_unpack/implicit_unpack.ml b/testsuite/tests/typing-implicit_unpack/implicit_unpack.ml index 3910059f..82fca3a5 100644 --- a/testsuite/tests/typing-implicit_unpack/implicit_unpack.ml +++ b/testsuite/tests/typing-implicit_unpack/implicit_unpack.ml @@ -152,7 +152,7 @@ let ssmap = let ssmap = (let module S = struct include SSMap end in (module S) : - (module + (module MapT with type key = string and type data = string and type map = SSMap.map)) ;; diff --git a/testsuite/tests/typing-misc/Makefile b/testsuite/tests/typing-misc/Makefile index 5f42b705..9625a3fb 100644 --- a/testsuite/tests/typing-misc/Makefile +++ b/testsuite/tests/typing-misc/Makefile @@ -1,4 +1,3 @@ BASEDIR=../.. include $(BASEDIR)/makefiles/Makefile.toplevel include $(BASEDIR)/makefiles/Makefile.common - diff --git a/testsuite/tests/typing-modules-bugs/pr5164_ok.ml b/testsuite/tests/typing-modules-bugs/pr5164_ok.ml index 7de770ed..5a59808e 100644 --- a/testsuite/tests/typing-modules-bugs/pr5164_ok.ml +++ b/testsuite/tests/typing-modules-bugs/pr5164_ok.ml @@ -1,7 +1,7 @@ module type INCLUDING = sig include module type of List include module type of ListLabels -end +end module Including_typed: INCLUDING = struct include List diff --git a/testsuite/tests/typing-modules/Makefile b/testsuite/tests/typing-modules/Makefile index 9add1557..145025ba 100644 --- a/testsuite/tests/typing-modules/Makefile +++ b/testsuite/tests/typing-modules/Makefile @@ -1,3 +1,2 @@ include ../../makefiles/Makefile.toplevel include ../../makefiles/Makefile.common - diff --git a/testsuite/tests/typing-objects-bugs/pr3968_bad.ml b/testsuite/tests/typing-objects-bugs/pr3968_bad.ml index 3d393120..01c50666 100644 --- a/testsuite/tests/typing-objects-bugs/pr3968_bad.ml +++ b/testsuite/tests/typing-objects-bugs/pr3968_bad.ml @@ -1,18 +1,18 @@ -type expr = +type expr = [ `Abs of string * expr | `App of expr * expr ] -class type exp = +class type exp = object method eval : (string, exp) Hashtbl.t -> expr end;; -class app e1 e2 : exp = +class app e1 e2 : exp = object - val l = e1 + val l = e1 val r = e2 - method eval env = + method eval env = match l with | `Abs(var,body) -> Hashtbl.add env var r; diff --git a/testsuite/tests/typing-objects-bugs/pr4018_bad.ml b/testsuite/tests/typing-objects-bugs/pr4018_bad.ml index 90ee7878..5195d463 100644 --- a/testsuite/tests/typing-objects-bugs/pr4018_bad.ml +++ b/testsuite/tests/typing-objects-bugs/pr4018_bad.ml @@ -8,7 +8,7 @@ class ['event] subject = object (self : 'subject) val mutable observers = ([]: (('subject, 'event) observer) list) method add_observer obs = observers <- (obs :: observers) - method notify_observers (e : 'event) = + method notify_observers (e : 'event) = List.iter (fun x -> x#notify self e) observers end diff --git a/testsuite/tests/typing-objects-bugs/pr4766_ok.ml b/testsuite/tests/typing-objects-bugs/pr4766_ok.ml index c5809c1d..726cc866 100644 --- a/testsuite/tests/typing-objects-bugs/pr4766_ok.ml +++ b/testsuite/tests/typing-objects-bugs/pr4766_ok.ml @@ -1,9 +1,9 @@ -class virtual ['a] c = -object (s : 'a) - method virtual m : 'b +class virtual ['a] c = +object (s : 'a) + method virtual m : 'b end -let o = +let o = object (s :'a) inherit ['a] c method m = 42 diff --git a/testsuite/tests/typing-objects-bugs/yamagata021012_ok.ml b/testsuite/tests/typing-objects-bugs/yamagata021012_ok.ml index 212a1683..fda0d123 100644 --- a/testsuite/tests/typing-objects-bugs/yamagata021012_ok.ml +++ b/testsuite/tests/typing-objects-bugs/yamagata021012_ok.ml @@ -31,9 +31,9 @@ class virtual ['a, 'cursor] storage_base = method fold : 'b. ('a -> int -> 'b -> 'b) -> 'b -> 'b = fun f a0 -> let cur = self#first in let rec loop count a = - if count >= self#len then a else - let a' = f cur#get count a in - cur#incr (); loop (count + 1) a' + if count >= self#len then a else + let a' = f cur#get count a in + cur#incr (); loop (count + 1) a' in loop 0 a0 method iter proc = @@ -63,7 +63,7 @@ struct let highest_bit = 1 lsl 30 let lower_bits = highest_bit - 1 - let char_of c = + let char_of c = try Char.chr c with Invalid_argument _ -> raise Out_of_range let of_char = Char.code @@ -129,7 +129,7 @@ class text_raw buf = object (self : 'self) inherit [cursor] ustorage_base val contents = buf - method first = new cursor (self :> text_raw) 0 + method first = new cursor (self :> text_raw) 0 method len = (String.length contents) / 4 method get i = get_buf contents (4 * i) method nth i = new cursor (self :> text_raw) i diff --git a/testsuite/tests/typing-objects/Makefile b/testsuite/tests/typing-objects/Makefile index 5f42b705..9625a3fb 100644 --- a/testsuite/tests/typing-objects/Makefile +++ b/testsuite/tests/typing-objects/Makefile @@ -1,4 +1,3 @@ BASEDIR=../.. include $(BASEDIR)/makefiles/Makefile.toplevel include $(BASEDIR)/makefiles/Makefile.common - diff --git a/testsuite/tests/typing-objects/Tests.ml b/testsuite/tests/typing-objects/Tests.ml index c7a5cb3d..15bef7f9 100644 --- a/testsuite/tests/typing-objects/Tests.ml +++ b/testsuite/tests/typing-objects/Tests.ml @@ -159,7 +159,7 @@ e#f, e#g, e#h, e#i, e#j;; class c a = object val x = 1 val y = 1 val z = 1 val a = a end;; class d b = object val z = 2 val t = 2 val u = 2 val b = b end;; -class e () = object +class e () = object val x = 3 inherit c 5 val y = 3 diff --git a/testsuite/tests/typing-objects/Tests.ml.principal.reference b/testsuite/tests/typing-objects/Tests.ml.principal.reference index 34a5071d..a194f7d0 100644 --- a/testsuite/tests/typing-objects/Tests.ml.principal.reference +++ b/testsuite/tests/typing-objects/Tests.ml.principal.reference @@ -162,24 +162,24 @@ Error: This expression has type bool but an expression was expected of type # - : int * int * int * int * int = (1, 3, 2, 2, 3) # class c : 'a -> object val a : 'a val x : int val y : int val z : int end # class d : 'a -> object val b : 'a val t : int val u : int val z : int end -# Characters 43-46: +# Characters 42-45: inherit c 5 ^^^ Warning 13: the following instance variables are overridden by the class c : x The behaviour changed in ocaml 3.10 (previous behaviour was hiding.) -Characters 53-54: +Characters 52-53: val y = 3 ^ Warning 13: the instance variable y is overridden. The behaviour changed in ocaml 3.10 (previous behaviour was hiding.) -Characters 81-84: +Characters 80-83: inherit d 7 ^^^ Warning 13: the following instance variables are overridden by the class d : t z The behaviour changed in ocaml 3.10 (previous behaviour was hiding.) -Characters 91-92: +Characters 90-91: val u = 3 ^ Warning 13: the instance variable u is overridden. diff --git a/testsuite/tests/typing-objects/Tests.ml.reference b/testsuite/tests/typing-objects/Tests.ml.reference index 45130d58..d5d0bea4 100644 --- a/testsuite/tests/typing-objects/Tests.ml.reference +++ b/testsuite/tests/typing-objects/Tests.ml.reference @@ -162,24 +162,24 @@ Error: This expression has type bool but an expression was expected of type # - : int * int * int * int * int = (1, 3, 2, 2, 3) # class c : 'a -> object val a : 'a val x : int val y : int val z : int end # class d : 'a -> object val b : 'a val t : int val u : int val z : int end -# Characters 43-46: +# Characters 42-45: inherit c 5 ^^^ Warning 13: the following instance variables are overridden by the class c : x The behaviour changed in ocaml 3.10 (previous behaviour was hiding.) -Characters 53-54: +Characters 52-53: val y = 3 ^ Warning 13: the instance variable y is overridden. The behaviour changed in ocaml 3.10 (previous behaviour was hiding.) -Characters 81-84: +Characters 80-83: inherit d 7 ^^^ Warning 13: the following instance variables are overridden by the class d : t z The behaviour changed in ocaml 3.10 (previous behaviour was hiding.) -Characters 91-92: +Characters 90-91: val u = 3 ^ Warning 13: the instance variable u is overridden. diff --git a/testsuite/tests/typing-objects/pr5619_bad.ml b/testsuite/tests/typing-objects/pr5619_bad.ml index fbecc927..2dd3eaaa 100644 --- a/testsuite/tests/typing-objects/pr5619_bad.ml +++ b/testsuite/tests/typing-objects/pr5619_bad.ml @@ -3,7 +3,7 @@ class type foo_t = method foo: string end -type 'a name = +type 'a name = Foo: foo_t name | Int: int name ;; diff --git a/testsuite/tests/typing-poly-bugs/pr5322_ok.ml b/testsuite/tests/typing-poly-bugs/pr5322_ok.ml index a24a6769..d6cbca1a 100644 --- a/testsuite/tests/typing-poly-bugs/pr5322_ok.ml +++ b/testsuite/tests/typing-poly-bugs/pr5322_ok.ml @@ -4,4 +4,3 @@ module M : sig val x : end = let ident v = v class alias = object method alias : 'a . 'a t -> 'a = ident end - diff --git a/testsuite/tests/typing-poly/Makefile b/testsuite/tests/typing-poly/Makefile index 5f42b705..9625a3fb 100644 --- a/testsuite/tests/typing-poly/Makefile +++ b/testsuite/tests/typing-poly/Makefile @@ -1,4 +1,3 @@ BASEDIR=../.. include $(BASEDIR)/makefiles/Makefile.toplevel include $(BASEDIR)/makefiles/Makefile.common - diff --git a/testsuite/tests/typing-poly/poly.ml b/testsuite/tests/typing-poly/poly.ml index 7efe4eb2..85196f16 100644 --- a/testsuite/tests/typing-poly/poly.ml +++ b/testsuite/tests/typing-poly/poly.ml @@ -1,4 +1,4 @@ -(* $Id: poly.ml 12534 2012-06-01 05:24:38Z garrigue $ *) +(* $Id: poly.ml 12800 2012-07-30 18:59:07Z doligez $ *) (* Polymorphic methods are now available in the main branch. Enjoy. @@ -448,7 +448,7 @@ function `B,1 -> 1 | _,1 -> 2;; function 1,`B -> 1 | 1,_ -> 2;; (* pass typetexp, but fails during Typedecl.check_recursion *) -type ('a, 'b) a = 'a -> unit constraint 'a = [> `B of ('a, 'b) b as 'b] +type ('a, 'b) a = 'a -> unit constraint 'a = [> `B of ('a, 'b) b as 'b] and ('a, 'b) b = 'b -> unit constraint 'b = [> `A of ('a, 'b) a as 'a];; (* PR#1917: expanding may change original in Ctype.unify2 *) @@ -459,12 +459,12 @@ class type ['a, 'b] a = object method as_a: ('a, 'b) a end and ['a, 'b] b = object method a: ('a, 'b) #a as 'a - method as_b: ('a, 'b) b + method as_b: ('a, 'b) b end class type ['b] ca = object ('s) inherit ['s, 'b] a end class type ['a] cb = object ('s) inherit ['a, 's] b end - + type bt = 'b ca cb as 'b ;; diff --git a/testsuite/tests/typing-poly/poly.ml.principal.reference b/testsuite/tests/typing-poly/poly.ml.principal.reference index f7dc11e2..d069595e 100644 --- a/testsuite/tests/typing-poly/poly.ml.principal.reference +++ b/testsuite/tests/typing-poly/poly.ml.principal.reference @@ -347,7 +347,7 @@ Characters 21-24: Warning 11: this match case is unused. - : int * [< `B ] -> int = # Characters 69-135: - type ('a, 'b) a = 'a -> unit constraint 'a = [> `B of ('a, 'b) b as 'b] + type ('a, 'b) a = 'a -> unit constraint 'a = [> `B of ('a, 'b) b as 'b] ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Error: Constraints are not satisfied in this type. Type diff --git a/testsuite/tests/typing-poly/poly.ml.reference b/testsuite/tests/typing-poly/poly.ml.reference index 0f0448e6..81fb3473 100644 --- a/testsuite/tests/typing-poly/poly.ml.reference +++ b/testsuite/tests/typing-poly/poly.ml.reference @@ -330,7 +330,7 @@ Characters 21-24: Warning 11: this match case is unused. - : int * [< `B ] -> int = # Characters 69-135: - type ('a, 'b) a = 'a -> unit constraint 'a = [> `B of ('a, 'b) b as 'b] + type ('a, 'b) a = 'a -> unit constraint 'a = [> `B of ('a, 'b) b as 'b] ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Error: Constraints are not satisfied in this type. Type diff --git a/testsuite/tests/typing-polyvariants-bugs/pr5057_ok.ml b/testsuite/tests/typing-polyvariants-bugs/pr5057_ok.ml index 38df7705..86cb665a 100644 --- a/testsuite/tests/typing-polyvariants-bugs/pr5057_ok.ml +++ b/testsuite/tests/typing-polyvariants-bugs/pr5057_ok.ml @@ -5,7 +5,7 @@ module TT = struct end let () = - let f flag = + let f flag = let module T = TT in let _ = match flag with `A -> 0 | `B r -> r in let _ = match flag with `A -> T.IntSet.mem | `B r -> r in diff --git a/testsuite/tests/typing-polyvariants-bugs/pr5057a_bad.ml b/testsuite/tests/typing-polyvariants-bugs/pr5057a_bad.ml index 35cc3386..15bb776b 100644 --- a/testsuite/tests/typing-polyvariants-bugs/pr5057a_bad.ml +++ b/testsuite/tests/typing-polyvariants-bugs/pr5057a_bad.ml @@ -1,6 +1,6 @@ (* This one should fail *) -let f flag = +let f flag = let module T = Set.Make(struct type t = int let compare = compare end) in let _ = match flag with `A -> 0 | `B r -> r in let _ = match flag with `A -> T.mem | `B r -> r in diff --git a/testsuite/tests/typing-private-bugs/pr5026_bad.ml b/testsuite/tests/typing-private-bugs/pr5026_bad.ml index 0e6d215d..10699952 100644 --- a/testsuite/tests/typing-private-bugs/pr5026_bad.ml +++ b/testsuite/tests/typing-private-bugs/pr5026_bad.ml @@ -3,7 +3,7 @@ type -'a typed = private untyped;; type -'typing wrapped = private sexp and +'a t = 'a typed wrapped and sexp = private untyped wrapped;; -class type ['a] s3 = object +class type ['a] s3 = object val underlying : 'a t end;; class ['a] s3object r : ['a] s3 = object diff --git a/testsuite/tests/typing-private/Makefile b/testsuite/tests/typing-private/Makefile index 5f42b705..9625a3fb 100644 --- a/testsuite/tests/typing-private/Makefile +++ b/testsuite/tests/typing-private/Makefile @@ -1,4 +1,3 @@ BASEDIR=../.. include $(BASEDIR)/makefiles/Makefile.toplevel include $(BASEDIR)/makefiles/Makefile.common - diff --git a/testsuite/tests/typing-private/private.ml b/testsuite/tests/typing-private/private.ml index 636f231b..6f19b89d 100644 --- a/testsuite/tests/typing-private/private.ml +++ b/testsuite/tests/typing-private/private.ml @@ -57,18 +57,18 @@ module M3 : sig val mk : int -> t end = M;; -module M4 : sig +module M4 : sig type t = M.t = T of int val mk : int -> t end = M;; (* Error: The variant or record definition does not match that of type M.t *) -module M5 : sig +module M5 : sig type t = M.t = private T of int val mk : int -> t end = M;; -module M6 : sig +module M6 : sig type t = private T of int val mk : int -> t end = M;; diff --git a/testsuite/tests/typing-private/private.ml.reference b/testsuite/tests/typing-private/private.ml.reference index 27cf9839..8a7b3db4 100644 --- a/testsuite/tests/typing-private/private.ml.reference +++ b/testsuite/tests/typing-private/private.ml.reference @@ -84,7 +84,7 @@ Error: Signature mismatch: # module M1 : sig type t = M.t val mk : int -> t end # module M2 : sig type t = M.t val mk : int -> t end # module M3 : sig type t = M.t val mk : int -> t end -# Characters 29-47: +# Characters 26-44: type t = M.t = T of int ^^^^^^^^^^^^^^^^^^ Error: This variant or record definition does not match that of type M.t diff --git a/testsuite/tests/typing-recmod/t02bad.ml b/testsuite/tests/typing-recmod/t02bad.ml index ac9d6390..b4301a41 100644 --- a/testsuite/tests/typing-recmod/t02bad.ml +++ b/testsuite/tests/typing-recmod/t02bad.ml @@ -1,4 +1,3 @@ (* Bad (t = t) *) module rec A : sig type t = B.t end = struct type t = B.t end and B : sig type t = A.t end = struct type t = A.t end;; - diff --git a/testsuite/tests/typing-recmod/t08bad.ml b/testsuite/tests/typing-recmod/t08bad.ml index 7df3d476..5ebafd11 100644 --- a/testsuite/tests/typing-recmod/t08bad.ml +++ b/testsuite/tests/typing-recmod/t08bad.ml @@ -2,4 +2,3 @@ module rec A : sig type 'a t = end = struct type 'a t = end and B : sig type 'a t = 'a A.t end = struct type 'a t = 'a A.t end;; - diff --git a/testsuite/tests/typing-recmod/t13ok.ml b/testsuite/tests/typing-recmod/t13ok.ml index 729afd51..4fea6e1f 100644 --- a/testsuite/tests/typing-recmod/t13ok.ml +++ b/testsuite/tests/typing-recmod/t13ok.ml @@ -1,5 +1,5 @@ (* OK *) class type [ 'node ] extension = object method node : 'node end -class type [ 'ext ] node = object constraint 'ext = 'ext node #extension end +class type [ 'ext ] node = object constraint 'ext = 'ext node #extension end class x = object method node : x node = assert false end type t = x node;; diff --git a/testsuite/tests/typing-recmod/t14bad.ml b/testsuite/tests/typing-recmod/t14bad.ml index 5c665368..1b92a28c 100644 --- a/testsuite/tests/typing-recmod/t14bad.ml +++ b/testsuite/tests/typing-recmod/t14bad.ml @@ -13,5 +13,5 @@ module PR_4261 = struct end module rec U : T with module D = U' = U - and U' : S with type t = U'.t = U + and U' : S with type t = U'.t = U end;; diff --git a/testsuite/tests/typing-recmod/t16ok.ml b/testsuite/tests/typing-recmod/t16ok.ml index f42de7b7..583b69bb 100644 --- a/testsuite/tests/typing-recmod/t16ok.ml +++ b/testsuite/tests/typing-recmod/t16ok.ml @@ -28,4 +28,3 @@ module PR_4450_2 = struct let create l = new c l end end;; - diff --git a/testsuite/tests/typing-recmod/t17ok.ml b/testsuite/tests/typing-recmod/t17ok.ml index a2ea895a..4521b66c 100644 --- a/testsuite/tests/typing-recmod/t17ok.ml +++ b/testsuite/tests/typing-recmod/t17ok.ml @@ -25,18 +25,17 @@ struct type t = I of int * int | D of int * Diet.t * int val compare : t -> t -> int val iter : (int -> unit) -> t -> unit - end = + end = struct type t = I of int * int | D of int * Diet.t * int let compare x1 x2 = 0 let rec iter f = function | I (l, r) -> for i = l to r do f i done | D (_, d, _) -> Diet.iter (iter f) d - end + end and Diet : SET with type t = Elt.t tree and type elt = Elt.t = MakeDiet(Elt) type t = Diet.t let iter f = Diet.iter (Elt.iter f) end - diff --git a/testsuite/tests/typing-recmod/t18ok.ml b/testsuite/tests/typing-recmod/t18ok.ml index 4f5814de..64fcf6ab 100644 --- a/testsuite/tests/typing-recmod/t18ok.ml +++ b/testsuite/tests/typing-recmod/t18ok.ml @@ -22,5 +22,4 @@ and DirHash end = struct type t = DirCompare.t list - end - + end diff --git a/testsuite/tests/typing-recmod/t19ok.ml b/testsuite/tests/typing-recmod/t19ok.ml index cd2dde8e..62e5f454 100644 --- a/testsuite/tests/typing-recmod/t19ok.ml +++ b/testsuite/tests/typing-recmod/t19ok.ml @@ -10,4 +10,3 @@ module PR_4758 = struct module Other = A end end - diff --git a/testsuite/tests/typing-recmod/t22ok.ml b/testsuite/tests/typing-recmod/t22ok.ml index 0aa63afd..de96eced 100644 --- a/testsuite/tests/typing-recmod/t22ok.ml +++ b/testsuite/tests/typing-recmod/t22ok.ml @@ -112,7 +112,7 @@ module rec Strengthen ;; module rec Strengthen2 - : sig type t + : sig type t val f : t -> t module M : sig type u end module R : sig type v end @@ -150,7 +150,7 @@ module rec PolyRec | Node(l,r) -> 1 + max (PolyRec.depth l) (PolyRec.depth r) end ;; - + (* Wrong LHS signatures (PR#4336) *) (* @@ -212,7 +212,7 @@ and Binding : sig type t = (string * Expr.t) list val fv: t -> StringSet.t - val bv: t -> StringSet.t + val bv: t -> StringSet.t val simpl: t -> t end = struct @@ -258,7 +258,7 @@ module type HEAP = val deleteMin: heap -> heap end -module Bootstrap (MakeH: functor (Element:ORDERED) -> +module Bootstrap (MakeH: functor (Element:ORDERED) -> HEAP with module Elem = Element) (Element: ORDERED) : HEAP with module Elem = Element = struct @@ -268,7 +268,7 @@ module Bootstrap (MakeH: functor (Element:ORDERED) -> val eq: t -> t -> bool val lt: t -> t -> bool val leq: t -> t -> bool - end + end = struct type t = E | H of Elem.t * PrimH.heap let leq t1 t2 = @@ -432,7 +432,7 @@ module rec Coerce1 module A = (Coerce1: sig val f: int -> int end) let g x = x let f x = if x <= 0 then 1 else A.f (x-1) * x - end + end ;; let _ = @@ -461,7 +461,7 @@ module Coerce4(A : sig val f : int -> int end) = struct end module rec Coerce5 - : sig val blabla: int -> int val f: int -> int end + : sig val blabla: int -> int val f: int -> int end = struct let blabla x = 0 let f x = 5 end and Coerce6 : sig val at: int -> int end @@ -473,16 +473,16 @@ let _ = (* Miscellaneous bug reports *) -module rec F +module rec F : sig type t = X of int | Y of int val f: t -> bool end = struct - type t = X of int | Y of int + type t = X of int | Y of int let f = function | X _ -> false | _ -> true - end;; + end;; let _ = test 100 (F.f (F.X 1)) false; diff --git a/testsuite/tests/typing-signatures/Makefile b/testsuite/tests/typing-signatures/Makefile index 5f42b705..9625a3fb 100644 --- a/testsuite/tests/typing-signatures/Makefile +++ b/testsuite/tests/typing-signatures/Makefile @@ -1,4 +1,3 @@ BASEDIR=../.. include $(BASEDIR)/makefiles/Makefile.toplevel include $(BASEDIR)/makefiles/Makefile.common - diff --git a/testsuite/tests/typing-signatures/els.ml b/testsuite/tests/typing-signatures/els.ml index f3c9c793..3713b64e 100644 --- a/testsuite/tests/typing-signatures/els.ml +++ b/testsuite/tests/typing-signatures/els.ml @@ -45,12 +45,12 @@ module type INTERP = sig include EVALUATOR module Parser : PARSER with type chunk = Ast.chunk val dostring : state -> string -> value list - val mk : unit -> state + val mk : unit -> state end;; module type USERTYPE = sig type t - val eq : t -> t -> bool + val eq : t -> t -> bool val to_string : t -> string end;; diff --git a/testsuite/tests/typing-sigsubst/Makefile b/testsuite/tests/typing-sigsubst/Makefile index 5f42b705..9625a3fb 100644 --- a/testsuite/tests/typing-sigsubst/Makefile +++ b/testsuite/tests/typing-sigsubst/Makefile @@ -1,4 +1,3 @@ BASEDIR=../.. include $(BASEDIR)/makefiles/Makefile.toplevel include $(BASEDIR)/makefiles/Makefile.common - diff --git a/testsuite/tests/typing-typeparam/Makefile b/testsuite/tests/typing-typeparam/Makefile index 5f42b705..9625a3fb 100644 --- a/testsuite/tests/typing-typeparam/Makefile +++ b/testsuite/tests/typing-typeparam/Makefile @@ -1,4 +1,3 @@ BASEDIR=../.. include $(BASEDIR)/makefiles/Makefile.toplevel include $(BASEDIR)/makefiles/Makefile.common - diff --git a/tools/depend.ml b/tools/depend.ml index e26bee57..3c37c132 100644 --- a/tools/depend.ml +++ b/tools/depend.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: depend.ml 12511 2012-05-30 13:29:48Z lefessan $ *) +(* $Id: depend.ml 12883 2012-08-25 11:35:20Z garrigue $ *) open Asttypes open Format @@ -108,6 +108,8 @@ let add_class_description bv infos = let add_class_type_declaration = add_class_description +let pattern_bv = ref StringSet.empty + let rec add_pattern bv pat = match pat.ppat_desc with Ppat_any -> () @@ -124,13 +126,19 @@ let rec add_pattern bv pat = | Ppat_variant(_, op) -> add_opt add_pattern bv op | Ppat_type li -> add bv li | Ppat_lazy p -> add_pattern bv p - | Ppat_unpack _ -> () + | Ppat_unpack id -> pattern_bv := StringSet.add id.txt !pattern_bv + +let add_pattern bv pat = + pattern_bv := bv; + add_pattern bv pat; + !pattern_bv let rec add_expr bv exp = match exp.pexp_desc with Pexp_ident l -> add bv l | Pexp_constant _ -> () - | Pexp_let(_, pel, e) -> add_pat_expr_list bv pel; add_expr bv e + | Pexp_let(rf, pel, e) -> + let bv = add_bindings rf bv pel in add_expr bv e | Pexp_function (_, opte, pel) -> add_opt add_expr bv opte; add_pat_expr_list bv pel | Pexp_apply(e, el) -> @@ -168,12 +176,19 @@ let rec add_expr bv exp = | Pexp_lazy (e) -> add_expr bv e | Pexp_poly (e, t) -> add_expr bv e; add_opt add_type bv t | Pexp_object { pcstr_pat = pat; pcstr_fields = fieldl } -> - add_pattern bv pat; List.iter (add_class_field bv) fieldl + let bv = add_pattern bv pat in List.iter (add_class_field bv) fieldl | Pexp_newtype (_, e) -> add_expr bv e | Pexp_pack m -> add_module bv m | Pexp_open (m, e) -> addmodule bv m; add_expr bv e + and add_pat_expr_list bv pel = - List.iter (fun (p, e) -> add_pattern bv p; add_expr bv e) pel + List.iter (fun (p, e) -> let bv = add_pattern bv p in add_expr bv e) pel + +and add_bindings recf bv pel = + let bv' = List.fold_left (fun bv (p, _) -> add_pattern bv p) bv pel in + let bv = if recf = Recursive then bv' else bv in + List.iter (fun (_, e) -> add_expr bv e) pel; + bv' and add_modtype bv mty = match mty.pmty_desc with @@ -245,8 +260,8 @@ and add_struct_item bv item = match item.pstr_desc with Pstr_eval e -> add_expr bv e; bv - | Pstr_value(id, pel) -> - add_pat_expr_list bv pel; bv + | Pstr_value(rf, pel) -> + let bv = add_bindings rf bv pel in bv | Pstr_primitive(id, vd) -> add_type bv vd.pval_type; bv | Pstr_type dcls -> @@ -288,13 +303,14 @@ and add_class_expr bv ce = Pcl_constr(l, tyl) -> add bv l; List.iter (add_type bv) tyl | Pcl_structure { pcstr_pat = pat; pcstr_fields = fieldl } -> - add_pattern bv pat; List.iter (add_class_field bv) fieldl + let bv = add_pattern bv pat in List.iter (add_class_field bv) fieldl | Pcl_fun(_, opte, pat, ce) -> - add_opt add_expr bv opte; add_pattern bv pat; add_class_expr bv ce + add_opt add_expr bv opte; + let bv = add_pattern bv pat in add_class_expr bv ce | Pcl_apply(ce, exprl) -> add_class_expr bv ce; List.iter (fun (_,e) -> add_expr bv e) exprl - | Pcl_let(_, pel, ce) -> - add_pat_expr_list bv pel; add_class_expr bv ce + | Pcl_let(rf, pel, ce) -> + let bv = add_bindings rf bv pel in add_class_expr bv ce | Pcl_constraint(ce, ct) -> add_class_expr bv ce; add_class_type bv ct diff --git a/tools/make-package-macosx b/tools/make-package-macosx index d3e45155..b3152af8 100755 --- a/tools/make-package-macosx +++ b/tools/make-package-macosx @@ -12,7 +12,7 @@ # # ######################################################################### -# $Id: make-package-macosx 12773 2012-07-25 12:32:19Z doligez $ +# $Id: make-package-macosx 12783 2012-07-26 12:37:40Z doligez $ cd package-macosx rm -rf ocaml.pkg ocaml-rw.dmg @@ -87,7 +87,7 @@ mkdir -p resources cat >resources/ReadMe.txt < - if false (* default valu of !Clflags.prettycsp *) - then (fixity_of_longident li) - else Prefix + if false (* default valu of !Clflags.prettycsp *) + then (fixity_of_longident li) + else Prefix *) | _ -> Prefix ;; @@ -328,7 +328,7 @@ let rec core_type ppf x = ); | s -> fprintf ppf "%s :@ " s ; - core_type ppf ct1; (* todo: what do we do here? *) + core_type ppf ct1; (* todo: what do we do here? *) ); fprintf ppf "@ ->@ " ; core_type ppf ct2 ; @@ -563,9 +563,9 @@ and simple_expr ppf x = fprintf ppf "%a@ " fmt_longident li | Pexp_ident (li) -> (* was (li, b) *) if is_infix (fixity_of_longident li) - || match li.txt with - | Longident.Lident (li) -> List.mem li.[0] prefix_symbols - | _ -> false + || match li.txt with + | Longident.Lident (li) -> List.mem li.[0] prefix_symbols + | _ -> false then fprintf ppf "(%a)" fmt_longident li else @@ -981,10 +981,10 @@ and type_declaration ppf x = (match x.ptype_manifest with | None -> () | Some(y) -> - core_type ppf y; - match x.ptype_kind with - | Ptype_variant _ | Ptype_record _ -> fprintf ppf " = " - | Ptype_abstract -> ()); + core_type ppf y; + match x.ptype_kind with + | Ptype_variant _ | Ptype_record _ -> fprintf ppf " = " + | Ptype_abstract -> ()); (match x.ptype_kind with | Ptype_variant (first::rest) -> pp_open_hovbox ppf indent ; @@ -1397,11 +1397,11 @@ and signature_item ppf x = | Psig_value (s, vd) -> let intro = if vd.pval_prim = [] then "val" else "external" in pp_open_hovbox ppf indent ; - if (is_infix (fixity_of_string s.txt)) - || List.mem s.txt.[0] prefix_symbols then + if (is_infix (fixity_of_string s.txt)) + || List.mem s.txt.[0] prefix_symbols then fprintf ppf "%s ( %s ) :@ " intro s.txt (* OXX done *) - else + else fprintf ppf "%s %s :@ " intro s.txt; value_description ppf vd; pp_close_box ppf () ; @@ -2155,5 +2155,3 @@ let toplevel_phrase ppf x = let print_structure = structure let print_signature = signature - - diff --git a/tools/read_cmt.ml b/tools/read_cmt.ml index dc795778..7485ea64 100644 --- a/tools/read_cmt.ml +++ b/tools/read_cmt.ml @@ -78,4 +78,3 @@ let _ = Arg.usage arg_list arg_usage end ) arg_usage - diff --git a/tools/typedtreeIter.ml b/tools/typedtreeIter.ml index a4f45ec9..b2191b4d 100644 --- a/tools/typedtreeIter.ml +++ b/tools/typedtreeIter.ml @@ -302,11 +302,11 @@ module MakeIterator(Iter : IteratorArgument) : sig iter_expression exp2 | Texp_send (exp, meth, expo) -> iter_expression exp; - begin - match expo with - None -> () - | Some exp -> iter_expression exp - end + begin + match expo with + None -> () + | Some exp -> iter_expression exp + end | Texp_new (path, _, _) -> () | Texp_instvar (_, path, _) -> () | Texp_setinstvar (_, _, _, exp) -> @@ -446,7 +446,7 @@ module MakeIterator(Iter : IteratorArgument) : sig | Tcl_structure clstr -> iter_class_structure clstr | Tcl_fun (label, pat, priv, cl, partial) -> iter_pattern pat; - List.iter (fun (id, _, exp) -> iter_expression exp) priv; + List.iter (fun (id, _, exp) -> iter_expression exp) priv; iter_class_expr cl | Tcl_apply (cl, args) -> @@ -459,7 +459,7 @@ module MakeIterator(Iter : IteratorArgument) : sig | Tcl_let (rec_flat, bindings, ivars, cl) -> iter_bindings rec_flat bindings; - List.iter (fun (id, _, exp) -> iter_expression exp) ivars; + List.iter (fun (id, _, exp) -> iter_expression exp) ivars; iter_class_expr cl | Tcl_constraint (cl, Some clty, vals, meths, concrs) -> @@ -573,7 +573,7 @@ module MakeIterator(Iter : IteratorArgument) : sig iter_expression exp (* | Tcf_let (rec_flag, bindings, exps) -> iter_bindings rec_flag bindings; - List.iter (fun (id, _, exp) -> iter_expression exp) exps; *) + List.iter (fun (id, _, exp) -> iter_expression exp) exps; *) | Tcf_init exp -> iter_expression exp end; @@ -643,5 +643,3 @@ module DefaultIteratorArgument = struct let leave_bindings _ = () end - - diff --git a/tools/typedtreeIter.mli b/tools/typedtreeIter.mli index 1aedead2..be9c6eff 100644 --- a/tools/typedtreeIter.mli +++ b/tools/typedtreeIter.mli @@ -92,4 +92,3 @@ module MakeIterator : end module DefaultIteratorArgument : IteratorArgument - diff --git a/tools/untypeast.ml b/tools/untypeast.ml index eb9ffbaf..50595a66 100644 --- a/tools/untypeast.ml +++ b/tools/untypeast.ml @@ -36,7 +36,7 @@ let rec lident_of_path path = Path.Pident id -> Longident.Lident (Ident.name id) | Path.Pdot (p, s, _) -> Longident.Ldot (lident_of_path p, s) | Path.Papply (p1, p2) -> - Longident.Lapply (lident_of_path p1, lident_of_path p2) + Longident.Lapply (lident_of_path p1, lident_of_path p2) let rec untype_structure str = List.map untype_structure_item str.str_items @@ -189,7 +189,7 @@ and untype_extra (extra, loc) sexp = in { pexp_desc = desc; pexp_loc = loc } - + and untype_expression exp = let desc = match exp.exp_desc with @@ -225,9 +225,10 @@ and untype_expression exp = Pexp_construct (lid, (match args with [] -> None - | args -> Some - { pexp_desc = Pexp_tuple (List.map untype_expression args); - pexp_loc = exp.exp_loc; } + | [ arg ] -> Some (untype_expression arg) + | args -> Some + { pexp_desc = Pexp_tuple (List.map untype_expression args); + pexp_loc = exp.exp_loc; } ), explicit_arity) | Texp_variant (label, expo) -> Pexp_variant (label, match expo with diff --git a/toplevel/expunge.ml b/toplevel/expunge.ml index 3fd0897b..c918960f 100644 --- a/toplevel/expunge.ml +++ b/toplevel/expunge.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: expunge.ml 12061 2012-01-20 15:43:29Z frisch $ *) +(* $Id: expunge.ml 12800 2012-07-30 18:59:07Z doligez $ *) (* "Expunge" a toplevel by removing compiler modules from the global List.map. Usage: expunge *) @@ -33,7 +33,7 @@ let to_keep = ref StringSet.empty let negate = Sys.argv.(3) = "-v" -let keep = +let keep = if negate then fun name -> is_exn name || not (StringSet.mem name !to_keep) else fun name -> is_exn name || (StringSet.mem name !to_keep) diff --git a/toplevel/genprintval.ml b/toplevel/genprintval.ml index 1e89e0aa..62fb0d37 100644 --- a/toplevel/genprintval.ml +++ b/toplevel/genprintval.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: genprintval.ml 12689 2012-07-10 14:54:19Z doligez $ *) +(* $Id: genprintval.ml 12800 2012-07-30 18:59:07Z doligez $ *) (* To print values *) @@ -249,15 +249,15 @@ module Make(O : OBJ)(EVP : EVALPATH with type valu = O.t) = struct else Cstr_constant(O.obj obj) in let (constr_name, constr_args,ret_type) = Datarepr.find_constr_by_tag tag constr_list in - let type_params = - match ret_type with - Some t -> - begin match (Ctype.repr t).desc with - Tconstr (_,params,_) -> - params - | _ -> assert false end - | None -> decl.type_params - in + let type_params = + match ret_type with + Some t -> + begin match (Ctype.repr t).desc with + Tconstr (_,params,_) -> + params + | _ -> assert false end + | None -> decl.type_params + in let ty_args = List.map (function ty -> diff --git a/typing/btype.ml b/typing/btype.ml index a036222b..b0abbd89 100644 --- a/typing/btype.ml +++ b/typing/btype.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: btype.ml 12726 2012-07-18 03:34:36Z garrigue $ *) +(* $Id: btype.ml 12800 2012-07-30 18:59:07Z doligez $ *) (* Basic operations on core types *) @@ -340,11 +340,11 @@ let unmark_type_decl decl = begin match decl.type_kind with Type_abstract -> () | Type_variant cstrs -> - List.iter - (fun (c, tl, ret_type_opt) -> - List.iter unmark_type tl; - Misc.may unmark_type ret_type_opt) - cstrs + List.iter + (fun (c, tl, ret_type_opt) -> + List.iter unmark_type tl; + Misc.may unmark_type ret_type_opt) + cstrs | Type_record(lbls, rep) -> List.iter (fun (c, mut, t) -> unmark_type t) lbls end; diff --git a/typing/cmt_format.ml b/typing/cmt_format.ml index 41bc08ea..dee54102 100644 --- a/typing/cmt_format.ml +++ b/typing/cmt_format.ml @@ -238,7 +238,7 @@ end = struct let may_map f v = match v with None -> v - | Some x -> Some (f x) + | Some x -> Some (f x) open Misc @@ -274,32 +274,32 @@ end = struct | Tstr_module (id, name, mexpr) -> Tstr_module (id, name, map_module_expr mexpr) | Tstr_recmodule list -> - let list = + let list = List.map (fun (id, name, mtype, mexpr) -> (id, name, map_module_type mtype, map_module_expr mexpr) - ) list - in - Tstr_recmodule list + ) list + in + Tstr_recmodule list | Tstr_modtype (id, name, mtype) -> Tstr_modtype (id, name, map_module_type mtype) | Tstr_open (path, lid) -> Tstr_open (path, lid) | Tstr_class list -> - let list = + let list = List.map (fun (ci, string_list, virtual_flag) -> - let ci = Map.enter_class_infos ci in - let ci_expr = map_class_expr ci.ci_expr in - (Map.leave_class_infos { ci with ci_expr = ci_expr}, + let ci = Map.enter_class_infos ci in + let ci_expr = map_class_expr ci.ci_expr in + (Map.leave_class_infos { ci with ci_expr = ci_expr}, string_list, virtual_flag) ) list - in - Tstr_class list + in + Tstr_class list | Tstr_class_type list -> let list = List.map (fun (id, name, ct) -> let ct = Map.enter_class_infos ct in let ci_expr = map_class_type ct.ci_expr in - (id, name, Map.leave_class_infos { ct with ci_expr = ci_expr}) + (id, name, Map.leave_class_infos { ct with ci_expr = ci_expr}) ) list in - Tstr_class_type list + Tstr_class_type list | Tstr_include (mexpr, idents) -> Tstr_include (map_module_expr mexpr, idents) in @@ -315,7 +315,7 @@ end = struct let typ_cstrs = List.map (fun (ct1, ct2, loc) -> (map_core_type ct1, map_core_type ct2, - loc) + loc) ) decl.typ_cstrs in let typ_kind = match decl.typ_kind with Ttype_abstract -> Ttype_abstract @@ -323,16 +323,16 @@ end = struct let list = List.map (fun (s, name, cts, loc) -> (s, name, List.map map_core_type cts, loc) ) list in - Ttype_variant list + Ttype_variant list | Ttype_record list -> - let list = + let list = List.map (fun (s, name, mut, ct, loc) -> (s, name, mut, map_core_type ct, loc) ) list in - Ttype_record list + Ttype_record list in let typ_manifest = - match decl.typ_manifest with + match decl.typ_manifest with None -> None | Some ct -> Some (map_core_type ct) in @@ -353,8 +353,8 @@ end = struct match pat.pat_desc with | Tpat_alias (pat1, p, text) -> let pat1 = map_pattern pat1 in - Tpat_alias (pat1, p, text) - | Tpat_tuple list -> Tpat_tuple (List.map map_pattern list) + Tpat_alias (pat1, p, text) + | Tpat_tuple list -> Tpat_tuple (List.map map_pattern list) | Tpat_construct (path, lid, cstr_decl, args, arity) -> Tpat_construct (path, lid, cstr_decl, List.map map_pattern args, arity) @@ -363,7 +363,7 @@ end = struct None -> pato | Some pat -> Some (map_pattern pat) in - Tpat_variant (label, pato, rowo) + Tpat_variant (label, pato, rowo) | Tpat_record (list, closed) -> Tpat_record (List.map (fun (path, lid, lab_desc, pat) -> (path, lid, lab_desc, map_pattern pat) ) list, closed) @@ -391,32 +391,32 @@ end = struct Texp_ident (_, _, _) | Texp_constant _ -> exp.exp_desc | Texp_let (rec_flag, list, exp) -> - Texp_let (rec_flag, - map_bindings rec_flag list, - map_expression exp) + Texp_let (rec_flag, + map_bindings rec_flag list, + map_expression exp) | Texp_function (label, cases, partial) -> Texp_function (label, map_bindings Nonrecursive cases, partial) | Texp_apply (exp, list) -> Texp_apply (map_expression exp, - List.map (fun (label, expo, optional) -> - let expo = - match expo with - None -> expo - | Some exp -> Some (map_expression exp) - in - (label, expo, optional) - ) list ) + List.map (fun (label, expo, optional) -> + let expo = + match expo with + None -> expo + | Some exp -> Some (map_expression exp) + in + (label, expo, optional) + ) list ) | Texp_match (exp, list, partial) -> Texp_match ( - map_expression exp, + map_expression exp, map_bindings Nonrecursive list, - partial - ) + partial + ) | Texp_try (exp, list) -> Texp_try ( - map_expression exp, + map_expression exp, map_bindings Nonrecursive list - ) + ) | Texp_tuple list -> Texp_tuple (List.map map_expression list) | Texp_construct (path, lid, cstr_desc, args, arity) -> @@ -426,85 +426,85 @@ end = struct let expo =match expo with None -> expo | Some exp -> Some (map_expression exp) - in - Texp_variant (label, expo) + in + Texp_variant (label, expo) | Texp_record (list, expo) -> - let list = + let list = List.map (fun (path, lid, lab_desc, exp) -> (path, lid, lab_desc, map_expression exp) ) list in let expo = match expo with None -> expo | Some exp -> Some (map_expression exp) - in - Texp_record (list, expo) + in + Texp_record (list, expo) | Texp_field (exp, path, lid, label) -> Texp_field (map_expression exp, path, lid, label) | Texp_setfield (exp1, path, lid, label, exp2) -> Texp_setfield ( - map_expression exp1, - path, lid, - label, + map_expression exp1, + path, lid, + label, map_expression exp2) | Texp_array list -> Texp_array (List.map map_expression list) | Texp_ifthenelse (exp1, exp2, expo) -> Texp_ifthenelse ( - map_expression exp1, + map_expression exp1, map_expression exp2, match expo with None -> expo - | Some exp -> Some (map_expression exp) - ) + | Some exp -> Some (map_expression exp) + ) | Texp_sequence (exp1, exp2) -> - Texp_sequence ( + Texp_sequence ( map_expression exp1, map_expression exp2 - ) + ) | Texp_while (exp1, exp2) -> - Texp_while ( + Texp_while ( map_expression exp1, map_expression exp2 - ) + ) | Texp_for (id, name, exp1, exp2, dir, exp3) -> - Texp_for ( - id, name, - map_expression exp1, - map_expression exp2, - dir, - map_expression exp3 - ) - | Texp_when (exp1, exp2) -> - Texp_when ( - map_expression exp1, - map_expression exp2 - ) - | Texp_send (exp, meth, expo) -> - Texp_send (map_expression exp, meth, may_map map_expression expo) - | Texp_new (path, lid, cl_decl) -> exp.exp_desc - | Texp_instvar (_, path, _) -> exp.exp_desc - | Texp_setinstvar (path, lid, path2, exp) -> - Texp_setinstvar (path, lid, path2, map_expression exp) - | Texp_override (path, list) -> - Texp_override ( - path, - List.map (fun (path, lid, exp) -> - (path, lid, map_expression exp) - ) list - ) - | Texp_letmodule (id, name, mexpr, exp) -> - Texp_letmodule ( - id, name, - map_module_expr mexpr, - map_expression exp - ) - | Texp_assert exp -> Texp_assert (map_expression exp) - | Texp_assertfalse -> exp.exp_desc - | Texp_lazy exp -> Texp_lazy (map_expression exp) - | Texp_object (cl, string_list) -> - Texp_object (map_class_structure cl, string_list) - | Texp_pack (mexpr) -> - Texp_pack (map_module_expr mexpr) + Texp_for ( + id, name, + map_expression exp1, + map_expression exp2, + dir, + map_expression exp3 + ) + | Texp_when (exp1, exp2) -> + Texp_when ( + map_expression exp1, + map_expression exp2 + ) + | Texp_send (exp, meth, expo) -> + Texp_send (map_expression exp, meth, may_map map_expression expo) + | Texp_new (path, lid, cl_decl) -> exp.exp_desc + | Texp_instvar (_, path, _) -> exp.exp_desc + | Texp_setinstvar (path, lid, path2, exp) -> + Texp_setinstvar (path, lid, path2, map_expression exp) + | Texp_override (path, list) -> + Texp_override ( + path, + List.map (fun (path, lid, exp) -> + (path, lid, map_expression exp) + ) list + ) + | Texp_letmodule (id, name, mexpr, exp) -> + Texp_letmodule ( + id, name, + map_module_expr mexpr, + map_expression exp + ) + | Texp_assert exp -> Texp_assert (map_expression exp) + | Texp_assertfalse -> exp.exp_desc + | Texp_lazy exp -> Texp_lazy (map_expression exp) + | Texp_object (cl, string_list) -> + Texp_object (map_class_structure cl, string_list) + | Texp_pack (mexpr) -> + Texp_pack (map_module_expr mexpr) in let exp_extra = List.map map_exp_extra exp.exp_extra in Map.leave_expression { @@ -522,12 +522,12 @@ end = struct | Texp_constraint (Some ct1, Some ct2) -> Texp_constraint (Some (map_core_type ct1), Some (map_core_type ct2)), loc - | Texp_poly (Some ct) -> - Texp_poly (Some ( map_core_type ct )), loc - | Texp_newtype _ + | Texp_poly (Some ct) -> + Texp_poly (Some ( map_core_type ct )), loc + | Texp_newtype _ | Texp_constraint (None, None) | Texp_open _ - | Texp_poly None -> exp_extra + | Texp_poly None -> exp_extra and map_package_type pack = @@ -551,7 +551,7 @@ end = struct List.map (fun (id, name, decl) -> (id, name, map_type_declaration decl) ) list - ) + ) | Tsig_exception (id, name, decl) -> Tsig_exception (id, name, map_exception_declaration decl) | Tsig_module (id, name, mtype) -> @@ -598,13 +598,13 @@ end = struct Tmty_ident (path, lid) -> mty.mty_desc | Tmty_signature sg -> Tmty_signature (map_signature sg) | Tmty_functor (id, name, mtype1, mtype2) -> - Tmty_functor (id, name, map_module_type mtype1, + Tmty_functor (id, name, map_module_type mtype1, map_module_type mtype2) | Tmty_with (mtype, list) -> Tmty_with (map_module_type mtype, - List.map (fun (path, lid, withc) -> - (path, lid, map_with_constraint withc) - ) list) + List.map (fun (path, lid, withc) -> + (path, lid, map_with_constraint withc) + ) list) | Tmty_typeof mexpr -> Tmty_typeof (map_module_expr mexpr) in @@ -655,21 +655,21 @@ end = struct | Tcl_structure clstr -> Tcl_structure (map_class_structure clstr) | Tcl_fun (label, pat, priv, cl, partial) -> Tcl_fun (label, map_pattern pat, - List.map (fun (id, name, exp) -> + List.map (fun (id, name, exp) -> (id, name, map_expression exp)) priv, - map_class_expr cl, partial) + map_class_expr cl, partial) | Tcl_apply (cl, args) -> Tcl_apply (map_class_expr cl, - List.map (fun (label, expo, optional) -> + List.map (fun (label, expo, optional) -> (label, may_map map_expression expo, optional) - ) args) + ) args) | Tcl_let (rec_flat, bindings, ivars, cl) -> Tcl_let (rec_flat, map_bindings rec_flat bindings, - List.map (fun (id, name, exp) -> + List.map (fun (id, name, exp) -> (id, name, map_expression exp)) ivars, - map_class_expr cl) + map_class_expr cl) | Tcl_constraint (cl, Some clty, vals, meths, concrs) -> Tcl_constraint ( map_class_expr cl, @@ -757,7 +757,7 @@ end = struct match rf with Ttag (label, bool, list) -> Ttag (label, bool, List.map map_core_type list) - | Tinherit ct -> Tinherit (map_core_type ct) + | Tinherit ct -> Tinherit (map_core_type ct) and map_class_field cf = let cf = Map.enter_class_field cf in @@ -765,21 +765,21 @@ end = struct match cf.cf_desc with Tcf_inher (ovf, cl, super, vals, meths) -> Tcf_inher (ovf, map_class_expr cl, super, vals, meths) - | Tcf_constr (cty, cty') -> + | Tcf_constr (cty, cty') -> Tcf_constr (map_core_type cty, map_core_type cty') - | Tcf_val (lab, name, mut, ident, Tcfk_virtual cty, override) -> + | Tcf_val (lab, name, mut, ident, Tcfk_virtual cty, override) -> Tcf_val (lab, name, mut, ident, Tcfk_virtual (map_core_type cty), override) - | Tcf_val (lab, name, mut, ident, Tcfk_concrete exp, override) -> + | Tcf_val (lab, name, mut, ident, Tcfk_concrete exp, override) -> Tcf_val (lab, name, mut, ident, Tcfk_concrete (map_expression exp), override) - | Tcf_meth (lab, name, priv, Tcfk_virtual cty, override) -> + | Tcf_meth (lab, name, priv, Tcfk_virtual cty, override) -> Tcf_meth (lab, name, priv, Tcfk_virtual (map_core_type cty), override) - | Tcf_meth (lab, name, priv, Tcfk_concrete exp, override) -> + | Tcf_meth (lab, name, priv, Tcfk_concrete exp, override) -> Tcf_meth (lab, name, priv, Tcfk_concrete (map_expression exp), override) - | Tcf_init exp -> Tcf_init (map_expression exp) + | Tcf_init exp -> Tcf_init (map_expression exp) in Map.leave_class_field { cf with cf_desc = cf_desc } diff --git a/typing/ctype.mli b/typing/ctype.mli index 65bf372a..560c7ac2 100644 --- a/typing/ctype.mli +++ b/typing/ctype.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: ctype.mli 12534 2012-06-01 05:24:38Z garrigue $ *) +(* $Id: ctype.mli 12800 2012-07-30 18:59:07Z doligez $ *) (* Operations on core types *) @@ -115,7 +115,7 @@ val instance_def: type_expr -> type_expr val instance_list: Env.t -> type_expr list -> type_expr list (* Take an instance of a list of type schemes *) val instance_constructor: - ?in_pattern:Env.t ref * int -> + ?in_pattern:Env.t ref * int -> constructor_description -> type_expr list * type_expr (* Same, for a constructor *) val instance_parameterized_type: diff --git a/typing/datarepr.ml b/typing/datarepr.ml index edf0153e..71e5a851 100644 --- a/typing/datarepr.ml +++ b/typing/datarepr.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: datarepr.ml 12511 2012-05-30 13:29:48Z lefessan $ *) +(* $Id: datarepr.ml 12800 2012-07-30 18:59:07Z doligez $ *) (* Compute constructor and label descriptions from type declarations, determining their representation. *) @@ -23,7 +23,7 @@ open Btype (* Simplified version of Ctype.free_vars *) let rec free_vars ty = let ret = ref TypeSet.empty in - let rec loop ty = + let rec loop ty = let ty = repr ty in if ty.level >= lowest_level then begin ty.level <- pivot_level - ty.level; @@ -35,7 +35,7 @@ let rec free_vars ty = iter_row loop row; if not (static_row row) then loop row.row_more | _ -> - iter_type_expr loop ty + iter_type_expr loop ty end in loop ty; @@ -52,39 +52,39 @@ let constructor_descrs ty_res cstrs priv = let rec describe_constructors idx_const idx_nonconst = function [] -> [] | (name, ty_args, ty_res_opt) :: rem -> - let ty_res = - match ty_res_opt with - | Some ty_res' -> ty_res' - | None -> ty_res - in + let ty_res = + match ty_res_opt with + | Some ty_res' -> ty_res' + | None -> ty_res + in let (tag, descr_rem) = match ty_args with [] -> (Cstr_constant idx_const, describe_constructors (idx_const+1) idx_nonconst rem) | _ -> (Cstr_block idx_nonconst, describe_constructors idx_const (idx_nonconst+1) rem) in - let existentials = - match ty_res_opt with - | None -> [] - | Some type_ret -> - let res_vars = free_vars type_ret in - let arg_vars = free_vars (newgenty (Ttuple ty_args)) in - TypeSet.elements (TypeSet.diff arg_vars res_vars) - in - let cstr = - { cstr_res = ty_res; - cstr_existentials = existentials; + let existentials = + match ty_res_opt with + | None -> [] + | Some type_ret -> + let res_vars = free_vars type_ret in + let arg_vars = free_vars (newgenty (Ttuple ty_args)) in + TypeSet.elements (TypeSet.diff arg_vars res_vars) + in + let cstr = + { cstr_res = ty_res; + cstr_existentials = existentials; cstr_args = ty_args; cstr_arity = List.length ty_args; cstr_tag = tag; cstr_consts = !num_consts; cstr_nonconsts = !num_nonconsts; - cstr_normal = !num_normal; + cstr_normal = !num_normal; cstr_private = priv; - cstr_generalized = ty_res_opt <> None - } in + cstr_generalized = ty_res_opt <> None + } in (name, cstr) :: descr_rem in - describe_constructors 0 0 cstrs + describe_constructors 0 0 cstrs let exception_descr path_exc decl = { cstr_res = Predef.type_exn; diff --git a/typing/env.ml b/typing/env.ml index 334a7378..061e86bc 100644 --- a/typing/env.ml +++ b/typing/env.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: env.ml 12706 2012-07-13 08:49:06Z lefessan $ *) +(* $Id: env.ml 12820 2012-08-03 20:23:26Z frisch $ *) (* Environment handling *) @@ -825,16 +825,16 @@ and components_of_module_maker (env, sub, path, mty) = let decl' = Subst.type_declaration sub decl in c.comp_types <- Tbl.add (Ident.name id) (decl', nopos) c.comp_types; - let constructors = constructors_of_type path decl' in - c.comp_constrs_by_path <- - Tbl.add (Ident.name id) - (List.map snd constructors, nopos) c.comp_constrs_by_path; + let constructors = constructors_of_type path decl' in + c.comp_constrs_by_path <- + Tbl.add (Ident.name id) + (List.map snd constructors, nopos) c.comp_constrs_by_path; List.iter (fun (name, descr) -> c.comp_constrs <- Tbl.add (Ident.name name) (descr, nopos) c.comp_constrs) constructors; - let labels = labels_of_type path decl' in + let labels = labels_of_type path decl' in List.iter (fun (name, descr) -> c.comp_labels <- @@ -927,7 +927,7 @@ and store_type id path info env = let constructors = constructors_of_type path info in let labels = labels_of_type path info in - if not env.in_signature && not loc.Location.loc_ghost && + if not loc.Location.loc_ghost && Warnings.is_active (Warnings.Unused_constructor ("", false, false)) then begin let ty = Ident.name id in @@ -941,7 +941,7 @@ and store_type id path info env = if not (ty = "" || ty.[0] = '_') then !add_delayed_check_forward (fun () -> - if not used.cu_positive then + if not env.in_signature && not used.cu_positive then Location.prerr_warning loc (Warnings.Unused_constructor (c, used.cu_pattern, used.cu_privatize))) @@ -980,7 +980,7 @@ and store_type_infos id path info env = and store_exception id path decl env = let loc = decl.exn_loc in - if not env.in_signature && not loc.Location.loc_ghost && + if not loc.Location.loc_ghost && Warnings.is_active (Warnings.Unused_exception ("", false)) then begin let ty = "exn" in @@ -991,7 +991,7 @@ and store_exception id path decl env = Hashtbl.add used_constructors k (add_constructor_usage used); !add_delayed_check_forward (fun () -> - if not used.cu_positive then + if not env.in_signature && not used.cu_positive then Location.prerr_warning loc (Warnings.Unused_exception (c, used.cu_pattern) diff --git a/typing/env.mli b/typing/env.mli index fad7d773..9846dc46 100644 --- a/typing/env.mli +++ b/typing/env.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: env.mli 12706 2012-07-13 08:49:06Z lefessan $ *) +(* $Id: env.mli 12800 2012-07-30 18:59:07Z doligez $ *) (* Environment handling *) @@ -216,6 +216,3 @@ val fold_classs: val fold_cltypes: (string -> Path.t -> Types.class_type_declaration -> 'a -> 'a) -> Longident.t option -> t -> 'a -> 'a - - - diff --git a/typing/includecore.ml b/typing/includecore.ml index 711a809d..c5dc89f0 100644 --- a/typing/includecore.ml +++ b/typing/includecore.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: includecore.ml 12520 2012-05-31 07:41:37Z garrigue $ *) +(* $Id: includecore.ml 12800 2012-07-30 18:59:07Z doligez $ *) (* Inclusion checks for the core language *) @@ -175,18 +175,18 @@ let rec compare_variants env decl1 decl2 n cstrs1 cstrs2 = [Field_arity cstr1] else match ret1, ret2 with | Some r1, Some r2 when not (Ctype.equal env true [r1] [r2]) -> - [Field_type cstr1] + [Field_type cstr1] | Some _, None | None, Some _ -> - [Field_type cstr1] + [Field_type cstr1] | _ -> - if Misc.for_all2 - (fun ty1 ty2 -> - Ctype.equal env true (ty1::decl1.type_params) - (ty2::decl2.type_params)) - (arg1) (arg2) - then - compare_variants env decl1 decl2 (n+1) rem1 rem2 - else [Field_type cstr1] + if Misc.for_all2 + (fun ty1 ty2 -> + Ctype.equal env true (ty1::decl1.type_params) + (ty2::decl2.type_params)) + (arg1) (arg2) + then + compare_variants env decl1 decl2 (n+1) rem1 rem2 + else [Field_type cstr1] let rec compare_records env decl1 decl2 n labels1 labels2 = diff --git a/typing/parmatch.ml b/typing/parmatch.ml index a0d42baf..9be70433 100644 --- a/typing/parmatch.ml +++ b/typing/parmatch.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: parmatch.ml 12726 2012-07-18 03:34:36Z garrigue $ *) +(* $Id: parmatch.ml 12961 2012-09-27 13:30:07Z garrigue $ *) (* Detection of partial matches and unused match cases. *) @@ -53,6 +53,12 @@ let is_absent_pat p = match p.pat_desc with | Tpat_variant (tag, _, row) -> is_absent tag row | _ -> false +let const_compare x y = + match x,y with + | Const_float f1, Const_float f2 -> + Pervasives.compare (float_of_string f1) (float_of_string f2) + | _, _ -> Pervasives.compare x y + let records_args l1 l2 = (* Invariant: fields are already sorted by Typecore.type_label_a_list *) let rec combine r1 r2 l1 l2 = match l1,l2 with @@ -77,7 +83,7 @@ let rec compat p q = | _,(Tpat_any|Tpat_var _) -> true | Tpat_or (p1,p2,_),_ -> compat p1 q || compat p2 q | _,Tpat_or (q1,q2,_) -> compat p q1 || compat p q2 - | Tpat_constant c1, Tpat_constant c2 -> c1=c2 + | Tpat_constant c1, Tpat_constant c2 -> const_compare c1 c2 = 0 | Tpat_tuple ps, Tpat_tuple qs -> compats ps qs | Tpat_lazy p, Tpat_lazy q -> compat p q | Tpat_construct (_, _, c1,ps1, _), Tpat_construct (_, _, c2,ps2, _) -> @@ -282,9 +288,7 @@ let simple_match p1 p2 = c1.cstr_tag = c2.cstr_tag | Tpat_variant(l1, _, _), Tpat_variant(l2, _, _) -> l1 = l2 - | Tpat_constant(Const_float s1), Tpat_constant(Const_float s2) -> - float_of_string s1 = float_of_string s2 - | Tpat_constant(c1), Tpat_constant(c2) -> c1 = c2 + | Tpat_constant(c1), Tpat_constant(c2) -> const_compare c1 c2 = 0 | Tpat_tuple _, Tpat_tuple _ -> true | Tpat_lazy _, Tpat_lazy _ -> true | Tpat_record _ , Tpat_record _ -> true @@ -629,7 +633,7 @@ let clean_env env = function | [] -> [] | x :: xs -> - if generalized_constructor x then loop xs else x :: loop xs + if generalized_constructor x then loop xs else x :: loop xs in loop env @@ -697,7 +701,7 @@ let extendable_match env = match env with let should_extend ext env = match ext with | None -> false | Some ext -> match env with - | ({pat_desc = + | ({pat_desc = Tpat_construct(_, _, {cstr_tag=(Cstr_constant _|Cstr_block _)},_,_)} as p, _) :: _ -> let path = get_type_path p.pat_type p.pat_env in @@ -749,7 +753,7 @@ let rec adt_path env ty = | {type_kind=Type_variant constr_list} -> begin match (Ctype.repr ty).desc with | Tconstr (path,_,_) -> - path + path | _ -> assert false end | {type_manifest = Some _} -> adt_path env (Ctype.expand_head_once env (clean_copy ty)) @@ -760,25 +764,25 @@ let rec map_filter f = function [] -> [] | x :: xs -> - match f x with - | None -> map_filter f xs - | Some y -> y :: map_filter f xs + match f x with + | None -> map_filter f xs + | Some y -> y :: map_filter f xs (* Sends back a pattern that complements constructor tags all_tag *) let complete_constrs p all_tags = match p.pat_desc with | Tpat_construct (_,_,c,_,_) -> begin try - let not_tags = complete_tags c.cstr_consts c.cstr_nonconsts all_tags in - let constrs = + let not_tags = complete_tags c.cstr_consts c.cstr_nonconsts all_tags in + let constrs = Env.find_constructors (adt_path p.pat_env p.pat_type) p.pat_env in - map_filter + map_filter (fun cnstr -> - if List.mem cnstr.cstr_tag not_tags then Some cnstr else None) - constrs + if List.mem cnstr.cstr_tag not_tags then Some cnstr else None) + constrs with | Datarepr.Constr_not_found -> - fatal_error "Parmatch.complete_constr: constr_not_found" + fatal_error "Parmatch.complete_constr: constr_not_found" end | _ -> fatal_error "Parmatch.complete_constr" @@ -935,8 +939,8 @@ let build_other_gadt ext env = | {pat_desc = Tpat_construct (_,_,c,_,_)} -> c.cstr_tag | _ -> fatal_error "Parmatch.get_tag" in let all_tags = List.map (fun (p,_) -> get_tag p) env in - let cnstrs = complete_constrs p all_tags in - let pats = List.map (pat_of_constr p) cnstrs in + let cnstrs = complete_constrs p all_tags in + let pats = List.map (pat_of_constr p) cnstrs in (* List.iter (Format.eprintf "%a@." top_pretty) pats; Format.eprintf "@.@."; *) pats @@ -1030,11 +1034,11 @@ let rec try_many_gadt f = function match f (p,pss) with | Rnone -> try_many f rest | Rsome sofar -> - let others = try_many f rest in - match others with - Rnone -> Rsome sofar - | Rsome sofar' -> - Rsome (sofar @ sofar') + let others = try_many f rest in + match others with + Rnone -> Rsome sofar + | Rsome sofar' -> + Rsome (sofar @ sofar') @@ -1088,13 +1092,13 @@ let rec exhaust ext pss n = match pss with let combinations f lst lst' = let rec iter2 x = function - [] -> [] + [] -> [] | y :: ys -> - f x y :: iter2 x ys + f x y :: iter2 x ys in let rec iter = function - [] -> [] + [] -> [] | x :: xs -> iter2 x lst' @ iter xs in iter lst @@ -1147,11 +1151,11 @@ let rec exhaust_gadt (ext:Path.t option) pss n = match pss with with | Rsome r -> Rsome (List.map (fun row -> (set_args p row)) r) | r -> r in - let before = try_many_gadt try_non_omega constrs in + let before = try_many_gadt try_non_omega constrs in if - full_match_gadt constrs && not (should_extend ext constrs) + full_match_gadt constrs && not (should_extend ext constrs) then - before + before else (* D = filter_extra pss is the default matrix @@ -1166,18 +1170,18 @@ let rec exhaust_gadt (ext:Path.t option) pss n = match pss with | Rnone -> before | Rsome r -> try - let missing_trailing = build_other_gadt ext constrs in - let before = - match before with - Rnone -> [] - | Rsome lst -> lst - in - let dug = - combinations - (fun head tail -> head :: tail) - missing_trailing - r - in + let missing_trailing = build_other_gadt ext constrs in + let before = + match before with + Rnone -> [] + | Rsome lst -> lst + in + let dug = + combinations + (fun head tail -> head :: tail) + missing_trailing + r + in Rsome (dug @ before) with (* cannot occur, since constructors don't make a full signature *) @@ -1192,11 +1196,11 @@ let exhaust_gadt ext pss n = (* The following line is needed to compile stdlib/printf.ml *) if lst = [] then Rsome (omegas n) else let singletons = - List.map - (function - [x] -> x - | _ -> assert false) - lst + List.map + (function + [x] -> x + | _ -> assert false) + lst in Rsome [orify_many singletons] @@ -1523,7 +1527,7 @@ let rec le_pat p q = | (Tpat_var _|Tpat_any),_ -> true | Tpat_alias(p,_,_), _ -> le_pat p q | _, Tpat_alias(q,_,_) -> le_pat p q - | Tpat_constant(c1), Tpat_constant(c2) -> c1 = c2 + | Tpat_constant(c1), Tpat_constant(c2) -> const_compare c1 c2 = 0 | Tpat_construct(_,_,c1,ps,_), Tpat_construct(_,_,c2,qs,_) -> c1.cstr_tag = c2.cstr_tag && le_pats ps qs | Tpat_variant(l1,Some p1,_), Tpat_variant(l2,Some p2,_) -> @@ -1567,7 +1571,7 @@ let rec lub p q = match p.pat_desc,q.pat_desc with | _,(Tpat_any|Tpat_var _) -> p | Tpat_or (p1,p2,_),_ -> orlub p1 p2 q | _,Tpat_or (q1,q2,_) -> orlub q1 q2 p (* Thanks god, lub is commutative *) -| Tpat_constant c1, Tpat_constant c2 when c1=c2 -> p +| Tpat_constant c1, Tpat_constant c2 when const_compare c1 c2 = 0 -> p | Tpat_tuple ps, Tpat_tuple qs -> let rs = lubs ps qs in make_pat (Tpat_tuple rs) p.pat_type p.pat_env @@ -1732,9 +1736,9 @@ let check_partial_all v casel = function | [] -> None | x :: xs -> - match f x with - | None -> get_first f xs - | x -> x + match f x with + | None -> get_first f xs + | x -> x (* conversion from Typedtree.pattern to Parsetree.pattern list *) @@ -1748,11 +1752,11 @@ module Conv = struct function | xs :: [] -> List.map (fun y -> [y]) xs | (x::xs)::ys -> - List.map - (fun lst -> x :: lst) - (select ys) - @ - select (xs::ys) + List.map + (fun lst -> x :: lst) + (select ys) + @ + select (xs::ys) | _ -> [] let name_counter = ref 0 @@ -1771,72 +1775,72 @@ module Conv = struct let rec loop pat = match pat.pat_desc with Tpat_or (a,b,_) -> - loop a @ loop b + loop a @ loop b | Tpat_any | Tpat_constant _ | Tpat_var _ -> - [mkpat Ppat_any] + [mkpat Ppat_any] | Tpat_alias (p,_,_) -> loop p | Tpat_tuple lst -> - let results = select (List.map loop lst) in - List.map - (fun lst -> mkpat (Ppat_tuple lst)) - results + let results = select (List.map loop lst) in + List.map + (fun lst -> mkpat (Ppat_tuple lst)) + results | Tpat_construct (cstr_path, cstr_lid, cstr,lst,_) -> - let id = fresh () in + let id = fresh () in let lid = { cstr_lid with txt = Longident.Lident id } in - Hashtbl.add constrs id (cstr_path,cstr); - let results = select (List.map loop lst) in - begin match lst with - [] -> - [mkpat (Ppat_construct(lid, None, false))] + Hashtbl.add constrs id (cstr_path,cstr); + let results = select (List.map loop lst) in + begin match lst with + [] -> + [mkpat (Ppat_construct(lid, None, false))] | _ -> - List.map - (fun lst -> - let arg = - match lst with - [] -> assert false - | [x] -> Some x - | _ -> Some (mkpat (Ppat_tuple lst)) - in - mkpat (Ppat_construct(lid, arg, false))) - results + List.map + (fun lst -> + let arg = + match lst with + [] -> assert false + | [x] -> Some x + | _ -> Some (mkpat (Ppat_tuple lst)) + in + mkpat (Ppat_construct(lid, arg, false))) + results end | Tpat_variant(label,p_opt,row_desc) -> - begin match p_opt with - | None -> - [mkpat (Ppat_variant(label, None))] - | Some p -> - let results = loop p in - List.map - (fun p -> - mkpat (Ppat_variant(label, Some p))) - results + begin match p_opt with + | None -> + [mkpat (Ppat_variant(label, None))] + | Some p -> + let results = loop p in + List.map + (fun p -> + mkpat (Ppat_variant(label, Some p))) + results end | Tpat_record (subpatterns, _closed_flag) -> - let pats = - select - (List.map (fun (_,_,_,x) -> (loop x)) subpatterns) - in - let label_idents = - List.map - (fun (lbl_path,_,lbl,_) -> - let id = fresh () in - Hashtbl.add labels id (lbl_path, lbl); - Longident.Lident id) - subpatterns - in - List.map - (fun lst -> - let lst = List.map2 (fun lid pat -> + let pats = + select + (List.map (fun (_,_,_,x) -> (loop x)) subpatterns) + in + let label_idents = + List.map + (fun (lbl_path,_,lbl,_) -> + let id = fresh () in + Hashtbl.add labels id (lbl_path, lbl); + Longident.Lident id) + subpatterns + in + List.map + (fun lst -> + let lst = List.map2 (fun lid pat -> (mknoloc lid, pat) ) label_idents lst in mkpat (Ppat_record (lst, Open))) - pats + pats | Tpat_array lst -> - let results = select (List.map loop lst) in - List.map (fun lst -> mkpat (Ppat_array lst)) results + let results = select (List.map loop lst) in + List.map (fun lst -> mkpat (Ppat_array lst)) results | Tpat_lazy p -> - let results = loop p in - List.map (fun p -> mkpat (Ppat_lazy p)) results + let results = loop p in + List.map (fun p -> mkpat (Ppat_lazy p)) results in let ps = loop typed in (ps, constrs, labels) @@ -1862,38 +1866,38 @@ let do_check_partial ?pred exhaust loc casel pss = match pss with begin match exhaust None pss (List.length ps) with | Rnone -> Total | Rsome [u] -> - let v = - match pred with - | Some pred -> - let (patterns,constrs,labels) = Conv.conv u in + let v = + match pred with + | Some pred -> + let (patterns,constrs,labels) = Conv.conv u in (* Hashtbl.iter (fun s (path, _) -> Printf.fprintf stderr "CONV: %s -> %s \n%!" s (Path.name path)) constrs ; *) - get_first (pred constrs labels) patterns - | None -> Some u - in - begin match v with - None -> Total - | Some v -> + get_first (pred constrs labels) patterns + | None -> Some u + in + begin match v with + None -> Total + | Some v -> let errmsg = try - let buf = Buffer.create 16 in - let fmt = formatter_of_buffer buf in - top_pretty fmt v; - begin match check_partial_all v casel with - | None -> () - | Some _ -> + let buf = Buffer.create 16 in + let fmt = formatter_of_buffer buf in + top_pretty fmt v; + begin match check_partial_all v casel with + | None -> () + | Some _ -> (* This is 'Some loc', where loc is the location of a possibly matching clause. Forget about loc, because printing two locations is a pain in the top-level *) Buffer.add_string buf "\n(However, some guarded clause may match this value.)" - end ; - Buffer.contents buf + end ; + Buffer.contents buf with _ -> - "" in + "" in Location.prerr_warning loc (Warnings.Partial_match errmsg) ; Partial end | _ -> @@ -2065,9 +2069,9 @@ let check_partial_param do_check_partial do_check_fragile loc casel = let pss = get_mins le_pats pss in let total = do_check_partial loc casel pss in if - total = Total && Warnings.is_active (Warnings.Fragile_match "") + total = Total && Warnings.is_active (Warnings.Fragile_match "") then begin - do_check_fragile loc casel pss + do_check_fragile loc casel pss end ; total end else diff --git a/typing/parmatch.mli b/typing/parmatch.mli index ccbf36a8..dfe0e7da 100644 --- a/typing/parmatch.mli +++ b/typing/parmatch.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: parmatch.mli 12521 2012-05-31 07:57:32Z garrigue $ *) +(* $Id: parmatch.mli 12961 2012-09-27 13:30:07Z garrigue $ *) (* Detection of partial matches and unused match cases. *) open Asttypes @@ -29,6 +29,7 @@ val normalize_pat : pattern -> pattern val all_record_args : (Path.t * Longident.t loc * label_description * pattern) list -> (Path.t * Longident.t loc * label_description * pattern) list +val const_compare : constant -> constant -> int val le_pat : pattern -> pattern -> bool val le_pats : pattern list -> pattern list -> bool diff --git a/typing/printtyp.ml b/typing/printtyp.ml index 1932a728..e22c4a74 100644 --- a/typing/printtyp.ml +++ b/typing/printtyp.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: printtyp.ml 12520 2012-05-31 07:41:37Z garrigue $ *) +(* $Id: printtyp.ml 12800 2012-07-30 18:59:07Z doligez $ *) (* Printing functions *) @@ -589,10 +589,10 @@ let rec tree_of_type_decl id decl = | Type_abstract -> () | Type_variant cstrs -> List.iter - (fun (_, args,ret_type_opt) -> - List.iter mark_loops args; - may mark_loops ret_type_opt) - cstrs + (fun (_, args,ret_type_opt) -> + List.iter mark_loops args; + may mark_loops ret_type_opt) + cstrs | Type_record(l, rep) -> List.iter (fun (_, _, ty) -> mark_loops ty) l end; diff --git a/typing/printtyped.ml b/typing/printtyped.ml index 55a0e2ec..d89d25b5 100644 --- a/typing/printtyped.ml +++ b/typing/printtyped.ml @@ -364,9 +364,9 @@ and value_description i ppf x = and string_option_underscore i ppf = function | Some x -> - string i ppf x.txt + string i ppf x.txt | None -> - string i ppf "_" + string i ppf "_" and type_declaration i ppf x = line i ppf "type_declaration %a\n" fmt_location x.typ_loc; diff --git a/typing/subst.ml b/typing/subst.ml index 86516c17..f0a2ecfc 100644 --- a/typing/subst.ml +++ b/typing/subst.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: subst.ml 12511 2012-05-30 13:29:48Z lefessan $ *) +(* $Id: subst.ml 12800 2012-07-30 18:59:07Z doligez $ *) (* Substitutions *) @@ -176,7 +176,7 @@ let type_declaration s decl = Type_variant (List.map (fun (n, args, ret_type) -> - (n, List.map (typexp s) args, may_map (typexp s) ret_type)) + (n, List.map (typexp s) args, may_map (typexp s) ret_type)) cstrs) | Type_record(lbls, rep) -> Type_record @@ -185,7 +185,7 @@ let type_declaration s decl = end; type_manifest = begin - match decl.type_manifest with + match decl.type_manifest with None -> None | Some ty -> Some(typexp s ty) end; diff --git a/typing/typeclass.ml b/typing/typeclass.ml index cae89d4d..c7f81b18 100644 --- a/typing/typeclass.ml +++ b/typing/typeclass.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: typeclass.ml 12616 2012-06-19 10:51:33Z garrigue $ *) +(* $Id: typeclass.ml 12800 2012-07-30 18:59:07Z doligez $ *) open Misc open Parsetree @@ -1722,4 +1722,3 @@ let report_error ppf = function "instance variable" | No_overriding (kind, name) -> fprintf ppf "@[The %s `%s'@ has no previous definition@]" kind name - diff --git a/typing/typecore.ml b/typing/typecore.ml index 12262788..94e4d9c9 100644 --- a/typing/typecore.ml +++ b/typing/typecore.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: typecore.ml 12726 2012-07-18 03:34:36Z garrigue $ *) +(* $Id: typecore.ml 12800 2012-07-30 18:59:07Z doligez $ *) (* Typechecking for the core language *) @@ -1386,7 +1386,7 @@ let self_coercion = ref ([] : (Path.t * Location.t list ref) list) let create_package_type loc env (p, l) = let s = !Typetexp.transl_modtype_longident loc env p in let fields = List.map (fun (name, ct) -> - name, Typetexp.transl_simple_type env false ct) l in + name, Typetexp.transl_simple_type env false ct) l in let ty = newty (Tpackage (s, List.map fst l, List.map (fun (_, cty) -> cty.ctyp_type) fields)) @@ -2035,8 +2035,8 @@ and type_expect ?in_function env sexp ty_expected = let (obj_ty, res_ty) = filter_arrow env method_type "" in unify env obj_ty desc.val_type; unify env res_ty (instance env typ); - let exp = - Texp_apply({exp_desc = + let exp = + Texp_apply({exp_desc = Texp_ident(Path.Pident method_id, lid, {val_type = method_type; val_kind = Val_reg; @@ -2050,11 +2050,11 @@ and type_expect ?in_function env sexp ty_expected = exp_type = desc.val_type; exp_env = env}, Required]) - in + in (Tmeth_name met, Some (re {exp_desc = exp; - exp_loc = loc; exp_extra = []; - exp_type = typ; - exp_env = env}), typ) + exp_loc = loc; exp_extra = []; + exp_type = typ; + exp_env = env}), typ) | _ -> assert false end @@ -3211,4 +3211,3 @@ let report_error ppf = function let () = Env.add_delayed_check_forward := add_delayed_check - diff --git a/typing/typedecl.ml b/typing/typedecl.ml index 37ff396a..79225278 100644 --- a/typing/typedecl.ml +++ b/typing/typedecl.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: typedecl.ml 12609 2012-06-14 10:47:30Z garrigue $ *) +(* $Id: typedecl.ml 12800 2012-07-30 18:59:07Z doligez $ *) (**** Typing of type definitions ****) @@ -129,8 +129,8 @@ let make_params sdecl = try List.map (function - None -> Ctype.new_global_var ~name:"_" () - | Some x -> enter_type_variable true sdecl.ptype_loc x.txt) + None -> Ctype.new_global_var ~name:"_" () + | Some x -> enter_type_variable true sdecl.ptype_loc x.txt) sdecl.ptype_params with Already_bound -> raise(Error(sdecl.ptype_loc, Repeated_parameter)) @@ -158,21 +158,21 @@ let transl_declaration env (name, sdecl) id = all_constrs := StringSet.add name !all_constrs) cstrs; if List.length - (List.filter (fun (_, args, _, _) -> args <> []) cstrs) - > (Config.max_tag + 1) then + (List.filter (fun (_, args, _, _) -> args <> []) cstrs) + > (Config.max_tag + 1) then raise(Error(sdecl.ptype_loc, Too_many_constructors)); - let make_cstr (lid, args, ret_type, loc) = - let name = Ident.create lid.txt in - match ret_type with - | None -> - (name, lid, List.map (transl_simple_type env true) args, None, loc) - | Some sty -> + let make_cstr (lid, args, ret_type, loc) = + let name = Ident.create lid.txt in + match ret_type with + | None -> + (name, lid, List.map (transl_simple_type env true) args, None, loc) + | Some sty -> (* if it's a generalized constructor we must first narrow and then widen so as to not introduce any new constraints *) - let z = narrow () in - reset_type_variables (); - let args = List.map (transl_simple_type env false) args in - let ret_type = + let z = narrow () in + reset_type_variables (); + let args = List.map (transl_simple_type env false) args in + let ret_type = let cty = transl_simple_type env false sty in let ty = cty.ctyp_type in let p = Path.Pident id in @@ -181,12 +181,12 @@ let transl_declaration env (name, sdecl) id = | _ -> raise (Error (sty.ptyp_loc, Constraint_failed (ty, Ctype.newconstr p params))) - in - widen z; - (name, lid, args, Some ret_type, loc) - in + in + widen z; + (name, lid, args, Some ret_type, loc) + in let cstrs = List.map make_cstr cstrs in - Ttype_variant (List.map (fun (name, lid, ctys, _, loc) -> + Ttype_variant (List.map (fun (name, lid, ctys, _, loc) -> name, lid, ctys, loc ) cstrs), Type_variant (List.map (fun (name, name_loc, ctys, option, loc) -> @@ -277,10 +277,10 @@ let generalize_decl decl = () | Type_variant v -> List.iter - (fun (_, tyl, ret_type) -> - List.iter Ctype.generalize tyl; - may Ctype.generalize ret_type) - v + (fun (_, tyl, ret_type) -> + List.iter Ctype.generalize tyl; + may Ctype.generalize ret_type) + v | Type_record(r, rep) -> List.iter (fun (_, _, ty) -> Ctype.generalize ty) r end; @@ -329,20 +329,20 @@ let check_constraints env (_, sdecl) (_, decl) = (fun (name, tyl, ret_type) -> let (styl, sret_type) = try - let (_, sty, sret_type, _) = - List.find (fun (n,_,_,_) -> n.txt = Ident.name name) pl - in (sty, sret_type) + let (_, sty, sret_type, _) = + List.find (fun (n,_,_,_) -> n.txt = Ident.name name) pl + in (sty, sret_type) with Not_found -> assert false in List.iter2 (fun sty ty -> check_constraints_rec env sty.ptyp_loc visited ty) styl tyl; - match sret_type, ret_type with - | Some sr, Some r -> - check_constraints_rec env sr.ptyp_loc visited r - | _ -> - () ) - l + match sret_type, ret_type with + | Some sr, Some r -> + check_constraints_rec env sr.ptyp_loc visited r + | _ -> + () ) + l | Type_record (l, _) -> let rec find_pl = function Ptype_record pl -> pl @@ -941,8 +941,8 @@ let transl_with_constraint env id row_path orig_decl sdecl = let constraints = List.map (function (ty, ty', loc) -> try - let cty = transl_simple_type env false ty in - let cty' = transl_simple_type env false ty' in + let cty = transl_simple_type env false ty in + let cty' = transl_simple_type env false ty' in let ty = cty.ctyp_type in let ty' = cty'.ctyp_type in Ctype.unify env ty ty'; @@ -1122,7 +1122,7 @@ let report_error ppf = function begin match decl.type_kind, decl.type_manifest with | Type_variant tl, _ -> explain_unbound ppf ty tl (fun (_,tl,_) -> - Btype.newgenty (Ttuple tl)) + Btype.newgenty (Ttuple tl)) "case" (fun (lab,_,_) -> Ident.name lab ^ " of ") | Type_record (tl, _), _ -> explain_unbound ppf ty tl (fun (_,_,t) -> t) diff --git a/typing/typemod.ml b/typing/typemod.ml index fc347e16..5643968d 100644 --- a/typing/typemod.ml +++ b/typing/typemod.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: typemod.ml 12755 2012-07-21 01:19:45Z garrigue $ *) +(* $Id: typemod.ml 12800 2012-07-30 18:59:07Z doligez $ *) open Misc open Longident @@ -136,7 +136,7 @@ let merge_constraint initial_env loc sg lid constr = List.map (fun (c,n) -> (not n, not c, not c)) sdecl.ptype_variance; type_loc = Location.none; - type_newtype_level = None } + type_newtype_level = None } and id_row = Ident.create (s^"#row") in let initial_env = Env.add_type id_row decl_row initial_env in let tdecl = Typedecl.transl_with_constraint @@ -446,7 +446,7 @@ and transl_signature env sg = match sg with [] -> [], [], env | item :: srem -> - let loc = item.psig_loc in + let loc = item.psig_loc in match item.psig_desc with | Psig_value(name, sdesc) -> let tdesc = Typedecl.transl_value_decl env item.psig_loc sdesc in @@ -533,9 +533,9 @@ and transl_signature env sg = mksig (Tsig_class (List.map2 (fun pcl tcl -> - let (_, _, _, _, _, _, _, _, _, _, _, tcl) = tcl in + let (_, _, _, _, _, _, _, _, _, _, _, tcl) = tcl in tcl) - cl classes)) env loc + cl classes)) env loc :: trem, List.flatten (map_rec @@ -554,9 +554,9 @@ and transl_signature env sg = let (classes, newenv) = Typeclass.class_type_declarations env cl in let (trem,rem, final_env) = transl_sig newenv srem in mksig (Tsig_class_type (List.map2 (fun pcl tcl -> - let (_, _, _, _, _, _, _, tcl) = tcl in - tcl - ) cl classes)) env loc :: trem, + let (_, _, _, _, _, _, _, tcl) = tcl in + tcl + ) cl classes)) env loc :: trem, List.flatten (map_rec (fun rs (i, _, d, i', d', i'', d'', _) -> @@ -925,13 +925,13 @@ and type_structure ?(toplevel = false) funct_body anchor env sstr scope = [] -> ([], [], env) | pstr :: srem -> - let loc = pstr.pstr_loc in - match pstr.pstr_desc with - | Pstr_eval sexpr -> - let expr = Typecore.type_expression env sexpr in - let (str_rem, sig_rem, final_env) = type_struct env srem in - (mkstr (Tstr_eval expr) loc :: str_rem, sig_rem, final_env) - | Pstr_value(rec_flag, sdefs) -> + let loc = pstr.pstr_loc in + match pstr.pstr_desc with + | Pstr_eval sexpr -> + let expr = Typecore.type_expression env sexpr in + let (str_rem, sig_rem, final_env) = type_struct env srem in + (mkstr (Tstr_eval expr) loc :: str_rem, sig_rem, final_env) + | Pstr_value(rec_flag, sdefs) -> let scope = match rec_flag with | Recursive -> Some (Annot.Idef {scope with @@ -1034,9 +1034,9 @@ and type_structure ?(toplevel = false) funct_body anchor env sstr scope = Sig_modtype(id, Modtype_manifest mty.mty_type) :: sig_rem, final_env) | Pstr_open (lid) -> - let (path, newenv) = type_open ~toplevel env loc lid in - let (str_rem, sig_rem, final_env) = type_struct newenv srem in - (mkstr (Tstr_open (path, lid)) loc :: str_rem, sig_rem, final_env) + let (path, newenv) = type_open ~toplevel env loc lid in + let (str_rem, sig_rem, final_env) = type_struct newenv srem in + (mkstr (Tstr_open (path, lid)) loc :: str_rem, sig_rem, final_env) | Pstr_class cl -> List.iter (fun {pci_name = name} -> check "type" loc type_names name.txt) diff --git a/typing/types.mli b/typing/types.mli index aff39eb3..1bd46ada 100644 --- a/typing/types.mli +++ b/typing/types.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: types.mli 12511 2012-05-30 13:29:48Z lefessan $ *) +(* $Id: types.mli 12800 2012-07-30 18:59:07Z doligez $ *) (* Representation of types and declarations *) @@ -109,7 +109,7 @@ type constructor_description = cstr_args: type_expr list; (* Type of the arguments *) cstr_arity: int; (* Number of arguments *) cstr_tag: constructor_tag; (* Tag for heap blocks *) - cstr_consts: int; (* Number of constant constructors *) + cstr_consts: int; (* Number of constant constructors *) cstr_nonconsts: int; (* Number of non-const constructors *) cstr_normal: int; (* Number of non generalized constrs *) cstr_generalized: bool; (* Constrained return type? *) diff --git a/typing/typetexp.ml b/typing/typetexp.ml index 5f9c6caf..aa8b7c6a 100644 --- a/typing/typetexp.ml +++ b/typing/typetexp.ml @@ -263,21 +263,21 @@ let rec transl_type env policy styp = with Unify trace -> raise (Error(styp.ptyp_loc, Type_mismatch trace)) end; - ctyp (Ttyp_constr (path, lid, args)) constr env loc + ctyp (Ttyp_constr (path, lid, args)) constr env loc | Ptyp_object fields -> let fields = List.map (fun pf -> - let desc = - match pf.pfield_desc with - | Pfield_var -> Tcfield_var - | Pfield (s,e) -> - let ty1 = transl_type env policy e in - Tcfield (s, ty1) - in - { field_desc = desc; field_loc = pf.pfield_loc }) - fields in + let desc = + match pf.pfield_desc with + | Pfield_var -> Tcfield_var + | Pfield (s,e) -> + let ty1 = transl_type env policy e in + Tcfield (s, ty1) + in + { field_desc = desc; field_loc = pf.pfield_loc }) + fields in let ty = newobj (transl_fields env policy [] fields) in - ctyp (Ttyp_object fields) ty env loc + ctyp (Ttyp_object fields) ty env loc | Ptyp_class(lid, stl, present) -> let (path, decl, is_variant) = try @@ -317,7 +317,7 @@ let rec transl_type env policy styp = try unify_var env ty' cty.ctyp_type with Unify trace -> raise (Error(sty.ptyp_loc, Type_mismatch (swap_list trace)))) (List.combine stl args) params; - let ty_args = List.map (fun ctyp -> ctyp.ctyp_type) args in + let ty_args = List.map (fun ctyp -> ctyp.ctyp_type) args in let ty = try Ctype.expand_head env (newconstr path ty_args) with Unify trace -> @@ -359,7 +359,7 @@ let rec transl_type env policy styp = | _ -> assert false in - ctyp (Ttyp_class (path, lid, args, present)) ty env loc + ctyp (Ttyp_class (path, lid, args, present)) ty env loc | Ptyp_alias(st, alias) -> let cty = try @@ -423,20 +423,20 @@ let rec transl_type env policy styp = let tl = List.map (transl_type env policy) stl in let f = match present with Some present when not (List.mem l present) -> - let ty_tl = List.map (fun cty -> cty.ctyp_type) tl in + let ty_tl = List.map (fun cty -> cty.ctyp_type) tl in Reither(c, ty_tl, false, ref None) | _ -> if List.length stl > 1 || c && stl <> [] then raise(Error(styp.ptyp_loc, Present_has_conjunction l)); match tl with [] -> Rpresent None | st :: _ -> - Rpresent (Some st.ctyp_type) + Rpresent (Some st.ctyp_type) in add_typed_field styp.ptyp_loc l f; - Ttag (l,c,tl) + Ttag (l,c,tl) | Rinherit sty -> let cty = transl_type env policy sty in - let ty = cty.ctyp_type in + let ty = cty.ctyp_type in let nm = match repr cty.ctyp_type with {desc=Tconstr(p, tl, _)} -> Some(p, tl) @@ -475,7 +475,7 @@ let rec transl_type env policy styp = in add_typed_field sty.ptyp_loc l f) fl; - Tinherit cty + Tinherit cty in let tfields = List.map add_field fields in let fields = Hashtbl.fold (fun _ p l -> p :: l) hfields [] in @@ -531,19 +531,19 @@ let rec transl_type env policy styp = let mty = !transl_modtype env mty in widen z; let ptys = List.map (fun (s, pty) -> - s, transl_type env policy pty - ) l in + s, transl_type env policy pty + ) l in let path = !transl_modtype_longident styp.ptyp_loc env p.txt in let ty = newty (Tpackage (path, List.map (fun (s, pty) -> s.txt) l, List.map (fun (_,cty) -> cty.ctyp_type) ptys)) in - ctyp (Ttyp_package { - pack_name = path; - pack_type = mty.mty_type; - pack_fields = ptys; + ctyp (Ttyp_package { + pack_name = path; + pack_type = mty.mty_type; + pack_fields = ptys; pack_txt = p; - }) ty env loc + }) ty env loc and transl_fields env policy seen = function @@ -641,7 +641,7 @@ let transl_simple_type_univars env styp = in make_fixed_univars typ.ctyp_type; { typ with ctyp_type = - instance env (Btype.newgenty (Tpoly (typ.ctyp_type, univs))) } + instance env (Btype.newgenty (Tpoly (typ.ctyp_type, univs))) } let transl_simple_type_delayed env styp = univars := []; used_variables := Tbl.empty; diff --git a/utils/clflags.mli b/utils/clflags.mli index fb0cddf1..e717bc1a 100644 --- a/utils/clflags.mli +++ b/utils/clflags.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: clflags.mli 12511 2012-05-30 13:29:48Z lefessan $ *) +(* $Id: clflags.mli 12800 2012-07-30 18:59:07Z doligez $ *) val objfiles : string list ref val ccobjs : string list ref @@ -81,4 +81,3 @@ val std_include_dir : unit -> string list val shared : bool ref val dlcode : bool ref val runtime_variant : string ref - diff --git a/utils/misc.ml b/utils/misc.ml index dda9909f..f2adc957 100644 --- a/utils/misc.ml +++ b/utils/misc.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: misc.ml 12511 2012-05-30 13:29:48Z lefessan $ *) +(* $Id: misc.ml 12800 2012-07-30 18:59:07Z doligez $ *) (* Errors *) @@ -224,4 +224,3 @@ let thd3 (_,_,x) = x let fst4 (x, _, _, _) = x let snd4 (_,x,_, _) = x let thd4 (_,_,x,_) = x - diff --git a/yacc/main.c b/yacc/main.c index d36205fb..035b3b3a 100644 --- a/yacc/main.c +++ b/yacc/main.c @@ -12,7 +12,7 @@ /* Based on public-domain code from Berkeley Yacc */ -/* $Id: main.c 11156 2011-07-27 14:17:02Z doligez $ */ +/* $Id: main.c 12800 2012-07-30 18:59:07Z doligez $ */ #include #include @@ -331,7 +331,7 @@ void create_file_names(void) if (action_fd == -1) open_error(action_file_name); entry_fd = mkstemp(entry_file_name); - if (entry_fd == -1) + if (entry_fd == -1) open_error(entry_file_name); text_fd = mkstemp(text_file_name); if (text_fd == -1) diff --git a/yacc/skeleton.c b/yacc/skeleton.c index 5d4b0834..6a957bb0 100644 --- a/yacc/skeleton.c +++ b/yacc/skeleton.c @@ -12,13 +12,14 @@ /* Based on public-domain code from Berkeley Yacc */ -/* $Id: skeleton.c 11156 2011-07-27 14:17:02Z doligez $ */ +/* $Id: skeleton.c 12834 2012-08-06 14:16:24Z doligez $ */ #include "defs.h" char *header[] = { "open Parsing;;", + "let _ = parse_error;;", /* avoid warning 33 (PR#5719) */ 0 }; -- 2.30.2