From: Stephane Glondu Date: Mon, 28 Dec 2009 15:11:12 +0000 (+0100) Subject: Imported Upstream version 3.11.2~rc1 X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~3^2~63^2~24 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c014d03a2b3a4cbba4b7b876037b540c820a1d4f;p=ocaml.git Imported Upstream version 3.11.2~rc1 --- diff --git a/Changes b/Changes index 336cf397..ac97c784 100644 --- a/Changes +++ b/Changes @@ -1,3 +1,47 @@ +Objective Caml 3.11.2: +---------------------- + +Bug fixes: +- PR#4151: better documentation for min and max w.r.t. NaN +- PR#4421: ocamlbuild uses wrong compiler for C files +- PR#4710, PR#4720: ocamlbuild does not use properly configuration information +- PR#4750: under some Windows installations, high start-up times for Unix lib +- PR#4777: problem with scanf and CRLF +- PR#4810: BSD problem with socket addresses, e.g. in Unix.getnameinfo +- PR#4813: issue with parsing of float literals by the GNU assembler +- PR#4816: problem with modules and private types +- PR#4818: missed opportunity for type-based optimization of bigarray accesses +- PR#4821: check for duplicate method names in classes +- PR#4823: build problem on Mac OS X +- PR#4836: spurious errors raised by Unix.single_write under Windows +- PR#4841, PR#4860, PR#4930: problem with ocamlopt -output-obj under Mac OS X +- PR#4847: C compiler error with ocamlc -output-obj under Win64 +- PR#4856: ocamlbuild uses ocamlrun to execute a native plugin +- PR#4867, PR#4760: ocamlopt -shared fails on Mac OS X 64bit +- PR#4873: ocamlbuild ignores "thread" tag when building a custom toplevel +- PR#4890: ocamlbuild tries to use native plugin on bytecode-only arch +- PR#4896: ocamlbuild should always pass -I to tools for external libraries +- PR#4900: small bug triggering automatic compaction even if max_overhead = 1M +- PR#4902: bug in %.0F printf format +- PR#4910: problem with format concatenation +- PR#4922: ocamlbuild recompiles too many files +- PR#4923: missing \xff for scanf %S +- PR#4933: functors not handling private types correctly +- Module Printf: the simple conversion %F (without width indication) was not + treated properly. +- Makefile: problem with cygwin, flexdll, and symbolic links + +Feature wishes: +- PR#9: (tentative implementation) make ocamldebug use #linenum annotations +- PR#123, PR#4477: custom exception printers +- PR#3456: Obj.double_field and Obj.set_double_field functions +- PR#4003: destination directory can be given to Filename.[open_]temp_file +- PR#4647: Buffer.blit function +- PR#4685: access to Filename.dir_sep +- PR#4703: support for debugging embedded applications +- PR#4723: "clear_rules" function to empty the set of ocamlbuild rules +- PR#4921: configure option to help cross-compilers + Objective Caml 3.11.1: ---------------------- @@ -53,6 +97,7 @@ Other changes: (contributed by Jonathan Davies, Citrix). - Support for 64-bit mode in Solaris/x86 (PR#4670). + Objective Caml 3.11.0: ---------------------- @@ -201,6 +246,7 @@ Bug fixes: - Small bugs in the make-package-macosx script - Bug in typing of polymorphic variants (reported on caml-list) + Objective Caml 3.10.1: ---------------------- @@ -2442,4 +2488,4 @@ Caml Special Light 1.06: * First public release. -$Id: Changes,v 1.183.2.18 2009/06/12 11:58:19 doligez Exp $ +$Id: Changes 9482 2009-12-22 13:32:12Z doligez $ diff --git a/INSTALL b/INSTALL index cdb3436f..ad24f4af 100644 --- a/INSTALL +++ b/INSTALL @@ -109,7 +109,7 @@ The "configure" script accepts the following options: -as (default: determined automatically) The assembler to use for assembling ocamlopt-generated code. --aspp (default: determined automatically> +-aspp (default: determined automatically) The assembler to use for assembling the parts of the run-time system manually written in assembly language. This assembler must preprocess its input with the C preprocessor. @@ -126,10 +126,13 @@ Examples: Installation in /usr, man pages in section "l": ./configure -bindir /usr/bin -libdir /usr/lib/ocaml -mandir /usr/man/manl - On a MacOSX/Intel Core 2 or MacOSX/PowerPC host, to build a 64-bit version - of OCaml: + On a MacOSX 10.5/Intel Core 2 or MacOSX 10.5/PowerPC host, + to build a 64-bit version of OCaml: ./configure -cc "gcc -m64" + On a MacOSX 10.6/Intel Core 2, to build a 32-bit version of OCaml: + ./configure -cc "gcc -m32" -as "as -arch i386" -aspp "gcc -m32 -c" + On a Linux x86/64 bits host, to build a 32-bit version of OCaml: ./configure -cc "gcc -m32" -as "as --32" -aspp "gcc -m32 -c" @@ -188,9 +191,9 @@ or: make opt > log.opt 2>&1 # in sh make opt >& log.opt # in csh -5- (Optional) If you want to compile fast versions of the Objective -Caml compilers, you can compile them with the native-code compiler -(they are compiled to bytecode by default). Just do: +5- Compile fast versions of the Objective Caml compilers, by +compiling them with the native-code compiler (you have only compiled +them to bytecode so far). Just do: make opt.opt diff --git a/Makefile b/Makefile index c33a2686..80c68242 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ # # ######################################################################### -# $Id: Makefile,v 1.222.2.3 2009/05/19 14:46:13 doligez Exp $ +# $Id: Makefile 9480 2009-12-18 23:04:13Z doligez $ # The main Makefile @@ -567,10 +567,11 @@ alldepend:: # The runtime system for the native-code compiler -runtimeopt: +runtimeopt: makeruntimeopt + cp asmrun/libasmrun.a stdlib/libasmrun.a + +makeruntimeopt: cd asmrun; $(MAKE) all - if test -f stdlib/libasmrun.a; then :; else \ - ln -s ../asmrun/libasmrun.a stdlib/libasmrun.a; fi clean:: cd asmrun; $(MAKE) clean @@ -762,6 +763,6 @@ distclean: .PHONY: ocamldoc.opt ocamllex ocamllex.opt ocamltools ocamltools.opt .PHONY: ocamlyacc opt-core opt opt.opt otherlibraries .PHONY: otherlibrariesopt package-macosx promote promote-cross -.PHONY: restore runtime runtimeopt world world.opt +.PHONY: restore runtime runtimeopt makeruntimeopt world world.opt include .depend diff --git a/Makefile.nt b/Makefile.nt index 4a605139..a157fbf1 100644 --- a/Makefile.nt +++ b/Makefile.nt @@ -10,7 +10,7 @@ # # ######################################################################### -# $Id: Makefile.nt,v 1.113.2.1 2008/11/10 16:13:20 ertai Exp $ +# $Id: Makefile.nt 9127 2008-11-10 16:13:20Z ertai $ # The main Makefile diff --git a/README b/README index aa54cbea..5252ab87 100644 --- a/README +++ b/README @@ -135,4 +135,4 @@ You can also contact the implementors directly at caml@inria.fr. ---- -$Id: README,v 1.44.14.1 2008/12/02 17:11:22 xleroy Exp $ +$Id: README 9146 2008-12-02 17:11:22Z xleroy $ diff --git a/VERSION b/VERSION index 24c85956..7798db3f 100644 --- a/VERSION +++ b/VERSION @@ -1,6 +1,6 @@ -3.11.1 +3.11.2+rc1 # The version string is the first line of this file. # It must be in the format described in stdlib/sys.mli -# $Id: VERSION,v 1.26.2.19 2009/06/12 11:58:19 doligez Exp $ +# $Id: VERSION 9500 2009-12-28 13:13:23Z doligez $ diff --git a/_tags b/_tags index 37ba928e..bb10f436 100644 --- a/_tags +++ b/_tags @@ -55,6 +55,7 @@ true: use_stdlib or : ocamlmklib : ocamlmklib : ocamlmklib +"otherlibs/threads/unix.cma": ocamlmklib : ocamlmklib : include_unix @@ -70,6 +71,7 @@ true: use_stdlib : otherlibs_bigarray : otherlibs_num : otherlibs_threads +"otherlibs/threads/unix.cma": -otherlibs_threads : otherlibs_systhreads : otherlibs_dbm : otherlibs_graph diff --git a/asmcomp/alpha/arch.ml b/asmcomp/alpha/arch.ml index 46eae60d..773397c1 100644 --- a/asmcomp/alpha/arch.ml +++ b/asmcomp/alpha/arch.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: arch.ml,v 1.10 2002/11/29 15:03:36 xleroy Exp $ *) +(* $Id: arch.ml 5304 2002-11-29 15:03:37Z xleroy $ *) (* Specific operations for the Alpha processor *) diff --git a/asmcomp/alpha/emit.mlp b/asmcomp/alpha/emit.mlp index 3ef5cd45..aa6003ac 100644 --- a/asmcomp/alpha/emit.mlp +++ b/asmcomp/alpha/emit.mlp @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: emit.mlp,v 1.42 2006/04/16 23:28:14 doligez Exp $ *) +(* $Id: emit.mlp 9314 2009-07-15 12:14:39Z xleroy $ *) module LabelSet = Set.Make(struct type t = Linearize.label let compare = compare end) @@ -793,9 +793,9 @@ let emit_item = function long decimal constants *) ` .quad 0x{emit_string(Nativeint.format "%x" n)}\n` | Csingle f -> - ` .float {emit_string f}\n` + emit_float32_directive ".long" f | Cdouble f -> - ` .double {emit_string f}\n` + emit_float64_directive ".quad" f | Csymbol_address s -> ` .quad {emit_symbol s}\n` | Clabel_address lbl -> diff --git a/asmcomp/alpha/proc.ml b/asmcomp/alpha/proc.ml index 2688b146..9d894358 100644 --- a/asmcomp/alpha/proc.ml +++ b/asmcomp/alpha/proc.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: proc.ml,v 1.7 2007/10/30 12:37:16 xleroy Exp $ *) +(* $Id: proc.ml 8462 2007-10-30 12:37:16Z xleroy $ *) (* Description of the Alpha processor *) diff --git a/asmcomp/alpha/reload.ml b/asmcomp/alpha/reload.ml index 17f0a371..e95a9909 100644 --- a/asmcomp/alpha/reload.ml +++ b/asmcomp/alpha/reload.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: reload.ml,v 1.3 1999/11/17 18:56:40 xleroy Exp $ *) +(* $Id: reload.ml 2553 1999-11-17 18:59:06Z xleroy $ *) (* Reloading for the Alpha *) diff --git a/asmcomp/alpha/scheduling.ml b/asmcomp/alpha/scheduling.ml index 47a6b92d..3f6ca8af 100644 --- a/asmcomp/alpha/scheduling.ml +++ b/asmcomp/alpha/scheduling.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: scheduling.ml,v 1.6 1999/11/17 18:56:40 xleroy Exp $ *) +(* $Id: scheduling.ml 2553 1999-11-17 18:59:06Z xleroy $ *) open Arch open Mach diff --git a/asmcomp/alpha/selection.ml b/asmcomp/alpha/selection.ml index 530c2f20..22a0ab45 100644 --- a/asmcomp/alpha/selection.ml +++ b/asmcomp/alpha/selection.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: selection.ml,v 1.12 2001/07/24 08:01:25 xleroy Exp $ *) +(* $Id: selection.ml 3593 2001-07-24 08:01:25Z xleroy $ *) (* Instruction selection for the Alpha processor *) diff --git a/asmcomp/amd64/arch.ml b/asmcomp/amd64/arch.ml index b0b5534e..fe52e54d 100644 --- a/asmcomp/amd64/arch.ml +++ b/asmcomp/amd64/arch.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: arch.ml,v 1.3 2007/01/01 13:07:35 xleroy Exp $ *) +(* $Id: arch.ml 7784 2007-01-01 13:07:35Z xleroy $ *) (* Machine-specific command-line options *) diff --git a/asmcomp/amd64/emit.mlp b/asmcomp/amd64/emit.mlp index a5b4643f..4a3f8448 100644 --- a/asmcomp/amd64/emit.mlp +++ b/asmcomp/amd64/emit.mlp @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: emit.mlp,v 1.16.2.4 2009/03/28 15:10:04 xleroy Exp $ *) +(* $Id: emit.mlp 9475 2009-12-16 10:04:38Z xleroy $ *) (* Emission of x86-64 (AMD 64) assembly code *) @@ -576,33 +576,26 @@ let emit_instr fallthrough i = end | Lswitch jumptbl -> let lbl = new_label() in - if !pic_code || !Clflags.dlcode then begin - (* PR#4424: r11 is known to be clobbered by the Lswitch, - meaning that no variable that is live across the Lswitch - is assigned to r11. However, the argument to Lswitch - can still be assigned to r11, so we need to special-case - this situation. *) - if i.arg.(0).loc = Reg 9 (* ie r11, cf amd64/proc.ml *) then begin - ` salq $3, %r11\n`; - ` pushq %r11\n`; - ` leaq {emit_label lbl}(%rip), %r11\n`; - ` addq 0(%rsp), %r11\n`; - ` addq $8, %rsp\n`; - ` jmp *(%r11)\n` - end else begin - ` leaq {emit_label lbl}(%rip), %r11\n`; - ` jmp *(%r11, {emit_reg i.arg.(0)}, 8)\n` - end - end else begin - ` jmp *{emit_label lbl}(, {emit_reg i.arg.(0)}, 8)\n` - end; + (* rax and rdx are clobbered by the Lswitch, + meaning that no variable that is live across the Lswitch + is assigned to rax or rdx. However, the argument to Lswitch + can still be assigned to one of these two registers, so + we must be careful not to clobber it before use. *) + let (tmp1, tmp2) = + if i.arg.(0).loc = Reg 0 (* rax *) + then (phys_reg 4 (*rdx*), phys_reg 0 (*rax*)) + else (phys_reg 0 (*rax*), phys_reg 4 (*rdx*)) in + ` leaq {emit_label lbl}(%rip), {emit_reg tmp1}\n`; + ` movslq ({emit_reg tmp1}, {emit_reg i.arg.(0)}, 4), {emit_reg tmp2}\n`; + ` addq {emit_reg tmp2}, {emit_reg tmp1}\n`; + ` jmp *{emit_reg tmp1}\n`; if macosx then ` .const\n` else ` .section .rodata\n`; - emit_align 8; + emit_align 4; `{emit_label lbl}:`; for i = 0 to Array.length jumptbl - 1 do - ` .quad {emit_label jumptbl.(i)}\n` + ` .long {emit_label jumptbl.(i)} - {emit_label lbl}\n` done; ` .text\n` | Lsetuptrap lbl -> @@ -635,7 +628,8 @@ let rec emit_all fallthrough i = (* Emission of the floating-point constants *) let emit_float_constant (lbl, cst) = - `{emit_label lbl}: .double {emit_string cst}\n` + `{emit_label lbl}:`; + emit_float64_directive ".quad" cst (* Emission of the profiling prelude *) @@ -668,7 +662,9 @@ let fundecl fundecl = bound_error_call := 0; ` .text\n`; emit_align 16; - if macosx && is_generic_function fundecl.fun_name + if macosx + && not !Clflags.output_c_object + && is_generic_function fundecl.fun_name then (* PR#4690 *) ` .private_extern {emit_symbol fundecl.fun_name}\n` else @@ -713,9 +709,9 @@ let emit_item = function | Cint n -> ` .quad {emit_nativeint n}\n` | Csingle f -> - ` .float {emit_string f}\n` + emit_float32_directive ".long" f | Cdouble f -> - ` .double {emit_string f}\n` + emit_float64_directive ".quad" f | Csymbol_address s -> ` .quad {emit_symbol s}\n` | Clabel_address lbl -> diff --git a/asmcomp/amd64/emit_nt.mlp b/asmcomp/amd64/emit_nt.mlp index cbe7f122..d1a06e6a 100644 --- a/asmcomp/amd64/emit_nt.mlp +++ b/asmcomp/amd64/emit_nt.mlp @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: emit_nt.mlp,v 1.7 2008/01/11 16:13:11 doligez Exp $ *) +(* $Id: emit_nt.mlp 8768 2008-01-11 16:13:18Z doligez $ *) (* Emission of x86-64 (AMD 64) assembly code, MASM syntax *) diff --git a/asmcomp/amd64/proc.ml b/asmcomp/amd64/proc.ml index d6766eee..35f938e4 100644 --- a/asmcomp/amd64/proc.ml +++ b/asmcomp/amd64/proc.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: proc.ml,v 1.5.4.1 2009/03/28 15:52:13 xleroy Exp $ *) +(* $Id: proc.ml 9342 2009-09-18 13:49:21Z xleroy $ *) (* Description of the AMD64 processor *) @@ -92,7 +92,6 @@ let phys_reg n = let rax = phys_reg 0 let rcx = phys_reg 5 let rdx = phys_reg 4 -let r11 = phys_reg 9 let rxmm15 = phys_reg 115 let stack_slot slot ty = @@ -170,7 +169,7 @@ let destroyed_at_oper = function | Iop(Istore(Single, _)) -> [| rxmm15 |] | Iop(Ialloc _ | Iintop(Icomp _) | Iintop_imm((Idiv|Imod|Icomp _), _)) -> [| rax |] - | Iswitch(_, _) when !pic_code || !Clflags.dlcode -> [| r11 |] + | Iswitch(_, _) -> [| rax; rdx |] | _ -> [||] let destroyed_at_raise = all_phys_regs diff --git a/asmcomp/amd64/proc_nt.ml b/asmcomp/amd64/proc_nt.ml index a8be92d7..3379b167 100644 --- a/asmcomp/amd64/proc_nt.ml +++ b/asmcomp/amd64/proc_nt.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: proc_nt.ml,v 1.4 2007/10/30 12:37:16 xleroy Exp $ *) +(* $Id: proc_nt.ml 8462 2007-10-30 12:37:16Z xleroy $ *) (* Description of the AMD64 processor with Win64 conventions *) diff --git a/asmcomp/amd64/reload.ml b/asmcomp/amd64/reload.ml index dc8222a6..2f742b90 100644 --- a/asmcomp/amd64/reload.ml +++ b/asmcomp/amd64/reload.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: reload.ml,v 1.6 2007/11/06 15:16:55 frisch Exp $ *) +(* $Id: reload.ml 8477 2007-11-06 15:16:56Z frisch $ *) open Cmm open Arch diff --git a/asmcomp/amd64/scheduling.ml b/asmcomp/amd64/scheduling.ml index 972c47c2..aeecf9e3 100644 --- a/asmcomp/amd64/scheduling.ml +++ b/asmcomp/amd64/scheduling.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: scheduling.ml,v 1.1 2003/06/30 08:28:44 xleroy Exp $ *) +(* $Id: scheduling.ml 5634 2003-06-30 08:28:48Z xleroy $ *) open Schedgen (* to create a dependency *) diff --git a/asmcomp/amd64/selection.ml b/asmcomp/amd64/selection.ml index 0d5acf84..143f7eba 100644 --- a/asmcomp/amd64/selection.ml +++ b/asmcomp/amd64/selection.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: selection.ml,v 1.7.4.1 2008/10/29 14:32:01 xleroy Exp $ *) +(* $Id: selection.ml 9114 2008-10-29 14:32:01Z xleroy $ *) (* Instruction selection for the AMD64 *) diff --git a/asmcomp/arm/arch.ml b/asmcomp/arm/arch.ml index a2b0027e..998fa4bb 100644 --- a/asmcomp/arm/arch.ml +++ b/asmcomp/arm/arch.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: arch.ml,v 1.9 2002/11/29 15:03:36 xleroy Exp $ *) +(* $Id: arch.ml 5304 2002-11-29 15:03:37Z xleroy $ *) (* Specific operations for the ARM processor *) diff --git a/asmcomp/arm/emit.mlp b/asmcomp/arm/emit.mlp index 73f5a38e..0f5255ad 100644 --- a/asmcomp/arm/emit.mlp +++ b/asmcomp/arm/emit.mlp @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: emit.mlp,v 1.19 2008/01/11 16:13:11 doligez Exp $ *) +(* $Id: emit.mlp 9314 2009-07-15 12:14:39Z xleroy $ *) (* Emission of ARM assembly code *) @@ -625,6 +625,9 @@ let emit_item = function | Csingle f -> ` .float {emit_string f}\n` | Cdouble f -> + (* FIXME: this version of the ARM port is mixed-endian, so we + use .double instead of emit_float64_directive. The next + version is little-endian, so we'll use emit_float64 then. *) ` .align 0\n`; ` .double {emit_string f}\n` | Csymbol_address s -> diff --git a/asmcomp/arm/proc.ml b/asmcomp/arm/proc.ml index 942a3a6e..ae0f4c12 100644 --- a/asmcomp/arm/proc.ml +++ b/asmcomp/arm/proc.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: proc.ml,v 1.9 2007/10/30 12:37:16 xleroy Exp $ *) +(* $Id: proc.ml 8462 2007-10-30 12:37:16Z xleroy $ *) (* Description of the ARM processor *) diff --git a/asmcomp/arm/reload.ml b/asmcomp/arm/reload.ml index 0ec090d1..09174387 100644 --- a/asmcomp/arm/reload.ml +++ b/asmcomp/arm/reload.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: reload.ml,v 1.4 1999/11/17 18:56:41 xleroy Exp $ *) +(* $Id: reload.ml 2553 1999-11-17 18:59:06Z xleroy $ *) (* Reloading for the ARM *) diff --git a/asmcomp/arm/scheduling.ml b/asmcomp/arm/scheduling.ml index 533a2175..930e1bc2 100644 --- a/asmcomp/arm/scheduling.ml +++ b/asmcomp/arm/scheduling.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: scheduling.ml,v 1.4 1999/11/17 18:56:41 xleroy Exp $ *) +(* $Id: scheduling.ml 2553 1999-11-17 18:59:06Z xleroy $ *) open Mach diff --git a/asmcomp/arm/selection.ml b/asmcomp/arm/selection.ml index 40c100a0..929f0347 100644 --- a/asmcomp/arm/selection.ml +++ b/asmcomp/arm/selection.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: selection.ml,v 1.7 2008/01/11 16:13:11 doligez Exp $ *) +(* $Id: selection.ml 8768 2008-01-11 16:13:18Z doligez $ *) (* Instruction selection for the ARM processor *) diff --git a/asmcomp/asmgen.ml b/asmcomp/asmgen.ml index f240ecf2..0fa0d9fb 100644 --- a/asmcomp/asmgen.ml +++ b/asmcomp/asmgen.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: asmgen.ml,v 1.22 2008/07/24 05:35:22 frisch Exp $ *) +(* $Id: asmgen.ml 8930 2008-07-24 05:35:22Z frisch $ *) (* From lambda to assembly code *) diff --git a/asmcomp/asmgen.mli b/asmcomp/asmgen.mli index 788e3263..19a79c84 100644 --- a/asmcomp/asmgen.mli +++ b/asmcomp/asmgen.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: asmgen.mli,v 1.8 2007/11/06 15:16:55 frisch Exp $ *) +(* $Id: asmgen.mli 8477 2007-11-06 15:16:56Z frisch $ *) (* From lambda to assembly code *) diff --git a/asmcomp/asmlibrarian.ml b/asmcomp/asmlibrarian.ml index b2ff5624..68f8b2f0 100644 --- a/asmcomp/asmlibrarian.ml +++ b/asmcomp/asmlibrarian.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: asmlibrarian.ml,v 1.14 2005/09/24 16:45:56 xleroy Exp $ *) +(* $Id: asmlibrarian.ml 7079 2005-09-24 16:45:56Z xleroy $ *) (* Build libraries of .cmx files *) diff --git a/asmcomp/asmlibrarian.mli b/asmcomp/asmlibrarian.mli index 9b60488d..0224d89a 100644 --- a/asmcomp/asmlibrarian.mli +++ b/asmcomp/asmlibrarian.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: asmlibrarian.mli,v 1.6 2000/04/21 08:10:27 weis Exp $ *) +(* $Id: asmlibrarian.mli 3123 2000-04-21 08:13:22Z weis $ *) (* Build libraries of .cmx files *) diff --git a/asmcomp/asmlink.ml b/asmcomp/asmlink.ml index 8ec81f56..b4e2ab9c 100644 --- a/asmcomp/asmlink.ml +++ b/asmcomp/asmlink.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: asmlink.ml,v 1.78 2008/01/31 09:13:07 frisch Exp $ *) +(* $Id: asmlink.ml 9338 2009-09-16 14:03:37Z garrigue $ *) (* Link a set of .cmx/.o files and produce an executable *) @@ -259,6 +259,7 @@ let link_shared ppf objfiles output_name = (fun (info, file_name, crc) -> check_consistency file_name info crc) units_tolink; Clflags.ccobjs := !Clflags.ccobjs @ !lib_ccobjs; + Clflags.ccopts := !lib_ccopts @ !Clflags.ccopts; let objfiles = List.rev (List.map object_file_name objfiles) @ !Clflags.ccobjs in diff --git a/asmcomp/asmlink.mli b/asmcomp/asmlink.mli index 77a0544e..301e9203 100644 --- a/asmcomp/asmlink.mli +++ b/asmcomp/asmlink.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: asmlink.mli,v 1.12 2007/11/06 15:16:55 frisch Exp $ *) +(* $Id: asmlink.mli 8477 2007-11-06 15:16:56Z frisch $ *) (* Link a set of .cmx/.o files and produce an executable or a plugin *) diff --git a/asmcomp/asmpackager.ml b/asmcomp/asmpackager.ml index a4152d99..8be1521c 100644 --- a/asmcomp/asmpackager.ml +++ b/asmcomp/asmpackager.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: asmpackager.ml,v 1.26 2007/11/15 16:09:57 frisch Exp $ *) +(* $Id: asmpackager.ml 8523 2007-11-15 16:09:57Z frisch $ *) (* "Package" a set of .cmx/.o files into one .cmx/.o file having the original compilation units as sub-modules. *) diff --git a/asmcomp/asmpackager.mli b/asmcomp/asmpackager.mli index 1e4e11d7..9d47e851 100644 --- a/asmcomp/asmpackager.mli +++ b/asmcomp/asmpackager.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: asmpackager.mli,v 1.2 2005/08/01 15:51:09 xleroy Exp $ *) +(* $Id: asmpackager.mli 7003 2005-08-01 15:51:09Z xleroy $ *) (* "Package" a set of .cmx/.o files into one .cmx/.o file having the original compilation units as sub-modules. *) diff --git a/asmcomp/clambda.ml b/asmcomp/clambda.ml index 2d264d14..ec836be1 100644 --- a/asmcomp/clambda.ml +++ b/asmcomp/clambda.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: clambda.ml,v 1.17 2007/01/29 12:10:50 xleroy Exp $ *) +(* $Id: clambda.ml 7812 2007-01-29 12:11:18Z xleroy $ *) (* A variant of the "lambda" code with direct / indirect calls explicit and closures explicit too *) diff --git a/asmcomp/clambda.mli b/asmcomp/clambda.mli index 2f752501..82d35600 100644 --- a/asmcomp/clambda.mli +++ b/asmcomp/clambda.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: clambda.mli,v 1.17 2007/01/29 12:10:50 xleroy Exp $ *) +(* $Id: clambda.mli 7812 2007-01-29 12:11:18Z xleroy $ *) (* A variant of the "lambda" code with direct / indirect calls explicit and closures explicit too *) diff --git a/asmcomp/closure.ml b/asmcomp/closure.ml index 30405234..544772a6 100644 --- a/asmcomp/closure.ml +++ b/asmcomp/closure.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: closure.ml,v 1.55 2008/08/01 12:52:14 xleroy Exp $ *) +(* $Id: closure.ml 8966 2008-08-01 12:52:14Z xleroy $ *) (* Introduction of closures, uncurrying, recognition of direct calls *) diff --git a/asmcomp/closure.mli b/asmcomp/closure.mli index eac7ce39..f0decfcf 100644 --- a/asmcomp/closure.mli +++ b/asmcomp/closure.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: closure.mli,v 1.5 1999/11/17 18:56:30 xleroy Exp $ *) +(* $Id: closure.mli 2553 1999-11-17 18:59:06Z xleroy $ *) (* Introduction of closures, uncurrying, recognition of direct calls *) diff --git a/asmcomp/cmm.ml b/asmcomp/cmm.ml index 1caa179c..234da9fa 100644 --- a/asmcomp/cmm.ml +++ b/asmcomp/cmm.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: cmm.ml,v 1.21 2007/01/29 12:10:50 xleroy Exp $ *) +(* $Id: cmm.ml 7812 2007-01-29 12:11:18Z xleroy $ *) type machtype_component = Addr diff --git a/asmcomp/cmm.mli b/asmcomp/cmm.mli index b2d29b81..79b00697 100644 --- a/asmcomp/cmm.mli +++ b/asmcomp/cmm.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: cmm.mli,v 1.21 2007/01/29 12:10:50 xleroy Exp $ *) +(* $Id: cmm.mli 7812 2007-01-29 12:11:18Z xleroy $ *) (* Second intermediate language (machine independent) *) diff --git a/asmcomp/cmmgen.ml b/asmcomp/cmmgen.ml index 9cf8c956..f17bdd40 100644 --- a/asmcomp/cmmgen.ml +++ b/asmcomp/cmmgen.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: cmmgen.ml,v 1.114.2.1 2009/01/26 17:06:10 xleroy Exp $ *) +(* $Id: cmmgen.ml 9167 2009-01-26 17:06:10Z xleroy $ *) (* Translation from closed lambda to C-- *) diff --git a/asmcomp/cmmgen.mli b/asmcomp/cmmgen.mli index a1804f50..4f5efc20 100644 --- a/asmcomp/cmmgen.mli +++ b/asmcomp/cmmgen.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: cmmgen.mli,v 1.16 2008/01/31 09:13:08 frisch Exp $ *) +(* $Id: cmmgen.mli 8800 2008-01-31 09:13:19Z frisch $ *) (* Translation from closed lambda to C-- *) diff --git a/asmcomp/codegen.ml b/asmcomp/codegen.ml index c737884d..2d9d750d 100644 --- a/asmcomp/codegen.ml +++ b/asmcomp/codegen.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: codegen.ml,v 1.7 2000/04/21 08:10:29 weis Exp $ *) +(* $Id: codegen.ml 3123 2000-04-21 08:13:22Z weis $ *) (* From C-- to assembly code *) diff --git a/asmcomp/codegen.mli b/asmcomp/codegen.mli index 51189632..06378ab0 100644 --- a/asmcomp/codegen.mli +++ b/asmcomp/codegen.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: codegen.mli,v 1.4 1999/11/17 18:56:31 xleroy Exp $ *) +(* $Id: codegen.mli 2553 1999-11-17 18:59:06Z xleroy $ *) (* From C-- to assembly code *) diff --git a/asmcomp/coloring.ml b/asmcomp/coloring.ml index 98d92200..64b5ea5f 100644 --- a/asmcomp/coloring.ml +++ b/asmcomp/coloring.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: coloring.ml,v 1.13 2004/08/12 13:34:42 xleroy Exp $ *) +(* $Id: coloring.ml 6592 2004-08-12 13:34:42Z xleroy $ *) (* Register allocation by coloring of the interference graph *) diff --git a/asmcomp/coloring.mli b/asmcomp/coloring.mli index 729a1d62..c92fd41b 100644 --- a/asmcomp/coloring.mli +++ b/asmcomp/coloring.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: coloring.mli,v 1.4 1999/11/17 18:56:31 xleroy Exp $ *) +(* $Id: coloring.mli 2553 1999-11-17 18:59:06Z xleroy $ *) (* Register allocation by coloring of the interference graph *) diff --git a/asmcomp/comballoc.ml b/asmcomp/comballoc.ml index 5888f864..b62a1b05 100644 --- a/asmcomp/comballoc.ml +++ b/asmcomp/comballoc.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: comballoc.ml,v 1.4 2007/01/29 12:10:50 xleroy Exp $ *) +(* $Id: comballoc.ml 7812 2007-01-29 12:11:18Z xleroy $ *) (* Combine heap allocations occurring in the same basic block *) diff --git a/asmcomp/comballoc.mli b/asmcomp/comballoc.mli index d0ff57ff..d6d72f58 100644 --- a/asmcomp/comballoc.mli +++ b/asmcomp/comballoc.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: comballoc.mli,v 1.2 1999/11/17 18:56:32 xleroy Exp $ *) +(* $Id: comballoc.mli 2553 1999-11-17 18:59:06Z xleroy $ *) (* Combine heap allocations occurring in the same basic block *) diff --git a/asmcomp/compilenv.ml b/asmcomp/compilenv.ml index 35b327c7..64171f88 100644 --- a/asmcomp/compilenv.ml +++ b/asmcomp/compilenv.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: compilenv.ml,v 1.24 2007/11/06 15:16:55 frisch Exp $ *) +(* $Id: compilenv.ml 8477 2007-11-06 15:16:56Z frisch $ *) (* Compilation environments for compilation units *) diff --git a/asmcomp/compilenv.mli b/asmcomp/compilenv.mli index 5d47fc3d..5bf8b165 100644 --- a/asmcomp/compilenv.mli +++ b/asmcomp/compilenv.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: compilenv.mli,v 1.17 2007/11/06 15:16:55 frisch Exp $ *) +(* $Id: compilenv.mli 8477 2007-11-06 15:16:56Z frisch $ *) (* Compilation environments for compilation units *) diff --git a/asmcomp/emit.mli b/asmcomp/emit.mli index 20fc1dfd..57b0066f 100644 --- a/asmcomp/emit.mli +++ b/asmcomp/emit.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: emit.mli,v 1.5 1999/11/17 18:56:32 xleroy Exp $ *) +(* $Id: emit.mli 2553 1999-11-17 18:59:06Z xleroy $ *) (* Generation of assembly code *) diff --git a/asmcomp/emitaux.ml b/asmcomp/emitaux.ml index fe8279a3..0cae6ddb 100644 --- a/asmcomp/emitaux.ml +++ b/asmcomp/emitaux.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: emitaux.ml,v 1.12.12.1 2009/01/26 17:06:10 xleroy Exp $ *) +(* $Id: emitaux.ml 9314 2009-07-15 12:14:39Z xleroy $ *) (* Common functions for emitting assembly code *) @@ -93,6 +93,27 @@ let emit_bytes_directive directive s = done; if !pos > 0 then emit_char '\n' +(* PR#4813: assemblers do strange things with float literals indeed, + so we convert to IEEE representation ourselves and emit float + literals as 32- or 64-bit integers. *) + +let emit_float64_directive directive f = + let x = Int64.bits_of_float (float_of_string f) in + emit_printf "\t%s\t0x%Lx\n" directive x + +let emit_float64_split_directive directive f = + let x = Int64.bits_of_float (float_of_string f) in + let lo = Int64.logand x 0xFFFF_FFFFL + and hi = Int64.shift_right_logical x 32 in + emit_printf "\t%s\t0x%Lx, 0x%Lx\n" + directive + (if Arch.big_endian then hi else lo) + (if Arch.big_endian then lo else hi) + +let emit_float32_directive directive f = + let x = Int32.bits_of_float (float_of_string f) in + emit_printf "\t%s\t0x%lx\n" directive x + (* Record live pointers at call points *) type frame_descr = diff --git a/asmcomp/emitaux.mli b/asmcomp/emitaux.mli index a63c8bab..88eac2f5 100644 --- a/asmcomp/emitaux.mli +++ b/asmcomp/emitaux.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: emitaux.mli,v 1.12.12.1 2009/01/26 17:06:10 xleroy Exp $ *) +(* $Id: emitaux.mli 9314 2009-07-15 12:14:39Z xleroy $ *) (* Common functions for emitting assembly code *) @@ -25,6 +25,9 @@ val emit_char: char -> unit val emit_string_literal: string -> unit val emit_string_directive: string -> string -> unit val emit_bytes_directive: string -> string -> unit +val emit_float64_directive: string -> string -> unit +val emit_float64_split_directive: string -> string -> unit +val emit_float32_directive: string -> string -> unit type frame_descr = { fd_lbl: int; (* Return address *) diff --git a/asmcomp/hppa/arch.ml b/asmcomp/hppa/arch.ml index 9a2e940c..33804321 100644 --- a/asmcomp/hppa/arch.ml +++ b/asmcomp/hppa/arch.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: arch.ml,v 1.7 2002/11/29 15:03:36 xleroy Exp $ *) +(* $Id: arch.ml 5304 2002-11-29 15:03:37Z xleroy $ *) (* Specific operations for the HP PA-RISC processor *) diff --git a/asmcomp/hppa/emit.mlp b/asmcomp/hppa/emit.mlp index b1fa3455..e6bf5a7d 100644 --- a/asmcomp/hppa/emit.mlp +++ b/asmcomp/hppa/emit.mlp @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: emit.mlp,v 1.20 2006/04/16 23:28:14 doligez Exp $ *) +(* $Id: emit.mlp 9475 2009-12-16 10:04:38Z xleroy $ *) (* Emission of HP PA-RISC assembly code *) @@ -299,7 +299,9 @@ let emit_float_constants () = ` .text\n`; emit_align 8; List.iter - (fun (lbl, cst) -> `{emit_label lbl}: .double {emit_string cst}\n`) + (fun (lbl, cst) -> + `{emit_label lbl}:`; + emit_float64_split_directive ".long" cst) !float_constants; float_constants := [] @@ -972,9 +974,9 @@ let emit_item = function | Cint n -> ` .long {emit_nativeint n}\n` | Csingle f -> - ` .float {emit_string f}\n` + emit_float32_directive ".long" f | Cdouble f -> - ` .double {emit_string f}\n` + emit_float64_split_directive ".long" f | Csymbol_address s -> use_symbol s; ` .long {emit_symbol s}\n` diff --git a/asmcomp/hppa/proc.ml b/asmcomp/hppa/proc.ml index 02a76499..3debb291 100644 --- a/asmcomp/hppa/proc.ml +++ b/asmcomp/hppa/proc.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: proc.ml,v 1.8 2007/10/30 12:37:16 xleroy Exp $ *) +(* $Id: proc.ml 8462 2007-10-30 12:37:16Z xleroy $ *) (* Description of the HP PA-RISC processor *) diff --git a/asmcomp/hppa/reload.ml b/asmcomp/hppa/reload.ml index 0016a90a..44371522 100644 --- a/asmcomp/hppa/reload.ml +++ b/asmcomp/hppa/reload.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: reload.ml,v 1.4 2008/01/11 16:13:11 doligez Exp $ *) +(* $Id: reload.ml 8768 2008-01-11 16:13:18Z doligez $ *) (* Reloading for the HPPA *) diff --git a/asmcomp/hppa/scheduling.ml b/asmcomp/hppa/scheduling.ml index 749fc604..8d2ed7cc 100644 --- a/asmcomp/hppa/scheduling.ml +++ b/asmcomp/hppa/scheduling.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: scheduling.ml,v 1.4 1999/11/17 18:56:42 xleroy Exp $ *) +(* $Id: scheduling.ml 2553 1999-11-17 18:59:06Z xleroy $ *) (* Instruction scheduling for the HPPA *) diff --git a/asmcomp/hppa/selection.ml b/asmcomp/hppa/selection.ml index 1119730b..67e9c0c9 100644 --- a/asmcomp/hppa/selection.ml +++ b/asmcomp/hppa/selection.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: selection.ml,v 1.6 2008/01/11 16:13:11 doligez Exp $ *) +(* $Id: selection.ml 8768 2008-01-11 16:13:18Z doligez $ *) (* Instruction selection for the HPPA processor *) diff --git a/asmcomp/i386/arch.ml b/asmcomp/i386/arch.ml index 3ccdb931..5bc296e7 100644 --- a/asmcomp/i386/arch.ml +++ b/asmcomp/i386/arch.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: arch.ml,v 1.13 2006/04/16 23:28:14 doligez Exp $ *) +(* $Id: arch.ml 7382 2006-04-16 23:28:22Z doligez $ *) (* Machine-specific command-line options *) diff --git a/asmcomp/i386/emit.mlp b/asmcomp/i386/emit.mlp index a073675f..2992f29c 100644 --- a/asmcomp/i386/emit.mlp +++ b/asmcomp/i386/emit.mlp @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: emit.mlp,v 1.41.2.4 2009/03/28 15:10:04 xleroy Exp $ *) +(* $Id: emit.mlp 9475 2009-12-16 10:04:38Z xleroy $ *) (* Emission of Intel 386 assembly code *) @@ -815,7 +815,8 @@ let rec emit_all fallthrough i = let emit_float_constant (lbl, cst) = ` .data\n`; - `{emit_label lbl}: .double {emit_string cst}\n` + `{emit_label lbl}:`; + emit_float64_split_directive ".long" cst (* Emission of external symbol references (for MacOSX) *) @@ -888,7 +889,9 @@ let fundecl fundecl = bound_error_call := 0; ` .text\n`; emit_align 16; - if macosx && is_generic_function fundecl.fun_name + if macosx + && not !Clflags.output_c_object + && is_generic_function fundecl.fun_name then (* PR#4690 *) ` .private_extern {emit_symbol fundecl.fun_name}\n` else @@ -928,9 +931,9 @@ let emit_item = function | Cint n -> ` .long {emit_nativeint n}\n` | Csingle f -> - ` .float {emit_string f}\n` + emit_float32_directive ".long" f | Cdouble f -> - ` .double {emit_string f}\n` + emit_float64_split_directive ".long" f | Csymbol_address s -> ` .long {emit_symbol s}\n` | Clabel_address lbl -> diff --git a/asmcomp/i386/emit_nt.mlp b/asmcomp/i386/emit_nt.mlp index 5195b21f..d75a60f3 100644 --- a/asmcomp/i386/emit_nt.mlp +++ b/asmcomp/i386/emit_nt.mlp @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: emit_nt.mlp,v 1.28.4.1 2009/03/21 16:15:47 xleroy Exp $ *) +(* $Id: emit_nt.mlp 9189 2009-03-21 16:15:47Z xleroy $ *) (* Emission of Intel 386 assembly code, MASM syntax. *) diff --git a/asmcomp/i386/proc.ml b/asmcomp/i386/proc.ml index b4a7dda5..0b802c4b 100644 --- a/asmcomp/i386/proc.ml +++ b/asmcomp/i386/proc.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: proc.ml,v 1.14 2007/10/30 12:37:16 xleroy Exp $ *) +(* $Id: proc.ml 8462 2007-10-30 12:37:16Z xleroy $ *) (* Description of the Intel 386 processor *) diff --git a/asmcomp/i386/proc_nt.ml b/asmcomp/i386/proc_nt.ml index 45b360ee..0489cd6c 100644 --- a/asmcomp/i386/proc_nt.ml +++ b/asmcomp/i386/proc_nt.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: proc_nt.ml,v 1.8 2008/01/11 16:13:11 doligez Exp $ *) +(* $Id: proc_nt.ml 8768 2008-01-11 16:13:18Z doligez $ *) (* Description of the Intel 386 processor, for Windows NT *) diff --git a/asmcomp/i386/reload.ml b/asmcomp/i386/reload.ml index c5291249..57e45cb7 100644 --- a/asmcomp/i386/reload.ml +++ b/asmcomp/i386/reload.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: reload.ml,v 1.6 2007/01/29 12:10:50 xleroy Exp $ *) +(* $Id: reload.ml 7812 2007-01-29 12:11:18Z xleroy $ *) open Cmm open Arch diff --git a/asmcomp/i386/scheduling.ml b/asmcomp/i386/scheduling.ml index bc90f0d2..61a107ea 100644 --- a/asmcomp/i386/scheduling.ml +++ b/asmcomp/i386/scheduling.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: scheduling.ml,v 1.3 2000/02/04 12:43:18 xleroy Exp $ *) +(* $Id: scheduling.ml 2779 2000-02-04 12:43:18Z xleroy $ *) open Schedgen (* to create a dependency *) diff --git a/asmcomp/i386/selection.ml b/asmcomp/i386/selection.ml index 5c2c3f05..1515592b 100644 --- a/asmcomp/i386/selection.ml +++ b/asmcomp/i386/selection.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: selection.ml,v 1.15 2007/01/29 12:10:50 xleroy Exp $ *) +(* $Id: selection.ml 7812 2007-01-29 12:11:18Z xleroy $ *) (* Instruction selection for the Intel x86 *) diff --git a/asmcomp/ia64/arch.ml b/asmcomp/ia64/arch.ml index 12b686bc..3c2a4c85 100644 --- a/asmcomp/ia64/arch.ml +++ b/asmcomp/ia64/arch.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: arch.ml,v 1.5 2002/11/29 15:03:36 xleroy Exp $ *) +(* $Id: arch.ml 5304 2002-11-29 15:03:37Z xleroy $ *) (* Specific operations for the IA64 processor *) diff --git a/asmcomp/ia64/emit.mlp b/asmcomp/ia64/emit.mlp index bfffcbe7..09a4de4b 100644 --- a/asmcomp/ia64/emit.mlp +++ b/asmcomp/ia64/emit.mlp @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: emit.mlp,v 1.17 2004/07/13 12:18:53 xleroy Exp $ *) +(* $Id: emit.mlp 9314 2009-07-15 12:14:39Z xleroy $ *) (* Emission of IA64 assembly code *) @@ -1287,9 +1287,9 @@ let emit_item = function | Cint n -> ` data8 {emit_nativeint n}\n` | Csingle f -> - ` real4 {emit_string f}\n` + emit_float32_directive "data4" f | Cdouble f -> - ` real8 {emit_string f}\n` + emit_float64_directive "data8" f | Csymbol_address s -> ` data8 {emit_symbol s}#\n` | Clabel_address lbl -> diff --git a/asmcomp/ia64/proc.ml b/asmcomp/ia64/proc.ml index ba773d46..3e425f89 100644 --- a/asmcomp/ia64/proc.ml +++ b/asmcomp/ia64/proc.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: proc.ml,v 1.6 2007/10/30 12:37:16 xleroy Exp $ *) +(* $Id: proc.ml 8462 2007-10-30 12:37:16Z xleroy $ *) (* Description of the IA64 processor *) diff --git a/asmcomp/ia64/reload.ml b/asmcomp/ia64/reload.ml index ca16e672..b9b9e6dd 100644 --- a/asmcomp/ia64/reload.ml +++ b/asmcomp/ia64/reload.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: reload.ml,v 1.2 2000/07/16 02:57:31 xleroy Exp $ *) +(* $Id: reload.ml 3235 2000-07-16 02:57:31Z xleroy $ *) (* Reloading for the IA64. *) diff --git a/asmcomp/ia64/scheduling.ml b/asmcomp/ia64/scheduling.ml index 9139c971..55a4e753 100644 --- a/asmcomp/ia64/scheduling.ml +++ b/asmcomp/ia64/scheduling.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: scheduling.ml,v 1.3 2000/07/16 02:57:31 xleroy Exp $ *) +(* $Id: scheduling.ml 3235 2000-07-16 02:57:31Z xleroy $ *) open Schedgen (* to create a dependency *) diff --git a/asmcomp/ia64/selection.ml b/asmcomp/ia64/selection.ml index 3944eb1c..43351089 100644 --- a/asmcomp/ia64/selection.ml +++ b/asmcomp/ia64/selection.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: selection.ml,v 1.7 2004/05/03 12:27:07 xleroy Exp $ *) +(* $Id: selection.ml 6276 2004-05-03 12:27:07Z xleroy $ *) (* Instruction selection for the IA64 processor *) diff --git a/asmcomp/interf.ml b/asmcomp/interf.ml index 7276ad03..b3e49df2 100644 --- a/asmcomp/interf.ml +++ b/asmcomp/interf.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: interf.ml,v 1.15 2007/01/29 12:10:50 xleroy Exp $ *) +(* $Id: interf.ml 7812 2007-01-29 12:11:18Z xleroy $ *) (* Construction of the interference graph. Annotate pseudoregs with interference lists and preference lists. *) diff --git a/asmcomp/interf.mli b/asmcomp/interf.mli index 91e805e4..f78f4059 100644 --- a/asmcomp/interf.mli +++ b/asmcomp/interf.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: interf.mli,v 1.4 1999/11/17 18:56:33 xleroy Exp $ *) +(* $Id: interf.mli 2553 1999-11-17 18:59:06Z xleroy $ *) (* Construction of the interference graph. Annotate pseudoregs with interference lists and preference lists. *) diff --git a/asmcomp/linearize.ml b/asmcomp/linearize.ml index b3281487..9a617fcd 100644 --- a/asmcomp/linearize.ml +++ b/asmcomp/linearize.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: linearize.ml,v 1.25 2007/01/29 12:10:50 xleroy Exp $ *) +(* $Id: linearize.ml 7812 2007-01-29 12:11:18Z xleroy $ *) (* Transformation of Mach code into a list of pseudo-instructions. *) diff --git a/asmcomp/linearize.mli b/asmcomp/linearize.mli index 926c3fa2..b85010f9 100644 --- a/asmcomp/linearize.mli +++ b/asmcomp/linearize.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: linearize.mli,v 1.14 2007/01/29 12:10:50 xleroy Exp $ *) +(* $Id: linearize.mli 7812 2007-01-29 12:11:18Z xleroy $ *) (* Transformation of Mach code into a list of pseudo-instructions. *) diff --git a/asmcomp/liveness.ml b/asmcomp/liveness.ml index f16fef53..9407f229 100644 --- a/asmcomp/liveness.ml +++ b/asmcomp/liveness.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: liveness.ml,v 1.15 2007/01/29 12:10:50 xleroy Exp $ *) +(* $Id: liveness.ml 7812 2007-01-29 12:11:18Z xleroy $ *) (* Liveness analysis. Annotate mach code with the set of regs live at each point. *) diff --git a/asmcomp/liveness.mli b/asmcomp/liveness.mli index bd791e18..de2509e8 100644 --- a/asmcomp/liveness.mli +++ b/asmcomp/liveness.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: liveness.mli,v 1.5 2000/04/21 08:10:33 weis Exp $ *) +(* $Id: liveness.mli 3123 2000-04-21 08:13:22Z weis $ *) (* Liveness analysis. Annotate mach code with the set of regs live at each point. *) diff --git a/asmcomp/mach.ml b/asmcomp/mach.ml index 67d0dc65..07ac1492 100644 --- a/asmcomp/mach.ml +++ b/asmcomp/mach.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: mach.ml,v 1.18 2007/01/29 12:10:50 xleroy Exp $ *) +(* $Id: mach.ml 7812 2007-01-29 12:11:18Z xleroy $ *) (* Representation of machine code by sequences of pseudoinstructions *) diff --git a/asmcomp/mach.mli b/asmcomp/mach.mli index ad28f3a7..30c510e8 100644 --- a/asmcomp/mach.mli +++ b/asmcomp/mach.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: mach.mli,v 1.18 2007/01/29 12:10:50 xleroy Exp $ *) +(* $Id: mach.mli 7812 2007-01-29 12:11:18Z xleroy $ *) (* Representation of machine code by sequences of pseudoinstructions *) diff --git a/asmcomp/mips/arch.ml b/asmcomp/mips/arch.ml index 8027e36c..411c9877 100644 --- a/asmcomp/mips/arch.ml +++ b/asmcomp/mips/arch.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: arch.ml,v 1.6 2002/11/29 15:03:36 xleroy Exp $ *) +(* $Id: arch.ml 5304 2002-11-29 15:03:37Z xleroy $ *) (* Specific operations for the Mips processor *) diff --git a/asmcomp/mips/emit.mlp b/asmcomp/mips/emit.mlp index a67d7fed..0899e2fc 100644 --- a/asmcomp/mips/emit.mlp +++ b/asmcomp/mips/emit.mlp @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: emit.mlp,v 1.18 2004/01/05 20:25:56 doligez Exp $ *) +(* $Id: emit.mlp 9314 2009-07-15 12:14:39Z xleroy $ *) (* Emission of Mips assembly code *) @@ -527,10 +527,9 @@ let emit_item = function | Cint n -> ` .word {emit_nativeint n}\n` | Csingle f -> - ` .float {emit_string f}\n` + emit_float32_directive ".word" f | Cdouble f -> - ` .align 0\n`; (* Prevent alignment on 8-byte boundary *) - ` .double {emit_string f}\n` + emit_float64_split_directive ".word" f | Csymbol_address s -> ` .word {emit_symbol s}\n` | Clabel_address lbl -> diff --git a/asmcomp/mips/proc.ml b/asmcomp/mips/proc.ml index 96221140..964ade46 100644 --- a/asmcomp/mips/proc.ml +++ b/asmcomp/mips/proc.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: proc.ml,v 1.7 2007/10/30 12:37:16 xleroy Exp $ *) +(* $Id: proc.ml 8462 2007-10-30 12:37:16Z xleroy $ *) (* Description of the Mips processor *) diff --git a/asmcomp/mips/reload.ml b/asmcomp/mips/reload.ml index de72414c..26a620b4 100644 --- a/asmcomp/mips/reload.ml +++ b/asmcomp/mips/reload.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: reload.ml,v 1.3 1999/11/17 18:56:45 xleroy Exp $ *) +(* $Id: reload.ml 2553 1999-11-17 18:59:06Z xleroy $ *) (* Reloading for the Mips *) diff --git a/asmcomp/mips/scheduling.ml b/asmcomp/mips/scheduling.ml index 7061cd39..273e20bd 100644 --- a/asmcomp/mips/scheduling.ml +++ b/asmcomp/mips/scheduling.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: scheduling.ml,v 1.2 1999/11/17 18:56:45 xleroy Exp $ *) +(* $Id: scheduling.ml 2553 1999-11-17 18:59:06Z xleroy $ *) open Schedgen (* to create a dependency *) diff --git a/asmcomp/mips/selection.ml b/asmcomp/mips/selection.ml index 690ef271..34be3c90 100644 --- a/asmcomp/mips/selection.ml +++ b/asmcomp/mips/selection.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: selection.ml,v 1.4 1999/11/17 18:56:46 xleroy Exp $ *) +(* $Id: selection.ml 2553 1999-11-17 18:59:06Z xleroy $ *) (* Instruction selection for the Mips processor *) diff --git a/asmcomp/power/arch.ml b/asmcomp/power/arch.ml index 4f5bb12c..33081429 100644 --- a/asmcomp/power/arch.ml +++ b/asmcomp/power/arch.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: arch.ml,v 1.12 2006/05/31 08:16:34 xleroy Exp $ *) +(* $Id: arch.ml 7430 2006-05-31 08:16:34Z xleroy $ *) (* Specific operations for the PowerPC processor *) diff --git a/asmcomp/power/emit.mlp b/asmcomp/power/emit.mlp index 5c2063d4..4b321993 100644 --- a/asmcomp/power/emit.mlp +++ b/asmcomp/power/emit.mlp @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: emit.mlp,v 1.26.4.1 2009/01/26 17:06:10 xleroy Exp $ *) +(* $Id: emit.mlp 9475 2009-12-16 10:04:38Z xleroy $ *) (* Emission of PowerPC assembly code *) @@ -835,7 +835,9 @@ let fundecl fundecl = call_gc_label := 0; float_literals := []; int_literals := []; - if Config.system = "rhapsody" && is_generic_function fundecl.fun_name + if Config.system = "rhapsody" + && not !Clflags.output_c_object + && is_generic_function fundecl.fun_name then (* PR#4690 *) ` .private_extern {emit_symbol fundecl.fun_name}\n` else @@ -871,7 +873,10 @@ let fundecl fundecl = ` .align 3\n`; List.iter (fun (f, lbl) -> - `{emit_label lbl}: .double 0d{emit_string f}\n`) + `{emit_label lbl}:`; + if ppc64 + then emit_float64_directive ".quad" f + else emit_float64_split_directive ".long" f) !float_literals; List.iter (fun (n, lbl) -> @@ -902,9 +907,11 @@ let emit_item = function | Cint n -> ` {emit_string datag} {emit_nativeint n}\n` | Csingle f -> - ` .float 0d{emit_string f}\n` + emit_float32_directive ".long" f | Cdouble f -> - ` .double 0d{emit_string f}\n` + if ppc64 + then emit_float64_directive ".quad" f + else emit_float64_split_directive ".long" f | Csymbol_address s -> ` {emit_string datag} {emit_symbol s}\n` | Clabel_address lbl -> diff --git a/asmcomp/power/proc.ml b/asmcomp/power/proc.ml index 5b540d94..510b9b1c 100644 --- a/asmcomp/power/proc.ml +++ b/asmcomp/power/proc.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: proc.ml,v 1.14 2007/10/30 12:37:16 xleroy Exp $ *) +(* $Id: proc.ml 8462 2007-10-30 12:37:16Z xleroy $ *) (* Description of the Power PC *) diff --git a/asmcomp/power/reload.ml b/asmcomp/power/reload.ml index e2ffd75c..abcac6c6 100644 --- a/asmcomp/power/reload.ml +++ b/asmcomp/power/reload.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: reload.ml,v 1.3 1999/11/17 18:56:46 xleroy Exp $ *) +(* $Id: reload.ml 2553 1999-11-17 18:59:06Z xleroy $ *) (* Reloading for the PowerPC *) diff --git a/asmcomp/power/scheduling.ml b/asmcomp/power/scheduling.ml index 7e760197..4312457b 100644 --- a/asmcomp/power/scheduling.ml +++ b/asmcomp/power/scheduling.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: scheduling.ml,v 1.6 2004/06/19 16:13:33 xleroy Exp $ *) +(* $Id: scheduling.ml 6423 2004-06-19 16:17:31Z xleroy $ *) (* Instruction scheduling for the Power PC *) diff --git a/asmcomp/power/selection.ml b/asmcomp/power/selection.ml index 622e84c2..d39ee518 100644 --- a/asmcomp/power/selection.ml +++ b/asmcomp/power/selection.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: selection.ml,v 1.8 2007/11/09 15:06:57 frisch Exp $ *) +(* $Id: selection.ml 8499 2007-11-09 15:06:57Z frisch $ *) (* Instruction selection for the Power PC processor *) diff --git a/asmcomp/printcmm.ml b/asmcomp/printcmm.ml index 73580836..0d0e1be7 100644 --- a/asmcomp/printcmm.ml +++ b/asmcomp/printcmm.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: printcmm.ml,v 1.25 2007/01/29 12:10:50 xleroy Exp $ *) +(* $Id: printcmm.ml 7812 2007-01-29 12:11:18Z xleroy $ *) (* Pretty-printing of C-- code *) diff --git a/asmcomp/printcmm.mli b/asmcomp/printcmm.mli index 4da8751b..f07a31db 100644 --- a/asmcomp/printcmm.mli +++ b/asmcomp/printcmm.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: printcmm.mli,v 1.6 2000/04/21 08:10:34 weis Exp $ *) +(* $Id: printcmm.mli 3123 2000-04-21 08:13:22Z weis $ *) (* Pretty-printing of C-- code *) diff --git a/asmcomp/printlinear.ml b/asmcomp/printlinear.ml index 24207ee2..941d6493 100644 --- a/asmcomp/printlinear.ml +++ b/asmcomp/printlinear.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: printlinear.ml,v 1.13 2007/01/29 12:10:50 xleroy Exp $ *) +(* $Id: printlinear.ml 7812 2007-01-29 12:11:18Z xleroy $ *) (* Pretty-printing of linearized machine code *) diff --git a/asmcomp/printlinear.mli b/asmcomp/printlinear.mli index 514f1100..dee1733f 100644 --- a/asmcomp/printlinear.mli +++ b/asmcomp/printlinear.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: printlinear.mli,v 1.5 2000/04/21 08:10:35 weis Exp $ *) +(* $Id: printlinear.mli 3123 2000-04-21 08:13:22Z weis $ *) (* Pretty-printing of linearized machine code *) diff --git a/asmcomp/printmach.ml b/asmcomp/printmach.ml index de93e380..87722121 100644 --- a/asmcomp/printmach.ml +++ b/asmcomp/printmach.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: printmach.ml,v 1.23 2007/01/29 12:10:50 xleroy Exp $ *) +(* $Id: printmach.ml 7812 2007-01-29 12:11:18Z xleroy $ *) (* Pretty-printing of pseudo machine code *) diff --git a/asmcomp/printmach.mli b/asmcomp/printmach.mli index 9dc483cd..edbda322 100644 --- a/asmcomp/printmach.mli +++ b/asmcomp/printmach.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: printmach.mli,v 1.6 2000/04/21 08:10:37 weis Exp $ *) +(* $Id: printmach.mli 3123 2000-04-21 08:13:22Z weis $ *) (* Pretty-printing of pseudo machine code *) diff --git a/asmcomp/proc.mli b/asmcomp/proc.mli index f15f256b..15086a44 100644 --- a/asmcomp/proc.mli +++ b/asmcomp/proc.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: proc.mli,v 1.16 1999/11/17 18:56:35 xleroy Exp $ *) +(* $Id: proc.mli 2553 1999-11-17 18:59:06Z xleroy $ *) (* Processor descriptions *) diff --git a/asmcomp/reg.ml b/asmcomp/reg.ml index ab16c615..3d996093 100644 --- a/asmcomp/reg.ml +++ b/asmcomp/reg.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: reg.ml,v 1.10 2000/06/29 11:44:06 xleroy Exp $ *) +(* $Id: reg.ml 3216 2000-06-29 11:44:06Z xleroy $ *) open Cmm diff --git a/asmcomp/reg.mli b/asmcomp/reg.mli index 7d93612c..b8ce2b64 100644 --- a/asmcomp/reg.mli +++ b/asmcomp/reg.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: reg.mli,v 1.7 1999/11/17 18:56:35 xleroy Exp $ *) +(* $Id: reg.mli 2553 1999-11-17 18:59:06Z xleroy $ *) (* Pseudo-registers *) diff --git a/asmcomp/reload.mli b/asmcomp/reload.mli index 11c8c047..154c4cc5 100644 --- a/asmcomp/reload.mli +++ b/asmcomp/reload.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: reload.mli,v 1.6 1999/11/17 18:56:35 xleroy Exp $ *) +(* $Id: reload.mli 2553 1999-11-17 18:59:06Z xleroy $ *) (* Insert load/stores for pseudoregs that got assigned to stack locations. *) diff --git a/asmcomp/reloadgen.ml b/asmcomp/reloadgen.ml index 693782d9..befc5c68 100644 --- a/asmcomp/reloadgen.ml +++ b/asmcomp/reloadgen.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: reloadgen.ml,v 1.6 2007/01/29 12:10:50 xleroy Exp $ *) +(* $Id: reloadgen.ml 7812 2007-01-29 12:11:18Z xleroy $ *) (* Insert load/stores for pseudoregs that got assigned to stack locations. *) diff --git a/asmcomp/reloadgen.mli b/asmcomp/reloadgen.mli index febb9367..80e90f79 100644 --- a/asmcomp/reloadgen.mli +++ b/asmcomp/reloadgen.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: reloadgen.mli,v 1.4 1999/11/17 18:56:36 xleroy Exp $ *) +(* $Id: reloadgen.mli 2553 1999-11-17 18:59:06Z xleroy $ *) class reload_generic : object method reload_operation : diff --git a/asmcomp/schedgen.ml b/asmcomp/schedgen.ml index 33f1570a..d89b448a 100644 --- a/asmcomp/schedgen.ml +++ b/asmcomp/schedgen.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: schedgen.ml,v 1.12 2007/01/29 12:10:50 xleroy Exp $ *) +(* $Id: schedgen.ml 7812 2007-01-29 12:11:18Z xleroy $ *) (* Instruction scheduling *) diff --git a/asmcomp/schedgen.mli b/asmcomp/schedgen.mli index 8c651548..73450659 100644 --- a/asmcomp/schedgen.mli +++ b/asmcomp/schedgen.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: schedgen.mli,v 1.6 1999/11/17 18:56:36 xleroy Exp $ *) +(* $Id: schedgen.mli 2553 1999-11-17 18:59:06Z xleroy $ *) (* Instruction scheduling *) diff --git a/asmcomp/scheduling.mli b/asmcomp/scheduling.mli index aef1f413..62c55741 100644 --- a/asmcomp/scheduling.mli +++ b/asmcomp/scheduling.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: scheduling.mli,v 1.3 1999/11/17 18:56:36 xleroy Exp $ *) +(* $Id: scheduling.mli 2553 1999-11-17 18:59:06Z xleroy $ *) (* Instruction scheduling *) diff --git a/asmcomp/selectgen.ml b/asmcomp/selectgen.ml index d170de48..705e501a 100644 --- a/asmcomp/selectgen.ml +++ b/asmcomp/selectgen.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: selectgen.ml,v 1.32 2007/01/29 12:10:50 xleroy Exp $ *) +(* $Id: selectgen.ml 7812 2007-01-29 12:11:18Z xleroy $ *) (* Selection of pseudo-instructions, assignment of pseudo-registers, sequentialization. *) diff --git a/asmcomp/selectgen.mli b/asmcomp/selectgen.mli index 2899d1ae..89edce67 100644 --- a/asmcomp/selectgen.mli +++ b/asmcomp/selectgen.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: selectgen.mli,v 1.8 2007/01/29 12:10:50 xleroy Exp $ *) +(* $Id: selectgen.mli 7812 2007-01-29 12:11:18Z xleroy $ *) (* Selection of pseudo-instructions, assignment of pseudo-registers, sequentialization. *) diff --git a/asmcomp/selection.mli b/asmcomp/selection.mli index e7a164e1..66abf607 100644 --- a/asmcomp/selection.mli +++ b/asmcomp/selection.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: selection.mli,v 1.6 1999/11/17 18:56:37 xleroy Exp $ *) +(* $Id: selection.mli 2553 1999-11-17 18:59:06Z xleroy $ *) (* Selection of pseudo-instructions, assignment of pseudo-registers, sequentialization. *) diff --git a/asmcomp/sparc/arch.ml b/asmcomp/sparc/arch.ml index c8a00be2..6bd9876f 100644 --- a/asmcomp/sparc/arch.ml +++ b/asmcomp/sparc/arch.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: arch.ml,v 1.8 2002/11/29 15:03:08 xleroy Exp $ *) +(* $Id: arch.ml 5303 2002-11-29 15:03:08Z xleroy $ *) (* Specific operations for the Sparc processor *) diff --git a/asmcomp/sparc/emit.mlp b/asmcomp/sparc/emit.mlp index cfecd1e6..c5cbe854 100644 --- a/asmcomp/sparc/emit.mlp +++ b/asmcomp/sparc/emit.mlp @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: emit.mlp,v 1.24 2006/04/16 23:28:15 doligez Exp $ *) +(* $Id: emit.mlp 9475 2009-12-16 10:04:38Z xleroy $ *) (* Emission of Sparc assembly code *) @@ -195,7 +195,8 @@ let float_constants = ref ([] : (int * string) list) let emit_float_constant (lbl, cst) = rodata (); ` .align 8\n`; - `{emit_label lbl}: .double 0r{emit_string cst}\n` + `{emit_label lbl}:`; + emit_float64_split_directive ".word" cst (* Emission of the profiling prelude *) let emit_profile () = @@ -723,9 +724,9 @@ let emit_item = function | Cint n -> ` .word {emit_nativeint n}\n` | Csingle f -> - ` .single 0r{emit_string f}\n` + emit_float32_directive ".word" f | Cdouble f -> - ` .double 0r{emit_string f}\n` + emit_float64_split_directive ".word" f | Csymbol_address s -> ` .word {emit_symbol s}\n` | Clabel_address lbl -> diff --git a/asmcomp/sparc/proc.ml b/asmcomp/sparc/proc.ml index 8127fc45..f21ac977 100644 --- a/asmcomp/sparc/proc.ml +++ b/asmcomp/sparc/proc.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: proc.ml,v 1.8 2007/10/30 12:37:16 xleroy Exp $ *) +(* $Id: proc.ml 8462 2007-10-30 12:37:16Z xleroy $ *) (* Description of the Sparc processor *) diff --git a/asmcomp/sparc/reload.ml b/asmcomp/sparc/reload.ml index 9d3898a5..a3558a7f 100644 --- a/asmcomp/sparc/reload.ml +++ b/asmcomp/sparc/reload.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: reload.ml,v 1.3 1999/11/17 18:56:47 xleroy Exp $ *) +(* $Id: reload.ml 2553 1999-11-17 18:59:06Z xleroy $ *) (* Reloading for the Sparc *) diff --git a/asmcomp/sparc/scheduling.ml b/asmcomp/sparc/scheduling.ml index ca8827fd..ebe9e7c2 100644 --- a/asmcomp/sparc/scheduling.ml +++ b/asmcomp/sparc/scheduling.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: scheduling.ml,v 1.5 2002/11/29 15:03:08 xleroy Exp $ *) +(* $Id: scheduling.ml 5303 2002-11-29 15:03:08Z xleroy $ *) open Cmm open Mach diff --git a/asmcomp/sparc/selection.ml b/asmcomp/sparc/selection.ml index 6af79721..37573ae4 100644 --- a/asmcomp/sparc/selection.ml +++ b/asmcomp/sparc/selection.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: selection.ml,v 1.8 2002/11/29 15:03:08 xleroy Exp $ *) +(* $Id: selection.ml 5303 2002-11-29 15:03:08Z xleroy $ *) (* Instruction selection for the Sparc processor *) diff --git a/asmcomp/spill.ml b/asmcomp/spill.ml index 2fba098f..93b32227 100644 --- a/asmcomp/spill.ml +++ b/asmcomp/spill.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: spill.ml,v 1.19 2007/01/29 12:10:50 xleroy Exp $ *) +(* $Id: spill.ml 7812 2007-01-29 12:11:18Z xleroy $ *) (* Insertion of moves to suggest possible spilling / reloading points before register allocation. *) diff --git a/asmcomp/spill.mli b/asmcomp/spill.mli index dfd5f1ee..a9fcd436 100644 --- a/asmcomp/spill.mli +++ b/asmcomp/spill.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: spill.mli,v 1.4 1999/11/17 18:56:38 xleroy Exp $ *) +(* $Id: spill.mli 2553 1999-11-17 18:59:06Z xleroy $ *) (* Insertion of moves to suggest possible spilling / reloading points before register allocation. *) diff --git a/asmcomp/split.ml b/asmcomp/split.ml index 74f2511c..391568d6 100644 --- a/asmcomp/split.ml +++ b/asmcomp/split.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: split.ml,v 1.10 2007/01/29 12:10:50 xleroy Exp $ *) +(* $Id: split.ml 7812 2007-01-29 12:11:18Z xleroy $ *) (* Renaming of registers at reload points to split live ranges. *) diff --git a/asmcomp/split.mli b/asmcomp/split.mli index 57c48d69..2cb16fda 100644 --- a/asmcomp/split.mli +++ b/asmcomp/split.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: split.mli,v 1.4 1999/11/17 18:56:38 xleroy Exp $ *) +(* $Id: split.mli 2553 1999-11-17 18:59:06Z xleroy $ *) (* Renaming of registers at reload points to split live ranges. *) diff --git a/asmrun/Makefile b/asmrun/Makefile index bc7cca2b..ac03dea5 100644 --- a/asmrun/Makefile +++ b/asmrun/Makefile @@ -11,7 +11,7 @@ # # ######################################################################### -# $Id: Makefile,v 1.59 2007/11/15 13:21:15 frisch Exp $ +# $Id: Makefile 8521 2007-11-15 13:21:15Z frisch $ include ../config/Makefile diff --git a/asmrun/Makefile.nt b/asmrun/Makefile.nt index c9b6061e..43f221cb 100644 --- a/asmrun/Makefile.nt +++ b/asmrun/Makefile.nt @@ -11,7 +11,7 @@ # # ######################################################################### -# $Id: Makefile.nt,v 1.28 2007/11/15 13:21:15 frisch Exp $ +# $Id: Makefile.nt 8521 2007-11-15 13:21:15Z frisch $ include ../config/Makefile diff --git a/asmrun/alpha.S b/asmrun/alpha.S index 1aa3a86d..98ce9139 100644 --- a/asmrun/alpha.S +++ b/asmrun/alpha.S @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: alpha.S,v 1.29 2004/01/03 12:51:18 doligez Exp $ */ +/* $Id: alpha.S 6050 2004-01-03 12:51:20Z doligez $ */ /* Asm part of the runtime system, Alpha processor */ diff --git a/asmrun/amd64.S b/asmrun/amd64.S index c9ce59d0..fe96110b 100644 --- a/asmrun/amd64.S +++ b/asmrun/amd64.S @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: amd64.S,v 1.12.2.1 2008/11/07 10:34:16 xleroy Exp $ */ +/* $Id: amd64.S 9119 2008-11-07 10:34:16Z xleroy $ */ /* Asm part of the runtime system, AMD64 processor */ /* Must be preprocessed by cpp */ diff --git a/asmrun/amd64nt.asm b/asmrun/amd64nt.asm index c441a275..caa4eb48 100644 --- a/asmrun/amd64nt.asm +++ b/asmrun/amd64nt.asm @@ -11,7 +11,7 @@ ; ;********************************************************************* -; $Id: amd64nt.asm,v 1.5 2007/03/01 10:26:51 xleroy Exp $ +; $Id: amd64nt.asm 7942 2007-03-01 10:26:51Z xleroy $ ; Asm part of the runtime system, AMD64 processor, Intel syntax diff --git a/asmrun/arm.S b/asmrun/arm.S index 985868eb..3a3a7323 100644 --- a/asmrun/arm.S +++ b/asmrun/arm.S @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: arm.S,v 1.16 2008/02/29 14:21:21 doligez Exp $ */ +/* $Id: arm.S 8823 2008-02-29 14:21:22Z doligez $ */ /* Asm part of the runtime system, ARM processor */ diff --git a/asmrun/backtrace.c b/asmrun/backtrace.c index 61e8d360..a875822b 100644 --- a/asmrun/backtrace.c +++ b/asmrun/backtrace.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: backtrace.c,v 1.4 2008/03/14 13:47:13 xleroy Exp $ */ +/* $Id: backtrace.c 8839 2008-03-14 13:47:24Z xleroy $ */ /* Stack backtrace for uncaught exceptions */ diff --git a/asmrun/fail.c b/asmrun/fail.c index 9cc5db24..0b2544cc 100644 --- a/asmrun/fail.c +++ b/asmrun/fail.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: fail.c,v 1.40 2008/09/18 11:23:28 xleroy Exp $ */ +/* $Id: fail.c 9030 2008-09-18 11:23:28Z xleroy $ */ /* Raising exceptions from C. */ diff --git a/asmrun/hppa.S b/asmrun/hppa.S index 0c0a8be1..e394ad47 100644 --- a/asmrun/hppa.S +++ b/asmrun/hppa.S @@ -11,7 +11,7 @@ ;* * ;********************************************************************* -; $Id: hppa.S,v 1.26 2006/04/16 23:28:15 doligez Exp $ +; $Id: hppa.S 7382 2006-04-16 23:28:22Z doligez $ ; Asm part of the runtime system for the HP PA-RISC processor. ; Must be preprocessed by cpp diff --git a/asmrun/i386.S b/asmrun/i386.S index 8aecc504..95198e0a 100644 --- a/asmrun/i386.S +++ b/asmrun/i386.S @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: i386.S,v 1.50 2008/08/01 08:04:57 xleroy Exp $ */ +/* $Id: i386.S 8962 2008-08-01 08:04:57Z xleroy $ */ /* Asm part of the runtime system, Intel 386 processor */ /* Must be preprocessed by cpp */ diff --git a/asmrun/i386nt.asm b/asmrun/i386nt.asm index 229ffc79..8f128919 100644 --- a/asmrun/i386nt.asm +++ b/asmrun/i386nt.asm @@ -11,7 +11,7 @@ ; ;********************************************************************* -; $Id: i386nt.asm,v 1.20 2007/01/29 12:10:52 xleroy Exp $ +; $Id: i386nt.asm 7812 2007-01-29 12:11:18Z xleroy $ ; Asm part of the runtime system, Intel 386 processor, Intel syntax diff --git a/asmrun/ia64.S b/asmrun/ia64.S index ad74a9f6..ca64ed55 100644 --- a/asmrun/ia64.S +++ b/asmrun/ia64.S @@ -10,9 +10,9 @@ /* */ /***********************************************************************/ -/* $Id: ia64.S,v 1.13 2004/01/03 12:51:19 doligez Exp $ */ +/* $Id: ia64.S 9341 2009-09-17 13:05:47Z xleroy $ */ -/* Asm part of the runtime system, Alpha processor */ +/* Asm part of the runtime system, IA64 processor */ #undef BROKEN_POSTINCREMENT @@ -68,15 +68,8 @@ caml_allocN: sub r4 = r4, r2 ;; cmp.ltu p0, p6 = r4, r5 (p6) br.ret.sptk b0 ;; - /* Stash return address at sp (in stack scratch area) */ - mov r3 = b0 ;; - st8 [sp] = r3 - /* Call GC */ - br.call.sptk b0 = caml_call_gc# ;; - /* Return to caller */ - ld8 r3 = [sp] ;; - mov b0 = r3 ;; - br.ret.sptk b0 + /* Fall through caml_call_gc */ + br.sptk.many caml_call_gc# .endp caml_allocN# diff --git a/asmrun/m68k.S b/asmrun/m68k.S index 8e6e9c3d..bf3cbfcb 100644 --- a/asmrun/m68k.S +++ b/asmrun/m68k.S @@ -11,7 +11,7 @@ |* * |*********************************************************************** -| $Id: m68k.S,v 1.15 2004/01/03 12:51:19 doligez Exp $ +| $Id: m68k.S 6050 2004-01-03 12:51:20Z doligez $ | Asm part of the runtime system, Motorola 68k processor diff --git a/asmrun/mips.s b/asmrun/mips.s index b5db5e03..2ce19ef2 100644 --- a/asmrun/mips.s +++ b/asmrun/mips.s @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: mips.s,v 1.12 2004/07/13 12:18:53 xleroy Exp $ */ +/* $Id: mips.s 6552 2004-07-13 12:19:15Z xleroy $ */ /* Asm part of the runtime system, Mips processor, IRIX n32 conventions */ diff --git a/asmrun/power-aix.S b/asmrun/power-aix.S index b8afea6f..0f0abf86 100644 --- a/asmrun/power-aix.S +++ b/asmrun/power-aix.S @@ -11,7 +11,7 @@ #* * #********************************************************************* -# $Id: power-aix.S,v 1.15 2004/01/03 12:51:19 doligez Exp $ +# $Id: power-aix.S 6050 2004-01-03 12:51:20Z doligez $ .csect .text[PR] diff --git a/asmrun/power-elf.S b/asmrun/power-elf.S index c890f46d..8a2f0011 100644 --- a/asmrun/power-elf.S +++ b/asmrun/power-elf.S @@ -11,7 +11,7 @@ /* */ /*********************************************************************/ -/* $Id: power-elf.S,v 1.18 2004/01/03 12:51:19 doligez Exp $ */ +/* $Id: power-elf.S 6050 2004-01-03 12:51:20Z doligez $ */ #define Addrglobal(reg,glob) \ addis reg, 0, glob@ha; \ diff --git a/asmrun/power-rhapsody.S b/asmrun/power-rhapsody.S index b7cfab59..48265379 100644 --- a/asmrun/power-rhapsody.S +++ b/asmrun/power-rhapsody.S @@ -11,7 +11,7 @@ /* */ /*********************************************************************/ -/* $Id: power-rhapsody.S,v 1.15 2007/01/29 12:10:52 xleroy Exp $ */ +/* $Id: power-rhapsody.S 7812 2007-01-29 12:11:18Z xleroy $ */ #ifdef __ppc64__ #define X(a,b) b diff --git a/asmrun/roots.c b/asmrun/roots.c index b375cf43..7953a961 100644 --- a/asmrun/roots.c +++ b/asmrun/roots.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: roots.c,v 1.45 2008/03/10 19:56:39 xleroy Exp $ */ +/* $Id: roots.c 8828 2008-03-10 19:56:39Z xleroy $ */ /* To walk the memory roots for garbage collection */ diff --git a/asmrun/signals_asm.c b/asmrun/signals_asm.c index d0b6e9cf..da4491d6 100644 --- a/asmrun/signals_asm.c +++ b/asmrun/signals_asm.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: signals_asm.c,v 1.6 2008/01/11 16:13:11 doligez Exp $ */ +/* $Id: signals_asm.c 8768 2008-01-11 16:13:18Z doligez $ */ /* Signal handling, code specific to the native-code compiler */ diff --git a/asmrun/signals_osdep.h b/asmrun/signals_osdep.h index 0422c2d1..102711d6 100644 --- a/asmrun/signals_osdep.h +++ b/asmrun/signals_osdep.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: signals_osdep.h,v 1.11.4.2 2009/03/28 15:18:31 xleroy Exp $ */ +/* $Id: signals_osdep.h 9194 2009-03-28 15:18:31Z xleroy $ */ /* Processor- and OS-dependent signal interface */ diff --git a/asmrun/sparc.S b/asmrun/sparc.S index 4ef6420f..d205c65e 100644 --- a/asmrun/sparc.S +++ b/asmrun/sparc.S @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: sparc.S,v 1.26 2004/10/06 06:33:25 garrigue Exp $ */ +/* $Id: sparc.S 6631 2004-10-06 06:33:25Z garrigue $ */ /* Asm part of the runtime system for the Sparc processor. */ /* Must be preprocessed by cpp */ diff --git a/asmrun/stack.h b/asmrun/stack.h index 82b41758..0b632406 100644 --- a/asmrun/stack.h +++ b/asmrun/stack.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: stack.h,v 1.35 2007/11/06 15:16:55 frisch Exp $ */ +/* $Id: stack.h 8477 2007-11-06 15:16:56Z frisch $ */ /* Machine-dependent interface with the asm code */ diff --git a/asmrun/startup.c b/asmrun/startup.c index b708c1e3..7508901d 100644 --- a/asmrun/startup.c +++ b/asmrun/startup.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: startup.c,v 1.36.2.1 2008/11/18 10:24:31 doligez Exp $ */ +/* $Id: startup.c 9131 2008-11-18 10:24:43Z doligez $ */ /* Start-up code */ diff --git a/boot/.cvsignore b/boot/.cvsignore index a0a2356c..5eeaef32 100644 --- a/boot/.cvsignore +++ b/boot/.cvsignore @@ -4,3 +4,4 @@ ocamlyacc camlheader myocamlbuild myocamlbuild.native +libcamlrun.a diff --git a/boot/ocamlc b/boot/ocamlc index 808d5b87..ba7a52fd 100755 Binary files a/boot/ocamlc and b/boot/ocamlc differ diff --git a/boot/ocamldep b/boot/ocamldep index 106160cc..b5289c88 100755 Binary files a/boot/ocamldep and b/boot/ocamldep differ diff --git a/boot/ocamllex b/boot/ocamllex index 15437fdb..8bf7272f 100755 Binary files a/boot/ocamllex and b/boot/ocamllex differ diff --git a/build/boot-c-parts-windows.sh b/build/boot-c-parts-windows.sh index fd428724..81415ad3 100755 --- a/build/boot-c-parts-windows.sh +++ b/build/boot-c-parts-windows.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: boot-c-parts-windows.sh,v 1.3 2007/10/08 14:19:34 doligez Exp $ +# $Id: boot-c-parts-windows.sh 8416 2007-10-08 14:19:34Z doligez $ cd `dirname $0`/.. set -ex diff --git a/build/boot-c-parts.sh b/build/boot-c-parts.sh index 9cb0262a..e62beba2 100755 --- a/build/boot-c-parts.sh +++ b/build/boot-c-parts.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: boot-c-parts.sh,v 1.2 2007/10/08 14:19:34 doligez Exp $ +# $Id: boot-c-parts.sh 8416 2007-10-08 14:19:34Z doligez $ cd `dirname $0`/.. set -ex diff --git a/build/boot.sh b/build/boot.sh index ee910808..a976b65d 100755 --- a/build/boot.sh +++ b/build/boot.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: boot.sh,v 1.2 2007/10/08 14:19:34 doligez Exp $ +# $Id: boot.sh 8416 2007-10-08 14:19:34Z doligez $ cd `dirname $0`/.. set -ex TAGLINE='true: -use_stdlib' diff --git a/build/camlp4-bootstrap.sh b/build/camlp4-bootstrap.sh index 10475dfb..1b621863 100755 --- a/build/camlp4-bootstrap.sh +++ b/build/camlp4-bootstrap.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: camlp4-bootstrap.sh,v 1.3 2007/10/08 14:19:34 doligez Exp $ +# $Id: camlp4-bootstrap.sh 8416 2007-10-08 14:19:34Z doligez $ set -e cd `dirname $0`/.. diff --git a/build/camlp4-byte-only.sh b/build/camlp4-byte-only.sh index 2ebf42d7..4154b53c 100755 --- a/build/camlp4-byte-only.sh +++ b/build/camlp4-byte-only.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: camlp4-byte-only.sh,v 1.3.4.1 2008/10/23 15:29:11 ertai Exp $ +# $Id: camlp4-byte-only.sh 9099 2008-10-23 15:29:11Z ertai $ set -e cd `dirname $0`/.. . build/targets.sh diff --git a/build/camlp4-native-only.sh b/build/camlp4-native-only.sh index ce70333c..da19bf15 100755 --- a/build/camlp4-native-only.sh +++ b/build/camlp4-native-only.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: camlp4-native-only.sh,v 1.3.4.1 2008/10/23 15:29:11 ertai Exp $ +# $Id: camlp4-native-only.sh 9099 2008-10-23 15:29:11Z ertai $ set -e cd `dirname $0`/.. . build/targets.sh diff --git a/build/camlp4-targets.sh b/build/camlp4-targets.sh index b158d19e..8c2eb319 100644 --- a/build/camlp4-targets.sh +++ b/build/camlp4-targets.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: camlp4-targets.sh,v 1.2 2007/10/08 14:19:34 doligez Exp $ +# $Id: camlp4-targets.sh 8416 2007-10-08 14:19:34Z doligez $ CAMLP4_COMMON="\ camlp4/Camlp4/Camlp4Ast.partial.ml \ camlp4/boot/camlp4boot.byte" diff --git a/build/distclean.sh b/build/distclean.sh index 145899e8..79284769 100755 --- a/build/distclean.sh +++ b/build/distclean.sh @@ -12,7 +12,7 @@ # # ######################################################################### -# $Id: distclean.sh,v 1.7.4.1 2008/10/23 15:29:11 ertai Exp $ +# $Id: distclean.sh 9099 2008-10-23 15:29:11Z ertai $ cd `dirname $0`/.. set -ex diff --git a/build/fastworld.sh b/build/fastworld.sh index c539141b..977fbcd0 100755 --- a/build/fastworld.sh +++ b/build/fastworld.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: fastworld.sh,v 1.3.4.2 2009/06/02 09:37:47 doligez Exp $ +# $Id: fastworld.sh 9283 2009-06-02 09:37:47Z doligez $ cd `dirname $0` set -e if [ -e ocamlbuild_mixed_mode ]; then diff --git a/build/install.sh b/build/install.sh index 5093f313..e3b77003 100755 --- a/build/install.sh +++ b/build/install.sh @@ -12,7 +12,7 @@ # # ######################################################################### -# $Id: install.sh,v 1.11.2.1 2009/06/04 11:32:46 doligez Exp $ +# $Id: install.sh 9289 2009-06-04 11:32:46Z doligez $ set -e diff --git a/build/mkconfig.sh b/build/mkconfig.sh index 41dc2ab8..0d20911f 100755 --- a/build/mkconfig.sh +++ b/build/mkconfig.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: mkconfig.sh,v 1.3 2007/11/06 15:16:56 frisch Exp $ +# $Id: mkconfig.sh 8477 2007-11-06 15:16:56Z frisch $ cd `dirname $0`/.. diff --git a/build/mkmyocamlbuild_config.sh b/build/mkmyocamlbuild_config.sh index f64e954f..c47ca521 100755 --- a/build/mkmyocamlbuild_config.sh +++ b/build/mkmyocamlbuild_config.sh @@ -12,7 +12,7 @@ # # ######################################################################### -# $Id: mkmyocamlbuild_config.sh,v 1.10 2008/01/11 16:13:16 doligez Exp $ +# $Id: mkmyocamlbuild_config.sh 8768 2008-01-11 16:13:18Z doligez $ cd `dirname $0`/.. diff --git a/build/mkruntimedef.sh b/build/mkruntimedef.sh index 0fa63b24..b7e7325b 100755 --- a/build/mkruntimedef.sh +++ b/build/mkruntimedef.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: mkruntimedef.sh,v 1.2 2007/10/08 14:19:34 doligez Exp $ +# $Id: mkruntimedef.sh 8416 2007-10-08 14:19:34Z doligez $ echo 'let builtin_exceptions = [|'; \ sed -n -e 's|.*/\* \("[A-Za-z_]*"\) \*/$| \1;|p' byterun/fail.h | \ sed -e '$s/;$//'; \ diff --git a/build/myocamlbuild.sh b/build/myocamlbuild.sh index 6b2a3b09..728ba62d 100755 --- a/build/myocamlbuild.sh +++ b/build/myocamlbuild.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: myocamlbuild.sh,v 1.3 2007/10/08 14:19:34 doligez Exp $ +# $Id: myocamlbuild.sh 8416 2007-10-08 14:19:34Z doligez $ cd `dirname $0`/.. set -xe if [ ! -x _build/ocamlbuild/ocamlbuildlight.byte ]; then diff --git a/build/ocamlbuild-byte-only.sh b/build/ocamlbuild-byte-only.sh index 84a2d913..b2c7607d 100755 --- a/build/ocamlbuild-byte-only.sh +++ b/build/ocamlbuild-byte-only.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: ocamlbuild-byte-only.sh,v 1.3.4.1 2008/10/23 15:29:11 ertai Exp $ +# $Id: ocamlbuild-byte-only.sh 9099 2008-10-23 15:29:11Z ertai $ set -e cd `dirname $0`/.. . build/targets.sh diff --git a/build/ocamlbuild-native-only.sh b/build/ocamlbuild-native-only.sh index c5669276..907cdd23 100755 --- a/build/ocamlbuild-native-only.sh +++ b/build/ocamlbuild-native-only.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: ocamlbuild-native-only.sh,v 1.3.4.1 2008/10/23 15:29:11 ertai Exp $ +# $Id: ocamlbuild-native-only.sh 9099 2008-10-23 15:29:11Z ertai $ set -e cd `dirname $0`/.. . build/targets.sh diff --git a/build/ocamlbuildlib-native-only.sh b/build/ocamlbuildlib-native-only.sh index bde15ca4..4517c80b 100755 --- a/build/ocamlbuildlib-native-only.sh +++ b/build/ocamlbuildlib-native-only.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: ocamlbuildlib-native-only.sh,v 1.2.4.1 2008/10/23 15:29:11 ertai Exp $ +# $Id: ocamlbuildlib-native-only.sh 9099 2008-10-23 15:29:11Z ertai $ set -e cd `dirname $0`/.. . build/targets.sh diff --git a/build/otherlibs-targets.sh b/build/otherlibs-targets.sh index 1327998a..69d96c65 100644 --- a/build/otherlibs-targets.sh +++ b/build/otherlibs-targets.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: otherlibs-targets.sh,v 1.4.4.1 2009/05/26 12:49:16 ertai Exp $ +# $Id: otherlibs-targets.sh 9281 2009-05-26 12:50:41Z ertai $ OTHERLIBS_BYTE="" OTHERLIBS_NATIVE="" OTHERLIBS_UNIX_NATIVE="" diff --git a/build/partial-install.sh b/build/partial-install.sh index 7240fff2..40b34b57 100755 --- a/build/partial-install.sh +++ b/build/partial-install.sh @@ -12,7 +12,7 @@ # # ######################################################################### -# $Id: partial-install.sh,v 1.9 2008/01/11 16:13:16 doligez Exp $ +# $Id: partial-install.sh 8768 2008-01-11 16:13:18Z doligez $ ###################################### ######### Copied from build/install.sh diff --git a/build/targets.sh b/build/targets.sh index 4154f498..98bbbadf 100644 --- a/build/targets.sh +++ b/build/targets.sh @@ -10,7 +10,7 @@ # # ######################################################################### -# $Id: targets.sh,v 1.5 2008/01/11 16:13:16 doligez Exp $ +# $Id: targets.sh 8768 2008-01-11 16:13:18Z doligez $ . config/config.sh . build/otherlibs-targets.sh diff --git a/build/world.all.sh b/build/world.all.sh index 579f297f..1b359da7 100755 --- a/build/world.all.sh +++ b/build/world.all.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: world.all.sh,v 1.3 2007/10/08 14:19:34 doligez Exp $ +# $Id: world.all.sh 8416 2007-10-08 14:19:34Z doligez $ set -e cd `dirname $0`/.. . build/targets.sh diff --git a/build/world.byte.sh b/build/world.byte.sh index 379a8104..d6cffd93 100755 --- a/build/world.byte.sh +++ b/build/world.byte.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: world.byte.sh,v 1.3 2007/10/08 14:19:34 doligez Exp $ +# $Id: world.byte.sh 8416 2007-10-08 14:19:34Z doligez $ set -e cd `dirname $0`/.. . build/targets.sh diff --git a/build/world.native.sh b/build/world.native.sh index d8066352..3412cdf1 100755 --- a/build/world.native.sh +++ b/build/world.native.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: world.native.sh,v 1.3 2007/10/08 14:19:34 doligez Exp $ +# $Id: world.native.sh 8416 2007-10-08 14:19:34Z doligez $ set -e cd `dirname $0`/.. . build/targets.sh diff --git a/build/world.sh b/build/world.sh index 3df67cf8..dd73e32d 100755 --- a/build/world.sh +++ b/build/world.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: world.sh,v 1.3.4.2 2009/06/02 09:37:47 doligez Exp $ +# $Id: world.sh 9283 2009-06-02 09:37:47Z doligez $ cd `dirname $0` set -e if [ -e ocamlbuild_mixed_mode ]; then diff --git a/bytecomp/bytegen.ml b/bytecomp/bytegen.ml index ffb2b46e..625a0f61 100644 --- a/bytecomp/bytegen.ml +++ b/bytecomp/bytegen.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: bytegen.ml,v 1.72.2.1 2009/04/02 09:06:32 xclerc Exp $ *) +(* $Id: bytegen.ml 9221 2009-04-02 09:06:33Z xclerc $ *) (* bytegen.ml : translation of lambda terms to lists of instructions. *) diff --git a/bytecomp/bytegen.mli b/bytecomp/bytegen.mli index b414e900..29407c3f 100644 --- a/bytecomp/bytegen.mli +++ b/bytecomp/bytegen.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: bytegen.mli,v 1.6 1999/11/17 18:56:59 xleroy Exp $ *) +(* $Id: bytegen.mli 2553 1999-11-17 18:59:06Z xleroy $ *) (* Generation of bytecode from lambda terms *) diff --git a/bytecomp/bytelibrarian.ml b/bytecomp/bytelibrarian.ml index 5c5c155a..10391fc1 100644 --- a/bytecomp/bytelibrarian.ml +++ b/bytecomp/bytelibrarian.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: bytelibrarian.ml,v 1.19 2006/05/11 15:50:53 xleroy Exp $ *) +(* $Id: bytelibrarian.ml 7422 2006-05-11 15:50:53Z xleroy $ *) (* Build libraries of .cmo files *) diff --git a/bytecomp/bytelibrarian.mli b/bytecomp/bytelibrarian.mli index c9f14316..2c706976 100644 --- a/bytecomp/bytelibrarian.mli +++ b/bytecomp/bytelibrarian.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: bytelibrarian.mli,v 1.6 2000/03/06 22:11:06 weis Exp $ *) +(* $Id: bytelibrarian.mli 2908 2000-03-06 22:12:09Z weis $ *) (* Build libraries of .cmo files *) diff --git a/bytecomp/bytelink.ml b/bytecomp/bytelink.ml index 63fd5850..1d9a4f49 100644 --- a/bytecomp/bytelink.ml +++ b/bytecomp/bytelink.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: bytelink.ml,v 1.95 2007/11/15 15:18:28 frisch Exp $ *) +(* $Id: bytelink.ml 9500 2009-12-28 13:13:23Z doligez $ *) (* Link a set of .cmo files and produce a bytecode executable. *) @@ -377,24 +377,53 @@ let output_data_string outchan data = end done +(* Output a debug stub *) + +let output_cds_file outfile = + Misc.remove_file outfile; + let outchan = + open_out_gen [Open_wronly; Open_trunc; Open_creat; Open_binary] + 0o777 outfile in + try + Bytesections.init_record outchan; + (* The map of global identifiers *) + Symtable.output_global_map outchan; + Bytesections.record outchan "SYMB"; + (* Debug info *) + output_debug_info outchan; + Bytesections.record outchan "DBUG"; + (* The table of contents and the trailer *) + Bytesections.write_toc_and_trailer outchan; + close_out outchan + with x -> + close_out outchan; + remove_file outfile; + raise x + (* Output a bytecode executable as a C file *) let link_bytecode_as_c tolink outfile = let outchan = open_out outfile in - try + begin try (* The bytecode *) - output_string outchan "#include \n"; output_string outchan "\ -CAMLextern void caml_startup_code( - code_t code, asize_t code_size, - char *data, asize_t data_size, - char *section_table, asize_t section_table_size, +#ifdef __cplusplus\n\ +extern \"C\" {\n\ +#endif\n\ +#include \n\ +CAMLextern void caml_startup_code(\n\ + code_t code, asize_t code_size,\n\ + char *data, asize_t data_size,\n\ + char *section_table, asize_t section_table_size,\n\ char **argv);\n"; output_string outchan "static int caml_code[] = {\n"; Symtable.init(); Consistbl.clear crc_interfaces; - let output_fun = output_code_string outchan - and currpos_fun () = 0 in + let currpos = ref 0 in + let output_fun code = + output_code_string outchan code; + currpos := !currpos + String.length code + and currpos_fun () = !currpos in List.iter (link_file output_fun currpos_fun) tolink; (* The final STOP instruction *) Printf.fprintf outchan "\n0x%x};\n\n" Opcodes.opSTOP; @@ -415,25 +444,31 @@ CAMLextern void caml_startup_code( (* The table of primitives *) Symtable.output_primitive_table outchan; (* The entry point *) - output_string outchan "\n -void caml_startup(char ** argv) -{ - caml_startup_code(caml_code, sizeof(caml_code), - caml_data, sizeof(caml_data), - caml_sections, sizeof(caml_sections), - argv); -}\n"; + output_string outchan "\n\ +void caml_startup(char ** argv)\n\ +{\n\ + caml_startup_code(caml_code, sizeof(caml_code),\n\ + caml_data, sizeof(caml_data),\n\ + caml_sections, sizeof(caml_sections),\n\ + argv);\n\ +}\n\ +#ifdef __cplusplus\n\ +}\n\ +#endif\n"; close_out outchan with x -> close_out outchan; raise x + end; + if !Clflags.debug then + output_cds_file ((Filename.chop_extension outfile) ^ ".cds") (* Build a custom runtime *) let build_custom_runtime prim_name exec_name = - Ccomp.call_linker Ccomp.Exe exec_name + Ccomp.call_linker Ccomp.Exe exec_name ([prim_name] @ List.rev !Clflags.ccobjs @ ["-lcamlrun"]) - Config.bytecomp_c_libraries + (Clflags.std_include_flag "-I" ^ " " ^ Config.bytecomp_c_libraries) let append_bytecode_and_cleanup bytecode_name exec_name prim_name = let oc = open_out_gen [Open_wronly; Open_append; Open_binary] 0 exec_name in @@ -472,7 +507,20 @@ let link objfiles output_name = try link_bytecode tolink bytecode_name false; let poc = open_out prim_name in + output_string poc "\ + #ifdef __cplusplus\n\ + extern \"C\" {\n\ + #endif\n\ + #ifdef _WIN64\n\ + typedef __int64 value;\n\ + #else\n\ + typedef long value;\n\ + #endif\n"; Symtable.output_primitive_table poc; + output_string poc "\ + #ifdef __cplusplus\n\ + }\n\ + #endif\n"; close_out poc; let exec_name = fix_exec_name output_name in if not (build_custom_runtime prim_name exec_name) diff --git a/bytecomp/bytelink.mli b/bytecomp/bytelink.mli index bb59279f..99befe1b 100644 --- a/bytecomp/bytelink.mli +++ b/bytecomp/bytelink.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: bytelink.mli,v 1.12 2006/05/11 15:50:53 xleroy Exp $ *) +(* $Id: bytelink.mli 7422 2006-05-11 15:50:53Z xleroy $ *) (* Link .cmo files and produce a bytecode executable. *) diff --git a/bytecomp/bytepackager.ml b/bytecomp/bytepackager.ml index 7915aede..dc53e4df 100644 --- a/bytecomp/bytepackager.ml +++ b/bytecomp/bytepackager.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: bytepackager.ml,v 1.6.10.1 2009/04/02 09:06:32 xclerc Exp $ *) +(* $Id: bytepackager.ml 9221 2009-04-02 09:06:33Z xclerc $ *) (* "Package" a set of .cmo files into one .cmo file having the original compilation units as sub-modules. *) diff --git a/bytecomp/bytepackager.mli b/bytecomp/bytepackager.mli index 914cd59b..de5c0862 100644 --- a/bytecomp/bytepackager.mli +++ b/bytecomp/bytepackager.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: bytepackager.mli,v 1.1 2002/02/08 16:55:42 xleroy Exp $ *) +(* $Id: bytepackager.mli 4367 2002-02-08 16:55:44Z xleroy $ *) (* "Package" a set of .cmo files into one .cmo file having the original compilation units as sub-modules. *) diff --git a/bytecomp/bytesections.ml b/bytecomp/bytesections.ml index 1200a436..407aeec8 100644 --- a/bytecomp/bytesections.ml +++ b/bytecomp/bytesections.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: bytesections.ml,v 1.3 2004/02/22 15:07:50 xleroy Exp $ *) +(* $Id: bytesections.ml 6130 2004-02-22 15:07:51Z xleroy $ *) (* Handling of sections in bytecode executable files *) diff --git a/bytecomp/bytesections.mli b/bytecomp/bytesections.mli index 7d3d3155..a58ea59c 100644 --- a/bytecomp/bytesections.mli +++ b/bytecomp/bytesections.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: bytesections.mli,v 1.3 2004/02/22 15:07:50 xleroy Exp $ *) +(* $Id: bytesections.mli 6130 2004-02-22 15:07:51Z xleroy $ *) (* Handling of sections in bytecode executable files *) diff --git a/bytecomp/cmo_format.mli b/bytecomp/cmo_format.mli index 46f222c9..6d78f11e 100644 --- a/bytecomp/cmo_format.mli +++ b/bytecomp/cmo_format.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: cmo_format.mli,v 1.1 2006/05/11 15:50:53 xleroy Exp $ *) +(* $Id: cmo_format.mli 7422 2006-05-11 15:50:53Z xleroy $ *) (* Symbol table information for .cmo and .cma files *) diff --git a/bytecomp/dll.ml b/bytecomp/dll.ml index 65112a21..57e18232 100644 --- a/bytecomp/dll.ml +++ b/bytecomp/dll.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: dll.ml,v 1.13.14.1 2009/05/01 01:46:50 garrigue Exp $ *) +(* $Id: dll.ml 9249 2009-05-01 01:46:50Z garrigue $ *) (* Handling of dynamically-linked libraries *) diff --git a/bytecomp/dll.mli b/bytecomp/dll.mli index 46d162fe..1af28c40 100644 --- a/bytecomp/dll.mli +++ b/bytecomp/dll.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: dll.mli,v 1.6 2006/09/28 21:36:38 xleroy Exp $ *) +(* $Id: dll.mli 7656 2006-09-28 21:36:38Z xleroy $ *) (* Handling of dynamically-linked libraries *) diff --git a/bytecomp/emitcode.ml b/bytecomp/emitcode.ml index f607e7c0..755873d6 100644 --- a/bytecomp/emitcode.ml +++ b/bytecomp/emitcode.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: emitcode.ml,v 1.34 2008/07/24 05:35:22 frisch Exp $ *) +(* $Id: emitcode.ml 8930 2008-07-24 05:35:22Z frisch $ *) (* Generation of bytecode + relocation information *) diff --git a/bytecomp/emitcode.mli b/bytecomp/emitcode.mli index 5a09293d..6c78f046 100644 --- a/bytecomp/emitcode.mli +++ b/bytecomp/emitcode.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: emitcode.mli,v 1.15 2006/05/11 15:50:53 xleroy Exp $ *) +(* $Id: emitcode.mli 7422 2006-05-11 15:50:53Z xleroy $ *) (* Generation of bytecode for .cmo files *) diff --git a/bytecomp/instruct.ml b/bytecomp/instruct.ml index 2169ac74..59c1edba 100644 --- a/bytecomp/instruct.ml +++ b/bytecomp/instruct.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: instruct.ml,v 1.22.20.1 2009/04/02 09:06:32 xclerc Exp $ *) +(* $Id: instruct.ml 9221 2009-04-02 09:06:33Z xclerc $ *) open Lambda diff --git a/bytecomp/instruct.mli b/bytecomp/instruct.mli index ce97609f..89427c41 100644 --- a/bytecomp/instruct.mli +++ b/bytecomp/instruct.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: instruct.mli,v 1.22.20.1 2009/04/02 09:06:32 xclerc Exp $ *) +(* $Id: instruct.mli 9221 2009-04-02 09:06:33Z xclerc $ *) (* The type of the instructions of the abstract machine *) diff --git a/bytecomp/lambda.ml b/bytecomp/lambda.ml index 121f8898..10a7c2a6 100644 --- a/bytecomp/lambda.ml +++ b/bytecomp/lambda.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: lambda.ml,v 1.48 2008/08/01 16:57:10 mauny Exp $ *) +(* $Id: lambda.ml 8974 2008-08-01 16:57:10Z mauny $ *) open Misc open Path diff --git a/bytecomp/lambda.mli b/bytecomp/lambda.mli index 0476b874..68611e02 100644 --- a/bytecomp/lambda.mli +++ b/bytecomp/lambda.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: lambda.mli,v 1.46 2008/08/01 16:57:10 mauny Exp $ *) +(* $Id: lambda.mli 8974 2008-08-01 16:57:10Z mauny $ *) (* The "lambda" intermediate code *) diff --git a/bytecomp/matching.ml b/bytecomp/matching.ml index a9fbc46b..478af3b1 100644 --- a/bytecomp/matching.ml +++ b/bytecomp/matching.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: matching.ml,v 1.71 2008/08/01 16:57:10 mauny Exp $ *) +(* $Id: matching.ml 8974 2008-08-01 16:57:10Z mauny $ *) (* Compilation of pattern matching *) diff --git a/bytecomp/matching.mli b/bytecomp/matching.mli index 41b35963..5e258565 100644 --- a/bytecomp/matching.mli +++ b/bytecomp/matching.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: matching.mli,v 1.13 2008/08/01 16:57:10 mauny Exp $ *) +(* $Id: matching.mli 8974 2008-08-01 16:57:10Z mauny $ *) (* Compilation of pattern-matching *) diff --git a/bytecomp/meta.ml b/bytecomp/meta.ml index 08cf707b..3e2cdeb8 100644 --- a/bytecomp/meta.ml +++ b/bytecomp/meta.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: meta.ml,v 1.13 2004/04/16 13:46:20 starynke Exp $ *) +(* $Id: meta.ml 6224 2004-04-16 13:46:43Z starynke $ *) external global_data : unit -> Obj.t array = "caml_get_global_data" external realloc_global_data : int -> unit = "caml_realloc_global" diff --git a/bytecomp/meta.mli b/bytecomp/meta.mli index 0cbe85ab..a5bc0119 100644 --- a/bytecomp/meta.mli +++ b/bytecomp/meta.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: meta.mli,v 1.13 2004/04/16 13:46:27 starynke Exp $ *) +(* $Id: meta.mli 6224 2004-04-16 13:46:43Z starynke $ *) (* To control the runtime system and bytecode interpreter *) diff --git a/bytecomp/printinstr.ml b/bytecomp/printinstr.ml index c385ed09..1f0a095c 100644 --- a/bytecomp/printinstr.ml +++ b/bytecomp/printinstr.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: printinstr.ml,v 1.23 2005/08/25 15:35:16 doligez Exp $ *) +(* $Id: printinstr.ml 7031 2005-08-25 15:35:16Z doligez $ *) (* Pretty-print lists of instructions *) diff --git a/bytecomp/printinstr.mli b/bytecomp/printinstr.mli index 04250d8e..4b1efd69 100644 --- a/bytecomp/printinstr.mli +++ b/bytecomp/printinstr.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: printinstr.mli,v 1.5 2000/03/06 22:11:08 weis Exp $ *) +(* $Id: printinstr.mli 2908 2000-03-06 22:12:09Z weis $ *) (* Pretty-print lists of instructions *) diff --git a/bytecomp/printlambda.ml b/bytecomp/printlambda.ml index edb32d07..0c7fde69 100644 --- a/bytecomp/printlambda.ml +++ b/bytecomp/printlambda.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: printlambda.ml,v 1.55 2008/08/01 16:57:10 mauny Exp $ *) +(* $Id: printlambda.ml 8974 2008-08-01 16:57:10Z mauny $ *) open Format open Asttypes diff --git a/bytecomp/printlambda.mli b/bytecomp/printlambda.mli index 8493e599..4c0d5681 100644 --- a/bytecomp/printlambda.mli +++ b/bytecomp/printlambda.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: printlambda.mli,v 1.5 2000/03/06 22:11:10 weis Exp $ *) +(* $Id: printlambda.mli 2908 2000-03-06 22:12:09Z weis $ *) open Lambda diff --git a/bytecomp/runtimedef.mli b/bytecomp/runtimedef.mli index 38329db1..f89d192c 100644 --- a/bytecomp/runtimedef.mli +++ b/bytecomp/runtimedef.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: runtimedef.mli,v 1.4 1999/11/17 18:57:01 xleroy Exp $ *) +(* $Id: runtimedef.mli 2553 1999-11-17 18:59:06Z xleroy $ *) (* Values and functions known and/or provided by the runtime system *) diff --git a/bytecomp/simplif.ml b/bytecomp/simplif.ml index 3db3d489..7f087650 100644 --- a/bytecomp/simplif.ml +++ b/bytecomp/simplif.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: simplif.ml,v 1.25 2008/03/19 10:26:56 maranget Exp $ *) +(* $Id: simplif.ml 8850 2008-03-19 10:26:56Z maranget $ *) (* Elimination of useless Llet(Alias) bindings. Also transform let-bound references into variables. *) diff --git a/bytecomp/simplif.mli b/bytecomp/simplif.mli index 16b1562f..fd8eab74 100644 --- a/bytecomp/simplif.mli +++ b/bytecomp/simplif.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: simplif.mli,v 1.3 1999/11/17 18:57:01 xleroy Exp $ *) +(* $Id: simplif.mli 2553 1999-11-17 18:59:06Z xleroy $ *) (* Elimination of useless Llet(Alias) bindings *) diff --git a/bytecomp/symtable.ml b/bytecomp/symtable.ml index fd38b811..244e5886 100644 --- a/bytecomp/symtable.ml +++ b/bytecomp/symtable.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: symtable.ml,v 1.39 2006/05/11 15:50:53 xleroy Exp $ *) +(* $Id: symtable.ml 9347 2009-09-23 14:31:18Z xleroy $ *) (* To assign numbers to globals and primitives *) @@ -114,14 +114,10 @@ open Printf let output_primitive_table outchan = let prim = all_primitives() in - fprintf outchan "\ - #ifdef __cplusplus\n\ - extern \"C\" {\n\ - #endif\n"; for i = 0 to Array.length prim - 1 do - fprintf outchan "extern long %s();\n" prim.(i) + fprintf outchan "extern value %s();\n" prim.(i) done; - fprintf outchan "typedef long (*primitive)();\n"; + fprintf outchan "typedef value (*primitive)();\n"; fprintf outchan "primitive caml_builtin_cprim[] = {\n"; for i = 0 to Array.length prim - 1 do fprintf outchan " %s,\n" prim.(i) @@ -131,11 +127,7 @@ let output_primitive_table outchan = for i = 0 to Array.length prim - 1 do fprintf outchan " \"%s\",\n" prim.(i) done; - fprintf outchan " (char *) 0 };\n"; - fprintf outchan "\ - #ifdef __cplusplus\n\ - }\n\ - #endif\n" + fprintf outchan " (char *) 0 };\n" (* Initialization for batch linking *) diff --git a/bytecomp/symtable.mli b/bytecomp/symtable.mli index 5743a9b1..2b1583f2 100644 --- a/bytecomp/symtable.mli +++ b/bytecomp/symtable.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: symtable.mli,v 1.15 2006/05/11 15:50:53 xleroy Exp $ *) +(* $Id: symtable.mli 7422 2006-05-11 15:50:53Z xleroy $ *) (* Assign locations and numbers to globals and primitives *) diff --git a/bytecomp/translclass.ml b/bytecomp/translclass.ml index c883e188..6aec67cc 100644 --- a/bytecomp/translclass.ml +++ b/bytecomp/translclass.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: translclass.ml,v 1.43.4.1 2008/10/08 13:07:13 doligez Exp $ *) +(* $Id: translclass.ml 9079 2008-10-08 13:09:39Z doligez $ *) open Misc open Asttypes diff --git a/bytecomp/translclass.mli b/bytecomp/translclass.mli index ab813c10..135f8d86 100644 --- a/bytecomp/translclass.mli +++ b/bytecomp/translclass.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: translclass.mli,v 1.12 2006/04/05 02:28:12 garrigue Exp $ *) +(* $Id: translclass.mli 7372 2006-04-05 02:28:13Z garrigue $ *) open Typedtree open Lambda diff --git a/bytecomp/translcore.ml b/bytecomp/translcore.ml index d4be9aa9..edf8da93 100644 --- a/bytecomp/translcore.ml +++ b/bytecomp/translcore.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: translcore.ml,v 1.110 2008/08/27 10:23:21 garrigue Exp $ *) +(* $Id: translcore.ml 8992 2008-08-27 10:23:21Z garrigue $ *) (* Translation from typed abstract syntax to lambda terms, for the core language *) diff --git a/bytecomp/translcore.mli b/bytecomp/translcore.mli index 761c9e81..9f8e1ac2 100644 --- a/bytecomp/translcore.mli +++ b/bytecomp/translcore.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: translcore.mli,v 1.19 2007/05/16 08:21:40 doligez Exp $ *) +(* $Id: translcore.mli 8232 2007-05-16 08:21:41Z doligez $ *) (* Translation from typed abstract syntax to lambda terms, for the core language *) diff --git a/bytecomp/translmod.ml b/bytecomp/translmod.ml index 4a7a9700..c05e1867 100644 --- a/bytecomp/translmod.ml +++ b/bytecomp/translmod.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: translmod.ml,v 1.56 2008/07/24 05:35:22 frisch Exp $ *) +(* $Id: translmod.ml 8930 2008-07-24 05:35:22Z frisch $ *) (* Translation from typed abstract syntax to lambda terms, for the module language *) diff --git a/bytecomp/translmod.mli b/bytecomp/translmod.mli index b292c34c..39eaa076 100644 --- a/bytecomp/translmod.mli +++ b/bytecomp/translmod.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: translmod.mli,v 1.14 2008/07/24 05:35:22 frisch Exp $ *) +(* $Id: translmod.mli 8930 2008-07-24 05:35:22Z frisch $ *) (* Translation from typed abstract syntax to lambda terms, for the module language *) diff --git a/bytecomp/translobj.ml b/bytecomp/translobj.ml index 9133784f..5d042346 100644 --- a/bytecomp/translobj.ml +++ b/bytecomp/translobj.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: translobj.ml,v 1.9.26.1 2008/10/08 13:07:13 doligez Exp $ *) +(* $Id: translobj.ml 9079 2008-10-08 13:09:39Z doligez $ *) open Misc open Primitive diff --git a/bytecomp/translobj.mli b/bytecomp/translobj.mli index 7146d5ef..7a0749b0 100644 --- a/bytecomp/translobj.mli +++ b/bytecomp/translobj.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: translobj.mli,v 1.6.26.1 2008/10/08 13:07:13 doligez Exp $ *) +(* $Id: translobj.mli 9079 2008-10-08 13:09:39Z doligez $ *) open Lambda diff --git a/bytecomp/typeopt.ml b/bytecomp/typeopt.ml index 366bb3e9..c7b90034 100644 --- a/bytecomp/typeopt.ml +++ b/bytecomp/typeopt.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: typeopt.ml,v 1.13 2008/02/29 14:21:22 doligez Exp $ *) +(* $Id: typeopt.ml 9334 2009-09-16 09:44:33Z xleroy $ *) (* Auxiliaries for type-based optimizations, e.g. array kinds *) @@ -22,18 +22,17 @@ open Types open Typedtree open Lambda +let scrape env ty = + (Ctype.repr (Ctype.expand_head_opt env (Ctype.correct_levels ty))).desc + let has_base_type exp base_ty_path = - let exp_ty = - Ctype.expand_head_opt exp.exp_env (Ctype.correct_levels exp.exp_type) in - match Ctype.repr exp_ty with - {desc = Tconstr(p, _, _)} -> Path.same p base_ty_path + match scrape exp.exp_env exp.exp_type with + | Tconstr(p, _, _) -> Path.same p base_ty_path | _ -> false let maybe_pointer exp = - let exp_ty = - Ctype.expand_head_opt exp.exp_env (Ctype.correct_levels exp.exp_type) in - match (Ctype.repr exp_ty).desc with - Tconstr(p, args, abbrev) -> + match scrape exp.exp_env exp.exp_type with + | Tconstr(p, args, abbrev) -> not (Path.same p Predef.path_int) && not (Path.same p Predef.path_char) && begin try @@ -50,9 +49,8 @@ let maybe_pointer exp = | _ -> true let array_element_kind env ty = - let ty = Ctype.repr (Ctype.expand_head_opt env ty) in - match ty.desc with - Tvar | Tunivar -> + match scrape env ty with + | Tvar | Tunivar -> Pgenarray | Tconstr(p, args, abbrev) -> if Path.same p Predef.path_int || Path.same p Predef.path_char then @@ -85,9 +83,8 @@ let array_element_kind env ty = Paddrarray let array_kind_gen ty env = - let array_ty = Ctype.expand_head_opt env (Ctype.correct_levels ty) in - match (Ctype.repr array_ty).desc with - Tconstr(p, [elt_ty], _) | Tpoly({desc = Tconstr(p, [elt_ty], _)}, _) + match scrape env ty with + | Tconstr(p, [elt_ty], _) | Tpoly({desc = Tconstr(p, [elt_ty], _)}, _) when Path.same p Predef.path_array -> array_element_kind env elt_ty | _ -> @@ -98,9 +95,9 @@ let array_kind exp = array_kind_gen exp.exp_type exp.exp_env let array_pattern_kind pat = array_kind_gen pat.pat_type pat.pat_env -let bigarray_decode_type ty tbl dfl = - match (Ctype.repr ty).desc with - Tconstr(Pdot(Pident mod_id, type_name, _), [], _) +let bigarray_decode_type env ty tbl dfl = + match scrape env ty with + | Tconstr(Pdot(Pident mod_id, type_name, _), [], _) when Ident.name mod_id = "Bigarray" -> begin try List.assoc type_name tbl with Not_found -> dfl end | _ -> @@ -125,10 +122,9 @@ let layout_table = "fortran_layout", Pbigarray_fortran_layout] let bigarray_kind_and_layout exp = - let ty = Ctype.repr (Ctype.expand_head_opt exp.exp_env exp.exp_type) in - match ty.desc with - Tconstr(p, [caml_type; elt_type; layout_type], abbrev) -> - (bigarray_decode_type elt_type kind_table Pbigarray_unknown, - bigarray_decode_type layout_type layout_table Pbigarray_unknown_layout) + match scrape exp.exp_env exp.exp_type with + | Tconstr(p, [caml_type; elt_type; layout_type], abbrev) -> + (bigarray_decode_type exp.exp_env elt_type kind_table Pbigarray_unknown, + bigarray_decode_type exp.exp_env layout_type layout_table Pbigarray_unknown_layout) | _ -> (Pbigarray_unknown, Pbigarray_unknown_layout) diff --git a/bytecomp/typeopt.mli b/bytecomp/typeopt.mli index d057be61..e7d3a48d 100644 --- a/bytecomp/typeopt.mli +++ b/bytecomp/typeopt.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: typeopt.mli,v 1.4 2000/02/28 15:45:50 xleroy Exp $ *) +(* $Id: typeopt.mli 2873 2000-02-28 15:45:50Z xleroy $ *) (* Auxiliaries for type-based optimizations, e.g. array kinds *) diff --git a/byterun/.cvsignore b/byterun/.cvsignore index 9020f408..b4714b05 100644 --- a/byterun/.cvsignore +++ b/byterun/.cvsignore @@ -15,3 +15,5 @@ interp.a.lst *.[sd]obj *.lib .gdb_history +*.so +*.a diff --git a/byterun/Makefile b/byterun/Makefile index 221466a1..47172726 100644 --- a/byterun/Makefile +++ b/byterun/Makefile @@ -11,7 +11,7 @@ # # ######################################################################### -# $Id: Makefile,v 1.64.2.5 2009/05/25 12:25:25 doligez Exp $ +# $Id: Makefile 9280 2009-05-25 12:25:25Z doligez $ include Makefile.common diff --git a/byterun/Makefile.common b/byterun/Makefile.common index 9580b86b..be957f04 100755 --- a/byterun/Makefile.common +++ b/byterun/Makefile.common @@ -11,7 +11,7 @@ # # ######################################################################### -# $Id: Makefile.common,v 1.6.2.1 2009/05/25 12:25:25 doligez Exp $ +# $Id: Makefile.common 9280 2009-05-25 12:25:25Z doligez $ include ../config/Makefile diff --git a/byterun/Makefile.nt b/byterun/Makefile.nt index 7691e23e..bc25e819 100644 --- a/byterun/Makefile.nt +++ b/byterun/Makefile.nt @@ -11,7 +11,7 @@ # # ######################################################################### -# $Id: Makefile.nt,v 1.48.2.1 2008/11/26 13:26:53 xleroy Exp $ +# $Id: Makefile.nt 9142 2008-11-26 13:26:53Z xleroy $ include Makefile.common diff --git a/byterun/alloc.c b/byterun/alloc.c index 5eb8ec5c..1c1f11fa 100644 --- a/byterun/alloc.c +++ b/byterun/alloc.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: alloc.c,v 1.29 2007/02/09 13:31:15 doligez Exp $ */ +/* $Id: alloc.c 7849 2007-02-09 13:31:15Z doligez $ */ /* 1. Allocation functions doing the same work as the macros in the case where [Setup_for_gc] and [Restore_after_gc] are no-ops. diff --git a/byterun/alloc.h b/byterun/alloc.h index 5960539b..af81bee7 100644 --- a/byterun/alloc.h +++ b/byterun/alloc.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: alloc.h,v 1.18 2005/09/22 14:21:50 xleroy Exp $ */ +/* $Id: alloc.h 7064 2005-09-22 14:21:50Z xleroy $ */ #ifndef CAML_ALLOC_H #define CAML_ALLOC_H diff --git a/byterun/array.c b/byterun/array.c index 88f16229..e6fe6f32 100644 --- a/byterun/array.c +++ b/byterun/array.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: array.c,v 1.26 2008/09/08 09:43:28 frisch Exp $ */ +/* $Id: array.c 8995 2008-09-08 09:43:28Z frisch $ */ /* Operations on arrays */ diff --git a/byterun/backtrace.c b/byterun/backtrace.c index eb240fc3..304fe44a 100644 --- a/byterun/backtrace.c +++ b/byterun/backtrace.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: backtrace.c,v 1.25 2008/03/14 13:47:24 xleroy Exp $ */ +/* $Id: backtrace.c 9300 2009-06-18 11:17:16Z xclerc $ */ /* Stack backtrace for uncaught exceptions */ @@ -39,6 +39,7 @@ CAMLexport int caml_backtrace_active = 0; CAMLexport int caml_backtrace_pos = 0; CAMLexport code_t * caml_backtrace_buffer = NULL; CAMLexport value caml_backtrace_last_exn = Val_unit; +CAMLexport char * caml_cds_file = NULL; #define BACKTRACE_BUFFER_SIZE 1024 /* Location of fields in the Instruct.debug_event record */ @@ -135,7 +136,11 @@ static value read_debug_info(void) uint32 num_events, orig, i; value evl, l; - exec_name = caml_exe_name; + if (caml_cds_file != NULL) { + exec_name = caml_cds_file; + } else { + exec_name = caml_exe_name; + } fd = caml_attempt_open(&exec_name, &trail, 1); if (fd < 0) CAMLreturn(Val_false); caml_read_section_descriptors(fd, &trail); diff --git a/byterun/backtrace.h b/byterun/backtrace.h index 25fbfb21..f3327d0d 100644 --- a/byterun/backtrace.h +++ b/byterun/backtrace.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: backtrace.h,v 1.8 2008/03/14 13:47:24 xleroy Exp $ */ +/* $Id: backtrace.h 9300 2009-06-18 11:17:16Z xclerc $ */ #ifndef CAML_BACKTRACE_H #define CAML_BACKTRACE_H @@ -22,6 +22,7 @@ CAMLextern int caml_backtrace_active; CAMLextern int caml_backtrace_pos; CAMLextern code_t * caml_backtrace_buffer; CAMLextern value caml_backtrace_last_exn; +CAMLextern char * caml_cds_file; CAMLprim value caml_record_backtrace(value vflag); #ifndef NATIVE_CODE diff --git a/byterun/callback.c b/byterun/callback.c index 2a5ea816..c30716b3 100644 --- a/byterun/callback.c +++ b/byterun/callback.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: callback.c,v 1.24 2006/09/11 12:12:24 doligez Exp $ */ +/* $Id: callback.c 7596 2006-09-11 12:12:24Z doligez $ */ /* Callbacks from C to Caml */ diff --git a/byterun/callback.h b/byterun/callback.h index e7339473..9937832b 100644 --- a/byterun/callback.h +++ b/byterun/callback.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: callback.h,v 1.14 2006/09/11 12:12:24 doligez Exp $ */ +/* $Id: callback.h 7596 2006-09-11 12:12:24Z doligez $ */ /* Callbacks from C to Caml */ diff --git a/byterun/compact.c b/byterun/compact.c index 710c0969..b10b6353 100644 --- a/byterun/compact.c +++ b/byterun/compact.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: compact.c,v 1.26 2008/02/29 12:56:15 doligez Exp $ */ +/* $Id: compact.c 8822 2008-02-29 12:56:15Z doligez $ */ #include diff --git a/byterun/compact.h b/byterun/compact.h index 424fe3e6..155e7ce8 100644 --- a/byterun/compact.h +++ b/byterun/compact.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: compact.h,v 1.7 2003/12/31 14:20:35 doligez Exp $ */ +/* $Id: compact.h 6044 2003-12-31 14:20:40Z doligez $ */ #ifndef CAML_COMPACT_H #define CAML_COMPACT_H diff --git a/byterun/compare.c b/byterun/compare.c index c49316f3..a383724e 100644 --- a/byterun/compare.c +++ b/byterun/compare.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: compare.c,v 1.39 2008/01/11 16:13:16 doligez Exp $ */ +/* $Id: compare.c 8768 2008-01-11 16:13:18Z doligez $ */ #include #include diff --git a/byterun/compare.h b/byterun/compare.h index 5f29b1f9..603d52bc 100644 --- a/byterun/compare.h +++ b/byterun/compare.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: compare.h,v 1.2 2003/12/31 14:20:35 doligez Exp $ */ +/* $Id: compare.h 6044 2003-12-31 14:20:40Z doligez $ */ #ifndef CAML_COMPARE_H #define CAML_COMPARE_H diff --git a/byterun/compatibility.h b/byterun/compatibility.h index 3c2d775c..fdc87b7c 100644 --- a/byterun/compatibility.h +++ b/byterun/compatibility.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: compatibility.h,v 1.17 2008/07/28 11:59:55 doligez Exp $ */ +/* $Id: compatibility.h 8953 2008-07-28 11:59:55Z doligez $ */ /* definitions for compatibility with old identifiers */ diff --git a/byterun/config.h b/byterun/config.h index 265d92a4..4606261e 100644 --- a/byterun/config.h +++ b/byterun/config.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: config.h,v 1.42.4.1 2008/11/02 14:30:05 xleroy Exp $ */ +/* $Id: config.h 9117 2008-11-02 14:30:05Z xleroy $ */ #ifndef CAML_CONFIG_H #define CAML_CONFIG_H diff --git a/byterun/custom.c b/byterun/custom.c index c83ed970..44bb5535 100644 --- a/byterun/custom.c +++ b/byterun/custom.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: custom.c,v 1.15 2005/09/22 14:21:50 xleroy Exp $ */ +/* $Id: custom.c 7064 2005-09-22 14:21:50Z xleroy $ */ #include diff --git a/byterun/custom.h b/byterun/custom.h index a8fc63f4..cddc6e96 100644 --- a/byterun/custom.h +++ b/byterun/custom.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: custom.h,v 1.13 2005/09/22 14:21:50 xleroy Exp $ */ +/* $Id: custom.h 7064 2005-09-22 14:21:50Z xleroy $ */ #ifndef CAML_CUSTOM_H #define CAML_CUSTOM_H diff --git a/byterun/debugger.c b/byterun/debugger.c index dd201fe0..378158d0 100644 --- a/byterun/debugger.c +++ b/byterun/debugger.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: debugger.c,v 1.31 2008/07/29 08:31:41 xleroy Exp $ */ +/* $Id: debugger.c 8955 2008-07-29 08:31:41Z xleroy $ */ /* Interface with the debugger */ diff --git a/byterun/debugger.h b/byterun/debugger.h index e030f971..124a59b3 100644 --- a/byterun/debugger.h +++ b/byterun/debugger.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: debugger.h,v 1.10 2005/09/22 14:21:50 xleroy Exp $ */ +/* $Id: debugger.h 7064 2005-09-22 14:21:50Z xleroy $ */ /* Interface with the debugger */ diff --git a/byterun/dynlink.c b/byterun/dynlink.c index ef8dcc07..cd6e8f6b 100644 --- a/byterun/dynlink.c +++ b/byterun/dynlink.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: dynlink.c,v 1.18 2008/04/22 12:24:10 frisch Exp $ */ +/* $Id: dynlink.c 8873 2008-04-22 12:24:10Z frisch $ */ /* Dynamic loading of C primitives. */ diff --git a/byterun/dynlink.h b/byterun/dynlink.h index 6b4f3014..aed9c03e 100644 --- a/byterun/dynlink.h +++ b/byterun/dynlink.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: dynlink.h,v 1.8 2004/02/22 15:07:51 xleroy Exp $ */ +/* $Id: dynlink.h 6130 2004-02-22 15:07:51Z xleroy $ */ /* Dynamic loading of C primitives. */ diff --git a/byterun/exec.h b/byterun/exec.h index ac788cd3..d126ea84 100644 --- a/byterun/exec.h +++ b/byterun/exec.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: exec.h,v 1.14 2004/06/01 12:36:34 xleroy Exp $ */ +/* $Id: exec.h 6359 2004-06-01 12:36:34Z xleroy $ */ /* exec.h : format of executable bytecode files */ diff --git a/byterun/extern.c b/byterun/extern.c index 24c58336..0e7bc62e 100644 --- a/byterun/extern.c +++ b/byterun/extern.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: extern.c,v 1.64 2008/08/04 11:45:58 xleroy Exp $ */ +/* $Id: extern.c 8978 2008-08-04 11:45:58Z xleroy $ */ /* Structured output */ diff --git a/byterun/fail.c b/byterun/fail.c index 11146f46..72af1f0e 100644 --- a/byterun/fail.c +++ b/byterun/fail.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: fail.c,v 1.32 2008/09/18 11:23:28 xleroy Exp $ */ +/* $Id: fail.c 9030 2008-09-18 11:23:28Z xleroy $ */ /* Raising exceptions from C. */ diff --git a/byterun/fail.h b/byterun/fail.h index ab7b1908..438728f9 100644 --- a/byterun/fail.h +++ b/byterun/fail.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: fail.h,v 1.27 2008/09/18 11:23:28 xleroy Exp $ */ +/* $Id: fail.h 9030 2008-09-18 11:23:28Z xleroy $ */ #ifndef CAML_FAIL_H #define CAML_FAIL_H diff --git a/byterun/finalise.c b/byterun/finalise.c index f352f28a..c0042b76 100644 --- a/byterun/finalise.c +++ b/byterun/finalise.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: finalise.c,v 1.23.2.1 2009/05/18 09:37:46 doligez Exp $ */ +/* $Id: finalise.c 9259 2009-05-18 09:37:46Z doligez $ */ /* Handling of finalised values. */ diff --git a/byterun/finalise.h b/byterun/finalise.h index 1ed4925d..cca82a1f 100644 --- a/byterun/finalise.h +++ b/byterun/finalise.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: finalise.h,v 1.5 2004/01/02 19:23:21 doligez Exp $ */ +/* $Id: finalise.h 6047 2004-01-02 19:23:29Z doligez $ */ #ifndef CAML_FINALISE_H #define CAML_FINALISE_H diff --git a/byterun/fix_code.c b/byterun/fix_code.c index cf732755..ac6281f2 100644 --- a/byterun/fix_code.c +++ b/byterun/fix_code.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: fix_code.c,v 1.31 2004/05/26 11:10:51 garrigue Exp $ */ +/* $Id: fix_code.c 6331 2004-05-26 11:10:52Z garrigue $ */ /* Handling of blocks of bytecode (endianness switch, threading). */ diff --git a/byterun/fix_code.h b/byterun/fix_code.h index c0ec39b8..3a841bb9 100644 --- a/byterun/fix_code.h +++ b/byterun/fix_code.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: fix_code.h,v 1.17 2004/01/02 19:23:21 doligez Exp $ */ +/* $Id: fix_code.h 6047 2004-01-02 19:23:29Z doligez $ */ /* Handling of blocks of bytecode (endianness switch, threading). */ diff --git a/byterun/floats.c b/byterun/floats.c index cdaff761..86f027ee 100644 --- a/byterun/floats.c +++ b/byterun/floats.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: floats.c,v 1.50 2008/08/02 11:02:28 xleroy Exp $ */ +/* $Id: floats.c 8976 2008-08-02 11:02:28Z xleroy $ */ /* The interface of this file is in "mlvalues.h" and "alloc.h" */ diff --git a/byterun/freelist.c b/byterun/freelist.c index ae9f4ce1..4201dfd9 100644 --- a/byterun/freelist.c +++ b/byterun/freelist.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: freelist.c,v 1.20.4.1 2008/11/18 10:24:42 doligez Exp $ */ +/* $Id: freelist.c 9131 2008-11-18 10:24:43Z doligez $ */ #define FREELIST_DEBUG 0 #if FREELIST_DEBUG diff --git a/byterun/freelist.h b/byterun/freelist.h index 1ec93e91..930f6894 100644 --- a/byterun/freelist.h +++ b/byterun/freelist.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: freelist.h,v 1.13.4.1 2008/11/18 10:24:43 doligez Exp $ */ +/* $Id: freelist.h 9131 2008-11-18 10:24:43Z doligez $ */ /* Free lists of heap blocks. */ diff --git a/byterun/gc.h b/byterun/gc.h index 6f77fc46..7acaea82 100644 --- a/byterun/gc.h +++ b/byterun/gc.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: gc.h,v 1.15 2004/07/19 13:20:06 xleroy Exp $ */ +/* $Id: gc.h 6557 2004-07-19 13:20:06Z xleroy $ */ #ifndef CAML_GC_H #define CAML_GC_H diff --git a/byterun/gc_ctrl.c b/byterun/gc_ctrl.c index 69114da6..d38c704e 100644 --- a/byterun/gc_ctrl.c +++ b/byterun/gc_ctrl.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: gc_ctrl.c,v 1.53.4.2 2008/11/20 18:33:13 doligez Exp $ */ +/* $Id: gc_ctrl.c 9409 2009-11-04 12:24:35Z doligez $ */ #include "alloc.h" #include "compact.h" @@ -41,7 +41,7 @@ intnat caml_stat_minor_collections = 0, caml_stat_compactions = 0, caml_stat_heap_chunks = 0; -extern asize_t caml_major_heap_increment; /* bytes; see major_gc.c */ +extern uintnat caml_major_heap_increment; /* bytes; see major_gc.c */ extern uintnat caml_percent_free; /* see major_gc.c */ extern uintnat caml_percent_max; /* see compact.c */ extern uintnat caml_allocation_policy; /* see freelist.c */ @@ -419,7 +419,7 @@ static void test_and_compact (void) fp = 100.0 * caml_fl_cur_size / (Wsize_bsize (caml_stat_heap_size) - caml_fl_cur_size); - if (fp > 1000000.0) fp = 1000000.0; + if (fp > 999999.0) fp = 999999.0; caml_gc_message (0x200, "Estimated overhead (lower bound) = %" ARCH_INTNAT_PRINTF_FORMAT "u%%\n", (uintnat) fp); diff --git a/byterun/gc_ctrl.h b/byterun/gc_ctrl.h index 6c3d9ea8..512f986f 100644 --- a/byterun/gc_ctrl.h +++ b/byterun/gc_ctrl.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: gc_ctrl.h,v 1.16 2005/09/22 14:21:50 xleroy Exp $ */ +/* $Id: gc_ctrl.h 7064 2005-09-22 14:21:50Z xleroy $ */ #ifndef CAML_GC_CTRL_H #define CAML_GC_CTRL_H diff --git a/byterun/globroots.c b/byterun/globroots.c index 3f60e95d..38aac416 100644 --- a/byterun/globroots.c +++ b/byterun/globroots.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: globroots.c,v 1.11.2.1 2009/03/28 15:26:37 xleroy Exp $ */ +/* $Id: globroots.c 9195 2009-03-28 15:26:37Z xleroy $ */ /* Registration of global memory roots */ diff --git a/byterun/globroots.h b/byterun/globroots.h index faa23032..3f1e6c4b 100644 --- a/byterun/globroots.h +++ b/byterun/globroots.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: globroots.h,v 1.5 2008/03/10 19:56:39 xleroy Exp $ */ +/* $Id: globroots.h 8828 2008-03-10 19:56:39Z xleroy $ */ /* Registration of global memory roots */ diff --git a/byterun/hash.c b/byterun/hash.c index dc0d58dc..c25ffa98 100644 --- a/byterun/hash.c +++ b/byterun/hash.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: hash.c,v 1.26 2008/08/01 14:10:36 xleroy Exp $ */ +/* $Id: hash.c 8970 2008-08-01 14:10:36Z xleroy $ */ /* The generic hashing primitive */ diff --git a/byterun/instrtrace.c b/byterun/instrtrace.c index fbff0013..b301c455 100644 --- a/byterun/instrtrace.c +++ b/byterun/instrtrace.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: instrtrace.c,v 1.22 2008/01/03 09:37:09 xleroy Exp $ */ +/* $Id: instrtrace.c 8743 2008-01-03 09:37:10Z xleroy $ */ /* Trace the instructions executed */ diff --git a/byterun/instrtrace.h b/byterun/instrtrace.h index a9d1716c..1e7657bc 100644 --- a/byterun/instrtrace.h +++ b/byterun/instrtrace.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: instrtrace.h,v 1.9 2005/09/22 14:21:50 xleroy Exp $ */ +/* $Id: instrtrace.h 7064 2005-09-22 14:21:50Z xleroy $ */ /* Trace the instructions executed */ diff --git a/byterun/instruct.h b/byterun/instruct.h index 1e6cda78..c684dcf9 100644 --- a/byterun/instruct.h +++ b/byterun/instruct.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: instruct.h,v 1.20 2004/05/26 11:10:51 garrigue Exp $ */ +/* $Id: instruct.h 6331 2004-05-26 11:10:52Z garrigue $ */ /* The instruction set. */ diff --git a/byterun/int64_emul.h b/byterun/int64_emul.h index f788103c..a5a5024e 100644 --- a/byterun/int64_emul.h +++ b/byterun/int64_emul.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: int64_emul.h,v 1.5.18.1 2009/03/28 18:34:19 xleroy Exp $ */ +/* $Id: int64_emul.h 9202 2009-03-28 18:34:19Z xleroy $ */ /* Software emulation of 64-bit integer arithmetic, for C compilers that do not support it. */ diff --git a/byterun/int64_format.h b/byterun/int64_format.h index 71a1634f..a0a4f256 100644 --- a/byterun/int64_format.h +++ b/byterun/int64_format.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: int64_format.h,v 1.2 2003/12/15 18:10:47 doligez Exp $ */ +/* $Id: int64_format.h 6021 2003-12-15 18:10:51Z doligez $ */ /* printf-like formatting of 64-bit integers, in case the C library printf() function does not support them. */ diff --git a/byterun/int64_native.h b/byterun/int64_native.h index 9fe40cbf..3a437df3 100644 --- a/byterun/int64_native.h +++ b/byterun/int64_native.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: int64_native.h,v 1.5.18.1 2009/03/28 18:34:19 xleroy Exp $ */ +/* $Id: int64_native.h 9202 2009-03-28 18:34:19Z xleroy $ */ /* Wrapper macros around native 64-bit integer arithmetic, so that it has the same interface as the software emulation diff --git a/byterun/intern.c b/byterun/intern.c index 8cb25e6c..78972f6a 100644 --- a/byterun/intern.c +++ b/byterun/intern.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: intern.c,v 1.61 2008/01/11 16:13:16 doligez Exp $ */ +/* $Id: intern.c 8768 2008-01-11 16:13:18Z doligez $ */ /* Structured input, compact format */ diff --git a/byterun/interp.c b/byterun/interp.c index 7e997871..0a2f0438 100644 --- a/byterun/interp.c +++ b/byterun/interp.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: interp.c,v 1.97.2.1 2009/05/25 08:02:16 xleroy Exp $ */ +/* $Id: interp.c 9279 2009-05-25 08:03:14Z xleroy $ */ /* The bytecode interpreter */ #include diff --git a/byterun/interp.h b/byterun/interp.h index 299b0917..8b83903c 100644 --- a/byterun/interp.h +++ b/byterun/interp.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: interp.h,v 1.13 2004/04/26 14:08:22 basile Exp $ */ +/* $Id: interp.h 6257 2004-04-26 14:08:22Z basile $ */ /* The bytecode interpreter */ diff --git a/byterun/intext.h b/byterun/intext.h index 7d8eb4c0..de0ef684 100644 --- a/byterun/intext.h +++ b/byterun/intext.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: intext.h,v 1.32 2005/09/22 14:21:50 xleroy Exp $ */ +/* $Id: intext.h 7064 2005-09-22 14:21:50Z xleroy $ */ /* Structured input/output */ diff --git a/byterun/ints.c b/byterun/ints.c index f6c9d70c..268c6561 100644 --- a/byterun/ints.c +++ b/byterun/ints.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: ints.c,v 1.51.4.2 2009/03/28 18:43:08 xleroy Exp $ */ +/* $Id: ints.c 9203 2009-03-28 18:43:08Z xleroy $ */ #include #include diff --git a/byterun/io.c b/byterun/io.c index 04b97461..c72fc4d5 100644 --- a/byterun/io.c +++ b/byterun/io.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: io.c,v 1.77 2007/02/25 12:38:36 xleroy Exp $ */ +/* $Id: io.c 7919 2007-02-25 12:38:36Z xleroy $ */ /* Buffered input/output. */ diff --git a/byterun/io.h b/byterun/io.h index e0c5b367..e43d5ec3 100644 --- a/byterun/io.h +++ b/byterun/io.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: io.h,v 1.32 2008/09/27 21:16:29 weis Exp $ */ +/* $Id: io.h 9041 2008-09-27 21:16:29Z weis $ */ /* Buffered input/output */ diff --git a/byterun/lexing.c b/byterun/lexing.c index db134f52..4a6fd486 100644 --- a/byterun/lexing.c +++ b/byterun/lexing.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: lexing.c,v 1.27 2004/01/01 16:42:36 doligez Exp $ */ +/* $Id: lexing.c 6045 2004-01-01 16:42:43Z doligez $ */ /* The table-driven automaton for lexers generated by camllex. */ diff --git a/byterun/main.c b/byterun/main.c index 199b5085..ad7f5c5a 100644 --- a/byterun/main.c +++ b/byterun/main.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: main.c,v 1.37 2008/02/29 12:56:15 doligez Exp $ */ +/* $Id: main.c 8822 2008-02-29 12:56:15Z doligez $ */ /* Main entry point (can be overridden by a user-provided main() function that calls caml_main() later). */ diff --git a/byterun/major_gc.c b/byterun/major_gc.c index c6aebf3f..db9fa8a3 100644 --- a/byterun/major_gc.c +++ b/byterun/major_gc.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: major_gc.c,v 1.62.2.1 2008/11/12 12:53:07 doligez Exp $ */ +/* $Id: major_gc.c 9409 2009-11-04 12:24:35Z doligez $ */ #include @@ -30,7 +30,7 @@ #include "weak.h" uintnat caml_percent_free; -intnat caml_major_heap_increment; +uintnat caml_major_heap_increment; CAMLexport char *caml_heap_start; char *caml_gc_sweep_hp; int caml_gc_phase; /* always Phase_mark, Phase_sweep, or Phase_idle */ diff --git a/byterun/major_gc.h b/byterun/major_gc.h index bb31a6a9..588ea503 100644 --- a/byterun/major_gc.h +++ b/byterun/major_gc.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: major_gc.h,v 1.23 2008/01/11 11:55:36 doligez Exp $ */ +/* $Id: major_gc.h 8766 2008-01-11 11:55:36Z doligez $ */ #ifndef CAML_MAJOR_GC_H #define CAML_MAJOR_GC_H diff --git a/byterun/md5.c b/byterun/md5.c index 700b765b..5d1f7e96 100644 --- a/byterun/md5.c +++ b/byterun/md5.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: md5.c,v 1.20 2006/04/16 23:28:21 doligez Exp $ */ +/* $Id: md5.c 7382 2006-04-16 23:28:22Z doligez $ */ #include #include "alloc.h" diff --git a/byterun/md5.h b/byterun/md5.h index d3a72a38..6eff13a9 100644 --- a/byterun/md5.h +++ b/byterun/md5.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: md5.h,v 1.13 2005/09/22 14:21:50 xleroy Exp $ */ +/* $Id: md5.h 7064 2005-09-22 14:21:50Z xleroy $ */ /* MD5 message digest */ diff --git a/byterun/memory.c b/byterun/memory.c index 3ab37a42..e609796f 100644 --- a/byterun/memory.c +++ b/byterun/memory.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: memory.c,v 1.46.4.1 2008/11/02 14:30:05 xleroy Exp $ */ +/* $Id: memory.c 9117 2008-11-02 14:30:05Z xleroy $ */ #include #include diff --git a/byterun/memory.h b/byterun/memory.h index fd16351e..1edab765 100644 --- a/byterun/memory.h +++ b/byterun/memory.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: memory.h,v 1.59.4.1 2008/11/02 14:30:05 xleroy Exp $ */ +/* $Id: memory.h 9117 2008-11-02 14:30:05Z xleroy $ */ /* Allocation macros and functions */ diff --git a/byterun/meta.c b/byterun/meta.c index d3b0d94b..d28aa37e 100644 --- a/byterun/meta.c +++ b/byterun/meta.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: meta.c,v 1.33 2008/01/31 09:13:19 frisch Exp $ */ +/* $Id: meta.c 8800 2008-01-31 09:13:19Z frisch $ */ /* Primitives for the toplevel */ diff --git a/byterun/minor_gc.c b/byterun/minor_gc.c index f20411c4..84d51b20 100644 --- a/byterun/minor_gc.c +++ b/byterun/minor_gc.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: minor_gc.c,v 1.47 2008/07/28 12:03:55 doligez Exp $ */ +/* $Id: minor_gc.c 8954 2008-07-28 12:03:55Z doligez $ */ #include #include "config.h" diff --git a/byterun/minor_gc.h b/byterun/minor_gc.h index e3e9d8ab..c9751e0d 100644 --- a/byterun/minor_gc.h +++ b/byterun/minor_gc.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: minor_gc.h,v 1.18 2007/05/04 14:05:13 doligez Exp $ */ +/* $Id: minor_gc.h 8211 2007-05-04 14:05:13Z doligez $ */ #ifndef CAML_MINOR_GC_H #define CAML_MINOR_GC_H diff --git a/byterun/misc.c b/byterun/misc.c index be9e54b4..8c25b75e 100644 --- a/byterun/misc.c +++ b/byterun/misc.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: misc.c,v 1.29 2008/02/29 12:56:15 doligez Exp $ */ +/* $Id: misc.c 8822 2008-02-29 12:56:15Z doligez $ */ #include #include "config.h" diff --git a/byterun/misc.h b/byterun/misc.h index 8d82025b..336f7bb3 100644 --- a/byterun/misc.h +++ b/byterun/misc.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: misc.h,v 1.33 2008/02/29 12:56:15 doligez Exp $ */ +/* $Id: misc.h 8822 2008-02-29 12:56:15Z doligez $ */ /* Miscellaneous macros and variables. */ diff --git a/byterun/mlvalues.h b/byterun/mlvalues.h index 90635630..8f97458f 100644 --- a/byterun/mlvalues.h +++ b/byterun/mlvalues.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: mlvalues.h,v 1.58 2008/08/01 14:10:36 xleroy Exp $ */ +/* $Id: mlvalues.h 8970 2008-08-01 14:10:36Z xleroy $ */ #ifndef CAML_MLVALUES_H #define CAML_MLVALUES_H diff --git a/byterun/obj.c b/byterun/obj.c index f2c4b374..5a5ae701 100644 --- a/byterun/obj.c +++ b/byterun/obj.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: obj.c,v 1.42 2008/01/29 13:11:15 doligez Exp $ */ +/* $Id: obj.c 9350 2009-09-24 09:12:51Z doligez $ */ /* Operations on objects */ @@ -165,6 +165,10 @@ CAMLprim value caml_obj_truncate (value v, value newsize) return Val_unit; } +CAMLprim value caml_obj_add_offset (value v, value offset) +{ + return v + Int32_val (offset); +} /* The following functions are used in stdlib/lazy.ml. They are not written in O'Caml because they must be atomic with respect diff --git a/byterun/osdeps.h b/byterun/osdeps.h index 494e188b..3ad18e83 100644 --- a/byterun/osdeps.h +++ b/byterun/osdeps.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: osdeps.h,v 1.12 2008/04/22 12:24:10 frisch Exp $ */ +/* $Id: osdeps.h 8873 2008-04-22 12:24:10Z frisch $ */ /* Operating system - specific stuff */ diff --git a/byterun/parsing.c b/byterun/parsing.c index 49050672..1816d5bb 100644 --- a/byterun/parsing.c +++ b/byterun/parsing.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: parsing.c,v 1.21 2008/08/06 09:38:25 xleroy Exp $ */ +/* $Id: parsing.c 8983 2008-08-06 09:38:25Z xleroy $ */ /* The PDA automaton for parsers generated by camlyacc */ diff --git a/byterun/prims.h b/byterun/prims.h index f4e76f39..0f4112ea 100644 --- a/byterun/prims.h +++ b/byterun/prims.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: prims.h,v 1.10 2004/02/22 15:07:51 xleroy Exp $ */ +/* $Id: prims.h 6130 2004-02-22 15:07:51Z xleroy $ */ /* Interface with C primitives. */ diff --git a/byterun/printexc.c b/byterun/printexc.c index b0003f1c..c2490f1c 100644 --- a/byterun/printexc.c +++ b/byterun/printexc.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: printexc.c,v 1.17 2007/01/29 12:11:15 xleroy Exp $ */ +/* $Id: printexc.c 7812 2007-01-29 12:11:18Z xleroy $ */ /* Print an uncaught exception and abort */ diff --git a/byterun/printexc.h b/byterun/printexc.h index c050b27b..cc48f4b2 100644 --- a/byterun/printexc.h +++ b/byterun/printexc.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: printexc.h,v 1.5 2004/01/01 16:42:37 doligez Exp $ */ +/* $Id: printexc.h 6045 2004-01-01 16:42:43Z doligez $ */ #ifndef CAML_PRINTEXC_H #define CAML_PRINTEXC_H diff --git a/byterun/reverse.h b/byterun/reverse.h index 26c0e01a..eaacf1bb 100644 --- a/byterun/reverse.h +++ b/byterun/reverse.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: reverse.h,v 1.12 2003/12/15 18:10:48 doligez Exp $ */ +/* $Id: reverse.h 6021 2003-12-15 18:10:51Z doligez $ */ /* Swap byte-order in 16, 32, and 64-bit integers or floats */ diff --git a/byterun/roots.c b/byterun/roots.c index dabb0016..d5ae3cb7 100644 --- a/byterun/roots.c +++ b/byterun/roots.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: roots.c,v 1.30 2008/03/10 19:56:39 xleroy Exp $ */ +/* $Id: roots.c 8828 2008-03-10 19:56:39Z xleroy $ */ /* To walk the memory roots for garbage collection */ diff --git a/byterun/roots.h b/byterun/roots.h index ec6a2063..4e02be2f 100644 --- a/byterun/roots.h +++ b/byterun/roots.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: roots.h,v 1.19 2005/09/22 14:21:50 xleroy Exp $ */ +/* $Id: roots.h 7064 2005-09-22 14:21:50Z xleroy $ */ #ifndef CAML_ROOTS_H #define CAML_ROOTS_H diff --git a/byterun/signals.c b/byterun/signals.c index a7236218..1c001200 100644 --- a/byterun/signals.c +++ b/byterun/signals.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: signals.c,v 1.53 2007/02/23 09:29:45 xleroy Exp $ */ +/* $Id: signals.c 7904 2007-02-23 09:29:45Z xleroy $ */ /* Signal handling, code common to the bytecode and native systems */ diff --git a/byterun/signals.h b/byterun/signals.h index ba6b7dcf..96372b49 100644 --- a/byterun/signals.h +++ b/byterun/signals.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: signals.h,v 1.27 2007/02/23 09:29:45 xleroy Exp $ */ +/* $Id: signals.h 7904 2007-02-23 09:29:45Z xleroy $ */ #ifndef CAML_SIGNALS_H #define CAML_SIGNALS_H diff --git a/byterun/signals_byt.c b/byterun/signals_byt.c index 44adbeaf..13a1d04f 100644 --- a/byterun/signals_byt.c +++ b/byterun/signals_byt.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: signals_byt.c,v 1.1 2007/02/23 09:29:45 xleroy Exp $ */ +/* $Id: signals_byt.c 7904 2007-02-23 09:29:45Z xleroy $ */ /* Signal handling, code specific to the bytecode interpreter */ diff --git a/byterun/signals_machdep.h b/byterun/signals_machdep.h index 7980c6b4..d96c0174 100644 --- a/byterun/signals_machdep.h +++ b/byterun/signals_machdep.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: signals_machdep.h,v 1.3 2007/02/23 09:43:14 xleroy Exp $ */ +/* $Id: signals_machdep.h 7905 2007-02-23 09:43:14Z xleroy $ */ /* Processor-specific operation: atomic "read and clear" */ diff --git a/byterun/stacks.c b/byterun/stacks.c index 8ebaa241..de562254 100644 --- a/byterun/stacks.c +++ b/byterun/stacks.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: stacks.c,v 1.22 2005/09/22 14:21:50 xleroy Exp $ */ +/* $Id: stacks.c 7064 2005-09-22 14:21:50Z xleroy $ */ /* To initialize and resize the stacks */ diff --git a/byterun/stacks.h b/byterun/stacks.h index a4917373..6e8a2f5e 100644 --- a/byterun/stacks.h +++ b/byterun/stacks.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: stacks.h,v 1.14 2005/09/22 14:21:50 xleroy Exp $ */ +/* $Id: stacks.h 7064 2005-09-22 14:21:50Z xleroy $ */ /* structure of the stacks */ diff --git a/byterun/startup.c b/byterun/startup.c index 55be64ec..ecddfe40 100644 --- a/byterun/startup.c +++ b/byterun/startup.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: startup.c,v 1.70.2.1 2008/11/18 10:24:43 doligez Exp $ */ +/* $Id: startup.c 9300 2009-06-18 11:17:16Z xclerc $ */ /* Start-up code */ @@ -439,12 +439,18 @@ CAMLexport void caml_startup_code( char **argv) { value res; + char* cds_file; caml_init_ieee_floats(); caml_init_custom_operations(); #ifdef DEBUG caml_verb_gc = 63; #endif + cds_file = getenv("CAML_DEBUG_FILE"); + if (cds_file != NULL) { + caml_cds_file = caml_stat_alloc(strlen(cds_file) + 1); + strcpy(caml_cds_file, cds_file); + } parse_camlrunparam(); caml_external_raise = NULL; /* Initialize the abstract machine */ @@ -454,8 +460,17 @@ CAMLexport void caml_startup_code( init_atoms(); /* Initialize the interpreter */ caml_interprete(NULL, 0); + /* Initialize the debugger, if needed */ + caml_debugger_init(); /* Load the code */ caml_start_code = code; + caml_code_size = code_size; + if (caml_debugger_in_use) { + int len, i; + len = code_size / sizeof(opcode_t); + caml_saved_code = (unsigned char *) caml_stat_alloc(len); + for (i = 0; i < len; i++) caml_saved_code[i] = caml_start_code[i]; + } #ifdef THREADED_CODE caml_thread_code(caml_start_code, code_size); #endif @@ -469,10 +484,19 @@ CAMLexport void caml_startup_code( /* Record the sections (for caml_get_section_table in meta.c) */ caml_section_table = section_table; caml_section_table_size = section_table_size; - /* Run the code */ + /* Initialize system libraries */ caml_init_exceptions(); caml_sys_init("", argv); - res = caml_interprete(caml_start_code, code_size); - if (Is_exception_result(res)) - caml_fatal_uncaught_exception(Extract_exception(res)); + /* Execute the program */ + caml_debugger(PROGRAM_START); + res = caml_interprete(caml_start_code, caml_code_size); + if (Is_exception_result(res)) { + caml_exn_bucket = Extract_exception(res); + if (caml_debugger_in_use) { + caml_extern_sp = &caml_exn_bucket; /* The debugger needs the + exception value.*/ + caml_debugger(UNCAUGHT_EXC); + } + caml_fatal_uncaught_exception(caml_exn_bucket); + } } diff --git a/byterun/startup.h b/byterun/startup.h index b103faa6..a3ffb8b6 100644 --- a/byterun/startup.h +++ b/byterun/startup.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: startup.h,v 1.5 2004/02/22 15:07:51 xleroy Exp $ */ +/* $Id: startup.h 6130 2004-02-22 15:07:51Z xleroy $ */ #ifndef CAML_STARTUP_H #define CAML_STARTUP_H diff --git a/byterun/str.c b/byterun/str.c index eda1db5b..c2fb7d9c 100644 --- a/byterun/str.c +++ b/byterun/str.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: str.c,v 1.28 2007/01/30 09:52:08 xleroy Exp $ */ +/* $Id: str.c 7819 2007-01-30 09:52:08Z xleroy $ */ /* Operations on strings */ diff --git a/byterun/sys.c b/byterun/sys.c index 446d54f9..458d3172 100644 --- a/byterun/sys.c +++ b/byterun/sys.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: sys.c,v 1.83 2007/03/01 13:37:39 xleroy Exp $ */ +/* $Id: sys.c 7944 2007-03-01 13:37:39Z xleroy $ */ /* Basic system calls */ diff --git a/byterun/sys.h b/byterun/sys.h index 1c7e2c80..ef56d94a 100644 --- a/byterun/sys.h +++ b/byterun/sys.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: sys.h,v 1.16 2007/02/25 12:38:36 xleroy Exp $ */ +/* $Id: sys.h 7919 2007-02-25 12:38:36Z xleroy $ */ #ifndef CAML_SYS_H #define CAML_SYS_H diff --git a/byterun/terminfo.c b/byterun/terminfo.c index 1525de3c..ac982d6e 100644 --- a/byterun/terminfo.c +++ b/byterun/terminfo.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: terminfo.c,v 1.23 2004/01/01 16:42:38 doligez Exp $ */ +/* $Id: terminfo.c 6045 2004-01-01 16:42:43Z doligez $ */ /* Read and output terminal commands */ diff --git a/byterun/ui.h b/byterun/ui.h index 8df391dc..2c213fdb 100644 --- a/byterun/ui.h +++ b/byterun/ui.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: ui.h,v 1.5 2003/12/15 18:10:49 doligez Exp $ */ +/* $Id: ui.h 6021 2003-12-15 18:10:51Z doligez $ */ /* Function declarations for non-Unix user interfaces */ diff --git a/byterun/unix.c b/byterun/unix.c index 457f88c3..77cb9e9d 100644 --- a/byterun/unix.c +++ b/byterun/unix.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: unix.c,v 1.35.2.1 2008/12/03 12:39:44 xleroy Exp $ */ +/* $Id: unix.c 9147 2008-12-03 12:39:44Z xleroy $ */ /* Unix-specific stuff */ diff --git a/byterun/weak.c b/byterun/weak.c index 09a10f9c..9661db61 100644 --- a/byterun/weak.c +++ b/byterun/weak.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: weak.c,v 1.29 2008/09/17 14:55:30 doligez Exp $ */ +/* $Id: weak.c 9028 2008-09-17 14:55:30Z doligez $ */ /* Operations on weak arrays */ diff --git a/byterun/weak.h b/byterun/weak.h index 9b37a982..5b4a02d0 100644 --- a/byterun/weak.h +++ b/byterun/weak.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: weak.h,v 1.7 2004/01/01 16:42:38 doligez Exp $ */ +/* $Id: weak.h 6045 2004-01-01 16:42:43Z doligez $ */ /* Operations on weak arrays */ diff --git a/byterun/win32.c b/byterun/win32.c index 418104d0..78bb8d67 100644 --- a/byterun/win32.c +++ b/byterun/win32.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: win32.c,v 1.36 2008/04/22 12:24:10 frisch Exp $ */ +/* $Id: win32.c 8873 2008-04-22 12:24:10Z frisch $ */ /* Win32-specific stuff */ diff --git a/camlp4/Makefile.ml b/camlp4/Makefile.ml index 543c9f14..32d212be 100644 --- a/camlp4/Makefile.ml +++ b/camlp4/Makefile.ml @@ -90,7 +90,7 @@ let may_define_unix = if windows then [] else ["-D UNIX"] let () = !options.ocaml_Flags ^= "-w Ale -warn-error Ale"^^ - (if getenv "DTYPES" "" <> "" then "-dtypes" + (if getenv "DTYPES" "" <> "" then "-annot" else ""); !options.ocaml_P4 := camlp4boot_may_debug may_define_unix; !options.ocaml_P4_opt := camlp4boot_may_debug ("-D OPT" :: may_define_unix); diff --git a/config/Makefile-templ b/config/Makefile-templ index f672be16..bf514217 100644 --- a/config/Makefile-templ +++ b/config/Makefile-templ @@ -11,7 +11,7 @@ # # ######################################################################### -# $Id: Makefile-templ,v 1.31 2007/10/30 12:37:16 xleroy Exp $ +# $Id: Makefile-templ 9313 2009-07-15 12:13:31Z xleroy $ ### Compile-time configuration @@ -78,10 +78,14 @@ SHARPBANGSCRIPTS=true # Under FreeBSD: #CPP=cpp -P +### Magic declarations for ocamlbuild -- leave unchanged +#ml let syslib x = "-l"^x;; +#ml let mklib out files opts = Printf.sprintf "ar rc %s %s %s; ranlib %s" out opts files out;; + ### How to invoke ranlib -# BSD-style: -#RANLIB=ranlib -#RANLIBCMD=ranlib +RANLIB=ranlib +RANLIBCMD=ranlib + # If ranlib is not needed: #RANLIB=ar rs #RANLIBCMD= diff --git a/config/Makefile.mingw b/config/Makefile.mingw index a94f6932..5c08ee82 100644 --- a/config/Makefile.mingw +++ b/config/Makefile.mingw @@ -11,7 +11,7 @@ # # ######################################################################### -# $Id: Makefile.mingw,v 1.27.2.1 2008/11/09 09:44:24 xleroy Exp $ +# $Id: Makefile.mingw 9124 2008-11-09 09:44:24Z xleroy $ # Configuration for Windows, Mingw compiler diff --git a/config/Makefile.msvc b/config/Makefile.msvc index 044f4b7c..284a478e 100644 --- a/config/Makefile.msvc +++ b/config/Makefile.msvc @@ -11,7 +11,7 @@ # # ######################################################################### -# $Id: Makefile.msvc,v 1.30.2.1 2008/11/10 15:24:51 xleroy Exp $ +# $Id: Makefile.msvc 9126 2008-11-10 15:24:51Z xleroy $ # Configuration for Windows, Visual C++ compiler diff --git a/config/Makefile.msvc64 b/config/Makefile.msvc64 index d409347c..e8bc54e9 100644 --- a/config/Makefile.msvc64 +++ b/config/Makefile.msvc64 @@ -11,7 +11,7 @@ # # ######################################################################### -# $Id: Makefile.msvc64,v 1.13 2008/07/29 08:31:41 xleroy Exp $ +# $Id: Makefile.msvc64 8955 2008-07-29 08:31:41Z xleroy $ # Configuration for Windows, Visual C++ compiler diff --git a/config/auto-aux/align.c b/config/auto-aux/align.c index 160d33ec..b98e33da 100644 --- a/config/auto-aux/align.c +++ b/config/auto-aux/align.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: align.c,v 1.7 2001/12/07 13:39:41 xleroy Exp $ */ +/* $Id: align.c 4144 2001-12-07 13:41:02Z xleroy $ */ #include #include diff --git a/config/auto-aux/async_io.c b/config/auto-aux/async_io.c index 7d141dd7..10aaa764 100644 --- a/config/auto-aux/async_io.c +++ b/config/auto-aux/async_io.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: async_io.c,v 1.8 2003/02/11 14:05:36 xleroy Exp $ */ +/* $Id: async_io.c 5393 2003-02-11 14:05:36Z xleroy $ */ #include #include diff --git a/config/auto-aux/bytecopy.c b/config/auto-aux/bytecopy.c index 537c4f7b..a16f3978 100644 --- a/config/auto-aux/bytecopy.c +++ b/config/auto-aux/bytecopy.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: bytecopy.c,v 1.7 2001/12/07 13:39:43 xleroy Exp $ */ +/* $Id: bytecopy.c 4144 2001-12-07 13:41:02Z xleroy $ */ char buffer[27]; diff --git a/config/auto-aux/dblalign.c b/config/auto-aux/dblalign.c index 9cf6956e..76c021b7 100644 --- a/config/auto-aux/dblalign.c +++ b/config/auto-aux/dblalign.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: dblalign.c,v 1.9 2001/12/07 13:39:43 xleroy Exp $ */ +/* $Id: dblalign.c 4144 2001-12-07 13:41:02Z xleroy $ */ #include #include diff --git a/config/auto-aux/divmod.c b/config/auto-aux/divmod.c index fb579c5e..c4ddf861 100644 --- a/config/auto-aux/divmod.c +++ b/config/auto-aux/divmod.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: divmod.c,v 1.3 2003/12/30 23:59:47 doligez Exp $ */ +/* $Id: divmod.c 6043 2003-12-31 00:00:57Z doligez $ */ /* Test semantics of division and modulus for negative arguments */ diff --git a/config/auto-aux/elf.c b/config/auto-aux/elf.c index 63ade0a5..e0f6653a 100644 --- a/config/auto-aux/elf.c +++ b/config/auto-aux/elf.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: elf.c,v 1.4 2001/12/07 13:39:43 xleroy Exp $ */ +/* $Id: elf.c 4144 2001-12-07 13:41:02Z xleroy $ */ #include diff --git a/config/auto-aux/endian.c b/config/auto-aux/endian.c index fad4b9d8..d3b622a0 100644 --- a/config/auto-aux/endian.c +++ b/config/auto-aux/endian.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: endian.c,v 1.8 2001/12/07 13:39:43 xleroy Exp $ */ +/* $Id: endian.c 4144 2001-12-07 13:41:02Z xleroy $ */ #include "m.h" diff --git a/config/auto-aux/getgroups.c b/config/auto-aux/getgroups.c index 6a1ee687..547d5e4a 100644 --- a/config/auto-aux/getgroups.c +++ b/config/auto-aux/getgroups.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: getgroups.c,v 1.8 2001/12/07 13:39:43 xleroy Exp $ */ +/* $Id: getgroups.c 4144 2001-12-07 13:41:02Z xleroy $ */ #include #include diff --git a/config/auto-aux/gethostbyaddr.c b/config/auto-aux/gethostbyaddr.c index 60c34e25..c11bb019 100644 --- a/config/auto-aux/gethostbyaddr.c +++ b/config/auto-aux/gethostbyaddr.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: gethostbyaddr.c,v 1.2 2002/05/06 08:29:52 xleroy Exp $ */ +/* $Id: gethostbyaddr.c 4771 2002-05-06 08:29:52Z xleroy $ */ #ifndef _REENTRANT /* This helps detection on Digital Unix... */ diff --git a/config/auto-aux/gethostbyname.c b/config/auto-aux/gethostbyname.c index f1830aa7..270905f2 100644 --- a/config/auto-aux/gethostbyname.c +++ b/config/auto-aux/gethostbyname.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: gethostbyname.c,v 1.2 2002/05/06 08:29:52 xleroy Exp $ */ +/* $Id: gethostbyname.c 4771 2002-05-06 08:29:52Z xleroy $ */ #ifndef _REENTRANT /* This helps detection on Digital Unix... */ diff --git a/config/auto-aux/ia32sse2.c b/config/auto-aux/ia32sse2.c index 20d3a160..41d62017 100644 --- a/config/auto-aux/ia32sse2.c +++ b/config/auto-aux/ia32sse2.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: ia32sse2.c,v 1.2 2005/03/24 17:20:53 doligez Exp $ */ +/* $Id: ia32sse2.c 6824 2005-03-24 17:20:54Z doligez $ */ /* Test whether IA32 assembler supports SSE2 instructions */ diff --git a/config/auto-aux/int64align.c b/config/auto-aux/int64align.c index 5f83e68c..482fad10 100644 --- a/config/auto-aux/int64align.c +++ b/config/auto-aux/int64align.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: int64align.c,v 1.2 2001/12/07 13:39:43 xleroy Exp $ */ +/* $Id: int64align.c 4144 2001-12-07 13:41:02Z xleroy $ */ #include #include diff --git a/config/auto-aux/longlong.c b/config/auto-aux/longlong.c index 40abd085..fd77588d 100644 --- a/config/auto-aux/longlong.c +++ b/config/auto-aux/longlong.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: longlong.c,v 1.4 2002/05/25 08:33:26 xleroy Exp $ */ +/* $Id: longlong.c 4833 2002-05-25 08:33:26Z xleroy $ */ #include #include diff --git a/config/auto-aux/schar.c b/config/auto-aux/schar.c index 209b4906..2499f537 100644 --- a/config/auto-aux/schar.c +++ b/config/auto-aux/schar.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: schar.c,v 1.8 2001/12/07 13:39:44 xleroy Exp $ */ +/* $Id: schar.c 4144 2001-12-07 13:41:02Z xleroy $ */ char foo[]="\377"; diff --git a/config/auto-aux/schar2.c b/config/auto-aux/schar2.c index 9b28c626..ef913aa5 100644 --- a/config/auto-aux/schar2.c +++ b/config/auto-aux/schar2.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: schar2.c,v 1.8 2001/12/07 13:39:44 xleroy Exp $ */ +/* $Id: schar2.c 4144 2001-12-07 13:41:02Z xleroy $ */ signed char foo[]="\377"; diff --git a/config/auto-aux/sighandler.c b/config/auto-aux/sighandler.c index 5ab79d7c..e27d4820 100644 --- a/config/auto-aux/sighandler.c +++ b/config/auto-aux/sighandler.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: sighandler.c,v 1.7 2001/12/07 13:39:44 xleroy Exp $ */ +/* $Id: sighandler.c 4144 2001-12-07 13:41:02Z xleroy $ */ #include diff --git a/config/auto-aux/signals.c b/config/auto-aux/signals.c index ffafd521..7f51be85 100644 --- a/config/auto-aux/signals.c +++ b/config/auto-aux/signals.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: signals.c,v 1.7 2001/12/07 13:39:44 xleroy Exp $ */ +/* $Id: signals.c 4144 2001-12-07 13:41:02Z xleroy $ */ /* To determine the semantics of signal handlers (System V: signal is reset to default behavior on entrance to the handler diff --git a/config/auto-aux/sizes.c b/config/auto-aux/sizes.c index 5ed0a3d2..b6014ce7 100644 --- a/config/auto-aux/sizes.c +++ b/config/auto-aux/sizes.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: sizes.c,v 1.9 2001/12/07 13:39:44 xleroy Exp $ */ +/* $Id: sizes.c 4144 2001-12-07 13:41:02Z xleroy $ */ #include diff --git a/config/auto-aux/stackov.c b/config/auto-aux/stackov.c index 2ef87130..15c74ab0 100644 --- a/config/auto-aux/stackov.c +++ b/config/auto-aux/stackov.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: stackov.c,v 1.5 2008/01/11 16:13:16 doligez Exp $ */ +/* $Id: stackov.c 8768 2008-01-11 16:13:18Z doligez $ */ #include #include diff --git a/config/m-nt.h b/config/m-nt.h index f89fb863..d56ab817 100644 --- a/config/m-nt.h +++ b/config/m-nt.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: m-nt.h,v 1.12 2006/05/09 16:01:26 xleroy Exp $ */ +/* $Id: m-nt.h 7408 2006-05-09 16:02:09Z xleroy $ */ /* Machine configuration, Intel x86 processors, Win32, Visual C++ or Mingw compiler */ diff --git a/config/m-templ.h b/config/m-templ.h index 71848b98..8245ba18 100644 --- a/config/m-templ.h +++ b/config/m-templ.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: m-templ.h,v 1.15 2005/09/22 14:21:50 xleroy Exp $ */ +/* $Id: m-templ.h 7064 2005-09-22 14:21:50Z xleroy $ */ /* Processor dependencies */ diff --git a/config/s-nt.h b/config/s-nt.h index 368ea7ea..1017e933 100644 --- a/config/s-nt.h +++ b/config/s-nt.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: s-nt.h,v 1.12 2002/06/18 13:00:55 xleroy Exp $ */ +/* $Id: s-nt.h 4933 2002-06-18 13:01:53Z xleroy $ */ /* Operating system dependencies, Intel x86 processors, Windows NT */ diff --git a/config/s-templ.h b/config/s-templ.h index edc3860e..0e473e98 100644 --- a/config/s-templ.h +++ b/config/s-templ.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: s-templ.h,v 1.22 2004/05/18 08:50:22 xleroy Exp $ */ +/* $Id: s-templ.h 6304 2004-05-18 08:50:22Z xleroy $ */ /* Operating system and standard library dependencies. */ diff --git a/configure b/configure index 166ceafb..1797b0c2 100755 --- a/configure +++ b/configure @@ -13,7 +13,7 @@ # # ######################################################################### -# $Id: configure,v 1.266.2.5 2009/05/20 15:33:09 weis Exp $ +# $Id: configure 9414 2009-11-17 13:28:44Z weis $ configure_options="$*" prefix=/usr/local @@ -95,6 +95,8 @@ while : ; do pthread_wanted=no;; -no-tk|--no-tk) tk_wanted=no;; + -partialld|--partialld) + partialld="$2"; shift;; -tkdefs*|--tkdefs*) tk_defs=$2; shift;; -tklibs*|--tklibs*) @@ -303,14 +305,16 @@ case "$bytecc,$host" in gcc*,*-*-cygwin*) bytecccompopts="-fno-defer-pop $gcc_warnings -U_WIN32" dllccompopts="-D_WIN32 -DCAML_DLL" - flexlink="flexlink -chain cygwin -merge-manifest" - flexdir=`$flexlink -where | dos2unix` - if test -z "$flexdir"; then - echo "flexlink not found: native shared libraries won't be available" - withsharedlibs=no - else - iflexdir="-I\"$flexdir\"" - mkexe="$flexlink -exe" + if test $withsharedlibs = yes; then + flexlink="flexlink -chain cygwin -merge-manifest" + flexdir=`$flexlink -where | dos2unix` + if test -z "$flexdir"; then + echo "flexlink not found: native shared libraries won't be available" + withsharedlibs=no + else + iflexdir="-I\"$flexdir\"" + mkexe="$flexlink -exe" + fi fi exe=".exe" ostype="Cygwin";; diff --git a/debugger/.depend b/debugger/.depend index f71fcbef..8aa21ba6 100644 --- a/debugger/.depend +++ b/debugger/.depend @@ -121,13 +121,13 @@ loadprinter.cmx: ../typing/types.cmx ../bytecomp/symtable.cmx printval.cmx \ ../parsing/longident.cmx ../typing/ident.cmx ../typing/env.cmx \ dynlink.cmx ../typing/ctype.cmx ../utils/config.cmx loadprinter.cmi main.cmo: unix_tools.cmi ../otherlibs/unix/unix.cmi time_travel.cmi \ - show_information.cmi question.cmi program_management.cmi parameters.cmi \ - ../utils/misc.cmi input_handling.cmi frames.cmi exec.cmi \ + show_information.cmi question.cmi program_management.cmi primitives.cmi \ + parameters.cmi ../utils/misc.cmi input_handling.cmi frames.cmi exec.cmi \ ../typing/env.cmi debugger_config.cmi ../utils/config.cmi \ command_line.cmi ../utils/clflags.cmi checkpoints.cmi main.cmx: unix_tools.cmx ../otherlibs/unix/unix.cmx time_travel.cmx \ - show_information.cmx question.cmx program_management.cmx parameters.cmx \ - ../utils/misc.cmx input_handling.cmx frames.cmx exec.cmx \ + show_information.cmx question.cmx program_management.cmx primitives.cmx \ + parameters.cmx ../utils/misc.cmx input_handling.cmx frames.cmx exec.cmx \ ../typing/env.cmx debugger_config.cmx ../utils/config.cmx \ command_line.cmx ../utils/clflags.cmx checkpoints.cmx parameters.cmo: primitives.cmi envaux.cmi debugger_config.cmi \ @@ -172,10 +172,10 @@ program_management.cmx: unix_tools.cmx ../otherlibs/unix/unix.cmx \ debugger_config.cmx breakpoints.cmx program_management.cmi question.cmo: primitives.cmi lexer.cmi input_handling.cmi question.cmi question.cmx: primitives.cmx lexer.cmx input_handling.cmx question.cmi -show_information.cmo: symbols.cmi show_source.cmi printval.cmi \ +show_information.cmo: symbols.cmi source.cmi show_source.cmi printval.cmi \ ../utils/misc.cmi ../bytecomp/instruct.cmi frames.cmi events.cmi \ debugcom.cmi checkpoints.cmi breakpoints.cmi show_information.cmi -show_information.cmx: symbols.cmx show_source.cmx printval.cmx \ +show_information.cmx: symbols.cmx source.cmx show_source.cmx printval.cmx \ ../utils/misc.cmx ../bytecomp/instruct.cmx frames.cmx events.cmx \ debugcom.cmx checkpoints.cmx breakpoints.cmx show_information.cmi show_source.cmo: source.cmi primitives.cmi parameters.cmi \ @@ -188,12 +188,12 @@ source.cmo: primitives.cmi ../utils/misc.cmi debugger_config.cmi \ ../utils/config.cmi source.cmi source.cmx: primitives.cmx ../utils/misc.cmx debugger_config.cmx \ ../utils/config.cmx source.cmi -symbols.cmo: ../bytecomp/symtable.cmi ../bytecomp/instruct.cmi events.cmi \ - debugger_config.cmi debugcom.cmi checkpoints.cmi \ - ../bytecomp/bytesections.cmi symbols.cmi -symbols.cmx: ../bytecomp/symtable.cmx ../bytecomp/instruct.cmx events.cmx \ - debugger_config.cmx debugcom.cmx checkpoints.cmx \ - ../bytecomp/bytesections.cmx symbols.cmi +symbols.cmo: ../bytecomp/symtable.cmi program_loading.cmi \ + ../bytecomp/instruct.cmi events.cmi debugger_config.cmi debugcom.cmi \ + checkpoints.cmi ../bytecomp/bytesections.cmi symbols.cmi +symbols.cmx: ../bytecomp/symtable.cmx program_loading.cmx \ + ../bytecomp/instruct.cmx events.cmx debugger_config.cmx debugcom.cmx \ + checkpoints.cmx ../bytecomp/bytesections.cmx symbols.cmi time_travel.cmo: trap_barrier.cmi symbols.cmi question.cmi \ program_loading.cmi primitives.cmi ../utils/misc.cmi int64ops.cmi \ ../bytecomp/instruct.cmi input_handling.cmi exec.cmi events.cmi \ diff --git a/debugger/Makefile b/debugger/Makefile index bc57cde2..cd623dcf 100644 --- a/debugger/Makefile +++ b/debugger/Makefile @@ -10,7 +10,7 @@ # # ######################################################################### -# $Id: Makefile,v 1.33 2008/07/29 08:31:41 xleroy Exp $ +# $Id: Makefile 8955 2008-07-29 08:31:41Z xleroy $ UNIXDIR=../otherlibs/unix include Makefile.shared diff --git a/debugger/Makefile.nt b/debugger/Makefile.nt index 523eb657..d179ac54 100644 --- a/debugger/Makefile.nt +++ b/debugger/Makefile.nt @@ -10,7 +10,7 @@ # # ######################################################################### -# $Id: Makefile.nt,v 1.1 2008/07/29 08:31:41 xleroy Exp $ +# $Id: Makefile.nt 8955 2008-07-29 08:31:41Z xleroy $ UNIXDIR=../otherlibs/win32unix include Makefile.shared diff --git a/debugger/Makefile.shared b/debugger/Makefile.shared index 1e97af45..2856dcbd 100644 --- a/debugger/Makefile.shared +++ b/debugger/Makefile.shared @@ -10,7 +10,7 @@ # # ######################################################################### -# $Id: Makefile.shared,v 1.1 2008/07/29 08:31:41 xleroy Exp $ +# $Id: Makefile.shared 9300 2009-06-18 11:17:16Z xclerc $ include ../config/Makefile @@ -60,11 +60,11 @@ OBJS=\ pos.cmo \ checkpoints.cmo \ events.cmo \ + program_loading.cmo \ symbols.cmo \ breakpoints.cmo \ trap_barrier.cmo \ history.cmo \ - program_loading.cmo \ printval.cmo \ show_source.cmo \ time_travel.cmo \ @@ -72,7 +72,7 @@ OBJS=\ frames.cmo \ eval.cmo \ show_information.cmo \ - loadprinter.cmo \ + loadprinter.cmo \ parser.cmo \ command_line.cmo \ main.cmo diff --git a/debugger/breakpoints.ml b/debugger/breakpoints.ml index 2c8d7253..f47101f8 100644 --- a/debugger/breakpoints.ml +++ b/debugger/breakpoints.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: breakpoints.ml,v 1.13.18.1 2009/04/02 09:44:21 xclerc Exp $ *) +(* $Id: breakpoints.ml 9226 2009-04-02 09:44:21Z xclerc $ *) (******************************* Breakpoints ***************************) diff --git a/debugger/breakpoints.mli b/debugger/breakpoints.mli index f3be8ec5..a4a1dc11 100644 --- a/debugger/breakpoints.mli +++ b/debugger/breakpoints.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: breakpoints.mli,v 1.2 1999/11/17 18:57:22 xleroy Exp $ *) +(* $Id: breakpoints.mli 2553 1999-11-17 18:59:06Z xleroy $ *) (******************************* Breakpoints ***************************) diff --git a/debugger/checkpoints.ml b/debugger/checkpoints.ml index 2f0fe622..28aa76cb 100644 --- a/debugger/checkpoints.ml +++ b/debugger/checkpoints.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: checkpoints.ml,v 1.4 2002/10/29 17:53:23 doligez Exp $ *) +(* $Id: checkpoints.ml 5200 2002-10-29 17:53:24Z doligez $ *) (*************************** Checkpoints *******************************) diff --git a/debugger/checkpoints.mli b/debugger/checkpoints.mli index cbd576a2..e489875d 100644 --- a/debugger/checkpoints.mli +++ b/debugger/checkpoints.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: checkpoints.mli,v 1.4 2002/10/29 17:53:23 doligez Exp $ *) +(* $Id: checkpoints.mli 5200 2002-10-29 17:53:24Z doligez $ *) (***************************** Checkpoints *****************************) diff --git a/debugger/command_line.ml b/debugger/command_line.ml index 280fbc01..74db2092 100644 --- a/debugger/command_line.ml +++ b/debugger/command_line.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: command_line.ml,v 1.25.2.2 2009/04/02 09:44:21 xclerc Exp $ *) +(* $Id: command_line.ml 9299 2009-06-17 08:15:39Z xclerc $ *) (************************ Reading and executing commands ***************) @@ -705,26 +705,30 @@ let instr_last ppf lexbuf = let instr_list ppf lexbuf = let (mo, beg, e) = list_arguments_eol Lexer.lexeme lexbuf in - let (curr_mod, point) = + let (curr_mod, line, column) = try selected_point () with | Not_found -> - ("", -1) + ("", -1, -1) in let mdle = convert_module (module_of_longident mo) in let pos = Lexing.dummy_pos in + let buffer = + try get_buffer pos mdle with + | Not_found -> error ("No source file for " ^ mdle ^ ".") in + let point = + if column <> -1 then + (point_of_coord buffer line 1) + column + else + -1 in let beginning = match beg with - | None when (mo <> None) || (point = -1) -> + | None when (mo <> None) || (line = -1) -> 1 | None -> - let buffer = - try get_buffer pos mdle with - | Not_found -> error ("No source file for " ^ mdle ^ ".") - in begin try - max 1 ((snd (line_of_pos buffer point)) - 10) + max 1 (line - 10) with Out_of_range -> 1 end @@ -861,11 +865,19 @@ let info_events ppf lexbuf = print_endline " Address Characters Kind Repr."; List.iter (function ev -> - Printf.printf + let start_char, end_char = + try + let buffer = get_buffer (Events.get_pos ev) ev.ev_module in + (snd (start_and_cnum buffer ev.ev_loc.Location.loc_start)), + (snd (start_and_cnum buffer ev.ev_loc.Location.loc_end)) + with _ -> + ev.ev_loc.Location.loc_start.Lexing.pos_cnum, + ev.ev_loc.Location.loc_end.Lexing.pos_cnum in + Printf.printf "%10d %6d-%-6d %10s %10s\n" ev.ev_pos - ev.ev_loc.Location.loc_start.Lexing.pos_cnum - ev.ev_loc.Location.loc_end.Lexing.pos_cnum + start_char + end_char ((match ev.ev_kind with Event_before -> "before" | Event_after _ -> "after" diff --git a/debugger/command_line.mli b/debugger/command_line.mli index aca2ffc7..24d720eb 100644 --- a/debugger/command_line.mli +++ b/debugger/command_line.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: command_line.mli,v 1.4 2000/03/07 18:22:14 weis Exp $ *) +(* $Id: command_line.mli 2919 2000-03-07 18:22:19Z weis $ *) (************************ Reading and executing commands ***************) diff --git a/debugger/debugcom.ml b/debugger/debugcom.ml index b4bf427e..5d595ca0 100644 --- a/debugger/debugcom.ml +++ b/debugger/debugcom.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: debugcom.ml,v 1.13 2008/07/29 08:31:41 xleroy Exp $ *) +(* $Id: debugcom.ml 8955 2008-07-29 08:31:41Z xleroy $ *) (* Low-level communication with the debuggee *) diff --git a/debugger/debugcom.mli b/debugger/debugcom.mli index ac26e45f..179595c2 100644 --- a/debugger/debugcom.mli +++ b/debugger/debugcom.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: debugcom.mli,v 1.8 2002/10/29 17:53:23 doligez Exp $ *) +(* $Id: debugcom.mli 5200 2002-10-29 17:53:24Z doligez $ *) (* Low-level communication with the debuggee *) diff --git a/debugger/debugger_config.ml b/debugger/debugger_config.ml index d8ed23de..acfadfed 100644 --- a/debugger/debugger_config.ml +++ b/debugger/debugger_config.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: debugger_config.ml,v 1.11.2.1 2009/04/02 09:06:32 xclerc Exp $ *) +(* $Id: debugger_config.ml 9221 2009-04-02 09:06:33Z xclerc $ *) (**************************** Configuration file ***********************) diff --git a/debugger/debugger_config.mli b/debugger/debugger_config.mli index befdba63..0d3b663d 100644 --- a/debugger/debugger_config.mli +++ b/debugger/debugger_config.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: debugger_config.mli,v 1.5.28.1 2009/04/02 09:06:32 xclerc Exp $ *) +(* $Id: debugger_config.mli 9221 2009-04-02 09:06:33Z xclerc $ *) (********************** Configuration file *****************************) diff --git a/debugger/dynlink.ml b/debugger/dynlink.ml index 9dec9333..03895885 100644 --- a/debugger/dynlink.ml +++ b/debugger/dynlink.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: dynlink.ml,v 1.2.14.1 2009/04/02 09:21:20 xclerc Exp $ *) +(* $Id: dynlink.ml 9222 2009-04-02 09:21:20Z xclerc $ *) (* Dynamic loading of .cmo files *) diff --git a/debugger/dynlink.mli b/debugger/dynlink.mli index bccfab74..31604dc5 100644 --- a/debugger/dynlink.mli +++ b/debugger/dynlink.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: dynlink.mli,v 1.1.14.1 2009/04/02 09:21:20 xclerc Exp $ *) +(* $Id: dynlink.mli 9222 2009-04-02 09:21:20Z xclerc $ *) (** Dynamic loading of object files. *) diff --git a/debugger/envaux.ml b/debugger/envaux.ml index d048bb1d..b0ca5a53 100644 --- a/debugger/envaux.ml +++ b/debugger/envaux.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: envaux.ml,v 1.7.38.1 2009/04/02 09:06:32 xclerc Exp $ *) +(* $Id: envaux.ml 9221 2009-04-02 09:06:33Z xclerc $ *) open Misc open Types diff --git a/debugger/envaux.mli b/debugger/envaux.mli index b8bfe75f..3b9d7715 100644 --- a/debugger/envaux.mli +++ b/debugger/envaux.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: envaux.mli,v 1.5 2000/03/06 22:11:20 weis Exp $ *) +(* $Id: envaux.mli 2908 2000-03-06 22:12:09Z weis $ *) open Format diff --git a/debugger/eval.ml b/debugger/eval.ml index 9e0a82dd..cd52cd08 100644 --- a/debugger/eval.ml +++ b/debugger/eval.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: eval.ml,v 1.30.4.5 2009/04/19 08:42:43 xleroy Exp $ *) +(* $Id: eval.ml 9236 2009-04-19 08:42:43Z xleroy $ *) open Misc open Path diff --git a/debugger/eval.mli b/debugger/eval.mli index 8e809253..f9888488 100644 --- a/debugger/eval.mli +++ b/debugger/eval.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: eval.mli,v 1.6 2000/03/06 22:11:21 weis Exp $ *) +(* $Id: eval.mli 2908 2000-03-06 22:12:09Z weis $ *) open Types open Parser_aux diff --git a/debugger/events.ml b/debugger/events.ml index de623554..c2988f04 100644 --- a/debugger/events.ml +++ b/debugger/events.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: events.ml,v 1.6.18.1 2009/04/02 09:44:21 xclerc Exp $ *) +(* $Id: events.ml 9226 2009-04-02 09:44:21Z xclerc $ *) (********************************* Events ******************************) diff --git a/debugger/events.mli b/debugger/events.mli index 63ad64e1..f12dd401 100644 --- a/debugger/events.mli +++ b/debugger/events.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: events.mli,v 1.4 2005/08/25 15:35:16 doligez Exp $ *) +(* $Id: events.mli 7031 2005-08-25 15:35:16Z doligez $ *) open Instruct diff --git a/debugger/exec.ml b/debugger/exec.ml index 2cf667e9..6390f2a5 100644 --- a/debugger/exec.ml +++ b/debugger/exec.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: exec.ml,v 1.5 2008/07/29 08:31:41 xleroy Exp $ *) +(* $Id: exec.ml 8955 2008-07-29 08:31:41Z xleroy $ *) (* Handling of keyboard interrupts *) diff --git a/debugger/exec.mli b/debugger/exec.mli index 679fab57..c6c3ab4f 100644 --- a/debugger/exec.mli +++ b/debugger/exec.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: exec.mli,v 1.4 1999/11/17 18:57:24 xleroy Exp $ *) +(* $Id: exec.mli 2553 1999-11-17 18:59:06Z xleroy $ *) (* Handling of keyboard interrupts *) diff --git a/debugger/frames.ml b/debugger/frames.ml index 3a43530f..fa36eff9 100644 --- a/debugger/frames.ml +++ b/debugger/frames.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: frames.ml,v 1.10.18.1 2009/04/02 09:44:21 xclerc Exp $ *) +(* $Id: frames.ml 9299 2009-06-17 08:15:39Z xclerc $ *) (***************************** Frames **********************************) @@ -33,7 +33,9 @@ let selected_point () = None -> raise Not_found | Some ev -> - (ev.ev_module, (Events.get_pos ev).Lexing.pos_cnum) + (ev.ev_module, + (Events.get_pos ev).Lexing.pos_lnum, + (Events.get_pos ev).Lexing.pos_cnum - (Events.get_pos ev).Lexing.pos_bol) let selected_event_is_before () = match !selected_event with diff --git a/debugger/frames.mli b/debugger/frames.mli index dd09b4f1..7767d126 100644 --- a/debugger/frames.mli +++ b/debugger/frames.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: frames.mli,v 1.3 1999/11/17 18:57:24 xleroy Exp $ *) +(* $Id: frames.mli 9299 2009-06-17 08:15:39Z xclerc $ *) (****************************** Frames *********************************) @@ -24,9 +24,9 @@ val current_frame : int ref (* Event at selected position. *) val selected_event : debug_event option ref -(* Selected position in source. *) +(* Selected position in source (module, line, column). *) (* Raise `Not_found' if not on an event. *) -val selected_point : unit -> string * int +val selected_point : unit -> string * int * int val selected_event_is_before : unit -> bool diff --git a/debugger/history.ml b/debugger/history.ml index ab9f54a1..b273b949 100644 --- a/debugger/history.ml +++ b/debugger/history.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: history.ml,v 1.5.28.1 2009/04/02 09:44:21 xclerc Exp $ *) +(* $Id: history.ml 9226 2009-04-02 09:44:21Z xclerc $ *) open Int64ops open Checkpoints diff --git a/debugger/history.mli b/debugger/history.mli index 9d805a12..2c217b77 100644 --- a/debugger/history.mli +++ b/debugger/history.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: history.mli,v 1.4 2002/10/29 17:53:24 doligez Exp $ *) +(* $Id: history.mli 5200 2002-10-29 17:53:24Z doligez $ *) val empty_history : unit -> unit diff --git a/debugger/input_handling.ml b/debugger/input_handling.ml index 480819b7..b9b9b450 100644 --- a/debugger/input_handling.ml +++ b/debugger/input_handling.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: input_handling.ml,v 1.5.14.1 2009/04/02 09:44:21 xclerc Exp $ *) +(* $Id: input_handling.ml 9226 2009-04-02 09:44:21Z xclerc $ *) (**************************** Input control ****************************) diff --git a/debugger/input_handling.mli b/debugger/input_handling.mli index e0b450eb..227ae833 100644 --- a/debugger/input_handling.mli +++ b/debugger/input_handling.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: input_handling.mli,v 1.3 2006/12/09 13:49:10 ertai Exp $ *) +(* $Id: input_handling.mli 7767 2006-12-09 13:49:10Z ertai $ *) (***************************** Input control ***************************) diff --git a/debugger/int64ops.ml b/debugger/int64ops.ml index d549aca7..667d6c07 100644 --- a/debugger/int64ops.ml +++ b/debugger/int64ops.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: int64ops.ml,v 1.1 2002/10/29 17:53:24 doligez Exp $ *) +(* $Id: int64ops.ml 5200 2002-10-29 17:53:24Z doligez $ *) (****************** arithmetic operators for Int64 *********************) diff --git a/debugger/int64ops.mli b/debugger/int64ops.mli index 4808590e..b6edfbc3 100644 --- a/debugger/int64ops.mli +++ b/debugger/int64ops.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: int64ops.mli,v 1.1 2002/10/29 17:53:24 doligez Exp $ *) +(* $Id: int64ops.mli 5200 2002-10-29 17:53:24Z doligez $ *) (****************** arithmetic operators for Int64 *********************) diff --git a/debugger/lexer.mli b/debugger/lexer.mli index df7cfad2..cc04aca8 100644 --- a/debugger/lexer.mli +++ b/debugger/lexer.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: lexer.mli,v 1.1 2004/06/13 12:46:11 xleroy Exp $ *) +(* $Id: lexer.mli 6394 2004-06-13 12:46:11Z xleroy $ *) val line: Lexing.lexbuf -> string val lexeme: Lexing.lexbuf -> Parser.token diff --git a/debugger/lexer.mll b/debugger/lexer.mll index 4737986b..b1b0246b 100644 --- a/debugger/lexer.mll +++ b/debugger/lexer.mll @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: lexer.mll,v 1.8.28.1 2009/04/02 09:44:21 xclerc Exp $ *) +(* $Id: lexer.mll 9226 2009-04-02 09:44:21Z xclerc $ *) { diff --git a/debugger/loadprinter.ml b/debugger/loadprinter.ml index bb861e0e..7ed5e44d 100644 --- a/debugger/loadprinter.ml +++ b/debugger/loadprinter.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: loadprinter.ml,v 1.19.20.1 2009/04/02 09:44:21 xclerc Exp $ *) +(* $Id: loadprinter.ml 9226 2009-04-02 09:44:21Z xclerc $ *) (* Loading and installation of user-defined printer functions *) diff --git a/debugger/loadprinter.mli b/debugger/loadprinter.mli index 21972fb8..ffc94a58 100644 --- a/debugger/loadprinter.mli +++ b/debugger/loadprinter.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: loadprinter.mli,v 1.4 2000/03/07 18:22:15 weis Exp $ *) +(* $Id: loadprinter.mli 2919 2000-03-07 18:22:19Z weis $ *) (* Loading and installation of user-defined printer functions *) diff --git a/debugger/main.ml b/debugger/main.ml index 8b6f3c21..02eb1822 100644 --- a/debugger/main.ml +++ b/debugger/main.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: main.ml,v 1.21.2.2 2009/04/02 09:44:21 xclerc Exp $ *) +(* $Id: main.ml 9310 2009-07-08 14:30:05Z xclerc $ *) open Input_handling open Question @@ -24,6 +24,7 @@ open Program_management open Frames open Show_information open Format +open Primitives let line_buffer = Lexing.from_function read_user_input @@ -107,7 +108,39 @@ let rec protect ppf restart loop = kill_program (); raise x -let toplevel_loop () = protect Format.std_formatter loop loop +let execute_file_if_any () = + let buffer = Buffer.create 128 in + begin + try + let base = ".ocamldebug" in + let file = + if Sys.file_exists base then + base + else + Filename.concat (Sys.getenv "HOME") base in + let ch = open_in file in + fprintf Format.std_formatter "Executing file %s@." file; + while true do + let line = string_trim (input_line ch) in + if line <> "" && line.[0] <> '#' then begin + Buffer.add_string buffer line; + Buffer.add_char buffer '\n' + end + done; + with _ -> () + end; + let len = Buffer.length buffer in + if len > 0 then + let commands = Buffer.sub buffer 0 (pred len) in + line_loop Format.std_formatter (Lexing.from_string commands) + +let toplevel_loop () = + interactif := false; + current_prompt := ""; + execute_file_if_any (); + interactif := true; + current_prompt := debugger_prompt; + protect Format.std_formatter loop loop (* Parsing of command-line arguments *) @@ -167,7 +200,6 @@ let main () = arguments := !arguments ^ " " ^ (Filename.quote Sys.argv.(j)) done end; - current_prompt := debugger_prompt; printf "\tObjective Caml Debugger version %s@.@." Config.version; Config.load_path := !default_load_path; Clflags.recursive_types := true; (* Allow recursive types. *) diff --git a/debugger/parameters.ml b/debugger/parameters.ml index 80dfb4ca..482c9709 100644 --- a/debugger/parameters.ml +++ b/debugger/parameters.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: parameters.ml,v 1.3.28.1 2009/04/02 09:06:32 xclerc Exp $ *) +(* $Id: parameters.ml 9221 2009-04-02 09:06:33Z xclerc $ *) (* Miscellaneous parameters *) diff --git a/debugger/parameters.mli b/debugger/parameters.mli index f392677e..e65d8dd2 100644 --- a/debugger/parameters.mli +++ b/debugger/parameters.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: parameters.mli,v 1.2.40.1 2009/04/02 09:06:32 xclerc Exp $ *) +(* $Id: parameters.mli 9221 2009-04-02 09:06:33Z xclerc $ *) (* Miscellaneous parameters *) diff --git a/debugger/parser.mly b/debugger/parser.mly index 40531b92..f32e0fe3 100644 --- a/debugger/parser.mly +++ b/debugger/parser.mly @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: parser.mly,v 1.7.28.4 2009/05/23 14:42:57 xclerc Exp $ */ +/* $Id: parser.mly 9275 2009-05-23 14:42:57Z xclerc $ */ %{ diff --git a/debugger/parser_aux.mli b/debugger/parser_aux.mli index 74da5529..4fca52e9 100644 --- a/debugger/parser_aux.mli +++ b/debugger/parser_aux.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: parser_aux.mli,v 1.4.40.1 2009/04/02 09:06:32 xclerc Exp $ *) +(* $Id: parser_aux.mli 9221 2009-04-02 09:06:33Z xclerc $ *) (*open Globals*) diff --git a/debugger/pattern_matching.ml b/debugger/pattern_matching.ml index ccec2cd0..bc6ad849 100644 --- a/debugger/pattern_matching.ml +++ b/debugger/pattern_matching.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: pattern_matching.ml,v 1.4 2000/12/28 13:03:41 weis Exp $ *) +(* $Id: pattern_matching.ml 3359 2000-12-28 13:07:42Z weis $ *) (************************ Simple pattern matching **********************) diff --git a/debugger/pattern_matching.mli b/debugger/pattern_matching.mli index c60a6fc7..b3862190 100644 --- a/debugger/pattern_matching.mli +++ b/debugger/pattern_matching.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: pattern_matching.mli,v 1.2 1999/11/17 18:57:26 xleroy Exp $ *) +(* $Id: pattern_matching.mli 2553 1999-11-17 18:59:06Z xleroy $ *) (************************ Simple pattern matching **********************) diff --git a/debugger/pos.ml b/debugger/pos.ml index 5e1bc277..f790ab6e 100644 --- a/debugger/pos.ml +++ b/debugger/pos.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: pos.ml,v 1.3 2006/12/09 13:49:10 ertai Exp $ *) +(* $Id: pos.ml 7767 2006-12-09 13:49:10Z ertai $ *) open Instruct;; open Lexing;; diff --git a/debugger/pos.mli b/debugger/pos.mli index 9cfbdd47..ee083272 100644 --- a/debugger/pos.mli +++ b/debugger/pos.mli @@ -10,6 +10,6 @@ (* *) (***********************************************************************) -(* $Id: pos.mli,v 1.1 2003/11/21 16:10:57 doligez Exp $ *) +(* $Id: pos.mli 5966 2003-11-21 16:10:57Z doligez $ *) val get_desc : Instruct.debug_event -> string;; diff --git a/debugger/primitives.ml b/debugger/primitives.ml index 96dbb03a..2040c7e4 100644 --- a/debugger/primitives.ml +++ b/debugger/primitives.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: primitives.ml,v 1.6.28.1 2009/04/02 09:44:21 xclerc Exp $ *) +(* $Id: primitives.ml 9226 2009-04-02 09:44:21Z xclerc $ *) (*********************** Basic functions and types *********************) diff --git a/debugger/primitives.mli b/debugger/primitives.mli index adf0ce95..60d15901 100644 --- a/debugger/primitives.mli +++ b/debugger/primitives.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: primitives.mli,v 1.2.40.1 2009/04/02 09:44:21 xclerc Exp $ *) +(* $Id: primitives.mli 9226 2009-04-02 09:44:21Z xclerc $ *) (********************* Basic functions and types ***********************) diff --git a/debugger/printval.ml b/debugger/printval.ml index e984b415..17dd7c63 100644 --- a/debugger/printval.ml +++ b/debugger/printval.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: printval.ml,v 1.21.28.1 2009/04/02 09:44:21 xclerc Exp $ *) +(* $Id: printval.ml 9226 2009-04-02 09:44:21Z xclerc $ *) (* To print values *) diff --git a/debugger/printval.mli b/debugger/printval.mli index 1488162a..38e48eb6 100644 --- a/debugger/printval.mli +++ b/debugger/printval.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: printval.mli,v 1.10 2001/07/03 11:04:09 xleroy Exp $ *) +(* $Id: printval.mli 3566 2001-07-03 11:04:10Z xleroy $ *) open Format diff --git a/debugger/program_loading.ml b/debugger/program_loading.ml index 4d5d368c..54b5a45f 100644 --- a/debugger/program_loading.ml +++ b/debugger/program_loading.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: program_loading.ml,v 1.8.2.1 2009/04/02 09:44:21 xclerc Exp $ *) +(* $Id: program_loading.ml 9226 2009-04-02 09:44:21Z xclerc $ *) (* Program loading *) diff --git a/debugger/program_loading.mli b/debugger/program_loading.mli index c858ecf5..48847ea1 100644 --- a/debugger/program_loading.mli +++ b/debugger/program_loading.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: program_loading.mli,v 1.3 1999/11/17 18:57:27 xleroy Exp $ *) +(* $Id: program_loading.mli 2553 1999-11-17 18:59:06Z xleroy $ *) (*** Debugging. ***) diff --git a/debugger/program_management.ml b/debugger/program_management.ml index 660ef292..7cc864cf 100644 --- a/debugger/program_management.ml +++ b/debugger/program_management.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: program_management.ml,v 1.13.2.1 2009/04/02 09:44:21 xclerc Exp $ *) +(* $Id: program_management.ml 9226 2009-04-02 09:44:21Z xclerc $ *) (* Manage the loading of the program *) diff --git a/debugger/program_management.mli b/debugger/program_management.mli index e2a4e92c..2ec0209e 100644 --- a/debugger/program_management.mli +++ b/debugger/program_management.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: program_management.mli,v 1.2 1999/11/17 18:57:27 xleroy Exp $ *) +(* $Id: program_management.mli 2553 1999-11-17 18:59:06Z xleroy $ *) (*** Program loading and initializations. ***) diff --git a/debugger/show_information.ml b/debugger/show_information.ml index 165fbf35..0c9ee2d0 100644 --- a/debugger/show_information.ml +++ b/debugger/show_information.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: show_information.ml,v 1.13.18.1 2009/04/02 09:44:21 xclerc Exp $ *) +(* $Id: show_information.ml 9299 2009-06-17 08:15:39Z xclerc $ *) open Instruct open Format @@ -20,6 +20,7 @@ open Checkpoints open Events open Symbols open Frames +open Source open Show_source open Breakpoints @@ -68,9 +69,15 @@ let show_current_event ppf = (* Display short information about one frame. *) let show_one_frame framenum ppf event = + let pos = Events.get_pos event in + let cnum = + try + let buffer = get_buffer pos event.ev_module in + snd (start_and_cnum buffer pos) + with _ -> pos.Lexing.pos_cnum in fprintf ppf "#%i Pc : %i %s char %i@." framenum event.ev_pos event.ev_module - (Events.get_pos event).Lexing.pos_cnum + cnum (* Display information about the current frame. *) (* --- `select frame' must have succeded before calling this function. *) diff --git a/debugger/show_information.mli b/debugger/show_information.mli index 711d7b4d..e7ef20e2 100644 --- a/debugger/show_information.mli +++ b/debugger/show_information.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: show_information.mli,v 1.3 2000/03/06 22:11:25 weis Exp $ *) +(* $Id: show_information.mli 2908 2000-03-06 22:12:09Z weis $ *) open Format;; diff --git a/debugger/show_source.ml b/debugger/show_source.ml index 1189b506..263caff1 100644 --- a/debugger/show_source.ml +++ b/debugger/show_source.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: show_source.ml,v 1.14.14.1 2009/04/02 09:44:21 xclerc Exp $ *) +(* $Id: show_source.ml 9299 2009-06-17 08:15:39Z xclerc $ *) open Debugger_config open Instruct @@ -45,13 +45,16 @@ let show_point ev selected = let before = (ev.ev_kind = Event_before) in if !emacs && selected then begin try + let buffer = get_buffer (Events.get_pos ev) mdle in let source = source_of_module ev.ev_loc.Location.loc_start mdle in printf "\026\026M%s:%i:%i" source - ev.ev_loc.Location.loc_start.Lexing.pos_cnum - ev.ev_loc.Location.loc_end.Lexing.pos_cnum; + (snd (start_and_cnum buffer ev.ev_loc.Location.loc_start)) + (snd (start_and_cnum buffer ev.ev_loc.Location.loc_end)); printf "%s\n" (if before then ":before" else ":after") with - Not_found -> (* get_buffer *) + Out_of_range -> (* point_of_coord *) + prerr_endline "Position out of range." + | Not_found -> (* Events.get_pos || get_buffer *) prerr_endline ("No source file for " ^ mdle ^ "."); show_no_point () end @@ -59,11 +62,10 @@ let show_point ev selected = begin try let pos = Events.get_pos ev in let buffer = get_buffer pos mdle in - let point = pos.Lexing.pos_cnum in - let (start, line_number) = line_of_pos buffer point in - ignore(print_line buffer line_number start point before) + let start, point = start_and_cnum buffer pos in + ignore(print_line buffer pos.Lexing.pos_lnum start point before) with - Out_of_range -> (* line_of_pos *) + Out_of_range -> (* point_of_coord *) prerr_endline "Position out of range." | Not_found -> (* Events.get_pos || get_buffer *) prerr_endline ("No source file for " ^ mdle ^ ".") diff --git a/debugger/show_source.mli b/debugger/show_source.mli index c3760f7c..0d4106fe 100644 --- a/debugger/show_source.mli +++ b/debugger/show_source.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: show_source.mli,v 1.5 2006/12/09 13:49:10 ertai Exp $ *) +(* $Id: show_source.mli 7767 2006-12-09 13:49:10Z ertai $ *) (* Print the line containing the point *) val show_point : Instruct.debug_event -> bool -> unit;; diff --git a/debugger/source.ml b/debugger/source.ml index 644fe845..1d8600c2 100644 --- a/debugger/source.ml +++ b/debugger/source.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: source.ml,v 1.8.14.1 2009/04/02 09:06:32 xclerc Exp $ *) +(* $Id: source.ml 9299 2009-06-17 08:15:39Z xclerc $ *) (************************ Source management ****************************) @@ -185,3 +185,8 @@ let pos_of_line buffer line = (* --- The first line and column are line 1 and column 1. *) let point_of_coord buffer line column = fst (pos_of_line buffer line) + (pred column) + +let start_and_cnum buffer pos = + let line_number = pos.Lexing.pos_lnum in + let start = point_of_coord buffer line_number 1 in + start, start + (pos.Lexing.pos_cnum - pos.Lexing.pos_bol) diff --git a/debugger/source.mli b/debugger/source.mli index 9cf01c04..5250313b 100644 --- a/debugger/source.mli +++ b/debugger/source.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: source.mli,v 1.3 2006/12/09 13:49:10 ertai Exp $ *) +(* $Id: source.mli 9299 2009-06-17 08:15:39Z xclerc $ *) (************************ Source management ****************************) @@ -56,3 +56,6 @@ val pos_of_line : buffer -> int -> position (* Convert a coordinate (line / column) into a position. *) (* --- The first line and column are line 1 and column 1. *) val point_of_coord : buffer -> int -> int -> int + +(* Return the offsets of both line start and cnum for the passed position. *) +val start_and_cnum : buffer -> Lexing.position -> (int * int) diff --git a/debugger/symbols.ml b/debugger/symbols.ml index 4b22d895..b3dda25b 100644 --- a/debugger/symbols.ml +++ b/debugger/symbols.ml @@ -11,12 +11,13 @@ (* *) (***********************************************************************) -(* $Id: symbols.ml,v 1.18.18.1 2009/04/02 09:44:21 xclerc Exp $ *) +(* $Id: symbols.ml 9300 2009-06-18 11:17:16Z xclerc $ *) (* Handling of symbol tables (globals and events) *) open Instruct open Debugger_config (* Toplevel *) +open Program_loading let modules = ref ([] : string list) @@ -61,6 +62,12 @@ let read_symbols' bytecode_file = List.iter (relocate_event orig) evl; eventlists := evl :: !eventlists done; + begin try + ignore (Bytesections.seek_section ic "CODE") + with Not_found -> + (* The file contains only debugging info, loading mode is forced to "manual" *) + set_launching_function (List.assoc "manual" loading_modes) + end; close_in_noerr ic; !eventlists diff --git a/debugger/symbols.mli b/debugger/symbols.mli index 6d53aa1a..f1ec0544 100644 --- a/debugger/symbols.mli +++ b/debugger/symbols.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: symbols.mli,v 1.7 2005/08/25 15:35:16 doligez Exp $ *) +(* $Id: symbols.mli 7031 2005-08-25 15:35:16Z doligez $ *) (* Modules used by the program. *) val modules : string list ref diff --git a/debugger/time_travel.ml b/debugger/time_travel.ml index 0d020246..855c7eca 100644 --- a/debugger/time_travel.ml +++ b/debugger/time_travel.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: time_travel.ml,v 1.21.14.1 2009/04/02 09:44:21 xclerc Exp $ *) +(* $Id: time_travel.ml 9226 2009-04-02 09:44:21Z xclerc $ *) (**************************** Time travel ******************************) diff --git a/debugger/time_travel.mli b/debugger/time_travel.mli index b37c99c9..c5d81154 100644 --- a/debugger/time_travel.mli +++ b/debugger/time_travel.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: time_travel.mli,v 1.6 2006/11/20 10:29:45 ertai Exp $ *) +(* $Id: time_travel.mli 7745 2006-11-20 10:29:45Z ertai $ *) (**************************** Time travel ******************************) diff --git a/debugger/trap_barrier.ml b/debugger/trap_barrier.ml index 59954f20..ecdfe893 100644 --- a/debugger/trap_barrier.ml +++ b/debugger/trap_barrier.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: trap_barrier.ml,v 1.3 1999/11/17 18:57:29 xleroy Exp $ *) +(* $Id: trap_barrier.ml 2553 1999-11-17 18:59:06Z xleroy $ *) (************************** Trap barrier *******************************) diff --git a/debugger/trap_barrier.mli b/debugger/trap_barrier.mli index 00a2ab2f..e72a9f7c 100644 --- a/debugger/trap_barrier.mli +++ b/debugger/trap_barrier.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: trap_barrier.mli,v 1.2 1999/11/17 18:57:29 xleroy Exp $ *) +(* $Id: trap_barrier.mli 2553 1999-11-17 18:59:06Z xleroy $ *) (************************* Trap barrier ********************************) diff --git a/debugger/unix_tools.ml b/debugger/unix_tools.ml index c9f233bb..a95dcc69 100644 --- a/debugger/unix_tools.ml +++ b/debugger/unix_tools.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: unix_tools.ml,v 1.9.2.1 2009/04/02 09:44:21 xclerc Exp $ *) +(* $Id: unix_tools.ml 9226 2009-04-02 09:44:21Z xclerc $ *) (****************** Tools for Unix *************************************) diff --git a/debugger/unix_tools.mli b/debugger/unix_tools.mli index bf2a9557..3a702b9d 100644 --- a/debugger/unix_tools.mli +++ b/debugger/unix_tools.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: unix_tools.mli,v 1.4 2002/11/02 22:36:45 doligez Exp $ *) +(* $Id: unix_tools.mli 5232 2002-11-02 22:36:46Z doligez $ *) (**************************** Tools for Unix ***************************) diff --git a/driver/compile.ml b/driver/compile.ml index c2e7074b..8e14272f 100644 --- a/driver/compile.ml +++ b/driver/compile.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: compile.ml,v 1.61 2008/10/06 13:53:54 doligez Exp $ *) +(* $Id: compile.ml 9074 2008-10-06 13:53:54Z doligez $ *) (* The batch compiler *) diff --git a/driver/compile.mli b/driver/compile.mli index 07286e0f..de9ebb26 100644 --- a/driver/compile.mli +++ b/driver/compile.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: compile.mli,v 1.8 2004/06/13 12:46:41 xleroy Exp $ *) +(* $Id: compile.mli 6395 2004-06-13 12:46:41Z xleroy $ *) (* Compile a .ml or .mli file *) diff --git a/driver/errors.ml b/driver/errors.ml index 0481b9cb..e7cd2648 100644 --- a/driver/errors.ml +++ b/driver/errors.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: errors.ml,v 1.27 2007/12/04 13:38:58 doligez Exp $ *) +(* $Id: errors.ml 8705 2007-12-04 13:38:58Z doligez $ *) (* WARNING: if you change something in this file, you must look at opterrors.ml and ocamldoc/odoc_analyse.ml diff --git a/driver/errors.mli b/driver/errors.mli index c8004280..7abc0d72 100644 --- a/driver/errors.mli +++ b/driver/errors.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: errors.mli,v 1.5 2000/03/06 22:11:31 weis Exp $ *) +(* $Id: errors.mli 2908 2000-03-06 22:12:09Z weis $ *) (* Error report *) open Format diff --git a/driver/main.ml b/driver/main.ml index 74968452..50e10eee 100644 --- a/driver/main.ml +++ b/driver/main.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: main.ml,v 1.71.2.2 2009/01/14 13:19:32 doligez Exp $ *) +(* $Id: main.ml 9164 2009-01-14 13:19:32Z doligez $ *) open Config open Clflags diff --git a/driver/main.mli b/driver/main.mli index e91c60c6..f7f414f7 100644 --- a/driver/main.mli +++ b/driver/main.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: main.mli,v 1.1 2000/01/07 16:03:04 doligez Exp $ *) +(* $Id: main.mli 2740 2000-01-07 16:03:04Z doligez $ *) (* this "empty" file is here to speed up garbage collection in ocamlc.opt diff --git a/driver/main_args.ml b/driver/main_args.ml index 7e1c23eb..5eb8adae 100644 --- a/driver/main_args.ml +++ b/driver/main_args.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: main_args.ml,v 1.50 2007/05/16 08:21:40 doligez Exp $ *) +(* $Id: main_args.ml 8232 2007-05-16 08:21:41Z doligez $ *) module Make_options (F : sig diff --git a/driver/main_args.mli b/driver/main_args.mli index f9a08c37..20f394b1 100644 --- a/driver/main_args.mli +++ b/driver/main_args.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: main_args.mli,v 1.27 2007/05/16 08:21:40 doligez Exp $ *) +(* $Id: main_args.mli 8232 2007-05-16 08:21:41Z doligez $ *) module Make_options (F : sig diff --git a/driver/optcompile.ml b/driver/optcompile.ml index c502c109..acbf223c 100644 --- a/driver/optcompile.ml +++ b/driver/optcompile.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: optcompile.ml,v 1.56.2.2 2008/10/17 14:01:35 doligez Exp $ *) +(* $Id: optcompile.ml 9094 2008-10-17 14:01:35Z doligez $ *) (* The batch compiler *) diff --git a/driver/optcompile.mli b/driver/optcompile.mli index 7f6f037e..47eb0656 100644 --- a/driver/optcompile.mli +++ b/driver/optcompile.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: optcompile.mli,v 1.8 2004/06/13 12:46:41 xleroy Exp $ *) +(* $Id: optcompile.mli 6395 2004-06-13 12:46:41Z xleroy $ *) (* Compile a .ml or .mli file *) diff --git a/driver/opterrors.ml b/driver/opterrors.ml index cea33b0a..ba83ab3c 100644 --- a/driver/opterrors.ml +++ b/driver/opterrors.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: opterrors.ml,v 1.20 2007/12/04 13:38:58 doligez Exp $ *) +(* $Id: opterrors.ml 8705 2007-12-04 13:38:58Z doligez $ *) (* WARNING: if you change something in this file, you must look at errors.ml to see if you need to make the same changes there. diff --git a/driver/opterrors.mli b/driver/opterrors.mli index 296ec689..44ea1dd3 100644 --- a/driver/opterrors.mli +++ b/driver/opterrors.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: opterrors.mli,v 1.5 2000/03/07 05:02:32 garrigue Exp $ *) +(* $Id: opterrors.mli 2910 2000-03-07 05:02:33Z garrigue $ *) (* Error report *) diff --git a/driver/optmain.ml b/driver/optmain.ml index 04fd6a4a..193ba4ae 100644 --- a/driver/optmain.ml +++ b/driver/optmain.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: optmain.ml,v 1.98.2.1 2008/10/15 08:48:51 xleroy Exp $ *) +(* $Id: optmain.ml 9084 2008-10-15 08:48:51Z xleroy $ *) open Config open Clflags diff --git a/driver/optmain.mli b/driver/optmain.mli index 8bd6aee5..08ca44ff 100644 --- a/driver/optmain.mli +++ b/driver/optmain.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: optmain.mli,v 1.1 2000/01/07 16:03:04 doligez Exp $ *) +(* $Id: optmain.mli 2740 2000-01-07 16:03:04Z doligez $ *) (* this "empty" file is here to speed up garbage collection in ocamlopt.opt diff --git a/driver/pparse.ml b/driver/pparse.ml index acdc08bd..1ce335b5 100644 --- a/driver/pparse.ml +++ b/driver/pparse.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: pparse.ml,v 1.3 2004/06/16 16:58:46 doligez Exp $ *) +(* $Id: pparse.ml 6415 2004-06-16 16:58:46Z doligez $ *) open Format diff --git a/driver/pparse.mli b/driver/pparse.mli index f8ff8fda..db2e5612 100644 --- a/driver/pparse.mli +++ b/driver/pparse.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: pparse.mli,v 1.1 2002/02/08 10:14:31 ddr Exp $ *) +(* $Id: pparse.mli 4365 2002-02-08 10:14:31Z ddr $ *) open Format diff --git a/emacs/Makefile b/emacs/Makefile index d67e2aac..1df717eb 100644 --- a/emacs/Makefile +++ b/emacs/Makefile @@ -10,7 +10,7 @@ # # ######################################################################### -# $Id: Makefile,v 1.17 2004/08/20 17:04:35 doligez Exp $ +# $Id: Makefile 6612 2004-08-20 17:04:35Z doligez $ include ../config/Makefile diff --git a/emacs/README b/emacs/README index 42a66d15..a1e4782a 100644 --- a/emacs/README +++ b/emacs/README @@ -1,4 +1,4 @@ - O'Caml emacs mode, snapshot of $Date: 2008/01/11 16:13:16 $ + O'Caml emacs mode, snapshot of $Date: 2008-01-11 17:13:18 +0100 (Fri, 11 Jan 2008) $ The files in this archive define a caml-mode for emacs, for editing Objective Caml and Objective Label programs, as well as an diff --git a/emacs/caml-compat.el b/emacs/caml-compat.el index d1ab815f..0071cf0d 100644 --- a/emacs/caml-compat.el +++ b/emacs/caml-compat.el @@ -10,7 +10,7 @@ ;(* *) ;(***********************************************************************) -;(* $Id: caml-compat.el,v 1.3 2004/08/20 17:04:35 doligez Exp $ *) +;(* $Id: caml-compat.el 6612 2004-08-20 17:04:35Z doligez $ *) ;; function definitions for old versions of emacs diff --git a/emacs/caml-emacs.el b/emacs/caml-emacs.el index c45d767f..c7eacfd1 100644 --- a/emacs/caml-emacs.el +++ b/emacs/caml-emacs.el @@ -10,7 +10,7 @@ ;(* *) ;(***********************************************************************) -;(* $Id: caml-emacs.el,v 1.7 2004/08/20 17:04:35 doligez Exp $ *) +;(* $Id: caml-emacs.el 6612 2004-08-20 17:04:35Z doligez $ *) ;; for caml-help.el (defalias 'caml-info-other-window 'info-other-window) diff --git a/emacs/caml-font-old.el b/emacs/caml-font-old.el index f226e1c9..4fbcd7cb 100644 --- a/emacs/caml-font-old.el +++ b/emacs/caml-font-old.el @@ -10,7 +10,7 @@ ;(* *) ;(***********************************************************************) -;(* $Id: caml-font-old.el,v 1.2 2008/01/11 16:13:16 doligez Exp $ *) +;(* $Id: caml-font-old.el 8768 2008-01-11 16:13:18Z doligez $ *) ;; useful colors diff --git a/emacs/caml-help.el b/emacs/caml-help.el index 84fc4206..29fde073 100644 --- a/emacs/caml-help.el +++ b/emacs/caml-help.el @@ -10,7 +10,7 @@ ;(* *) ;(***********************************************************************) -;(* $Id: caml-help.el,v 1.17 2004/08/20 17:04:35 doligez Exp $ *) +;(* $Id: caml-help.el 6612 2004-08-20 17:04:35Z doligez $ *) ;; caml-info.el --- contextual completion and help to caml-mode diff --git a/emacs/caml-hilit.el b/emacs/caml-hilit.el index eda9548b..8c973ff6 100644 --- a/emacs/caml-hilit.el +++ b/emacs/caml-hilit.el @@ -10,7 +10,7 @@ ;(* *) ;(***********************************************************************) -;(* $Id: caml-hilit.el,v 1.9 2004/08/20 17:04:35 doligez Exp $ *) +;(* $Id: caml-hilit.el 6612 2004-08-20 17:04:35Z doligez $ *) ; Highlighting patterns for hilit19 under caml-mode diff --git a/emacs/caml-types.el b/emacs/caml-types.el index 67237a31..38ffe0f3 100644 --- a/emacs/caml-types.el +++ b/emacs/caml-types.el @@ -10,7 +10,7 @@ ;(* *) ;(***********************************************************************) -;(* $Id: caml-types.el,v 1.38 2008/07/29 15:49:31 doligez Exp $ *) +;(* $Id: caml-types.el 9364 2009-10-02 12:31:37Z doligez $ *) ; An emacs-lisp complement to the "-annot" option of ocamlc and ocamlopt. @@ -256,9 +256,9 @@ See `caml-types-location-re' for annotation file format. (let* ((loc-re (concat caml-types-position-re " " caml-types-position-re)) (end-re (concat caml-types-position-re " --")) - (def-re (concat "def \\([^ ]\\)* " loc-re)) - (def-end-re (concat "def \\([^ ]\\)* " end-re)) - (internal-re (concat "int_ref \\([^ ]\\)* " loc-re)) + (def-re (concat "def \\([^ ]*\\) " loc-re)) + (def-end-re (concat "def \\([^ ]*\\) " end-re)) + (internal-re (concat "int_ref \\([^ ]*\\) " loc-re)) (external-re "ext_ref \\(.*\\)")) (cond ((string-match def-re kind) @@ -359,7 +359,7 @@ See `caml-types-location-re' for annotation file format. (expand-file-name "_build" project-dir))))) (if (equal project-dir (parent-dir project-dir)) (error (concat "No annotation file. " - "You should compile with option \"-dtypes\"."))) + "You should compile with option \"-annot\"."))) (setq project-dir (parent-dir project-dir))) type-path)))) diff --git a/emacs/caml-xemacs.el b/emacs/caml-xemacs.el index d662c0d2..9a9d8454 100644 --- a/emacs/caml-xemacs.el +++ b/emacs/caml-xemacs.el @@ -10,7 +10,7 @@ ;(* *) ;(***********************************************************************) -;(* $Id: caml-xemacs.el,v 1.7 2005/03/24 17:20:53 doligez Exp $ *) +;(* $Id: caml-xemacs.el 6824 2005-03-24 17:20:54Z doligez $ *) (require 'overlay) diff --git a/emacs/caml.el b/emacs/caml.el index 1f6d86bc..a7155b21 100644 --- a/emacs/caml.el +++ b/emacs/caml.el @@ -10,7 +10,7 @@ ;(* *) ;(***********************************************************************) -;(* $Id: caml.el,v 1.44.2.2 2008/12/03 16:16:43 doligez Exp $ *) +;(* $Id: caml.el 9150 2008-12-03 16:16:43Z doligez $ *) ;;; caml.el --- O'Caml code editing commands for Emacs diff --git a/emacs/camldebug.el b/emacs/camldebug.el index 528f6825..261e66a8 100644 --- a/emacs/camldebug.el +++ b/emacs/camldebug.el @@ -10,7 +10,7 @@ ;(* *) ;(***********************************************************************) -;(* $Id: camldebug.el,v 1.11 2005/10/26 13:23:12 doligez Exp $ *) +;(* $Id: camldebug.el 7169 2005-10-26 13:23:12Z doligez $ *) ;;; Run camldebug under Emacs ;;; Derived from gdb.el. diff --git a/emacs/inf-caml.el b/emacs/inf-caml.el index b32c940b..1a60a6e7 100644 --- a/emacs/inf-caml.el +++ b/emacs/inf-caml.el @@ -10,7 +10,7 @@ ;(* *) ;(***********************************************************************) -;(* $Id: inf-caml.el,v 1.11 2004/08/20 17:04:35 doligez Exp $ *) +;(* $Id: inf-caml.el 6612 2004-08-20 17:04:35Z doligez $ *) ;;; inf-caml.el --- run the Caml toplevel in an Emacs buffer diff --git a/emacs/ocamltags.in b/emacs/ocamltags.in index 9d7db13b..55edab33 100644 --- a/emacs/ocamltags.in +++ b/emacs/ocamltags.in @@ -12,7 +12,7 @@ ;(* *) ;(***********************************************************************) -;(* $Id: ocamltags.in,v 1.6 2004/08/20 17:04:35 doligez Exp $ *) +;(* $Id: ocamltags.in 6612 2004-08-20 17:04:35Z 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,v 1.6 2004/08/20 17:04:35 doligez Exp $ +;; $Id: ocamltags.in 6612 2004-08-20 17:04:35Z doligez $ (require 'caml) diff --git a/lex/Makefile b/lex/Makefile index 0d085496..25f32828 100644 --- a/lex/Makefile +++ b/lex/Makefile @@ -10,7 +10,7 @@ # # ######################################################################### -# $Id: Makefile,v 1.19 2004/11/29 14:49:24 doligez Exp $ +# $Id: Makefile 6708 2004-11-29 14:49:24Z doligez $ # The lexer generator CAMLC=../boot/ocamlrun ../boot/ocamlc -nostdlib -I ../boot diff --git a/lex/Makefile.nt b/lex/Makefile.nt index fa7abb25..7efed1f5 100644 --- a/lex/Makefile.nt +++ b/lex/Makefile.nt @@ -10,7 +10,7 @@ # # ######################################################################### -# $Id: Makefile.nt,v 1.9 2003/01/06 14:57:22 xleroy Exp $ +# $Id: Makefile.nt 5372 2003-01-06 14:57:22Z xleroy $ # The lexer generator diff --git a/lex/compact.ml b/lex/compact.ml index f6fe4a3b..7d7fbadd 100644 --- a/lex/compact.ml +++ b/lex/compact.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: compact.ml,v 1.7 2002/10/28 16:46:49 maranget Exp $ *) +(* $Id: compact.ml 5193 2002-10-28 16:46:50Z maranget $ *) (* Compaction of an automata *) diff --git a/lex/compact.mli b/lex/compact.mli index 3023db94..b91cf13e 100644 --- a/lex/compact.mli +++ b/lex/compact.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: compact.mli,v 1.4 2002/10/28 16:46:49 maranget Exp $ *) +(* $Id: compact.mli 5193 2002-10-28 16:46:50Z maranget $ *) (* Compaction of an automata *) type lex_tables = diff --git a/lex/cset.ml b/lex/cset.ml index 8a7515c9..0b1b2b11 100644 --- a/lex/cset.ml +++ b/lex/cset.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: cset.ml,v 1.3 2004/04/29 11:12:49 maranget Exp $ *) +(* $Id: cset.ml 6269 2004-04-29 11:12:49Z maranget $ *) exception Bad diff --git a/lex/cset.mli b/lex/cset.mli index 48496037..3fafeba4 100644 --- a/lex/cset.mli +++ b/lex/cset.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: cset.mli,v 1.3 2004/04/29 11:12:49 maranget Exp $ *) +(* $Id: cset.mli 6269 2004-04-29 11:12:49Z maranget $ *) (* Set of characters encoded as list of intervals *) diff --git a/lex/lexer.mli b/lex/lexer.mli index dfc3eca1..0a5dd257 100644 --- a/lex/lexer.mli +++ b/lex/lexer.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: lexer.mli,v 1.6 2004/04/21 23:26:05 doligez Exp $ *) +(* $Id: lexer.mli 6244 2004-04-21 23:26:06Z doligez $ *) val main: Lexing.lexbuf -> Parser.token diff --git a/lex/lexer.mll b/lex/lexer.mll index c039d917..46569beb 100644 --- a/lex/lexer.mll +++ b/lex/lexer.mll @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: lexer.mll,v 1.22 2006/01/04 16:55:49 doligez Exp $ *) +(* $Id: lexer.mll 7307 2006-01-04 16:55:50Z doligez $ *) (* The lexical analyzer for lexer definitions. Bootstrapped! *) diff --git a/lex/lexgen.ml b/lex/lexgen.ml index 93f3a113..2e1ff8e6 100644 --- a/lex/lexgen.ml +++ b/lex/lexgen.ml @@ -12,7 +12,7 @@ (* *) (***********************************************************************) -(* $Id: lexgen.ml,v 1.21 2008/03/07 15:24:48 maranget Exp $ *) +(* $Id: lexgen.ml 8827 2008-03-07 15:24:48Z maranget $ *) (* Compiling a lexer definition *) diff --git a/lex/lexgen.mli b/lex/lexgen.mli index 37e53b4c..3e43a049 100644 --- a/lex/lexgen.mli +++ b/lex/lexgen.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: lexgen.mli,v 1.6 2007/01/29 16:44:16 maranget Exp $ *) +(* $Id: lexgen.mli 7815 2007-01-29 16:44:16Z maranget $ *) (* raised when there are too many bindings (>= 254 memory cells) *) diff --git a/lex/main.ml b/lex/main.ml index e33da6f2..199ba861 100644 --- a/lex/main.ml +++ b/lex/main.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: main.ml,v 1.22 2004/08/20 17:04:35 doligez Exp $ *) +(* $Id: main.ml 6612 2004-08-20 17:04:35Z doligez $ *) (* The lexer generator. Command-line parsing. *) diff --git a/lex/output.ml b/lex/output.ml index e37d1811..e41c8f23 100644 --- a/lex/output.ml +++ b/lex/output.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: output.ml,v 1.26 2007/01/29 16:44:16 maranget Exp $ *) +(* $Id: output.ml 7815 2007-01-29 16:44:16Z maranget $ *) (* Output the DFA tables and its entry points *) diff --git a/lex/output.mli b/lex/output.mli index 2c763e98..46ef258b 100644 --- a/lex/output.mli +++ b/lex/output.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: output.mli,v 1.8 2002/12/09 10:44:46 maranget Exp $ *) +(* $Id: output.mli 5323 2002-12-09 10:44:46Z maranget $ *) (* Output the DFA tables and its entry points *) diff --git a/lex/outputbis.ml b/lex/outputbis.ml index f8e9315d..7675c7a7 100644 --- a/lex/outputbis.ml +++ b/lex/outputbis.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: outputbis.ml,v 1.6 2007/01/29 16:44:16 maranget Exp $ *) +(* $Id: outputbis.ml 7815 2007-01-29 16:44:16Z maranget $ *) (* Output the DFA tables and its entry points *) diff --git a/lex/outputbis.mli b/lex/outputbis.mli index 01192a5e..9c600413 100644 --- a/lex/outputbis.mli +++ b/lex/outputbis.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: outputbis.mli,v 1.3 2002/12/09 10:44:46 maranget Exp $ *) +(* $Id: outputbis.mli 5323 2002-12-09 10:44:46Z maranget $ *) val output_lexdef : string -> in_channel -> diff --git a/lex/parser.mly b/lex/parser.mly index cbe5a1f1..b821c7a7 100644 --- a/lex/parser.mly +++ b/lex/parser.mly @@ -10,7 +10,7 @@ /* */ /***********************************************************************/ -/* $Id: parser.mly,v 1.23 2007/01/29 16:44:16 maranget Exp $ */ +/* $Id: parser.mly 7815 2007-01-29 16:44:16Z maranget $ */ /* The grammar for lexer definitions */ diff --git a/lex/syntax.ml b/lex/syntax.ml index 2f491078..356c5612 100644 --- a/lex/syntax.ml +++ b/lex/syntax.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: syntax.ml,v 1.9 2007/01/29 16:44:16 maranget Exp $ *) +(* $Id: syntax.ml 7815 2007-01-29 16:44:16Z maranget $ *) (* This apparently useless implmentation file is in fact required by the pa_ocamllex syntax extension *) diff --git a/lex/syntax.mli b/lex/syntax.mli index ab90f632..19dbdcd1 100644 --- a/lex/syntax.mli +++ b/lex/syntax.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: syntax.mli,v 1.9 2007/01/29 16:44:16 maranget Exp $ *) +(* $Id: syntax.mli 7815 2007-01-29 16:44:16Z maranget $ *) (* The shallow abstract syntax *) diff --git a/man/Makefile b/man/Makefile index 7c6a1573..ebd058d1 100644 --- a/man/Makefile +++ b/man/Makefile @@ -10,7 +10,7 @@ # # ######################################################################### -# $Id: Makefile,v 1.3 2002/04/24 09:09:35 xleroy Exp $ +# $Id: Makefile 4733 2002-04-24 09:09:35Z xleroy $ include ../config/Makefile diff --git a/man/ocaml.m b/man/ocaml.m index 8087d747..ac760510 100644 --- a/man/ocaml.m +++ b/man/ocaml.m @@ -1,4 +1,4 @@ -\" $Id: ocaml.m,v 1.10.2.1 2009/01/13 15:17:09 doligez Exp $ +\" $Id: ocaml.m 9162 2009-01-13 15:17:09Z doligez $ .TH OCAML 1 diff --git a/man/ocamlc.m b/man/ocamlc.m index a7fae5d3..c1fda29a 100644 --- a/man/ocamlc.m +++ b/man/ocamlc.m @@ -1,4 +1,4 @@ -\" $Id: ocamlc.m,v 1.12.2.1 2008/10/29 12:38:52 doligez Exp $ +\" $Id: ocamlc.m 9111 2008-10-29 12:38:52Z doligez $ .TH OCAMLC 1 diff --git a/man/ocamlcp.m b/man/ocamlcp.m index 1b3cc52a..a7b6a574 100644 --- a/man/ocamlcp.m +++ b/man/ocamlcp.m @@ -1,4 +1,4 @@ -\" $Id: ocamlcp.m,v 1.4 2008/09/15 14:05:30 doligez Exp $ +\" $Id: ocamlcp.m 9025 2008-09-15 14:05:30Z doligez $ .TH OCAMLCP 1 diff --git a/man/ocamldebug.m b/man/ocamldebug.m index 1e81e896..b2e90343 100644 --- a/man/ocamldebug.m +++ b/man/ocamldebug.m @@ -1,4 +1,4 @@ -\" $Id: ocamldebug.m,v 1.2 2008/09/15 14:05:30 doligez Exp $ +\" $Id: ocamldebug.m 9025 2008-09-15 14:05:30Z doligez $ .TH OCAMLDEBUG 1 diff --git a/man/ocamldep.m b/man/ocamldep.m index 884ceb15..d6571abf 100644 --- a/man/ocamldep.m +++ b/man/ocamldep.m @@ -1,4 +1,4 @@ -\" $Id: ocamldep.m,v 1.6 2008/09/15 14:12:56 doligez Exp $ +\" $Id: ocamldep.m 9026 2008-09-15 14:12:56Z doligez $ .TH OCAMLDEP 1 diff --git a/man/ocamldoc.m b/man/ocamldoc.m index df807c7d..576eade5 100644 --- a/man/ocamldoc.m +++ b/man/ocamldoc.m @@ -1,4 +1,4 @@ -\" $Id: ocamldoc.m,v 1.5.2.1 2009/05/27 14:35:27 doligez Exp $ +\" $Id: ocamldoc.m 9282 2009-05-27 14:35:27Z doligez $ .TH OCAMLDOC 1 diff --git a/man/ocamllex.m b/man/ocamllex.m index 128dc56c..35151211 100644 --- a/man/ocamllex.m +++ b/man/ocamllex.m @@ -1,4 +1,4 @@ -\" $Id: ocamllex.m,v 1.5 2008/09/15 14:12:56 doligez Exp $ +\" $Id: ocamllex.m 9026 2008-09-15 14:12:56Z doligez $ .TH OCAMLLEX 1 .SH NAME diff --git a/man/ocamlmktop.m b/man/ocamlmktop.m index 7112d525..c70503ba 100644 --- a/man/ocamlmktop.m +++ b/man/ocamlmktop.m @@ -1,4 +1,4 @@ -\" $Id: ocamlmktop.m,v 1.3 2008/09/15 14:12:56 doligez Exp $ +\" $Id: ocamlmktop.m 9026 2008-09-15 14:12:56Z doligez $ .TH OCAMLMKTOP 1 .SH NAME diff --git a/man/ocamlopt.m b/man/ocamlopt.m index cdebf3d1..cdf5412a 100644 --- a/man/ocamlopt.m +++ b/man/ocamlopt.m @@ -1,4 +1,4 @@ -\" $Id: ocamlopt.m,v 1.10.2.1 2008/10/29 12:38:52 doligez Exp $ +\" $Id: ocamlopt.m 9111 2008-10-29 12:38:52Z doligez $ .TH OCAMLOPT 1 .SH NAME diff --git a/man/ocamlprof.m b/man/ocamlprof.m index 7b0fa104..c66ebede 100644 --- a/man/ocamlprof.m +++ b/man/ocamlprof.m @@ -1,4 +1,4 @@ -\" $Id: ocamlprof.m,v 1.6 2008/09/15 14:25:42 doligez Exp $ +\" $Id: ocamlprof.m 9027 2008-09-15 14:25:42Z doligez $ .TH OCAMLPROF 1 .SH NAME diff --git a/man/ocamlrun.m b/man/ocamlrun.m index a4c52de4..238ea559 100644 --- a/man/ocamlrun.m +++ b/man/ocamlrun.m @@ -1,4 +1,4 @@ -\" $Id: ocamlrun.m,v 1.6.2.1 2008/11/18 10:41:17 doligez Exp $ +\" $Id: ocamlrun.m 9133 2008-11-18 10:41:17Z doligez $ .TH OCAMLRUN 1 .SH NAME diff --git a/man/ocamlyacc.m b/man/ocamlyacc.m index 463891a0..af0cb6fb 100644 --- a/man/ocamlyacc.m +++ b/man/ocamlyacc.m @@ -1,4 +1,4 @@ -\" $Id: ocamlyacc.m,v 1.4 2008/09/15 14:12:56 doligez Exp $ +\" $Id: ocamlyacc.m 9026 2008-09-15 14:12:56Z doligez $ .TH OCAMLYACC 1 .SH NAME diff --git a/myocamlbuild.ml b/myocamlbuild.ml index 360dc56c..c27f0ac8 100644 --- a/myocamlbuild.ml +++ b/myocamlbuild.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: myocamlbuild.ml,v 1.23.2.7 2009/06/04 11:33:21 doligez Exp $ *) +(* $Id: myocamlbuild.ml 9290 2009-06-04 11:33:21Z doligez $ *) open Ocamlbuild_plugin open Command diff --git a/myocamlbuild_config.mli b/myocamlbuild_config.mli index ce82607f..28b22617 100644 --- a/myocamlbuild_config.mli +++ b/myocamlbuild_config.mli @@ -53,6 +53,7 @@ val ext_asm : string val ext_dll : string val o : string val a : string +val so : string val toolchain : string val ccomptype : string val extralibs : string diff --git a/ocamlbuild/_tags b/ocamlbuild/_tags index 215d1127..d0d8028a 100644 --- a/ocamlbuild/_tags +++ b/ocamlbuild/_tags @@ -1,6 +1,6 @@ # OCamlbuild tags file true: debug -<*.ml> or <*.mli>: warn_A, warn_error_A, warn_e, dtypes +<*.ml> or <*.mli>: warn_A, warn_error_A, warn_e, annot "discard_printf.ml": rectypes "ocamlbuildlib.cma" or "ocamlbuildlightlib.cma": linkall <*.byte> or <*.native> or <*.top>: use_unix diff --git a/ocamlbuild/command.ml b/ocamlbuild/command.ml index 40f4022a..2653116e 100644 --- a/ocamlbuild/command.ml +++ b/ocamlbuild/command.ml @@ -278,7 +278,7 @@ let execute_many ?(quiet=false) ?(pretend=false) cmds = | Some _ -> false :: acc_res, acc_exn end ([], None) konts in match opt_exn with - | Some(exn) -> Some(res, exn) + | Some(exn) -> Some(List.rev res, exn) | None -> None else My_unix.execute_many ~ticker ?max_jobs ~display konts diff --git a/ocamlbuild/ocaml_specific.ml b/ocamlbuild/ocaml_specific.ml index e5ad0a22..32b917b5 100644 --- a/ocamlbuild/ocaml_specific.ml +++ b/ocamlbuild/ocaml_specific.ml @@ -305,7 +305,8 @@ rule "ocaml C stubs: c -> o" begin fun env _build -> let c = env "%.c" in let o = env x_o in - let cc = Cmd(S[!Options.ocamlc; T(tags_of_pathname c++"c"++"compile"); A"-c"; Px c]) in + let comp = if Tags.mem "native" (tags_of_pathname c) then !Options.ocamlopt else !Options.ocamlc in + let cc = Cmd(S[comp; T(tags_of_pathname c++"c"++"compile"); A"-c"; Px c]) in if Pathname.dirname o = Pathname.current_dir_name then cc else Seq[cc; mv (Pathname.basename o) o] end;; @@ -416,6 +417,8 @@ flag ["ocaml"; "compile"; "thread"] (A "-thread");; flag ["ocaml"; "doc"; "thread"] (S[A"-I"; A"+threads"]);; flag ["ocaml"; "link"; "thread"; "native"; "program"] (S[A "threads.cmxa"; A "-thread"]);; flag ["ocaml"; "link"; "thread"; "byte"; "program"] (S[A "threads.cma"; A "-thread"]);; +flag ["ocaml"; "link"; "thread"; "native"; "toplevel"] (S[A "threads.cmxa"; A "-thread"]);; +flag ["ocaml"; "link"; "thread"; "byte"; "toplevel"] (S[A "threads.cma"; A "-thread"]);; flag ["ocaml"; "compile"; "nopervasives"] (A"-nopervasives");; flag ["ocaml"; "compile"; "nolabels"] (A"-nolabels");; diff --git a/ocamlbuild/ocaml_utils.ml b/ocamlbuild/ocaml_utils.ml index d42c884b..bbfe60e3 100644 --- a/ocamlbuild/ocaml_utils.ml +++ b/ocamlbuild/ocaml_utils.ml @@ -123,7 +123,10 @@ let ocaml_lib ?(extern=false) ?(byte=true) ?(native=true) ?dir ?tag_name libpath end; match dir with | None -> () - | Some dir -> flag ["ocaml"; tag_name; "compile"] (S[A"-I"; P dir]) + | Some dir -> + List.iter + (fun x -> flag ["ocaml"; tag_name; x] (S[A"-I"; P dir])) + ["compile"; "doc"; "infer_interface"] let cmi_of = Pathname.update_extensions "cmi" diff --git a/ocamlbuild/ocamlbuild-presentation.rslide b/ocamlbuild/ocamlbuild-presentation.rslide index 7fdec39f..30ba657b 100644 --- a/ocamlbuild/ocamlbuild-presentation.rslide +++ b/ocamlbuild/ocamlbuild-presentation.rslide @@ -166,7 +166,7 @@ slide "The tags, our way to specify exceptions", 'fragile=singleslide' do end code_tags do : "funny.ml": rectypes - ~<**/*.ml*>~: warn_A, warn_error_A, debug, dtypes + ~<**/*.ml*>~: warn_A, warn_error_A, debug, annot "foo.ml" or "bar.ml": warn_v, warn_error_v "vendor.ml": -warn_A, -warn_error_A : use_unix diff --git a/ocamlbuild/ocamlbuild_plugin.ml b/ocamlbuild/ocamlbuild_plugin.ml index 930ba17c..2aadca17 100644 --- a/ocamlbuild/ocamlbuild_plugin.ml +++ b/ocamlbuild/ocamlbuild_plugin.ml @@ -31,6 +31,7 @@ type env = Pathname.t -> Pathname.t type builder = Pathname.t list list -> (Pathname.t, exn) Ocamlbuild_pack.My_std.Outcome.t list type action = env -> builder -> Command.t let rule = Rule.rule +let clear_rules = Rule.clear_rules let dep = Command.dep let copy_rule = Rule.copy_rule let ocaml_lib = Ocamlbuild_pack.Ocaml_utils.ocaml_lib diff --git a/ocamlbuild/ocamlbuild_unix_plugin.ml b/ocamlbuild/ocamlbuild_unix_plugin.ml index 1e4efff4..c562d428 100644 --- a/ocamlbuild/ocamlbuild_unix_plugin.ml +++ b/ocamlbuild/ocamlbuild_unix_plugin.ml @@ -61,6 +61,7 @@ let stdout_isatty () = Unix.isatty Unix.stdout let execute_many = + let exit i = raise (My_std.Exit_with_code i) in let exit = function | Ocamlbuild_executor.Subcommand_failed -> exit Exit_codes.rc_executor_subcommand_failed | Ocamlbuild_executor.Subcommand_got_signal -> exit Exit_codes.rc_executor_subcommand_got_signal diff --git a/ocamlbuild/options.ml b/ocamlbuild/options.ml index 7e9bd5b3..11839c61 100644 --- a/ocamlbuild/options.ml +++ b/ocamlbuild/options.ml @@ -76,9 +76,10 @@ let program_to_execute = ref false let must_clean = ref false let show_documentation = ref false let recursive = ref false -let ext_lib = ref "a" -let ext_obj = ref "o" -let ext_dll = ref "so" +let ext_lib = ref Ocamlbuild_Myocamlbuild_config.a +let ext_obj = ref Ocamlbuild_Myocamlbuild_config.o +let ext_dll = ref Ocamlbuild_Myocamlbuild_config.so +let exe = ref Ocamlbuild_Myocamlbuild_config.exe let targets_internal = ref [] let ocaml_libs_internal = ref [] diff --git a/ocamlbuild/plugin.ml b/ocamlbuild/plugin.ml index 97d76af0..8465ee77 100644 --- a/ocamlbuild/plugin.ml +++ b/ocamlbuild/plugin.ml @@ -30,7 +30,7 @@ module Make(U:sig end) = let we_have_a_config_file = sys_file_exists plugin_config_file let we_need_a_plugin = !Options.plugin && sys_file_exists plugin_file - let we_have_a_plugin = sys_file_exists (!Options.build_dir/plugin) + let we_have_a_plugin = sys_file_exists ((!Options.build_dir/plugin)^(!Options.exe)) let we_have_a_config_file_interface = sys_file_exists plugin_config_file_interface let up_to_date_or_copy fn = @@ -56,6 +56,12 @@ module Make(U:sig end) = () (* Up to date *) (* FIXME: remove ocamlbuild_config.ml in _build/ if removed in parent *) else begin + if !Options.native_plugin + && not (sys_file_exists ((!Ocamlbuild_where.libdir)/"ocamlbuildlib.cmxa")) then + begin + Options.native_plugin := false; + eprintf "Warning: Won't be able to compile a native plugin" + end; let plugin_config = if we_have_a_config_file then if we_have_a_config_file_interface then @@ -83,10 +89,10 @@ module Make(U:sig end) = let cmd = Cmd(S[compiler; A"-I"; P dir; libs; more_options; P(dir/ocamlbuildlib); plugin_config; P plugin_file; - P(dir/ocamlbuild); A"-o"; Px plugin]) + P(dir/ocamlbuild); A"-o"; Px (plugin^(!Options.exe))]) in Shell.chdir !Options.build_dir; - Shell.rm_f plugin; + Shell.rm_f (plugin^(!Options.exe)); Command.execute cmd end @@ -96,7 +102,8 @@ module Make(U:sig end) = rebuild_plugin_if_needed (); Shell.chdir Pathname.pwd; if not !Options.just_plugin then - let spec = S[!Options.ocamlrun; P(!Options.build_dir/plugin); + let runner = if !Options.native_plugin then N else !Options.ocamlrun in + let spec = S[runner; P(!Options.build_dir/plugin^(!Options.exe)); A"-no-plugin"; atomize (List.tl (Array.to_list Sys.argv))] in let () = Log.finish () in raise (Exit_silently_with_code (sys_command (Command.string_of_command_spec spec))) diff --git a/ocamlbuild/rule.ml b/ocamlbuild/rule.ml index bf217e7d..ac0f0c8b 100644 --- a/ocamlbuild/rule.ml +++ b/ocamlbuild/rule.ml @@ -227,7 +227,7 @@ let call builder r = then thunk () else List.iter (fun x -> Resource.Cache.suspend_resource x action.command thunk r.prods) r.prods -let (get_rules, add_rule) = +let (get_rules, add_rule, clear_rules) = let rules = ref [] in (fun () -> !rules), begin fun pos r -> @@ -248,7 +248,8 @@ let (get_rules, add_rule) = List.fold_right begin fun x acc -> if x.name = s then r :: x :: acc else x :: acc end !rules [] - end + end, + (fun () -> rules := []) let rule name ?(tags=[]) ?(prods=[]) ?(deps=[]) ?prod ?dep ?stamp ?(insert = `bottom) code = let res_add import xs xopt = diff --git a/ocamlbuild/rule.mli b/ocamlbuild/rule.mli index 9be718e2..16af0f6f 100644 --- a/ocamlbuild/rule.mli +++ b/ocamlbuild/rule.mli @@ -73,6 +73,7 @@ val print_rule_name : Format.formatter -> 'a gen_rule -> unit val print_rule_contents : 'a rule_printer val get_rules : unit -> rule_scheme list +val clear_rules : unit -> unit val call : builder -> rule -> unit diff --git a/ocamlbuild/signatures.mli b/ocamlbuild/signatures.mli index 4304d749..40923b69 100644 --- a/ocamlbuild/signatures.mli +++ b/ocamlbuild/signatures.mli @@ -397,6 +397,7 @@ module type OPTIONS = sig val ext_obj : string ref val ext_lib : string ref val ext_dll : string ref + val exe : string ref end module type ARCH = sig @@ -520,6 +521,9 @@ module type PLUGIN = sig ?insert:[`top | `before of string | `after of string | `bottom] -> string -> string -> unit + (** Empties the list of rules of the ocamlbuild engine. *) + val clear_rules : unit -> unit + (** [dep tags deps] Will build [deps] when all [tags] will be activated. *) val dep : Tags.elt list -> Pathname.t list -> unit diff --git a/ocamldoc/.cvsignore b/ocamldoc/.cvsignore index 720ee641..0372a098 100644 --- a/ocamldoc/.cvsignore +++ b/ocamldoc/.cvsignore @@ -14,3 +14,4 @@ stdlib_man test_stdlib test_latex test +*.a diff --git a/ocamldoc/Makefile b/ocamldoc/Makefile index 66f9fddc..a252bfb1 100644 --- a/ocamldoc/Makefile +++ b/ocamldoc/Makefile @@ -9,7 +9,7 @@ #(* *) #(***********************************************************************) -# $Id: Makefile,v 1.66.4.1 2009/04/09 13:56:38 guesdon Exp $ +# $Id: Makefile 9229 2009-04-09 13:56:38Z guesdon $ include ../config/Makefile diff --git a/ocamldoc/Makefile.nt b/ocamldoc/Makefile.nt index ec7504dd..d11dcccc 100644 --- a/ocamldoc/Makefile.nt +++ b/ocamldoc/Makefile.nt @@ -9,7 +9,7 @@ #(* *) #(***********************************************************************) -# $Id: Makefile.nt,v 1.27.4.2 2009/05/20 12:07:05 doligez Exp $ +# $Id: Makefile.nt 9272 2009-05-20 12:07:05Z doligez $ include ../config/Makefile diff --git a/ocamldoc/odoc.ml b/ocamldoc/odoc.ml index 97c70f3f..996aa019 100644 --- a/ocamldoc/odoc.ml +++ b/ocamldoc/odoc.ml @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc.ml,v 1.9.14.1 2009/04/09 13:56:38 guesdon Exp $ *) +(* $Id: odoc.ml 9371 2009-10-16 12:40:04Z doligez $ *) (** Main module for bytecode. *) @@ -81,11 +81,11 @@ let _ = prerr_endline (Odoc_messages.load_file_error file "Not_found"); exit 1 | Sys_error s - | Failure s -> + | Failure s -> prerr_endline (Odoc_messages.load_file_error file s); exit 1 -let _ = print_DEBUG "Fin du chargement dynamique éventuel" +let _ = print_DEBUG "Fin du chargement dynamique eventuel" let default_html_generator = new Odoc_html.html let default_latex_generator = new Odoc_latex.latex @@ -147,4 +147,4 @@ let _ = exit 0 -(* eof $Id: odoc.ml,v 1.9.14.1 2009/04/09 13:56:38 guesdon Exp $ *) +(* eof $Id: odoc.ml 9371 2009-10-16 12:40:04Z doligez $ *) diff --git a/ocamldoc/odoc_analyse.ml b/ocamldoc/odoc_analyse.ml index 24cb064f..d266190f 100644 --- a/ocamldoc/odoc_analyse.ml +++ b/ocamldoc/odoc_analyse.ml @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_analyse.ml,v 1.15 2007/12/04 13:38:58 doligez Exp $ *) +(* $Id: odoc_analyse.ml 8705 2007-12-04 13:38:58Z doligez $ *) (** Analysis of source files. This module is strongly inspired from driver/main.ml :-) *) diff --git a/ocamldoc/odoc_analyse.mli b/ocamldoc/odoc_analyse.mli index d7f20fb9..d99f677e 100644 --- a/ocamldoc/odoc_analyse.mli +++ b/ocamldoc/odoc_analyse.mli @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_analyse.mli,v 1.4 2004/08/20 17:04:35 doligez Exp $ *) +(* $Id: odoc_analyse.mli 6612 2004-08-20 17:04:35Z doligez $ *) (** Analysis of source files. *) diff --git a/ocamldoc/odoc_args.ml b/ocamldoc/odoc_args.ml index d9ba9324..4f98c065 100644 --- a/ocamldoc/odoc_args.ml +++ b/ocamldoc/odoc_args.ml @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* cvsid $Id: odoc_args.ml,v 1.22.2.1 2009/04/09 13:56:38 guesdon Exp $ *) +(* cvsid $Id: odoc_args.ml 9229 2009-04-09 13:56:38Z guesdon $ *) (** Command-line arguments. *) diff --git a/ocamldoc/odoc_args.mli b/ocamldoc/odoc_args.mli index f2fd6b39..0f0947f7 100644 --- a/ocamldoc/odoc_args.mli +++ b/ocamldoc/odoc_args.mli @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_args.mli,v 1.17.2.1 2009/04/09 13:56:38 guesdon Exp $ *) +(* $Id: odoc_args.mli 9229 2009-04-09 13:56:38Z guesdon $ *) (** Analysis of the command line arguments. *) diff --git a/ocamldoc/odoc_ast.ml b/ocamldoc/odoc_ast.ml index c44f204d..8870fe01 100644 --- a/ocamldoc/odoc_ast.ml +++ b/ocamldoc/odoc_ast.ml @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_ast.ml,v 1.32 2008/07/25 13:28:23 guesdon Exp $ *) +(* $Id: odoc_ast.ml 9371 2009-10-16 12:40:04Z doligez $ *) (** Analysis of implementation files. *) open Misc @@ -332,7 +332,7 @@ module Analyser = in (new_param, func_body2) | _ -> - print_DEBUG3 "Pas le bon filtre pour le paramètre optionnel avec valeur par défaut."; + print_DEBUG3 "Pas le bon filtre pour le parametre optionnel avec valeur par defaut."; (parameter, func_body) ) ) @@ -477,7 +477,7 @@ module Analyser = in (new_param, body2) | _ -> - print_DEBUG3 "Pas le bon filtre pour le paramètre optionnel avec valeur par défaut."; + print_DEBUG3 "Pas le bon filtre pour le parametre optionnel avec valeur par defaut."; (parameter, body) ) ) diff --git a/ocamldoc/odoc_ast.mli b/ocamldoc/odoc_ast.mli index b68b7774..9b5196ac 100644 --- a/ocamldoc/odoc_ast.mli +++ b/ocamldoc/odoc_ast.mli @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_ast.mli,v 1.4 2003/11/24 10:39:29 starynke Exp $ *) +(* $Id: odoc_ast.mli 5973 2003-11-24 10:44:07Z starynke $ *) (** The module for analysing the typed abstract syntax tree and source code and creating modules, classes, ..., elements.*) diff --git a/ocamldoc/odoc_class.ml b/ocamldoc/odoc_class.ml index c2848b8b..49c507f7 100644 --- a/ocamldoc/odoc_class.ml +++ b/ocamldoc/odoc_class.ml @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_class.ml,v 1.5 2004/03/26 15:57:02 guesdon Exp $ *) +(* $Id: odoc_class.ml 6174 2004-03-26 15:57:03Z guesdon $ *) (** Representation and manipulation of classes and class types.*) @@ -250,4 +250,4 @@ let class_type_parameter_text_by_name clt label = None -(* eof $Id: odoc_class.ml,v 1.5 2004/03/26 15:57:02 guesdon Exp $ *) +(* eof $Id: odoc_class.ml 6174 2004-03-26 15:57:03Z guesdon $ *) diff --git a/ocamldoc/odoc_comments.ml b/ocamldoc/odoc_comments.ml index ad22bb64..4986bff2 100644 --- a/ocamldoc/odoc_comments.ml +++ b/ocamldoc/odoc_comments.ml @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_comments.ml,v 1.6 2006/09/20 11:14:36 doligez Exp $ *) +(* $Id: odoc_comments.ml 7619 2006-09-20 11:14:37Z doligez $ *) (** Analysis of comments. *) diff --git a/ocamldoc/odoc_comments.mli b/ocamldoc/odoc_comments.mli index 6a51b88f..6e1a3768 100644 --- a/ocamldoc/odoc_comments.mli +++ b/ocamldoc/odoc_comments.mli @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_comments.mli,v 1.5 2006/09/20 11:14:36 doligez Exp $ *) +(* $Id: odoc_comments.mli 7619 2006-09-20 11:14:37Z doligez $ *) (** Analysis of comments. *) diff --git a/ocamldoc/odoc_comments_global.ml b/ocamldoc/odoc_comments_global.ml index 92846af1..d26d91c4 100644 --- a/ocamldoc/odoc_comments_global.ml +++ b/ocamldoc/odoc_comments_global.ml @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_comments_global.ml,v 1.2 2003/11/24 10:39:30 starynke Exp $ *) +(* $Id: odoc_comments_global.ml 5973 2003-11-24 10:44:07Z starynke $ *) (** The global variables used by the special comment parser.*) @@ -45,4 +45,4 @@ let init () = return_value := None ; customs := [] -(* eof $Id: odoc_comments_global.ml,v 1.2 2003/11/24 10:39:30 starynke Exp $ *) +(* eof $Id: odoc_comments_global.ml 5973 2003-11-24 10:44:07Z starynke $ *) diff --git a/ocamldoc/odoc_comments_global.mli b/ocamldoc/odoc_comments_global.mli index c29d074f..736d8d83 100644 --- a/ocamldoc/odoc_comments_global.mli +++ b/ocamldoc/odoc_comments_global.mli @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_comments_global.mli,v 1.2 2003/11/24 10:39:30 starynke Exp $ *) +(* $Id: odoc_comments_global.mli 5973 2003-11-24 10:44:07Z starynke $ *) (** The global variables used by the special comment parser.*) diff --git a/ocamldoc/odoc_config.ml b/ocamldoc/odoc_config.ml index f854b8d9..038b1caa 100644 --- a/ocamldoc/odoc_config.ml +++ b/ocamldoc/odoc_config.ml @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_config.ml,v 1.2 2007/10/08 14:19:34 doligez Exp $ *) +(* $Id: odoc_config.ml 8416 2007-10-08 14:19:34Z doligez $ *) let custom_generators_path = Filename.concat Config.standard_library diff --git a/ocamldoc/odoc_config.mli b/ocamldoc/odoc_config.mli index eaadd909..f67a6117 100644 --- a/ocamldoc/odoc_config.mli +++ b/ocamldoc/odoc_config.mli @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_config.mli,v 1.2 2007/10/08 14:19:34 doligez Exp $ *) +(* $Id: odoc_config.mli 8416 2007-10-08 14:19:34Z doligez $ *) (** Ocamldoc configuration contants. *) diff --git a/ocamldoc/odoc_control.ml b/ocamldoc/odoc_control.ml index 979b9ad0..07bf335d 100644 --- a/ocamldoc/odoc_control.ml +++ b/ocamldoc/odoc_control.ml @@ -9,5 +9,5 @@ (* *) (***********************************************************************) -(* $Id: odoc_control.ml,v 1.2 2003/11/24 10:39:30 starynke Exp $ *) +(* $Id: odoc_control.ml 5973 2003-11-24 10:44:07Z starynke $ *) diff --git a/ocamldoc/odoc_cross.ml b/ocamldoc/odoc_cross.ml index 9b7974db..a0244a17 100644 --- a/ocamldoc/odoc_cross.ml +++ b/ocamldoc/odoc_cross.ml @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_cross.ml,v 1.18 2007/10/09 10:29:36 weis Exp $ *) +(* $Id: odoc_cross.ml 8418 2007-10-09 10:29:37Z weis $ *) (** Cross referencing. *) diff --git a/ocamldoc/odoc_cross.mli b/ocamldoc/odoc_cross.mli index f70170a8..35e70b6a 100644 --- a/ocamldoc/odoc_cross.mli +++ b/ocamldoc/odoc_cross.mli @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_cross.mli,v 1.3 2006/09/20 11:14:36 doligez Exp $ *) +(* $Id: odoc_cross.mli 7619 2006-09-20 11:14:37Z doligez $ *) (** Cross-referencing. *) diff --git a/ocamldoc/odoc_dag2html.ml b/ocamldoc/odoc_dag2html.ml index cbe82409..4daf0f95 100644 --- a/ocamldoc/odoc_dag2html.ml +++ b/ocamldoc/odoc_dag2html.ml @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_dag2html.ml,v 1.4 2004/12/03 14:42:09 guesdon Exp $ *) +(* $Id: odoc_dag2html.ml 6723 2004-12-03 14:42:09Z guesdon $ *) (** The types and functions to create a html table representing a dag. Thanks to Daniel De Rauglaudre. *) diff --git a/ocamldoc/odoc_dag2html.mli b/ocamldoc/odoc_dag2html.mli index a1bbf49f..1886d830 100644 --- a/ocamldoc/odoc_dag2html.mli +++ b/ocamldoc/odoc_dag2html.mli @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_dag2html.mli,v 1.3 2003/11/24 10:39:31 starynke Exp $ *) +(* $Id: odoc_dag2html.mli 5973 2003-11-24 10:44:07Z starynke $ *) (** The types and functions to create a html table representing a dag. Thanks to Daniel de Rauglaudre. *) diff --git a/ocamldoc/odoc_dep.ml b/ocamldoc/odoc_dep.ml index f975cbdc..2ef7a88b 100644 --- a/ocamldoc/odoc_dep.ml +++ b/ocamldoc/odoc_dep.ml @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_dep.ml,v 1.7 2007/10/09 10:29:36 weis Exp $ *) +(* $Id: odoc_dep.ml 8418 2007-10-09 10:29:37Z weis $ *) (** Top modules dependencies. *) diff --git a/ocamldoc/odoc_dot.ml b/ocamldoc/odoc_dot.ml index d442fcd4..e6c73fad 100644 --- a/ocamldoc/odoc_dot.ml +++ b/ocamldoc/odoc_dot.ml @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_dot.ml,v 1.7 2006/09/20 11:14:36 doligez Exp $ *) +(* $Id: odoc_dot.ml 7619 2006-09-20 11:14:37Z doligez $ *) (** Definition of a class which outputs a dot file showing top modules dependencies.*) diff --git a/ocamldoc/odoc_env.ml b/ocamldoc/odoc_env.ml index 6845ce2c..bc81855e 100644 --- a/ocamldoc/odoc_env.ml +++ b/ocamldoc/odoc_env.ml @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_env.ml,v 1.7 2004/06/12 08:55:46 xleroy Exp $ *) +(* $Id: odoc_env.ml 6386 2004-06-12 08:55:49Z xleroy $ *) (** Environment for finding complete names from relative names. *) @@ -242,4 +242,4 @@ let subst_class_type env t = in iter t -(* eof $Id: odoc_env.ml,v 1.7 2004/06/12 08:55:46 xleroy Exp $ *) +(* eof $Id: odoc_env.ml 6386 2004-06-12 08:55:49Z xleroy $ *) diff --git a/ocamldoc/odoc_env.mli b/ocamldoc/odoc_env.mli index 4e2cbe9e..ae96a976 100644 --- a/ocamldoc/odoc_env.mli +++ b/ocamldoc/odoc_env.mli @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_env.mli,v 1.3 2003/11/24 10:39:31 starynke Exp $ *) +(* $Id: odoc_env.mli 5973 2003-11-24 10:44:07Z starynke $ *) (** Environment for finding complete names from relative names. *) diff --git a/ocamldoc/odoc_exception.ml b/ocamldoc/odoc_exception.ml index 015915aa..e6bf02d6 100644 --- a/ocamldoc/odoc_exception.ml +++ b/ocamldoc/odoc_exception.ml @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_exception.ml,v 1.3 2003/11/24 10:39:31 starynke Exp $ *) +(* $Id: odoc_exception.ml 5973 2003-11-24 10:44:07Z starynke $ *) (** Representation and manipulation of exceptions. *) diff --git a/ocamldoc/odoc_global.ml b/ocamldoc/odoc_global.ml index de5fdd8b..45d7906e 100644 --- a/ocamldoc/odoc_global.ml +++ b/ocamldoc/odoc_global.ml @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_global.ml,v 1.3 2003/11/24 10:41:03 starynke Exp $ *) +(* $Id: odoc_global.ml 5973 2003-11-24 10:44:07Z starynke $ *) (** Global variables. *) diff --git a/ocamldoc/odoc_global.mli b/ocamldoc/odoc_global.mli index 1c8c2194..4889056b 100644 --- a/ocamldoc/odoc_global.mli +++ b/ocamldoc/odoc_global.mli @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_global.mli,v 1.2 2003/11/24 10:41:03 starynke Exp $ *) +(* $Id: odoc_global.mli 5973 2003-11-24 10:44:07Z starynke $ *) (** Global variables. *) diff --git a/ocamldoc/odoc_html.ml b/ocamldoc/odoc_html.ml index 21294cb0..3467af84 100644 --- a/ocamldoc/odoc_html.ml +++ b/ocamldoc/odoc_html.ml @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_html.ml,v 1.64.2.1 2008/11/10 13:03:55 guesdon Exp $ *) +(* $Id: odoc_html.ml 9125 2008-11-10 13:03:55Z guesdon $ *) (** Generation of html documentation.*) diff --git a/ocamldoc/odoc_info.ml b/ocamldoc/odoc_info.ml index 55f20259..3eddaff3 100644 --- a/ocamldoc/odoc_info.ml +++ b/ocamldoc/odoc_info.ml @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_info.ml,v 1.24 2007/10/08 14:19:34 doligez Exp $ *) +(* $Id: odoc_info.ml 8416 2007-10-08 14:19:34Z doligez $ *) (** Interface for analysing documented OCaml source files and to the collected information. *) diff --git a/ocamldoc/odoc_info.mli b/ocamldoc/odoc_info.mli index 375f4754..2fca47f2 100644 --- a/ocamldoc/odoc_info.mli +++ b/ocamldoc/odoc_info.mli @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_info.mli,v 1.45 2008/07/25 13:28:23 guesdon Exp $ *) +(* $Id: odoc_info.mli 8932 2008-07-25 13:28:23Z guesdon $ *) (** Interface to the information collected in source files. *) diff --git a/ocamldoc/odoc_inherit.ml b/ocamldoc/odoc_inherit.ml index 915b4cb0..5582ce98 100644 --- a/ocamldoc/odoc_inherit.ml +++ b/ocamldoc/odoc_inherit.ml @@ -9,5 +9,5 @@ (* *) (***********************************************************************) -(* $Id: odoc_inherit.ml,v 1.2 2003/11/24 10:41:04 starynke Exp $ *) +(* $Id: odoc_inherit.ml 5973 2003-11-24 10:44:07Z starynke $ *) diff --git a/ocamldoc/odoc_latex.ml b/ocamldoc/odoc_latex.ml index 58571c26..bf047554 100644 --- a/ocamldoc/odoc_latex.ml +++ b/ocamldoc/odoc_latex.ml @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_latex.ml,v 1.41 2007/10/09 10:29:36 weis Exp $ *) +(* $Id: odoc_latex.ml 8418 2007-10-09 10:29:37Z weis $ *) (** Generation of LaTeX documentation. *) diff --git a/ocamldoc/odoc_latex_style.ml b/ocamldoc/odoc_latex_style.ml index 6b791c87..578751da 100644 --- a/ocamldoc/odoc_latex_style.ml +++ b/ocamldoc/odoc_latex_style.ml @@ -11,7 +11,7 @@ (** The content of the LaTeX style to generate when generating LaTeX code. *) -(* $Id: odoc_latex_style.ml,v 1.5 2004/06/11 14:25:50 guesdon Exp $ *) +(* $Id: odoc_latex_style.ml 6378 2004-06-11 14:25:50Z guesdon $ *) let content =" %% Support macros for LaTeX documentation generated by ocamldoc. diff --git a/ocamldoc/odoc_lexer.mll b/ocamldoc/odoc_lexer.mll index 034767d0..d4772994 100644 --- a/ocamldoc/odoc_lexer.mll +++ b/ocamldoc/odoc_lexer.mll @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_lexer.mll,v 1.5 2008/07/23 11:14:22 guesdon Exp $ *) +(* $Id: odoc_lexer.mll 8928 2008-07-23 11:14:22Z guesdon $ *) (** The lexer for special comments. *) diff --git a/ocamldoc/odoc_man.ml b/ocamldoc/odoc_man.ml index 2e495b18..028fd7a7 100644 --- a/ocamldoc/odoc_man.ml +++ b/ocamldoc/odoc_man.ml @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_man.ml,v 1.28.2.1 2008/10/29 11:58:35 guesdon Exp $ *) +(* $Id: odoc_man.ml 9109 2008-10-29 11:58:35Z guesdon $ *) (** The man pages generator. *) open Odoc_info diff --git a/ocamldoc/odoc_merge.ml b/ocamldoc/odoc_merge.ml index 15838d41..bbf8de10 100644 --- a/ocamldoc/odoc_merge.ml +++ b/ocamldoc/odoc_merge.ml @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_merge.ml,v 1.13 2007/10/09 10:29:36 weis Exp $ *) +(* $Id: odoc_merge.ml 8418 2007-10-09 10:29:37Z weis $ *) (** Merge of information from [.ml] and [.mli] for a module.*) diff --git a/ocamldoc/odoc_merge.mli b/ocamldoc/odoc_merge.mli index 904d62c7..aaf42c19 100644 --- a/ocamldoc/odoc_merge.mli +++ b/ocamldoc/odoc_merge.mli @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_merge.mli,v 1.3 2003/11/24 10:41:05 starynke Exp $ *) +(* $Id: odoc_merge.mli 5973 2003-11-24 10:44:07Z starynke $ *) (** Merge of information from [.ml] and [.mli] for a module.*) diff --git a/ocamldoc/odoc_messages.ml b/ocamldoc/odoc_messages.ml index cadca59a..c634bdb2 100644 --- a/ocamldoc/odoc_messages.ml +++ b/ocamldoc/odoc_messages.ml @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_messages.ml,v 1.32.2.1 2009/04/09 13:56:38 guesdon Exp $ *) +(* $Id: odoc_messages.ml 9229 2009-04-09 13:56:38Z guesdon $ *) (** The messages of the application. *) diff --git a/ocamldoc/odoc_misc.ml b/ocamldoc/odoc_misc.ml index c6634151..0c6510a7 100644 --- a/ocamldoc/odoc_misc.ml +++ b/ocamldoc/odoc_misc.ml @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_misc.ml,v 1.21 2006/07/06 07:19:06 pouillar Exp $ *) +(* $Id: odoc_misc.ml 7470 2006-07-06 07:19:06Z pouillar $ *) let no_blanks s = let len = String.length s in diff --git a/ocamldoc/odoc_misc.mli b/ocamldoc/odoc_misc.mli index 83f94ef5..06b66fc3 100644 --- a/ocamldoc/odoc_misc.mli +++ b/ocamldoc/odoc_misc.mli @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_misc.mli,v 1.13 2006/01/04 16:55:50 doligez Exp $ *) +(* $Id: odoc_misc.mli 7307 2006-01-04 16:55:50Z doligez $ *) (** Miscelaneous functions *) diff --git a/ocamldoc/odoc_module.ml b/ocamldoc/odoc_module.ml index a9696516..caeffeb4 100644 --- a/ocamldoc/odoc_module.ml +++ b/ocamldoc/odoc_module.ml @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_module.ml,v 1.12 2006/09/20 11:14:37 doligez Exp $ *) +(* $Id: odoc_module.ml 7619 2006-09-20 11:14:37Z doligez $ *) (** Representation and manipulation of modules and module types. *) diff --git a/ocamldoc/odoc_name.ml b/ocamldoc/odoc_name.ml index a8459747..049dea58 100644 --- a/ocamldoc/odoc_name.ml +++ b/ocamldoc/odoc_name.ml @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_name.ml,v 1.10.14.1 2009/03/12 18:21:08 doligez Exp $ *) +(* $Id: odoc_name.ml 9185 2009-03-12 18:21:08Z doligez $ *) (** Representation of element names. *) diff --git a/ocamldoc/odoc_name.mli b/ocamldoc/odoc_name.mli index 539dfbaa..58eeff45 100644 --- a/ocamldoc/odoc_name.mli +++ b/ocamldoc/odoc_name.mli @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_name.mli,v 1.4 2004/03/26 09:09:50 guesdon Exp $ *) +(* $Id: odoc_name.mli 6173 2004-03-26 09:09:50Z guesdon $ *) (** Representation of element names. *) diff --git a/ocamldoc/odoc_ocamlhtml.mll b/ocamldoc/odoc_ocamlhtml.mll index e7c5c77c..e2279508 100644 --- a/ocamldoc/odoc_ocamlhtml.mll +++ b/ocamldoc/odoc_ocamlhtml.mll @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_ocamlhtml.mll,v 1.10.4.1 2008/11/10 13:03:55 guesdon Exp $ *) +(* $Id: odoc_ocamlhtml.mll 9125 2008-11-10 13:03:55Z guesdon $ *) (** Generation of html code to display OCaml code. *) open Lexing diff --git a/ocamldoc/odoc_parameter.ml b/ocamldoc/odoc_parameter.ml index 51c442a8..2d2af1f7 100644 --- a/ocamldoc/odoc_parameter.ml +++ b/ocamldoc/odoc_parameter.ml @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_parameter.ml,v 1.8 2004/04/02 15:10:57 guesdon Exp $ *) +(* $Id: odoc_parameter.ml 6185 2004-04-02 15:10:58Z guesdon $ *) (** Representation and manipulation of method / function / class parameters. *) diff --git a/ocamldoc/odoc_parser.mly b/ocamldoc/odoc_parser.mly index 550ded05..d885e2a5 100644 --- a/ocamldoc/odoc_parser.mly +++ b/ocamldoc/odoc_parser.mly @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_parser.mly,v 1.3 2003/11/24 10:43:11 starynke Exp $ *) +(* $Id: odoc_parser.mly 5973 2003-11-24 10:44:07Z starynke $ *) open Odoc_types open Odoc_comments_global diff --git a/ocamldoc/odoc_print.ml b/ocamldoc/odoc_print.ml index 5be5cfeb..116d22b9 100644 --- a/ocamldoc/odoc_print.ml +++ b/ocamldoc/odoc_print.ml @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_print.ml,v 1.3 2004/05/18 13:28:00 garrigue Exp $ *) +(* $Id: odoc_print.ml 6307 2004-05-18 13:28:00Z garrigue $ *) open Format diff --git a/ocamldoc/odoc_print.mli b/ocamldoc/odoc_print.mli index e825b6e4..69e7526f 100644 --- a/ocamldoc/odoc_print.mli +++ b/ocamldoc/odoc_print.mli @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_print.mli,v 1.2 2004/03/26 09:09:50 guesdon Exp $ *) +(* $Id: odoc_print.mli 6173 2004-03-26 09:09:50Z guesdon $ *) (** Printing functions. *) diff --git a/ocamldoc/odoc_scan.ml b/ocamldoc/odoc_scan.ml index 1b669e15..d7d694f8 100644 --- a/ocamldoc/odoc_scan.ml +++ b/ocamldoc/odoc_scan.ml @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_scan.ml,v 1.3 2003/11/24 10:43:11 starynke Exp $ *) +(* $Id: odoc_scan.ml 5973 2003-11-24 10:44:07Z starynke $ *) (** Scanning of modules and elements. diff --git a/ocamldoc/odoc_search.ml b/ocamldoc/odoc_search.ml index e863fcb2..c5d7eff1 100644 --- a/ocamldoc/odoc_search.ml +++ b/ocamldoc/odoc_search.ml @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_search.ml,v 1.7 2006/01/04 16:55:50 doligez Exp $ *) +(* $Id: odoc_search.ml 7307 2006-01-04 16:55:50Z doligez $ *) (** Research of elements through modules. *) @@ -632,4 +632,4 @@ let find_section mods regexp = Res_section (_,t) -> t | _ -> assert false -(* eof $Id: odoc_search.ml,v 1.7 2006/01/04 16:55:50 doligez Exp $ *) +(* eof $Id: odoc_search.ml 7307 2006-01-04 16:55:50Z doligez $ *) diff --git a/ocamldoc/odoc_search.mli b/ocamldoc/odoc_search.mli index 4254af07..9b4f2f5e 100644 --- a/ocamldoc/odoc_search.mli +++ b/ocamldoc/odoc_search.mli @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_search.mli,v 1.4 2003/11/24 10:43:12 starynke Exp $ *) +(* $Id: odoc_search.mli 5973 2003-11-24 10:44:07Z starynke $ *) (** Research of elements through modules. *) diff --git a/ocamldoc/odoc_see_lexer.mll b/ocamldoc/odoc_see_lexer.mll index fe16fee2..799678a4 100644 --- a/ocamldoc/odoc_see_lexer.mll +++ b/ocamldoc/odoc_see_lexer.mll @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_see_lexer.mll,v 1.3 2003/11/24 10:43:12 starynke Exp $ *) +(* $Id: odoc_see_lexer.mll 5973 2003-11-24 10:44:07Z starynke $ *) let print_DEBUG2 s = print_string s ; print_newline () diff --git a/ocamldoc/odoc_sig.ml b/ocamldoc/odoc_sig.ml index 329e23b4..a9b3f34f 100644 --- a/ocamldoc/odoc_sig.ml +++ b/ocamldoc/odoc_sig.ml @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_sig.ml,v 1.41 2008/07/23 08:55:36 guesdon Exp $ *) +(* $Id: odoc_sig.ml 8927 2008-07-23 08:55:36Z guesdon $ *) (** Analysis of interface files. *) diff --git a/ocamldoc/odoc_sig.mli b/ocamldoc/odoc_sig.mli index 9802e928..d1518a81 100644 --- a/ocamldoc/odoc_sig.mli +++ b/ocamldoc/odoc_sig.mli @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_sig.mli,v 1.6 2004/11/03 09:31:19 guesdon Exp $ *) +(* $Id: odoc_sig.mli 6661 2004-11-03 09:31:19Z guesdon $ *) (** The module for analysing a signature and source code and creating modules, classes, ..., elements.*) diff --git a/ocamldoc/odoc_str.ml b/ocamldoc/odoc_str.ml index 2aad6fb3..6ca8cccb 100644 --- a/ocamldoc/odoc_str.ml +++ b/ocamldoc/odoc_str.ml @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_str.ml,v 1.13 2008/07/23 08:55:36 guesdon Exp $ *) +(* $Id: odoc_str.ml 8927 2008-07-23 08:55:36Z guesdon $ *) (** The functions to get a string from different kinds of elements (types, modules, ...). *) @@ -274,4 +274,4 @@ let string_of_method m = None -> "" | Some i -> Odoc_misc.string_of_info i) -(* eof $Id: odoc_str.ml,v 1.13 2008/07/23 08:55:36 guesdon Exp $ *) +(* eof $Id: odoc_str.ml 8927 2008-07-23 08:55:36Z guesdon $ *) diff --git a/ocamldoc/odoc_str.mli b/ocamldoc/odoc_str.mli index 7f67c31a..b70c9817 100644 --- a/ocamldoc/odoc_str.mli +++ b/ocamldoc/odoc_str.mli @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_str.mli,v 1.6 2004/08/20 17:04:35 doligez Exp $ *) +(* $Id: odoc_str.mli 6612 2004-08-20 17:04:35Z doligez $ *) (** The functions to get a string from different kinds of elements (types, modules, ...). *) diff --git a/ocamldoc/odoc_test.ml b/ocamldoc/odoc_test.ml index 8c2d020e..49d98e2f 100644 --- a/ocamldoc/odoc_test.ml +++ b/ocamldoc/odoc_test.ml @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_test.ml,v 1.1 2004/02/20 16:28:27 guesdon Exp $ *) +(* $Id: odoc_test.ml 6127 2004-02-20 16:28:27Z guesdon $ *) (** Custom generator to perform test on ocamldoc. *) diff --git a/ocamldoc/odoc_texi.ml b/ocamldoc/odoc_texi.ml index 1c7d5fd2..414a86ab 100644 --- a/ocamldoc/odoc_texi.ml +++ b/ocamldoc/odoc_texi.ml @@ -8,7 +8,7 @@ (* under the terms of the Q Public License version 1.0. *) (***********************************************************************) -(* $Id: odoc_texi.ml,v 1.24 2008/07/23 08:55:36 guesdon Exp $ *) +(* $Id: odoc_texi.ml 8927 2008-07-23 08:55:36Z guesdon $ *) (** Generation of Texinfo documentation. *) diff --git a/ocamldoc/odoc_text.ml b/ocamldoc/odoc_text.ml index 57dd461a..234c2eec 100644 --- a/ocamldoc/odoc_text.ml +++ b/ocamldoc/odoc_text.ml @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_text.ml,v 1.6 2006/01/04 16:55:50 doligez Exp $ *) +(* $Id: odoc_text.ml 7307 2006-01-04 16:55:50Z doligez $ *) exception Text_syntax of int * int * string (* line, char, string *) diff --git a/ocamldoc/odoc_text.mli b/ocamldoc/odoc_text.mli index 6dca491a..cea7d50e 100644 --- a/ocamldoc/odoc_text.mli +++ b/ocamldoc/odoc_text.mli @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_text.mli,v 1.3 2003/11/24 21:20:51 guesdon Exp $ *) +(* $Id: odoc_text.mli 5974 2003-11-24 21:20:51Z guesdon $ *) (** A module with a function to parse strings to obtain a [Odoc_types.text] value. *) diff --git a/ocamldoc/odoc_text_lexer.mll b/ocamldoc/odoc_text_lexer.mll index d9015f87..34a8dfe4 100644 --- a/ocamldoc/odoc_text_lexer.mll +++ b/ocamldoc/odoc_text_lexer.mll @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_text_lexer.mll,v 1.9 2006/01/04 16:55:50 doligez Exp $ *) +(* $Id: odoc_text_lexer.mll 7307 2006-01-04 16:55:50Z doligez $ *) (** The lexer for string to build text structures. *) diff --git a/ocamldoc/odoc_text_parser.mly b/ocamldoc/odoc_text_parser.mly index e1e30398..4972f5b3 100644 --- a/ocamldoc/odoc_text_parser.mly +++ b/ocamldoc/odoc_text_parser.mly @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_text_parser.mly,v 1.5 2006/01/04 16:55:50 doligez Exp $ *) +(* $Id: odoc_text_parser.mly 7307 2006-01-04 16:55:50Z doligez $ *) open Odoc_types diff --git a/ocamldoc/odoc_to_text.ml b/ocamldoc/odoc_to_text.ml index 0c636e1c..b02b0edc 100644 --- a/ocamldoc/odoc_to_text.ml +++ b/ocamldoc/odoc_to_text.ml @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_to_text.ml,v 1.17 2008/07/23 08:55:36 guesdon Exp $ *) +(* $Id: odoc_to_text.ml 8927 2008-07-23 08:55:36Z guesdon $ *) (** Text generation. diff --git a/ocamldoc/odoc_type.ml b/ocamldoc/odoc_type.ml index 3d4a663e..9d92e51b 100644 --- a/ocamldoc/odoc_type.ml +++ b/ocamldoc/odoc_type.ml @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_type.ml,v 1.7 2008/05/21 05:56:39 guesdon Exp $ *) +(* $Id: odoc_type.ml 8883 2008-05-21 05:56:39Z guesdon $ *) (** Representation and manipulation of a type, but not class nor module type.*) diff --git a/ocamldoc/odoc_types.ml b/ocamldoc/odoc_types.ml index fb48721b..c469015e 100644 --- a/ocamldoc/odoc_types.ml +++ b/ocamldoc/odoc_types.ml @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_types.ml,v 1.9 2006/01/04 16:55:50 doligez Exp $ *) +(* $Id: odoc_types.ml 7307 2006-01-04 16:55:50Z doligez $ *) type ref_kind = RK_module diff --git a/ocamldoc/odoc_types.mli b/ocamldoc/odoc_types.mli index cad2bcc3..3b9b2589 100644 --- a/ocamldoc/odoc_types.mli +++ b/ocamldoc/odoc_types.mli @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_types.mli,v 1.6 2006/01/04 16:55:50 doligez Exp $ *) +(* $Id: odoc_types.mli 7307 2006-01-04 16:55:50Z doligez $ *) (** Types for the information collected in comments. *) diff --git a/ocamldoc/odoc_value.ml b/ocamldoc/odoc_value.ml index 05714faa..c88c0d37 100644 --- a/ocamldoc/odoc_value.ml +++ b/ocamldoc/odoc_value.ml @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_value.ml,v 1.7 2008/07/23 08:55:36 guesdon Exp $ *) +(* $Id: odoc_value.ml 8927 2008-07-23 08:55:36Z guesdon $ *) (** Representation and manipulation of values, class attributes and class methods. *) diff --git a/ocamldoc/remove_DEBUG b/ocamldoc/remove_DEBUG index da94ce04..be5a4987 100755 --- a/ocamldoc/remove_DEBUG +++ b/ocamldoc/remove_DEBUG @@ -11,11 +11,12 @@ #(* *) #(***********************************************************************) -# $Id: remove_DEBUG,v 1.3 2004/04/15 16:18:52 doligez Exp $ +# $Id: remove_DEBUG 9312 2009-07-09 17:09:48Z doligez $ # usage: remove_DEBUG # remove from every line that contains the string "DEBUG", # respecting the cpp # line annotation conventions echo "# 1 \"$1\"" -LC_ALL=C sed -e '/DEBUG/s/.*//' "$1" +LC_ALL=C sed -e '/DEBUG/c\ +(* DEBUG statement removed *)' "$1" diff --git a/ocamldoc/runocamldoc b/ocamldoc/runocamldoc index 606baa70..5638297b 100644 --- a/ocamldoc/runocamldoc +++ b/ocamldoc/runocamldoc @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: runocamldoc,v 1.6 2002/07/23 14:11:53 doligez Exp $ +# $Id: runocamldoc 5029 2002-07-23 14:12:03Z doligez $ case "$1" in true) shift diff --git a/otherlibs/Makefile b/otherlibs/Makefile index 2c4afdcc..e769c161 100644 --- a/otherlibs/Makefile +++ b/otherlibs/Makefile @@ -11,7 +11,7 @@ # # ######################################################################### -# $Id: Makefile,v 1.4 2007/11/08 09:17:47 frisch Exp $ +# $Id: Makefile 8489 2007-11-08 09:17:48Z frisch $ # Common Makefile for otherlibs on the Unix ports diff --git a/otherlibs/Makefile.nt b/otherlibs/Makefile.nt index 7ea9d4f3..97c50894 100644 --- a/otherlibs/Makefile.nt +++ b/otherlibs/Makefile.nt @@ -11,7 +11,7 @@ # # ######################################################################### -# $Id: Makefile.nt,v 1.3 2007/11/08 09:17:48 frisch Exp $ +# $Id: Makefile.nt 8489 2007-11-08 09:17:48Z frisch $ # Common Makefile for otherlibs on the Win32/MinGW ports diff --git a/otherlibs/Makefile.shared b/otherlibs/Makefile.shared index 527cb6b7..b235cc3d 100644 --- a/otherlibs/Makefile.shared +++ b/otherlibs/Makefile.shared @@ -11,7 +11,7 @@ # # ######################################################################### -# $Id: Makefile.shared,v 1.3 2008/07/15 15:31:32 frisch Exp $ +# $Id: Makefile.shared 8916 2008-07-15 15:31:32Z frisch $ # Common Makefile for otherlibs diff --git a/otherlibs/bigarray/.cvsignore b/otherlibs/bigarray/.cvsignore index c54b3a35..52db225e 100644 --- a/otherlibs/bigarray/.cvsignore +++ b/otherlibs/bigarray/.cvsignore @@ -1,3 +1,5 @@ *.o *.x so_locations +*.so +*.a diff --git a/otherlibs/bigarray/Makefile b/otherlibs/bigarray/Makefile index 9a323c94..81f5aef2 100644 --- a/otherlibs/bigarray/Makefile +++ b/otherlibs/bigarray/Makefile @@ -11,7 +11,7 @@ # # ######################################################################### -# $Id: Makefile,v 1.25 2008/01/04 09:52:27 xleroy Exp $ +# $Id: Makefile 8748 2008-01-04 09:52:27Z xleroy $ LIBNAME=bigarray EXTRACFLAGS=-I../unix -DIN_OCAML_BIGARRAY -DCAML_NAME_SPACE diff --git a/otherlibs/bigarray/Makefile.nt b/otherlibs/bigarray/Makefile.nt index 7a43f5f6..94ef9ddd 100644 --- a/otherlibs/bigarray/Makefile.nt +++ b/otherlibs/bigarray/Makefile.nt @@ -11,7 +11,7 @@ # # ######################################################################### -# $Id: Makefile.nt,v 1.13 2008/01/04 15:01:48 xleroy Exp $ +# $Id: Makefile.nt 8754 2008-01-04 15:01:48Z xleroy $ LIBNAME=bigarray EXTRACFLAGS=-I../win32unix -DIN_OCAML_BIGARRAY -DCAML_NAME_SPACE diff --git a/otherlibs/bigarray/bigarray.h b/otherlibs/bigarray/bigarray.h index 7fc10e63..2078a4f1 100644 --- a/otherlibs/bigarray/bigarray.h +++ b/otherlibs/bigarray/bigarray.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: bigarray.h,v 1.9.14.1 2008/11/09 09:03:50 xleroy Exp $ */ +/* $Id: bigarray.h 9123 2008-11-09 09:03:51Z xleroy $ */ #ifndef CAML_BIGARRAY_H #define CAML_BIGARRAY_H diff --git a/otherlibs/bigarray/bigarray.ml b/otherlibs/bigarray/bigarray.ml index 4c2960f1..201e69da 100644 --- a/otherlibs/bigarray/bigarray.ml +++ b/otherlibs/bigarray/bigarray.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: bigarray.ml,v 1.20 2008/07/14 09:09:53 xleroy Exp $ *) +(* $Id: bigarray.ml 8911 2008-07-14 09:09:53Z xleroy $ *) (* Module [Bigarray]: large, multi-dimensional, numerical arrays *) diff --git a/otherlibs/bigarray/bigarray.mli b/otherlibs/bigarray/bigarray.mli index ed77a6a4..0c6cb05a 100644 --- a/otherlibs/bigarray/bigarray.mli +++ b/otherlibs/bigarray/bigarray.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: bigarray.mli,v 1.27.2.1 2008/10/08 13:07:13 doligez Exp $ *) +(* $Id: bigarray.mli 9079 2008-10-08 13:09:39Z doligez $ *) (** Large, multi-dimensional, numerical arrays. diff --git a/otherlibs/bigarray/bigarray_stubs.c b/otherlibs/bigarray/bigarray_stubs.c index d1d19d9b..9e4774ee 100644 --- a/otherlibs/bigarray/bigarray_stubs.c +++ b/otherlibs/bigarray/bigarray_stubs.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: bigarray_stubs.c,v 1.23.4.1 2008/11/09 09:03:51 xleroy Exp $ */ +/* $Id: bigarray_stubs.c 9123 2008-11-09 09:03:51Z xleroy $ */ #include #include diff --git a/otherlibs/bigarray/mmap_unix.c b/otherlibs/bigarray/mmap_unix.c index 06631051..cc8b4333 100644 --- a/otherlibs/bigarray/mmap_unix.c +++ b/otherlibs/bigarray/mmap_unix.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: mmap_unix.c,v 1.11 2008/01/04 15:01:48 xleroy Exp $ */ +/* $Id: mmap_unix.c 8754 2008-01-04 15:01:48Z xleroy $ */ #include #include diff --git a/otherlibs/bigarray/mmap_win32.c b/otherlibs/bigarray/mmap_win32.c index 6256fb60..b1a024cd 100644 --- a/otherlibs/bigarray/mmap_win32.c +++ b/otherlibs/bigarray/mmap_win32.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: mmap_win32.c,v 1.12 2008/01/15 14:55:15 frisch Exp $ */ +/* $Id: mmap_win32.c 8773 2008-01-15 14:55:15Z frisch $ */ #include #include diff --git a/otherlibs/dbm/.cvsignore b/otherlibs/dbm/.cvsignore index 074dd28a..29fea472 100644 --- a/otherlibs/dbm/.cvsignore +++ b/otherlibs/dbm/.cvsignore @@ -1 +1,3 @@ so_locations +*.so +*.a diff --git a/otherlibs/dbm/Makefile b/otherlibs/dbm/Makefile index 71fe0ba1..dbfb1b1b 100644 --- a/otherlibs/dbm/Makefile +++ b/otherlibs/dbm/Makefile @@ -11,7 +11,7 @@ # # ######################################################################### -# $Id: Makefile,v 1.26.4.1 2009/03/31 11:33:25 xleroy Exp $ +# $Id: Makefile 9214 2009-03-31 11:33:25Z xleroy $ # Makefile for the ndbm library diff --git a/otherlibs/dbm/cldbm.c b/otherlibs/dbm/cldbm.c index b899b158..9fa5be2b 100644 --- a/otherlibs/dbm/cldbm.c +++ b/otherlibs/dbm/cldbm.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: cldbm.c,v 1.8 2003/07/08 13:50:31 xleroy Exp $ */ +/* $Id: cldbm.c 5670 2003-07-08 13:50:31Z xleroy $ */ #include #include diff --git a/otherlibs/dbm/dbm.ml b/otherlibs/dbm/dbm.ml index 771e286f..7ecc0c4f 100644 --- a/otherlibs/dbm/dbm.ml +++ b/otherlibs/dbm/dbm.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: dbm.ml,v 1.10 2001/12/07 13:39:51 xleroy Exp $ *) +(* $Id: dbm.ml 4144 2001-12-07 13:41:02Z xleroy $ *) type t diff --git a/otherlibs/dbm/dbm.mli b/otherlibs/dbm/dbm.mli index e4ae6029..059c8588 100644 --- a/otherlibs/dbm/dbm.mli +++ b/otherlibs/dbm/dbm.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: dbm.mli,v 1.15 2001/12/07 13:39:51 xleroy Exp $ *) +(* $Id: dbm.mli 4144 2001-12-07 13:41:02Z xleroy $ *) (** Interface to the NDBM database. *) diff --git a/otherlibs/dynlink/.cvsignore b/otherlibs/dynlink/.cvsignore index 5ea9775e..29b3102d 100644 --- a/otherlibs/dynlink/.cvsignore +++ b/otherlibs/dynlink/.cvsignore @@ -1 +1,2 @@ extract_crc +*.a diff --git a/otherlibs/dynlink/Makefile b/otherlibs/dynlink/Makefile index bcfe3319..c7c06624 100644 --- a/otherlibs/dynlink/Makefile +++ b/otherlibs/dynlink/Makefile @@ -11,7 +11,7 @@ # # ######################################################################### -# $Id: Makefile,v 1.34 2008/04/16 06:50:31 frisch Exp $ +# $Id: Makefile 8868 2008-04-16 06:50:31Z frisch $ # Makefile for the dynamic link library diff --git a/otherlibs/dynlink/Makefile.nt b/otherlibs/dynlink/Makefile.nt index eca546e6..8dc4aee6 100644 --- a/otherlibs/dynlink/Makefile.nt +++ b/otherlibs/dynlink/Makefile.nt @@ -11,7 +11,7 @@ # # ######################################################################### -# $Id: Makefile.nt,v 1.17 2007/11/06 15:16:56 frisch Exp $ +# $Id: Makefile.nt 8477 2007-11-06 15:16:56Z frisch $ # Makefile for the dynamic link library diff --git a/otherlibs/dynlink/dynlink.ml b/otherlibs/dynlink/dynlink.ml index cbea1175..e3406157 100644 --- a/otherlibs/dynlink/dynlink.ml +++ b/otherlibs/dynlink/dynlink.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: dynlink.ml,v 1.36 2008/04/22 12:24:10 frisch Exp $ *) +(* $Id: dynlink.ml 8873 2008-04-22 12:24:10Z frisch $ *) (* Dynamic loading of .cmo files *) diff --git a/otherlibs/dynlink/dynlink.mli b/otherlibs/dynlink/dynlink.mli index 25d6414a..c0285939 100644 --- a/otherlibs/dynlink/dynlink.mli +++ b/otherlibs/dynlink/dynlink.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: dynlink.mli,v 1.23 2008/04/22 12:24:10 frisch Exp $ *) +(* $Id: dynlink.mli 8873 2008-04-22 12:24:10Z frisch $ *) (** Dynamic loading of object files. *) diff --git a/otherlibs/dynlink/extract_crc.ml b/otherlibs/dynlink/extract_crc.ml index 3a548b2c..3884239e 100644 --- a/otherlibs/dynlink/extract_crc.ml +++ b/otherlibs/dynlink/extract_crc.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: extract_crc.ml,v 1.10 2004/04/09 13:26:41 xleroy Exp $ *) +(* $Id: extract_crc.ml 6195 2004-04-09 13:26:41Z xleroy $ *) (* Print the digests of unit interfaces *) diff --git a/otherlibs/dynlink/natdynlink.ml b/otherlibs/dynlink/natdynlink.ml index 9015c739..4291bcc0 100644 --- a/otherlibs/dynlink/natdynlink.ml +++ b/otherlibs/dynlink/natdynlink.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: natdynlink.ml,v 1.6 2008/08/28 22:17:51 frisch Exp $ *) +(* $Id: natdynlink.ml 8993 2008-08-28 22:17:51Z frisch $ *) (* Dynamic loading of .cmx files *) diff --git a/otherlibs/graph/.cvsignore b/otherlibs/graph/.cvsignore index 074dd28a..29fea472 100644 --- a/otherlibs/graph/.cvsignore +++ b/otherlibs/graph/.cvsignore @@ -1 +1,3 @@ so_locations +*.so +*.a diff --git a/otherlibs/graph/Makefile b/otherlibs/graph/Makefile index 9a6c7ee1..fac25018 100644 --- a/otherlibs/graph/Makefile +++ b/otherlibs/graph/Makefile @@ -11,7 +11,7 @@ # # ######################################################################### -# $Id: Makefile,v 1.42 2007/11/08 09:23:06 frisch Exp $ +# $Id: Makefile 8490 2007-11-08 09:23:06Z frisch $ # Makefile for the portable graphics library diff --git a/otherlibs/graph/color.c b/otherlibs/graph/color.c index b24b44bb..fa00f3e3 100644 --- a/otherlibs/graph/color.c +++ b/otherlibs/graph/color.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: color.c,v 1.18 2004/05/17 17:10:00 doligez Exp $ */ +/* $Id: color.c 6299 2004-05-17 17:10:00Z doligez $ */ #include "libgraph.h" #include diff --git a/otherlibs/graph/draw.c b/otherlibs/graph/draw.c index 6c52a279..c5c5578b 100644 --- a/otherlibs/graph/draw.c +++ b/otherlibs/graph/draw.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: draw.c,v 1.19 2004/05/30 14:11:41 xleroy Exp $ */ +/* $Id: draw.c 6351 2004-05-30 14:11:41Z xleroy $ */ #include "libgraph.h" #include diff --git a/otherlibs/graph/dump_img.c b/otherlibs/graph/dump_img.c index 1407cae6..484901c8 100644 --- a/otherlibs/graph/dump_img.c +++ b/otherlibs/graph/dump_img.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: dump_img.c,v 1.11 2004/03/24 15:02:04 starynke Exp $ */ +/* $Id: dump_img.c 6171 2004-03-24 15:02:06Z starynke $ */ #include "libgraph.h" #include "image.h" diff --git a/otherlibs/graph/events.c b/otherlibs/graph/events.c index 7c9319af..6e8a9ce4 100644 --- a/otherlibs/graph/events.c +++ b/otherlibs/graph/events.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: events.c,v 1.18 2005/08/13 20:59:37 doligez Exp $ */ +/* $Id: events.c 7019 2005-08-13 20:59:37Z doligez $ */ #include #include "libgraph.h" diff --git a/otherlibs/graph/fill.c b/otherlibs/graph/fill.c index a33eccde..67777057 100644 --- a/otherlibs/graph/fill.c +++ b/otherlibs/graph/fill.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: fill.c,v 1.14 2004/05/30 14:11:41 xleroy Exp $ */ +/* $Id: fill.c 6351 2004-05-30 14:11:41Z xleroy $ */ #include "libgraph.h" #include diff --git a/otherlibs/graph/graphics.ml b/otherlibs/graph/graphics.ml index 2a64b3d0..050638ad 100644 --- a/otherlibs/graph/graphics.ml +++ b/otherlibs/graph/graphics.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: graphics.ml,v 1.26 2005/08/13 20:59:37 doligez Exp $ *) +(* $Id: graphics.ml 7019 2005-08-13 20:59:37Z doligez $ *) exception Graphic_failure of string diff --git a/otherlibs/graph/graphics.mli b/otherlibs/graph/graphics.mli index f61b7b57..e25e742f 100644 --- a/otherlibs/graph/graphics.mli +++ b/otherlibs/graph/graphics.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: graphics.mli,v 1.37 2005/08/13 20:59:37 doligez Exp $ *) +(* $Id: graphics.mli 7019 2005-08-13 20:59:37Z doligez $ *) (** Machine-independent graphics primitives. *) diff --git a/otherlibs/graph/graphicsX11.ml b/otherlibs/graph/graphicsX11.ml index 07528af3..8ef04cbf 100644 --- a/otherlibs/graph/graphicsX11.ml +++ b/otherlibs/graph/graphicsX11.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: graphicsX11.ml,v 1.3 2004/03/24 15:02:06 starynke Exp $ *) +(* $Id: graphicsX11.ml 6171 2004-03-24 15:02:06Z starynke $ *) (* Module [GraphicsX11]: additional graphics primitives for the X Windows system *) diff --git a/otherlibs/graph/graphicsX11.mli b/otherlibs/graph/graphicsX11.mli index 12d0cbfe..8f55d11a 100644 --- a/otherlibs/graph/graphicsX11.mli +++ b/otherlibs/graph/graphicsX11.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: graphicsX11.mli,v 1.4 2001/12/07 13:39:54 xleroy Exp $ *) +(* $Id: graphicsX11.mli 4144 2001-12-07 13:41:02Z xleroy $ *) (** Additional graphics primitives for the X Windows system. *) diff --git a/otherlibs/graph/image.c b/otherlibs/graph/image.c index 302b4136..7bace1ee 100644 --- a/otherlibs/graph/image.c +++ b/otherlibs/graph/image.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: image.c,v 1.13 2004/03/24 15:02:05 starynke Exp $ */ +/* $Id: image.c 6171 2004-03-24 15:02:06Z starynke $ */ #include "libgraph.h" #include "image.h" @@ -104,4 +104,4 @@ value caml_gr_draw_image(value im, value vx, value vy) return Val_unit; } -/* eof $Id: image.c,v 1.13 2004/03/24 15:02:05 starynke Exp $ */ +/* eof $Id: image.c 6171 2004-03-24 15:02:06Z starynke $ */ diff --git a/otherlibs/graph/image.h b/otherlibs/graph/image.h index 72f41efd..a373a2b6 100644 --- a/otherlibs/graph/image.h +++ b/otherlibs/graph/image.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: image.h,v 1.8 2004/03/24 15:02:06 starynke Exp $ */ +/* $Id: image.h 6171 2004-03-24 15:02:06Z starynke $ */ struct grimage { int width, height; /* Dimensions of the image */ diff --git a/otherlibs/graph/libgraph.h b/otherlibs/graph/libgraph.h index 86b0eca1..ec13f1dc 100644 --- a/otherlibs/graph/libgraph.h +++ b/otherlibs/graph/libgraph.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: libgraph.h,v 1.23 2004/05/30 10:25:08 xleroy Exp $ */ +/* $Id: libgraph.h 6350 2004-05-30 10:25:08Z xleroy $ */ #include #include diff --git a/otherlibs/graph/make_img.c b/otherlibs/graph/make_img.c index a68773a5..7a7f531f 100644 --- a/otherlibs/graph/make_img.c +++ b/otherlibs/graph/make_img.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: make_img.c,v 1.13 2004/03/24 15:02:05 starynke Exp $ */ +/* $Id: make_img.c 6171 2004-03-24 15:02:06Z starynke $ */ #include "libgraph.h" #include "image.h" diff --git a/otherlibs/graph/open.c b/otherlibs/graph/open.c index 11542a2e..5039aa59 100644 --- a/otherlibs/graph/open.c +++ b/otherlibs/graph/open.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: open.c,v 1.34 2005/08/13 20:59:37 doligez Exp $ */ +/* $Id: open.c 7019 2005-08-13 20:59:37Z doligez $ */ #include #include diff --git a/otherlibs/graph/point_col.c b/otherlibs/graph/point_col.c index a0f4a96b..0decdf7b 100644 --- a/otherlibs/graph/point_col.c +++ b/otherlibs/graph/point_col.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: point_col.c,v 1.8 2004/03/24 15:02:05 starynke Exp $ */ +/* $Id: point_col.c 6171 2004-03-24 15:02:06Z starynke $ */ #include "libgraph.h" diff --git a/otherlibs/graph/sound.c b/otherlibs/graph/sound.c index f032d953..1d9dc67a 100644 --- a/otherlibs/graph/sound.c +++ b/otherlibs/graph/sound.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: sound.c,v 1.9 2004/03/24 15:02:05 starynke Exp $ */ +/* $Id: sound.c 6171 2004-03-24 15:02:06Z starynke $ */ #include "libgraph.h" diff --git a/otherlibs/graph/subwindow.c b/otherlibs/graph/subwindow.c index 7ecaa85a..a7c2bae9 100644 --- a/otherlibs/graph/subwindow.c +++ b/otherlibs/graph/subwindow.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: subwindow.c,v 1.6 2004/03/24 15:02:05 starynke Exp $ */ +/* $Id: subwindow.c 6171 2004-03-24 15:02:06Z starynke $ */ #include "libgraph.h" diff --git a/otherlibs/graph/text.c b/otherlibs/graph/text.c index 9e00f0f6..af63fe64 100644 --- a/otherlibs/graph/text.c +++ b/otherlibs/graph/text.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: text.c,v 1.15 2004/03/24 15:02:06 starynke Exp $ */ +/* $Id: text.c 6171 2004-03-24 15:02:06Z starynke $ */ #include "libgraph.h" #include diff --git a/otherlibs/labltk/browser/dummyUnix.mli b/otherlibs/labltk/browser/dummyUnix.mli index 4d394f11..1f6df582 100644 --- a/otherlibs/labltk/browser/dummyUnix.mli +++ b/otherlibs/labltk/browser/dummyUnix.mli @@ -12,7 +12,7 @@ (* *) (*************************************************************************) -(* $Id: dummyUnix.mli,v 1.4 2003/12/29 22:15:01 doligez Exp $ *) +(* $Id: dummyUnix.mli 6041 2003-12-29 22:15:02Z doligez $ *) module Mutex : sig type t diff --git a/otherlibs/labltk/browser/dummyWin.mli b/otherlibs/labltk/browser/dummyWin.mli index ddaa4eff..d25f81d4 100644 --- a/otherlibs/labltk/browser/dummyWin.mli +++ b/otherlibs/labltk/browser/dummyWin.mli @@ -12,4 +12,4 @@ (* *) (*************************************************************************) -(* $Id: dummyWin.mli,v 1.2 2001/12/07 13:39:55 xleroy Exp $ *) +(* $Id: dummyWin.mli 4144 2001-12-07 13:41:02Z xleroy $ *) diff --git a/otherlibs/labltk/browser/editor.ml b/otherlibs/labltk/browser/editor.ml index 1fffd3ba..f5d45030 100644 --- a/otherlibs/labltk/browser/editor.ml +++ b/otherlibs/labltk/browser/editor.ml @@ -12,7 +12,7 @@ (* *) (*************************************************************************) -(* $Id: editor.ml,v 1.41 2006/01/04 16:55:50 doligez Exp $ *) +(* $Id: editor.ml 7307 2006-01-04 16:55:50Z doligez $ *) open StdLabels open Tk diff --git a/otherlibs/labltk/browser/editor.mli b/otherlibs/labltk/browser/editor.mli index 2d72a8e4..c284bb10 100644 --- a/otherlibs/labltk/browser/editor.mli +++ b/otherlibs/labltk/browser/editor.mli @@ -12,7 +12,7 @@ (* *) (*************************************************************************) -(* $Id: editor.mli,v 1.5 2001/12/07 13:39:57 xleroy Exp $ *) +(* $Id: editor.mli 4144 2001-12-07 13:41:02Z xleroy $ *) open Widget diff --git a/otherlibs/labltk/browser/fileselect.ml b/otherlibs/labltk/browser/fileselect.ml index 2ee04fb0..32e15071 100644 --- a/otherlibs/labltk/browser/fileselect.ml +++ b/otherlibs/labltk/browser/fileselect.ml @@ -12,7 +12,7 @@ (* *) (*************************************************************************) -(* $Id: fileselect.ml,v 1.21 2005/01/28 16:13:11 doligez Exp $ *) +(* $Id: fileselect.ml 6757 2005-01-28 16:13:11Z doligez $ *) (* file selection box *) diff --git a/otherlibs/labltk/browser/fileselect.mli b/otherlibs/labltk/browser/fileselect.mli index d500ec61..00a52ac8 100644 --- a/otherlibs/labltk/browser/fileselect.mli +++ b/otherlibs/labltk/browser/fileselect.mli @@ -12,7 +12,7 @@ (* *) (*************************************************************************) -(* $Id: fileselect.mli,v 1.7 2002/04/26 12:15:33 furuse Exp $ *) +(* $Id: fileselect.mli 4745 2002-04-26 12:16:26Z furuse $ *) val f : title:string -> diff --git a/otherlibs/labltk/browser/jg_bind.ml b/otherlibs/labltk/browser/jg_bind.ml index dcc594a0..0a0bbfac 100644 --- a/otherlibs/labltk/browser/jg_bind.ml +++ b/otherlibs/labltk/browser/jg_bind.ml @@ -12,7 +12,7 @@ (* *) (*************************************************************************) -(* $Id: jg_bind.ml,v 1.7 2001/12/07 13:39:57 xleroy Exp $ *) +(* $Id: jg_bind.ml 4144 2001-12-07 13:41:02Z xleroy $ *) open Tk diff --git a/otherlibs/labltk/browser/jg_bind.mli b/otherlibs/labltk/browser/jg_bind.mli index 8fd60905..a3a1907d 100644 --- a/otherlibs/labltk/browser/jg_bind.mli +++ b/otherlibs/labltk/browser/jg_bind.mli @@ -12,7 +12,7 @@ (* *) (*************************************************************************) -(* $Id: jg_bind.mli,v 1.5 2001/12/07 13:39:57 xleroy Exp $ *) +(* $Id: jg_bind.mli 4144 2001-12-07 13:41:02Z xleroy $ *) open Widget diff --git a/otherlibs/labltk/browser/jg_box.ml b/otherlibs/labltk/browser/jg_box.ml index a6c5bafd..e62388eb 100644 --- a/otherlibs/labltk/browser/jg_box.ml +++ b/otherlibs/labltk/browser/jg_box.ml @@ -12,7 +12,7 @@ (* *) (*************************************************************************) -(* $Id: jg_box.ml,v 1.8 2001/12/07 13:39:58 xleroy Exp $ *) +(* $Id: jg_box.ml 4144 2001-12-07 13:41:02Z xleroy $ *) open Tk diff --git a/otherlibs/labltk/browser/jg_button.ml b/otherlibs/labltk/browser/jg_button.ml index bb960394..0adff9a6 100644 --- a/otherlibs/labltk/browser/jg_button.ml +++ b/otherlibs/labltk/browser/jg_button.ml @@ -12,7 +12,7 @@ (* *) (*************************************************************************) -(* $Id: jg_button.ml,v 1.8 2001/12/07 13:39:58 xleroy Exp $ *) +(* $Id: jg_button.ml 4144 2001-12-07 13:41:02Z xleroy $ *) open Tk diff --git a/otherlibs/labltk/browser/jg_completion.ml b/otherlibs/labltk/browser/jg_completion.ml index ecc7dfa7..bdf1ea82 100644 --- a/otherlibs/labltk/browser/jg_completion.ml +++ b/otherlibs/labltk/browser/jg_completion.ml @@ -12,7 +12,7 @@ (* *) (*************************************************************************) -(* $Id: jg_completion.ml,v 1.10 2001/12/07 13:39:58 xleroy Exp $ *) +(* $Id: jg_completion.ml 4144 2001-12-07 13:41:02Z xleroy $ *) let lt_string ?(nocase=false) s1 s2 = if nocase then String.lowercase s1 < String.lowercase s2 else s1 < s2 diff --git a/otherlibs/labltk/browser/jg_completion.mli b/otherlibs/labltk/browser/jg_completion.mli index ead4ba7a..2cffc8b8 100644 --- a/otherlibs/labltk/browser/jg_completion.mli +++ b/otherlibs/labltk/browser/jg_completion.mli @@ -12,7 +12,7 @@ (* *) (*************************************************************************) -(* $Id: jg_completion.mli,v 1.6 2001/12/07 13:39:58 xleroy Exp $ *) +(* $Id: jg_completion.mli 4144 2001-12-07 13:41:02Z xleroy $ *) val lt_string : ?nocase:bool -> string -> string -> bool diff --git a/otherlibs/labltk/browser/jg_config.ml b/otherlibs/labltk/browser/jg_config.ml index c1aa70c3..4d456189 100644 --- a/otherlibs/labltk/browser/jg_config.ml +++ b/otherlibs/labltk/browser/jg_config.ml @@ -12,7 +12,7 @@ (* *) (*************************************************************************) -(* $Id: jg_config.ml,v 1.10 2001/12/07 13:39:58 xleroy Exp $ *) +(* $Id: jg_config.ml 4144 2001-12-07 13:41:02Z xleroy $ *) open StdLabels open Jg_tk diff --git a/otherlibs/labltk/browser/jg_config.mli b/otherlibs/labltk/browser/jg_config.mli index 7548d5b8..3e583490 100644 --- a/otherlibs/labltk/browser/jg_config.mli +++ b/otherlibs/labltk/browser/jg_config.mli @@ -12,6 +12,6 @@ (* *) (*************************************************************************) -(* $Id: jg_config.mli,v 1.5 2001/12/07 13:39:58 xleroy Exp $ *) +(* $Id: jg_config.mli 4144 2001-12-07 13:41:02Z xleroy $ *) val init: unit -> unit diff --git a/otherlibs/labltk/browser/jg_entry.ml b/otherlibs/labltk/browser/jg_entry.ml index 5c4640da..58fa7f2e 100644 --- a/otherlibs/labltk/browser/jg_entry.ml +++ b/otherlibs/labltk/browser/jg_entry.ml @@ -12,7 +12,7 @@ (* *) (*************************************************************************) -(* $Id: jg_entry.ml,v 1.7 2001/12/07 13:39:58 xleroy Exp $ *) +(* $Id: jg_entry.ml 4144 2001-12-07 13:41:02Z xleroy $ *) open Tk diff --git a/otherlibs/labltk/browser/jg_memo.ml b/otherlibs/labltk/browser/jg_memo.ml index e5237b72..abdfe075 100644 --- a/otherlibs/labltk/browser/jg_memo.ml +++ b/otherlibs/labltk/browser/jg_memo.ml @@ -12,7 +12,7 @@ (* *) (*************************************************************************) -(* $Id: jg_memo.ml,v 1.8 2001/12/07 13:39:58 xleroy Exp $ *) +(* $Id: jg_memo.ml 4144 2001-12-07 13:41:02Z xleroy $ *) type ('a, 'b) assoc_list = Nil diff --git a/otherlibs/labltk/browser/jg_memo.mli b/otherlibs/labltk/browser/jg_memo.mli index 3378683f..1b9396ee 100644 --- a/otherlibs/labltk/browser/jg_memo.mli +++ b/otherlibs/labltk/browser/jg_memo.mli @@ -12,7 +12,7 @@ (* *) (*************************************************************************) -(* $Id: jg_memo.mli,v 1.7 2001/12/07 13:39:59 xleroy Exp $ *) +(* $Id: jg_memo.mli 4144 2001-12-07 13:41:02Z xleroy $ *) val fast : f:('a -> 'b) -> 'a -> 'b (* "fast" memoizer: uses a List.assq like function *) diff --git a/otherlibs/labltk/browser/jg_menu.ml b/otherlibs/labltk/browser/jg_menu.ml index 574708a6..b0ef967c 100644 --- a/otherlibs/labltk/browser/jg_menu.ml +++ b/otherlibs/labltk/browser/jg_menu.ml @@ -12,7 +12,7 @@ (* *) (*************************************************************************) -(* $Id: jg_menu.ml,v 1.9 2006/01/04 16:55:50 doligez Exp $ *) +(* $Id: jg_menu.ml 7307 2006-01-04 16:55:50Z doligez $ *) open Tk diff --git a/otherlibs/labltk/browser/jg_message.ml b/otherlibs/labltk/browser/jg_message.ml index cae25b3b..8925216e 100644 --- a/otherlibs/labltk/browser/jg_message.ml +++ b/otherlibs/labltk/browser/jg_message.ml @@ -12,7 +12,7 @@ (* *) (*************************************************************************) -(* $Id: jg_message.ml,v 1.18 2002/07/26 00:04:05 garrigue Exp $ *) +(* $Id: jg_message.ml 5045 2002-07-26 00:04:05Z garrigue $ *) open StdLabels open Tk diff --git a/otherlibs/labltk/browser/jg_message.mli b/otherlibs/labltk/browser/jg_message.mli index fa3facc1..6cf581de 100644 --- a/otherlibs/labltk/browser/jg_message.mli +++ b/otherlibs/labltk/browser/jg_message.mli @@ -12,7 +12,7 @@ (* *) (*************************************************************************) -(* $Id: jg_message.mli,v 1.10 2002/07/26 00:04:05 garrigue Exp $ *) +(* $Id: jg_message.mli 5045 2002-07-26 00:04:05Z garrigue $ *) open Widget diff --git a/otherlibs/labltk/browser/jg_multibox.ml b/otherlibs/labltk/browser/jg_multibox.ml index ec1f1488..94b6334b 100644 --- a/otherlibs/labltk/browser/jg_multibox.ml +++ b/otherlibs/labltk/browser/jg_multibox.ml @@ -12,7 +12,7 @@ (* *) (*************************************************************************) -(* $Id: jg_multibox.ml,v 1.11 2001/12/07 13:39:59 xleroy Exp $ *) +(* $Id: jg_multibox.ml 4144 2001-12-07 13:41:02Z xleroy $ *) open StdLabels diff --git a/otherlibs/labltk/browser/jg_multibox.mli b/otherlibs/labltk/browser/jg_multibox.mli index 124d1e59..e122edcf 100644 --- a/otherlibs/labltk/browser/jg_multibox.mli +++ b/otherlibs/labltk/browser/jg_multibox.mli @@ -12,7 +12,7 @@ (* *) (*************************************************************************) -(* $Id: jg_multibox.mli,v 1.6 2001/12/07 13:39:59 xleroy Exp $ *) +(* $Id: jg_multibox.mli 4144 2001-12-07 13:41:02Z xleroy $ *) class c : cols:int -> texts:string list -> diff --git a/otherlibs/labltk/browser/jg_text.ml b/otherlibs/labltk/browser/jg_text.ml index ee1fab9a..84dae4d8 100644 --- a/otherlibs/labltk/browser/jg_text.ml +++ b/otherlibs/labltk/browser/jg_text.ml @@ -12,7 +12,7 @@ (* *) (*************************************************************************) -(* $Id: jg_text.ml,v 1.11 2002/08/09 10:34:44 garrigue Exp $ *) +(* $Id: jg_text.ml 5094 2002-08-09 10:34:44Z garrigue $ *) open StdLabels open Tk diff --git a/otherlibs/labltk/browser/jg_text.mli b/otherlibs/labltk/browser/jg_text.mli index 289c31c0..a498eed6 100644 --- a/otherlibs/labltk/browser/jg_text.mli +++ b/otherlibs/labltk/browser/jg_text.mli @@ -12,7 +12,7 @@ (* *) (*************************************************************************) -(* $Id: jg_text.mli,v 1.7 2001/12/07 13:40:00 xleroy Exp $ *) +(* $Id: jg_text.mli 4144 2001-12-07 13:41:02Z xleroy $ *) open Widget diff --git a/otherlibs/labltk/browser/jg_tk.ml b/otherlibs/labltk/browser/jg_tk.ml index a4d46322..6441caeb 100644 --- a/otherlibs/labltk/browser/jg_tk.ml +++ b/otherlibs/labltk/browser/jg_tk.ml @@ -12,7 +12,7 @@ (* *) (*************************************************************************) -(* $Id: jg_tk.ml,v 1.7 2001/12/07 13:40:00 xleroy Exp $ *) +(* $Id: jg_tk.ml 4144 2001-12-07 13:41:02Z xleroy $ *) open Tk diff --git a/otherlibs/labltk/browser/jg_toplevel.ml b/otherlibs/labltk/browser/jg_toplevel.ml index f53ada2f..c26f76fc 100644 --- a/otherlibs/labltk/browser/jg_toplevel.ml +++ b/otherlibs/labltk/browser/jg_toplevel.ml @@ -12,7 +12,7 @@ (* *) (*************************************************************************) -(* $Id: jg_toplevel.ml,v 1.8 2001/12/07 13:40:00 xleroy Exp $ *) +(* $Id: jg_toplevel.ml 4144 2001-12-07 13:41:02Z xleroy $ *) open Tk diff --git a/otherlibs/labltk/browser/lexical.ml b/otherlibs/labltk/browser/lexical.ml index 3e25b238..3d48ef45 100644 --- a/otherlibs/labltk/browser/lexical.ml +++ b/otherlibs/labltk/browser/lexical.ml @@ -12,7 +12,7 @@ (* *) (*************************************************************************) -(* $Id: lexical.ml,v 1.15.32.1 2009/06/08 04:43:32 garrigue Exp $ *) +(* $Id: lexical.ml 9293 2009-06-08 04:43:32Z garrigue $ *) open StdLabels open Tk diff --git a/otherlibs/labltk/browser/lexical.mli b/otherlibs/labltk/browser/lexical.mli index bbfa5e78..e2a02d2d 100644 --- a/otherlibs/labltk/browser/lexical.mli +++ b/otherlibs/labltk/browser/lexical.mli @@ -12,7 +12,7 @@ (* *) (*************************************************************************) -(* $Id: lexical.mli,v 1.6 2001/12/07 13:40:00 xleroy Exp $ *) +(* $Id: lexical.mli 4144 2001-12-07 13:41:02Z xleroy $ *) open Widget diff --git a/otherlibs/labltk/browser/list2.ml b/otherlibs/labltk/browser/list2.ml index 1e012e54..2dd4bb1a 100644 --- a/otherlibs/labltk/browser/list2.ml +++ b/otherlibs/labltk/browser/list2.ml @@ -12,7 +12,7 @@ (* *) (*************************************************************************) -(* $Id: list2.ml,v 1.9 2001/12/07 13:40:00 xleroy Exp $ *) +(* $Id: list2.ml 4144 2001-12-07 13:41:02Z xleroy $ *) open StdLabels diff --git a/otherlibs/labltk/browser/main.ml b/otherlibs/labltk/browser/main.ml index 653212b4..1b7027c7 100644 --- a/otherlibs/labltk/browser/main.ml +++ b/otherlibs/labltk/browser/main.ml @@ -12,7 +12,7 @@ (* *) (*************************************************************************) -(* $Id: main.ml,v 1.34 2006/04/16 23:28:21 doligez Exp $ *) +(* $Id: main.ml 7382 2006-04-16 23:28:22Z doligez $ *) open StdLabels module Unix = UnixLabels diff --git a/otherlibs/labltk/browser/mytypes.mli b/otherlibs/labltk/browser/mytypes.mli index 233d0ff2..d7eb8856 100644 --- a/otherlibs/labltk/browser/mytypes.mli +++ b/otherlibs/labltk/browser/mytypes.mli @@ -12,7 +12,7 @@ (* *) (*************************************************************************) -(* $Id: mytypes.mli,v 1.7 2007/05/16 08:21:40 doligez Exp $ *) +(* $Id: mytypes.mli 8232 2007-05-16 08:21:41Z doligez $ *) open Widget diff --git a/otherlibs/labltk/browser/searchid.ml b/otherlibs/labltk/browser/searchid.ml index 22877350..c787fe00 100644 --- a/otherlibs/labltk/browser/searchid.ml +++ b/otherlibs/labltk/browser/searchid.ml @@ -12,7 +12,7 @@ (* *) (*************************************************************************) -(* $Id: searchid.ml,v 1.25 2008/07/09 14:03:08 mauny Exp $ *) +(* $Id: searchid.ml 8907 2008-07-09 14:03:08Z mauny $ *) open StdLabels open Location diff --git a/otherlibs/labltk/browser/searchid.mli b/otherlibs/labltk/browser/searchid.mli index 33ab6a1d..07fefec8 100644 --- a/otherlibs/labltk/browser/searchid.mli +++ b/otherlibs/labltk/browser/searchid.mli @@ -12,7 +12,7 @@ (* *) (*************************************************************************) -(* $Id: searchid.mli,v 1.6 2002/07/25 22:51:47 garrigue Exp $ *) +(* $Id: searchid.mli 5044 2002-07-25 22:51:47Z garrigue $ *) val start_env : Env.t ref val module_list : string list ref diff --git a/otherlibs/labltk/browser/searchpos.ml b/otherlibs/labltk/browser/searchpos.ml index e32ea84b..7700ad3e 100644 --- a/otherlibs/labltk/browser/searchpos.ml +++ b/otherlibs/labltk/browser/searchpos.ml @@ -12,7 +12,7 @@ (* *) (*************************************************************************) -(* $Id: searchpos.ml,v 1.52 2008/07/09 14:03:08 mauny Exp $ *) +(* $Id: searchpos.ml 8907 2008-07-09 14:03:08Z mauny $ *) open StdLabels open Support diff --git a/otherlibs/labltk/browser/searchpos.mli b/otherlibs/labltk/browser/searchpos.mli index d04dac6e..0beb0985 100644 --- a/otherlibs/labltk/browser/searchpos.mli +++ b/otherlibs/labltk/browser/searchpos.mli @@ -12,7 +12,7 @@ (* *) (*************************************************************************) -(* $Id: searchpos.mli,v 1.13 2007/05/16 08:21:40 doligez Exp $ *) +(* $Id: searchpos.mli 8232 2007-05-16 08:21:41Z doligez $ *) open Widget diff --git a/otherlibs/labltk/browser/setpath.ml b/otherlibs/labltk/browser/setpath.ml index 93bf99ba..b7000b85 100644 --- a/otherlibs/labltk/browser/setpath.ml +++ b/otherlibs/labltk/browser/setpath.ml @@ -12,7 +12,7 @@ (* *) (*************************************************************************) -(* $Id: setpath.ml,v 1.16 2002/04/26 12:15:34 furuse Exp $ *) +(* $Id: setpath.ml 4745 2002-04-26 12:16:26Z furuse $ *) open StdLabels open Tk diff --git a/otherlibs/labltk/browser/setpath.mli b/otherlibs/labltk/browser/setpath.mli index 6bf8fe1d..2ad7ed8e 100644 --- a/otherlibs/labltk/browser/setpath.mli +++ b/otherlibs/labltk/browser/setpath.mli @@ -12,7 +12,7 @@ (* *) (*************************************************************************) -(* $Id: setpath.mli,v 1.6 2001/12/07 13:40:02 xleroy Exp $ *) +(* $Id: setpath.mli 4144 2001-12-07 13:41:02Z xleroy $ *) open Widget diff --git a/otherlibs/labltk/browser/shell.ml b/otherlibs/labltk/browser/shell.ml index 4afec1e6..5b009b3f 100644 --- a/otherlibs/labltk/browser/shell.ml +++ b/otherlibs/labltk/browser/shell.ml @@ -12,7 +12,7 @@ (* *) (*************************************************************************) -(* $Id: shell.ml,v 1.41 2006/01/18 13:26:03 garrigue Exp $ *) +(* $Id: shell.ml 7327 2006-01-18 13:26:03Z garrigue $ *) open StdLabels module Unix = UnixLabels diff --git a/otherlibs/labltk/browser/shell.mli b/otherlibs/labltk/browser/shell.mli index d5866442..a2c4c250 100644 --- a/otherlibs/labltk/browser/shell.mli +++ b/otherlibs/labltk/browser/shell.mli @@ -12,7 +12,7 @@ (* *) (*************************************************************************) -(* $Id: shell.mli,v 1.8 2002/07/25 22:51:47 garrigue Exp $ *) +(* $Id: shell.mli 5044 2002-07-25 22:51:47Z garrigue $ *) class ['a] history : unit -> diff --git a/otherlibs/labltk/browser/typecheck.ml b/otherlibs/labltk/browser/typecheck.ml index 05b2d9cb..4fa4a4a1 100644 --- a/otherlibs/labltk/browser/typecheck.ml +++ b/otherlibs/labltk/browser/typecheck.ml @@ -12,7 +12,7 @@ (* *) (*************************************************************************) -(* $Id: typecheck.ml,v 1.16.6.1 2009/06/08 04:43:32 garrigue Exp $ *) +(* $Id: typecheck.ml 9293 2009-06-08 04:43:32Z garrigue $ *) open StdLabels open Tk diff --git a/otherlibs/labltk/browser/typecheck.mli b/otherlibs/labltk/browser/typecheck.mli index 05a7bd42..d7569189 100644 --- a/otherlibs/labltk/browser/typecheck.mli +++ b/otherlibs/labltk/browser/typecheck.mli @@ -12,7 +12,7 @@ (* *) (*************************************************************************) -(* $Id: typecheck.mli,v 1.5 2001/12/07 13:40:02 xleroy Exp $ *) +(* $Id: typecheck.mli 4144 2001-12-07 13:41:02Z xleroy $ *) open Widget open Mytypes diff --git a/otherlibs/labltk/browser/useunix.ml b/otherlibs/labltk/browser/useunix.ml index 7ad96d1a..00ac1fb4 100644 --- a/otherlibs/labltk/browser/useunix.ml +++ b/otherlibs/labltk/browser/useunix.ml @@ -12,7 +12,7 @@ (* *) (*************************************************************************) -(* $Id: useunix.ml,v 1.13 2002/08/09 10:34:44 garrigue Exp $ *) +(* $Id: useunix.ml 5094 2002-08-09 10:34:44Z garrigue $ *) open StdLabels open UnixLabels diff --git a/otherlibs/labltk/browser/useunix.mli b/otherlibs/labltk/browser/useunix.mli index 95ecd723..c0059b80 100644 --- a/otherlibs/labltk/browser/useunix.mli +++ b/otherlibs/labltk/browser/useunix.mli @@ -12,7 +12,7 @@ (* *) (*************************************************************************) -(* $Id: useunix.mli,v 1.6 2002/08/09 10:34:44 garrigue Exp $ *) +(* $Id: useunix.mli 5094 2002-08-09 10:34:44Z garrigue $ *) (* Unix utilities *) diff --git a/otherlibs/labltk/browser/viewer.ml b/otherlibs/labltk/browser/viewer.ml index 1c1ba14b..97511bcf 100644 --- a/otherlibs/labltk/browser/viewer.ml +++ b/otherlibs/labltk/browser/viewer.ml @@ -12,7 +12,7 @@ (* *) (*************************************************************************) -(* $Id: viewer.ml,v 1.33 2006/01/04 16:55:50 doligez Exp $ *) +(* $Id: viewer.ml 7307 2006-01-04 16:55:50Z doligez $ *) open StdLabels open Tk diff --git a/otherlibs/labltk/browser/viewer.mli b/otherlibs/labltk/browser/viewer.mli index 09ef045b..fdab185b 100644 --- a/otherlibs/labltk/browser/viewer.mli +++ b/otherlibs/labltk/browser/viewer.mli @@ -12,7 +12,7 @@ (* *) (*************************************************************************) -(* $Id: viewer.mli,v 1.7 2002/07/11 13:49:51 garrigue Exp $ *) +(* $Id: viewer.mli 4990 2002-07-11 13:49:51Z garrigue $ *) (* Module viewer *) open Widget diff --git a/otherlibs/labltk/builtin/LICENSE b/otherlibs/labltk/builtin/LICENSE index a95e32cc..3098bdf7 100644 --- a/otherlibs/labltk/builtin/LICENSE +++ b/otherlibs/labltk/builtin/LICENSE @@ -14,6 +14,6 @@ (* *) (*************************************************************************) -(* $Id: LICENSE,v 1.2 2001/12/07 13:40:03 xleroy Exp $ *) +(* $Id: LICENSE 4144 2001-12-07 13:41:02Z xleroy $ *) All the files in this directory are subject to the above copyright notice. \ No newline at end of file diff --git a/otherlibs/labltk/compiler/compile.ml b/otherlibs/labltk/compiler/compile.ml index 865f787f..d3b19446 100644 --- a/otherlibs/labltk/compiler/compile.ml +++ b/otherlibs/labltk/compiler/compile.ml @@ -14,7 +14,7 @@ (* *) (***********************************************************************) -(* $Id: compile.ml,v 1.32 2005/01/28 16:13:11 doligez Exp $ *) +(* $Id: compile.ml 6757 2005-01-28 16:13:11Z doligez $ *) open StdLabels open Tables diff --git a/otherlibs/labltk/compiler/intf.ml b/otherlibs/labltk/compiler/intf.ml index b1633893..f1baae32 100644 --- a/otherlibs/labltk/compiler/intf.ml +++ b/otherlibs/labltk/compiler/intf.ml @@ -14,7 +14,7 @@ (* *) (***********************************************************************) -(* $Id: intf.ml,v 1.20 2002/07/23 14:11:55 doligez Exp $ *) +(* $Id: intf.ml 5029 2002-07-23 14:12:03Z doligez $ *) open StdLabels diff --git a/otherlibs/labltk/compiler/lexer.mll b/otherlibs/labltk/compiler/lexer.mll index 248b1b87..bc28c1d4 100644 --- a/otherlibs/labltk/compiler/lexer.mll +++ b/otherlibs/labltk/compiler/lexer.mll @@ -14,7 +14,7 @@ (* *) (***********************************************************************) -(* $Id: lexer.mll,v 1.14 2002/07/23 14:11:55 doligez Exp $ *) +(* $Id: lexer.mll 5029 2002-07-23 14:12:03Z doligez $ *) { open StdLabels diff --git a/otherlibs/labltk/compiler/maincompile.ml b/otherlibs/labltk/compiler/maincompile.ml index d703c87c..817e4b64 100644 --- a/otherlibs/labltk/compiler/maincompile.ml +++ b/otherlibs/labltk/compiler/maincompile.ml @@ -14,7 +14,7 @@ (* *) (***********************************************************************) -(* $Id: maincompile.ml,v 1.20 2005/01/28 16:13:11 doligez Exp $ *) +(* $Id: maincompile.ml 6757 2005-01-28 16:13:11Z doligez $ *) open StdLabels open Support diff --git a/otherlibs/labltk/compiler/parser.mly b/otherlibs/labltk/compiler/parser.mly index 0284cc3d..72cca469 100644 --- a/otherlibs/labltk/compiler/parser.mly +++ b/otherlibs/labltk/compiler/parser.mly @@ -14,7 +14,7 @@ /* */ /***********************************************************************/ -/* $Id: parser.mly,v 1.9 2003/03/27 15:04:44 furuse Exp $ */ +/* $Id: parser.mly 5464 2003-03-27 15:04:44Z furuse $ */ %{ diff --git a/otherlibs/labltk/compiler/tables.ml b/otherlibs/labltk/compiler/tables.ml index 4904295a..2ccd0fd1 100644 --- a/otherlibs/labltk/compiler/tables.ml +++ b/otherlibs/labltk/compiler/tables.ml @@ -14,7 +14,7 @@ (* *) (***********************************************************************) -(* $Id: tables.ml,v 1.20 2002/04/26 12:15:48 furuse Exp $ *) +(* $Id: tables.ml 4745 2002-04-26 12:16:26Z furuse $ *) open StdLabels open Support diff --git a/otherlibs/labltk/compiler/tsort.ml b/otherlibs/labltk/compiler/tsort.ml index 25fab204..e8074ae8 100644 --- a/otherlibs/labltk/compiler/tsort.ml +++ b/otherlibs/labltk/compiler/tsort.ml @@ -14,7 +14,7 @@ (* *) (***********************************************************************) -(* $Id: tsort.ml,v 1.12 2002/04/26 12:15:48 furuse Exp $ *) +(* $Id: tsort.ml 4745 2002-04-26 12:16:26Z furuse $ *) open StdLabels diff --git a/otherlibs/labltk/examples_labltk/README b/otherlibs/labltk/examples_labltk/README index bb80b114..88eaccda 100644 --- a/otherlibs/labltk/examples_labltk/README +++ b/otherlibs/labltk/examples_labltk/README @@ -1,4 +1,4 @@ -$Id: README,v 1.2 2002/04/26 12:15:57 furuse Exp $ +$Id: README 4745 2002-04-26 12:16:26Z furuse $ Some examples for LablTk. They are written in classic mode, except testris.ml which uses label diff --git a/otherlibs/labltk/examples_labltk/calc.ml b/otherlibs/labltk/examples_labltk/calc.ml index 9e1f239a..b334f67b 100644 --- a/otherlibs/labltk/examples_labltk/calc.ml +++ b/otherlibs/labltk/examples_labltk/calc.ml @@ -14,7 +14,7 @@ (* *) (***********************************************************************) -(* $Id: calc.ml,v 1.3 2002/10/11 18:56:18 doligez Exp $ *) +(* $Id: calc.ml 5175 2002-10-11 19:01:19Z doligez $ *) (* A simple calculator demonstrating OO programming with O'Labl and LablTk. diff --git a/otherlibs/labltk/examples_labltk/clock.ml b/otherlibs/labltk/examples_labltk/clock.ml index cdb55888..9e5227b9 100644 --- a/otherlibs/labltk/examples_labltk/clock.ml +++ b/otherlibs/labltk/examples_labltk/clock.ml @@ -14,7 +14,7 @@ (* *) (***********************************************************************) -(* $Id: clock.ml,v 1.2 2002/04/26 12:15:58 furuse Exp $ *) +(* $Id: clock.ml 4745 2002-04-26 12:16:26Z furuse $ *) (* Clock/V, a simple clock. Reverts every time you push the right button. diff --git a/otherlibs/labltk/examples_labltk/demo.ml b/otherlibs/labltk/examples_labltk/demo.ml index 85541be2..6c9daed8 100644 --- a/otherlibs/labltk/examples_labltk/demo.ml +++ b/otherlibs/labltk/examples_labltk/demo.ml @@ -14,7 +14,7 @@ (* *) (***********************************************************************) -(* $Id: demo.ml,v 1.2 2002/04/26 12:15:58 furuse Exp $ *) +(* $Id: demo.ml 4745 2002-04-26 12:16:26Z furuse $ *) (* Some CamlTk4 Demonstration by JPF *) diff --git a/otherlibs/labltk/examples_labltk/eyes.ml b/otherlibs/labltk/examples_labltk/eyes.ml index 692d3d64..c33f6264 100644 --- a/otherlibs/labltk/examples_labltk/eyes.ml +++ b/otherlibs/labltk/examples_labltk/eyes.ml @@ -14,7 +14,7 @@ (* *) (***********************************************************************) -(* $Id: eyes.ml,v 1.2 2002/04/26 12:15:58 furuse Exp $ *) +(* $Id: eyes.ml 4745 2002-04-26 12:16:26Z furuse $ *) open Tk diff --git a/otherlibs/labltk/examples_labltk/hello.ml b/otherlibs/labltk/examples_labltk/hello.ml index a751e063..4bb4f3a4 100644 --- a/otherlibs/labltk/examples_labltk/hello.ml +++ b/otherlibs/labltk/examples_labltk/hello.ml @@ -14,7 +14,7 @@ (* *) (***********************************************************************) -(* $Id: hello.ml,v 1.2 2002/04/26 12:15:58 furuse Exp $ *) +(* $Id: hello.ml 4745 2002-04-26 12:16:26Z furuse $ *) (* LablTk4 Demonstration by JPF *) diff --git a/otherlibs/labltk/examples_labltk/taquin.ml b/otherlibs/labltk/examples_labltk/taquin.ml index a2ccb7a0..2b2fd6a1 100644 --- a/otherlibs/labltk/examples_labltk/taquin.ml +++ b/otherlibs/labltk/examples_labltk/taquin.ml @@ -14,7 +14,7 @@ (* *) (***********************************************************************) -(* $Id: taquin.ml,v 1.2 2002/04/26 12:15:59 furuse Exp $ *) +(* $Id: taquin.ml 4745 2002-04-26 12:16:26Z furuse $ *) open Tk;; diff --git a/otherlibs/labltk/examples_labltk/tetris.ml b/otherlibs/labltk/examples_labltk/tetris.ml index b9af0d1b..641909c0 100644 --- a/otherlibs/labltk/examples_labltk/tetris.ml +++ b/otherlibs/labltk/examples_labltk/tetris.ml @@ -14,7 +14,7 @@ (* *) (***********************************************************************) -(* $Id: tetris.ml,v 1.4 2004/06/12 03:20:00 garrigue Exp $ *) +(* $Id: tetris.ml 6385 2004-06-12 03:20:00Z garrigue $ *) (* A Tetris game for LablTk *) (* written by Jun P. Furuse *) diff --git a/otherlibs/labltk/frx/.cvsignore b/otherlibs/labltk/frx/.cvsignore new file mode 100644 index 00000000..10301e28 --- /dev/null +++ b/otherlibs/labltk/frx/.cvsignore @@ -0,0 +1 @@ +*.a diff --git a/otherlibs/labltk/frx/frx_entry.ml b/otherlibs/labltk/frx/frx_entry.ml index 4b760fcf..6af349c7 100644 --- a/otherlibs/labltk/frx/frx_entry.ml +++ b/otherlibs/labltk/frx/frx_entry.ml @@ -15,7 +15,7 @@ (***********************************************************************) open Camltk -let version = "$Id: frx_entry.ml,v 1.2 2002/04/26 12:16:02 furuse Exp $" +let version = "$Id: frx_entry.ml 4745 2002-04-26 12:16:26Z furuse $" (* * Tk 4.0 has emacs bindings for entry widgets diff --git a/otherlibs/labltk/frx/frx_fileinput.ml b/otherlibs/labltk/frx/frx_fileinput.ml index a12d09a8..83cbffaa 100644 --- a/otherlibs/labltk/frx/frx_fileinput.ml +++ b/otherlibs/labltk/frx/frx_fileinput.ml @@ -15,7 +15,7 @@ (***********************************************************************) open Camltk -let version = "$Id: frx_fileinput.ml,v 1.2 2002/04/26 12:16:03 furuse Exp $" +let version = "$Id: frx_fileinput.ml 4745 2002-04-26 12:16:26Z furuse $" (* * Simple spooling for fileinput callbacks diff --git a/otherlibs/labltk/frx/frx_font.ml b/otherlibs/labltk/frx/frx_font.ml index 7948bffa..7e28523a 100644 --- a/otherlibs/labltk/frx/frx_font.ml +++ b/otherlibs/labltk/frx/frx_font.ml @@ -16,7 +16,7 @@ open Camltk open Widget -let version = "$Id: frx_font.ml,v 1.3 2002/07/23 14:11:56 doligez Exp $" +let version = "$Id: frx_font.ml 5029 2002-07-23 14:12:03Z doligez $" (* * Finding fonts. Inspired by code in Ical by Sanjay Ghemawat. diff --git a/otherlibs/labltk/frx/frx_lbutton.ml b/otherlibs/labltk/frx/frx_lbutton.ml index 61bd5dc9..b9447616 100644 --- a/otherlibs/labltk/frx/frx_lbutton.ml +++ b/otherlibs/labltk/frx/frx_lbutton.ml @@ -18,7 +18,7 @@ open Camltk open Widget -let version = "$Id: frx_lbutton.ml,v 1.2 2002/04/26 12:16:05 furuse Exp $" +let version = "$Id: frx_lbutton.ml 4745 2002-04-26 12:16:26Z furuse $" (* * Simulate a button with a bitmap AND a label diff --git a/otherlibs/labltk/frx/frx_listbox.ml b/otherlibs/labltk/frx/frx_listbox.ml index 35e610cf..bc1c6bde 100644 --- a/otherlibs/labltk/frx/frx_listbox.ml +++ b/otherlibs/labltk/frx/frx_listbox.ml @@ -15,7 +15,7 @@ (***********************************************************************) open Camltk -let version = "$Id: frx_listbox.ml,v 1.3 2002/07/23 14:11:56 doligez Exp $" +let version = "$Id: frx_listbox.ml 5029 2002-07-23 14:12:03Z doligez $" (* * Link a scrollbar and a listbox diff --git a/otherlibs/labltk/frx/frx_req.ml b/otherlibs/labltk/frx/frx_req.ml index 10c55ea4..29dce64c 100644 --- a/otherlibs/labltk/frx/frx_req.ml +++ b/otherlibs/labltk/frx/frx_req.ml @@ -20,7 +20,7 @@ open Camltk * jargon). *) -let version = "$Id: frx_req.ml,v 1.3 2002/07/23 14:11:58 doligez Exp $" +let version = "$Id: frx_req.ml 5029 2002-07-23 14:12:03Z doligez $" (* * Simple requester diff --git a/otherlibs/labltk/frx/frx_text.ml b/otherlibs/labltk/frx/frx_text.ml index 60f4c821..11b4335c 100644 --- a/otherlibs/labltk/frx/frx_text.ml +++ b/otherlibs/labltk/frx/frx_text.ml @@ -15,7 +15,7 @@ (***********************************************************************) open Camltk -let version = "$Id: frx_text.ml,v 1.3 2002/07/23 14:11:58 doligez Exp $" +let version = "$Id: frx_text.ml 5029 2002-07-23 14:12:03Z doligez $" (* * convert an integer to an absolute index diff --git a/otherlibs/labltk/frx/frx_widget.ml b/otherlibs/labltk/frx/frx_widget.ml index 534a13f8..cb61fff3 100644 --- a/otherlibs/labltk/frx/frx_widget.ml +++ b/otherlibs/labltk/frx/frx_widget.ml @@ -16,7 +16,7 @@ open Camltk open Widget -let version = "$Id: frx_widget.ml,v 1.2 2002/04/26 12:16:10 furuse Exp $" +let version = "$Id: frx_widget.ml 4745 2002-04-26 12:16:26Z furuse $" (* Make a window (toplevel widget) resizeable *) let resizeable t = update_idletasks(); (* wait until layout is computed *) diff --git a/otherlibs/labltk/jpf/.cvsignore b/otherlibs/labltk/jpf/.cvsignore new file mode 100644 index 00000000..10301e28 --- /dev/null +++ b/otherlibs/labltk/jpf/.cvsignore @@ -0,0 +1 @@ +*.a diff --git a/otherlibs/labltk/jpf/balloon.ml b/otherlibs/labltk/jpf/balloon.ml index 7caab2d5..288e0194 100644 --- a/otherlibs/labltk/jpf/balloon.ml +++ b/otherlibs/labltk/jpf/balloon.ml @@ -14,7 +14,7 @@ (* *) (***********************************************************************) -(* $Id: balloon.ml,v 1.15 2002/04/26 12:16:12 furuse Exp $ *) +(* $Id: balloon.ml 4745 2002-04-26 12:16:26Z furuse $ *) open StdLabels diff --git a/otherlibs/labltk/jpf/balloon.mli b/otherlibs/labltk/jpf/balloon.mli index 6bd8bcd7..42a1d107 100644 --- a/otherlibs/labltk/jpf/balloon.mli +++ b/otherlibs/labltk/jpf/balloon.mli @@ -14,7 +14,7 @@ (* *) (***********************************************************************) -(* $Id: balloon.mli,v 1.7 2002/04/26 12:16:12 furuse Exp $ *) +(* $Id: balloon.mli 4745 2002-04-26 12:16:26Z furuse $ *) (* easy balloon help facility *) open Widget diff --git a/otherlibs/labltk/jpf/balloontest.ml b/otherlibs/labltk/jpf/balloontest.ml index 0cca5354..4f04e894 100644 --- a/otherlibs/labltk/jpf/balloontest.ml +++ b/otherlibs/labltk/jpf/balloontest.ml @@ -14,7 +14,7 @@ (* *) (***********************************************************************) -(* $Id: balloontest.ml,v 1.8 2002/04/26 12:16:12 furuse Exp $ *) +(* $Id: balloontest.ml 4745 2002-04-26 12:16:26Z furuse $ *) open Tk open Widget diff --git a/otherlibs/labltk/jpf/fileselect.ml b/otherlibs/labltk/jpf/fileselect.ml index f58c25dd..f03064db 100644 --- a/otherlibs/labltk/jpf/fileselect.ml +++ b/otherlibs/labltk/jpf/fileselect.ml @@ -14,7 +14,7 @@ (* *) (***********************************************************************) -(* $Id: fileselect.ml,v 1.21 2005/01/28 16:13:11 doligez Exp $ *) +(* $Id: fileselect.ml 6757 2005-01-28 16:13:11Z doligez $ *) (* file selection box *) diff --git a/otherlibs/labltk/jpf/fileselect.mli b/otherlibs/labltk/jpf/fileselect.mli index dc2ae04f..fe8f5945 100644 --- a/otherlibs/labltk/jpf/fileselect.mli +++ b/otherlibs/labltk/jpf/fileselect.mli @@ -14,7 +14,7 @@ (* *) (***********************************************************************) -(* $Id: fileselect.mli,v 1.7 2002/04/26 12:16:12 furuse Exp $ *) +(* $Id: fileselect.mli 4745 2002-04-26 12:16:26Z furuse $ *) (* This file selecter works only under the OS with the full unix support. For the portability, Tk.getOpenFile and Tk.getSaveFile are recommended. *) diff --git a/otherlibs/labltk/lib/.cvsignore b/otherlibs/labltk/lib/.cvsignore index 80df4415..02d049a4 100644 --- a/otherlibs/labltk/lib/.cvsignore +++ b/otherlibs/labltk/lib/.cvsignore @@ -5,4 +5,4 @@ labltktop labltk mltktop mltk modules labltk.cma labltk.cmxa - +*.a diff --git a/otherlibs/labltk/support/.cvsignore b/otherlibs/labltk/support/.cvsignore new file mode 100644 index 00000000..56d9c77a --- /dev/null +++ b/otherlibs/labltk/support/.cvsignore @@ -0,0 +1,2 @@ +*.so +*.a diff --git a/otherlibs/labltk/support/camltk.h b/otherlibs/labltk/support/camltk.h index ba52fd1d..e14b6f61 100644 --- a/otherlibs/labltk/support/camltk.h +++ b/otherlibs/labltk/support/camltk.h @@ -14,7 +14,7 @@ /* */ /*************************************************************************/ -/* $Id: camltk.h,v 1.13 2008/09/26 07:35:24 garrigue Exp $ */ +/* $Id: camltk.h 9036 2008-09-26 07:35:24Z garrigue $ */ #if defined(_WIN32) && defined(CAML_DLL) && defined(IN_CAMLTKSUPPORT) #define CAMLTKextern CAMLexport diff --git a/otherlibs/labltk/support/cltkCaml.c b/otherlibs/labltk/support/cltkCaml.c index 00a4d016..2f5fe100 100644 --- a/otherlibs/labltk/support/cltkCaml.c +++ b/otherlibs/labltk/support/cltkCaml.c @@ -14,7 +14,7 @@ /* */ /***********************************************************************/ -/* $Id: cltkCaml.c,v 1.10 2008/09/26 07:35:24 garrigue Exp $ */ +/* $Id: cltkCaml.c 9036 2008-09-26 07:35:24Z garrigue $ */ #include #include diff --git a/otherlibs/labltk/support/cltkDMain.c b/otherlibs/labltk/support/cltkDMain.c index 1790e4e7..7561ec77 100644 --- a/otherlibs/labltk/support/cltkDMain.c +++ b/otherlibs/labltk/support/cltkDMain.c @@ -14,7 +14,7 @@ /* */ /*************************************************************************/ -/* $Id: cltkDMain.c,v 1.7 2008/07/01 09:55:52 weis Exp $ */ +/* $Id: cltkDMain.c 8899 2008-07-01 09:55:52Z weis $ */ #include #include diff --git a/otherlibs/labltk/support/cltkEval.c b/otherlibs/labltk/support/cltkEval.c index 9dd212e0..08bbd1be 100644 --- a/otherlibs/labltk/support/cltkEval.c +++ b/otherlibs/labltk/support/cltkEval.c @@ -14,7 +14,7 @@ /* */ /***********************************************************************/ -/* $Id: cltkEval.c,v 1.15 2008/07/01 09:55:52 weis Exp $ */ +/* $Id: cltkEval.c 8899 2008-07-01 09:55:52Z weis $ */ #include #include diff --git a/otherlibs/labltk/support/cltkEvent.c b/otherlibs/labltk/support/cltkEvent.c index dbda7514..5b875af5 100644 --- a/otherlibs/labltk/support/cltkEvent.c +++ b/otherlibs/labltk/support/cltkEvent.c @@ -14,7 +14,7 @@ /* */ /***********************************************************************/ -/* $Id: cltkEvent.c,v 1.8 2002/04/26 12:16:17 furuse Exp $ */ +/* $Id: cltkEvent.c 4745 2002-04-26 12:16:26Z furuse $ */ #include #include diff --git a/otherlibs/labltk/support/cltkFile.c b/otherlibs/labltk/support/cltkFile.c index 8989d108..ff159ad8 100644 --- a/otherlibs/labltk/support/cltkFile.c +++ b/otherlibs/labltk/support/cltkFile.c @@ -14,7 +14,7 @@ /* */ /***********************************************************************/ -/* $Id: cltkFile.c,v 1.12 2002/04/26 12:16:17 furuse Exp $ */ +/* $Id: cltkFile.c 4745 2002-04-26 12:16:26Z furuse $ */ #ifdef __CYGWIN__ #define _WIN32 diff --git a/otherlibs/labltk/support/cltkMain.c b/otherlibs/labltk/support/cltkMain.c index f4cf1e08..1d948a3f 100644 --- a/otherlibs/labltk/support/cltkMain.c +++ b/otherlibs/labltk/support/cltkMain.c @@ -14,7 +14,7 @@ /* */ /***********************************************************************/ -/* $Id: cltkMain.c,v 1.15 2008/07/01 09:55:52 weis Exp $ */ +/* $Id: cltkMain.c 8899 2008-07-01 09:55:52Z weis $ */ #include #include diff --git a/otherlibs/labltk/support/cltkMisc.c b/otherlibs/labltk/support/cltkMisc.c index 7397da4f..8d77fb00 100644 --- a/otherlibs/labltk/support/cltkMisc.c +++ b/otherlibs/labltk/support/cltkMisc.c @@ -14,7 +14,7 @@ /* */ /***********************************************************************/ -/* $Id: cltkMisc.c,v 1.10 2002/07/23 14:11:59 doligez Exp $ */ +/* $Id: cltkMisc.c 5029 2002-07-23 14:12:03Z doligez $ */ #include #include diff --git a/otherlibs/labltk/support/cltkTimer.c b/otherlibs/labltk/support/cltkTimer.c index 3f3efa80..2d31a1ac 100644 --- a/otherlibs/labltk/support/cltkTimer.c +++ b/otherlibs/labltk/support/cltkTimer.c @@ -14,7 +14,7 @@ /* */ /***********************************************************************/ -/* $Id: cltkTimer.c,v 1.9 2002/04/26 12:16:19 furuse Exp $ */ +/* $Id: cltkTimer.c 4745 2002-04-26 12:16:26Z furuse $ */ #include #include diff --git a/otherlibs/labltk/support/cltkUtf.c b/otherlibs/labltk/support/cltkUtf.c index e94c29e2..5654c7e5 100644 --- a/otherlibs/labltk/support/cltkUtf.c +++ b/otherlibs/labltk/support/cltkUtf.c @@ -14,7 +14,7 @@ /* */ /***********************************************************************/ -/* $Id: cltkUtf.c,v 1.2 2002/04/26 12:16:19 furuse Exp $ */ +/* $Id: cltkUtf.c 4745 2002-04-26 12:16:26Z furuse $ */ #include #include diff --git a/otherlibs/labltk/support/cltkVar.c b/otherlibs/labltk/support/cltkVar.c index 8a8de64e..d9bbf3cc 100644 --- a/otherlibs/labltk/support/cltkVar.c +++ b/otherlibs/labltk/support/cltkVar.c @@ -14,7 +14,7 @@ /* */ /***********************************************************************/ -/* $Id: cltkVar.c,v 1.9 2002/07/23 14:11:59 doligez Exp $ */ +/* $Id: cltkVar.c 5029 2002-07-23 14:12:03Z doligez $ */ /* Alternative to tkwait variable */ #include diff --git a/otherlibs/labltk/support/cltkWait.c b/otherlibs/labltk/support/cltkWait.c index f194d56a..eb819b12 100644 --- a/otherlibs/labltk/support/cltkWait.c +++ b/otherlibs/labltk/support/cltkWait.c @@ -14,7 +14,7 @@ /* */ /***********************************************************************/ -/* $Id: cltkWait.c,v 1.9 2002/07/23 14:11:59 doligez Exp $ */ +/* $Id: cltkWait.c 5029 2002-07-23 14:12:03Z doligez $ */ #include #include diff --git a/otherlibs/labltk/support/fileevent.ml b/otherlibs/labltk/support/fileevent.ml index a6ffc8b6..6cbac085 100644 --- a/otherlibs/labltk/support/fileevent.ml +++ b/otherlibs/labltk/support/fileevent.ml @@ -14,7 +14,7 @@ (* *) (***********************************************************************) -(* $Id: fileevent.ml,v 1.12 2002/04/26 12:16:19 furuse Exp $ *) +(* $Id: fileevent.ml 4745 2002-04-26 12:16:26Z furuse $ *) open Unix open Support diff --git a/otherlibs/labltk/support/fileevent.mli b/otherlibs/labltk/support/fileevent.mli index 48ed9430..fa3e8be2 100644 --- a/otherlibs/labltk/support/fileevent.mli +++ b/otherlibs/labltk/support/fileevent.mli @@ -14,7 +14,7 @@ (* *) (***********************************************************************) -(* $Id: fileevent.mli,v 1.7 2002/04/26 12:16:20 furuse Exp $ *) +(* $Id: fileevent.mli 4745 2002-04-26 12:16:26Z furuse $ *) open Unix diff --git a/otherlibs/labltk/support/protocol.ml b/otherlibs/labltk/support/protocol.ml index 79a103c8..636bfefe 100644 --- a/otherlibs/labltk/support/protocol.ml +++ b/otherlibs/labltk/support/protocol.ml @@ -14,7 +14,7 @@ (* *) (***********************************************************************) -(* $Id: protocol.ml,v 1.21 2005/12/21 05:29:08 garrigue Exp $ *) +(* $Id: protocol.ml 7283 2005-12-21 05:29:08Z garrigue $ *) open Support open Widget diff --git a/otherlibs/labltk/support/protocol.mli b/otherlibs/labltk/support/protocol.mli index 1e419115..02c3636a 100644 --- a/otherlibs/labltk/support/protocol.mli +++ b/otherlibs/labltk/support/protocol.mli @@ -14,7 +14,7 @@ (* *) (***********************************************************************) -(* $Id: protocol.mli,v 1.12 2005/12/21 05:29:08 garrigue Exp $ *) +(* $Id: protocol.mli 7283 2005-12-21 05:29:08Z garrigue $ *) open Widget diff --git a/otherlibs/labltk/support/rawwidget.ml b/otherlibs/labltk/support/rawwidget.ml index 7eb7b4c1..3e220be7 100644 --- a/otherlibs/labltk/support/rawwidget.ml +++ b/otherlibs/labltk/support/rawwidget.ml @@ -14,7 +14,7 @@ (* *) (***********************************************************************) -(* $Id: rawwidget.ml,v 1.3 2002/07/23 14:11:59 doligez Exp $ *) +(* $Id: rawwidget.ml 5029 2002-07-23 14:12:03Z doligez $ *) open Support diff --git a/otherlibs/labltk/support/rawwidget.mli b/otherlibs/labltk/support/rawwidget.mli index 9e03dee8..d698d118 100644 --- a/otherlibs/labltk/support/rawwidget.mli +++ b/otherlibs/labltk/support/rawwidget.mli @@ -14,7 +14,7 @@ (* *) (***********************************************************************) -(* $Id: rawwidget.mli,v 1.2 2002/04/26 12:16:20 furuse Exp $ *) +(* $Id: rawwidget.mli 4745 2002-04-26 12:16:26Z furuse $ *) (* Support for widget manipulations *) diff --git a/otherlibs/labltk/support/slave.ml b/otherlibs/labltk/support/slave.ml index 334088ab..5e078842 100644 --- a/otherlibs/labltk/support/slave.ml +++ b/otherlibs/labltk/support/slave.ml @@ -14,7 +14,7 @@ (* *) (***********************************************************************) -(* $Id: slave.ml,v 1.5 2002/04/26 12:16:21 furuse Exp $ *) +(* $Id: slave.ml 4745 2002-04-26 12:16:26Z furuse $ *) (* The code run on initialisation, in addition to normal Tk code * NOTE: camltk has not fully been initialised yet diff --git a/otherlibs/labltk/support/support.ml b/otherlibs/labltk/support/support.ml index 1c5994c9..66d65e51 100644 --- a/otherlibs/labltk/support/support.ml +++ b/otherlibs/labltk/support/support.ml @@ -14,7 +14,7 @@ (* *) (***********************************************************************) -(* $Id: support.ml,v 1.9 2002/04/26 12:16:21 furuse Exp $ *) +(* $Id: support.ml 4745 2002-04-26 12:16:26Z furuse $ *) (* Parsing results of Tcl *) (* List.split a string according to char_sep predicate *) diff --git a/otherlibs/labltk/support/support.mli b/otherlibs/labltk/support/support.mli index 8551aed5..351e5fc2 100644 --- a/otherlibs/labltk/support/support.mli +++ b/otherlibs/labltk/support/support.mli @@ -14,7 +14,7 @@ (* *) (***********************************************************************) -(* $Id: support.mli,v 1.8 2002/04/26 12:16:21 furuse Exp $ *) +(* $Id: support.mli 4745 2002-04-26 12:16:26Z furuse $ *) val split_str : pred:(char -> bool) -> string -> string list val may : ('a -> 'b) -> 'a option -> 'b option diff --git a/otherlibs/labltk/support/textvariable.ml b/otherlibs/labltk/support/textvariable.ml index 087ff87d..e6d49bab 100644 --- a/otherlibs/labltk/support/textvariable.ml +++ b/otherlibs/labltk/support/textvariable.ml @@ -14,7 +14,7 @@ (* *) (***********************************************************************) -(* $Id: textvariable.ml,v 1.16 2002/07/23 14:11:59 doligez Exp $ *) +(* $Id: textvariable.ml 5029 2002-07-23 14:12:03Z doligez $ *) open Support open Protocol diff --git a/otherlibs/labltk/support/textvariable.mli b/otherlibs/labltk/support/textvariable.mli index 7d101bc7..c3a5adaf 100644 --- a/otherlibs/labltk/support/textvariable.mli +++ b/otherlibs/labltk/support/textvariable.mli @@ -14,7 +14,7 @@ (* *) (***********************************************************************) -(* $Id: textvariable.mli,v 1.10 2002/04/26 12:16:21 furuse Exp $ *) +(* $Id: textvariable.mli 4745 2002-04-26 12:16:26Z furuse $ *) (* Support for Tk -textvariable option *) open Widget diff --git a/otherlibs/labltk/support/timer.ml b/otherlibs/labltk/support/timer.ml index 65eb50e7..face27c0 100644 --- a/otherlibs/labltk/support/timer.ml +++ b/otherlibs/labltk/support/timer.ml @@ -14,7 +14,7 @@ (* *) (***********************************************************************) -(* $Id: timer.ml,v 1.10 2002/09/12 10:12:26 furuse Exp $ *) +(* $Id: timer.ml 5128 2002-09-12 10:12:26Z furuse $ *) (* Timers *) open Support diff --git a/otherlibs/labltk/support/timer.mli b/otherlibs/labltk/support/timer.mli index 435e6e9c..bf65f657 100644 --- a/otherlibs/labltk/support/timer.mli +++ b/otherlibs/labltk/support/timer.mli @@ -14,7 +14,7 @@ (* *) (***********************************************************************) -(* $Id: timer.mli,v 1.8 2002/04/26 12:16:21 furuse Exp $ *) +(* $Id: timer.mli 4745 2002-04-26 12:16:26Z furuse $ *) type t diff --git a/otherlibs/labltk/support/tkthread.ml b/otherlibs/labltk/support/tkthread.ml index d4a03ee2..6bcadfd0 100644 --- a/otherlibs/labltk/support/tkthread.ml +++ b/otherlibs/labltk/support/tkthread.ml @@ -12,7 +12,7 @@ (* *) (***********************************************************************) -(* $Id: tkthread.ml,v 1.3 2008/01/11 16:13:16 doligez Exp $ *) +(* $Id: tkthread.ml 8768 2008-01-11 16:13:18Z doligez $ *) let jobs : (unit -> unit) Queue.t = Queue.create () let m = Mutex.create () diff --git a/otherlibs/labltk/support/tkthread.mli b/otherlibs/labltk/support/tkthread.mli index 6fef9129..2ee96ec9 100644 --- a/otherlibs/labltk/support/tkthread.mli +++ b/otherlibs/labltk/support/tkthread.mli @@ -12,7 +12,7 @@ (* *) (***********************************************************************) -(* $Id: tkthread.mli,v 1.4 2008/01/11 16:13:16 doligez Exp $ *) +(* $Id: tkthread.mli 8768 2008-01-11 16:13:18Z doligez $ *) (* Helper functions for using LablTk with threads. To use, add tkthread.cmo or tkthread.cmx to your command line *) diff --git a/otherlibs/labltk/support/tkwait.ml b/otherlibs/labltk/support/tkwait.ml index 35749666..3bf095b5 100644 --- a/otherlibs/labltk/support/tkwait.ml +++ b/otherlibs/labltk/support/tkwait.ml @@ -14,7 +14,7 @@ (* *) (***********************************************************************) -(* $Id: tkwait.ml,v 1.7 2002/04/26 12:16:21 furuse Exp $ *) +(* $Id: tkwait.ml 4745 2002-04-26 12:16:26Z furuse $ *) external internal_tracevis : string -> string -> unit = "camltk_wait_vis" diff --git a/otherlibs/labltk/support/widget.ml b/otherlibs/labltk/support/widget.ml index d6320750..581c879e 100644 --- a/otherlibs/labltk/support/widget.ml +++ b/otherlibs/labltk/support/widget.ml @@ -14,7 +14,7 @@ (* *) (***********************************************************************) -(* $Id: widget.ml,v 1.16 2002/04/26 12:16:22 furuse Exp $ *) +(* $Id: widget.ml 4745 2002-04-26 12:16:26Z furuse $ *) (* Hack to permit having the different data type with the same name [widget] for CamlTk and LablTk. *) diff --git a/otherlibs/labltk/support/widget.mli b/otherlibs/labltk/support/widget.mli index 2023579b..14b3bdc9 100644 --- a/otherlibs/labltk/support/widget.mli +++ b/otherlibs/labltk/support/widget.mli @@ -14,7 +14,7 @@ (* *) (***********************************************************************) -(* $Id: widget.mli,v 1.7 2002/04/26 12:16:22 furuse Exp $ *) +(* $Id: widget.mli 4745 2002-04-26 12:16:26Z furuse $ *) (* Support for widget manipulations *) diff --git a/otherlibs/labltk/tkanim/.cvsignore b/otherlibs/labltk/tkanim/.cvsignore index e1c70145..38784098 100644 --- a/otherlibs/labltk/tkanim/.cvsignore +++ b/otherlibs/labltk/tkanim/.cvsignore @@ -1,2 +1,4 @@ gifanimtest gifanimtest-static +*.so +*.a diff --git a/otherlibs/num/.cvsignore b/otherlibs/num/.cvsignore index 7786c62f..02023cba 100644 --- a/otherlibs/num/.cvsignore +++ b/otherlibs/num/.cvsignore @@ -1,3 +1,5 @@ libnums.x *.c.x so_locations +*.so +*.a diff --git a/otherlibs/num/Makefile b/otherlibs/num/Makefile index 9c377caf..5c51f55e 100644 --- a/otherlibs/num/Makefile +++ b/otherlibs/num/Makefile @@ -11,7 +11,7 @@ # # ######################################################################### -# $Id: Makefile,v 1.37 2008/09/10 16:10:43 weis Exp $ +# $Id: Makefile 9021 2008-09-10 16:10:43Z weis $ # Makefile for the "num" (exact rational arithmetic) library diff --git a/otherlibs/num/Makefile.nt b/otherlibs/num/Makefile.nt index 00490e6d..98968652 100644 --- a/otherlibs/num/Makefile.nt +++ b/otherlibs/num/Makefile.nt @@ -11,7 +11,7 @@ # # ######################################################################### -# $Id: Makefile.nt,v 1.22 2007/11/06 15:16:56 frisch Exp $ +# $Id: Makefile.nt 8477 2007-11-06 15:16:56Z frisch $ # Makefile for the "num" (exact rational arithmetic) library diff --git a/otherlibs/num/arith_flags.ml b/otherlibs/num/arith_flags.ml index 19103ed9..4debbcfd 100644 --- a/otherlibs/num/arith_flags.ml +++ b/otherlibs/num/arith_flags.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: arith_flags.ml,v 1.4 2001/12/07 13:40:14 xleroy Exp $ *) +(* $Id: arith_flags.ml 4144 2001-12-07 13:41:02Z xleroy $ *) let error_when_null_denominator_flag = ref true;; diff --git a/otherlibs/num/arith_flags.mli b/otherlibs/num/arith_flags.mli index 30e5300c..a132ea41 100644 --- a/otherlibs/num/arith_flags.mli +++ b/otherlibs/num/arith_flags.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: arith_flags.mli,v 1.5 2001/12/07 13:40:14 xleroy Exp $ *) +(* $Id: arith_flags.mli 4144 2001-12-07 13:41:02Z xleroy $ *) val error_when_null_denominator_flag : bool ref val normalize_ratio_flag : bool ref diff --git a/otherlibs/num/arith_status.ml b/otherlibs/num/arith_status.ml index a15b5816..923ca00e 100644 --- a/otherlibs/num/arith_status.ml +++ b/otherlibs/num/arith_status.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: arith_status.ml,v 1.4 2001/12/07 13:40:14 xleroy Exp $ *) +(* $Id: arith_status.ml 4144 2001-12-07 13:41:02Z xleroy $ *) open Arith_flags;; diff --git a/otherlibs/num/arith_status.mli b/otherlibs/num/arith_status.mli index 76300eb8..aea83246 100644 --- a/otherlibs/num/arith_status.mli +++ b/otherlibs/num/arith_status.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: arith_status.mli,v 1.6 2001/12/07 13:40:14 xleroy Exp $ *) +(* $Id: arith_status.mli 4144 2001-12-07 13:41:02Z xleroy $ *) (** Flags that control rational arithmetic. *) diff --git a/otherlibs/num/big_int.ml b/otherlibs/num/big_int.ml index 669df773..71b8e180 100644 --- a/otherlibs/num/big_int.ml +++ b/otherlibs/num/big_int.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: big_int.ml,v 1.24.2.2 2009/05/24 19:46:44 xleroy Exp $ *) +(* $Id: big_int.ml 9277 2009-05-24 19:46:44Z xleroy $ *) open Int_misc open Nat diff --git a/otherlibs/num/big_int.mli b/otherlibs/num/big_int.mli index bd477f39..6fdb2a5a 100644 --- a/otherlibs/num/big_int.mli +++ b/otherlibs/num/big_int.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: big_int.mli,v 1.11 2008/01/04 13:15:52 xleroy Exp $ *) +(* $Id: big_int.mli 8751 2008-01-04 13:15:52Z xleroy $ *) (** Operations on arbitrary-precision integers. diff --git a/otherlibs/num/bng.c b/otherlibs/num/bng.c index 6baf3550..a14502e1 100644 --- a/otherlibs/num/bng.c +++ b/otherlibs/num/bng.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: bng.c,v 1.4 2005/09/22 14:21:50 xleroy Exp $ */ +/* $Id: bng.c 7064 2005-09-22 14:21:50Z xleroy $ */ #include "bng.h" #include "config.h" diff --git a/otherlibs/num/bng.h b/otherlibs/num/bng.h index d895bf51..bc8f4797 100644 --- a/otherlibs/num/bng.h +++ b/otherlibs/num/bng.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: bng.h,v 1.3 2005/09/22 14:21:50 xleroy Exp $ */ +/* $Id: bng.h 7064 2005-09-22 14:21:50Z xleroy $ */ #include #include "config.h" diff --git a/otherlibs/num/bng_alpha.c b/otherlibs/num/bng_alpha.c index 94168a38..82b21346 100644 --- a/otherlibs/num/bng_alpha.c +++ b/otherlibs/num/bng_alpha.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: bng_alpha.c,v 1.1 2003/10/24 09:17:32 xleroy Exp $ */ +/* $Id: bng_alpha.c 5880 2003-10-24 09:18:01Z xleroy $ */ /* Code specific to the Alpha architecture. */ diff --git a/otherlibs/num/bng_amd64.c b/otherlibs/num/bng_amd64.c index 85ee15e4..00a771af 100644 --- a/otherlibs/num/bng_amd64.c +++ b/otherlibs/num/bng_amd64.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: bng_amd64.c,v 1.1 2003/10/24 09:17:33 xleroy Exp $ */ +/* $Id: bng_amd64.c 5880 2003-10-24 09:18:01Z xleroy $ */ /* Code specific to the AMD x86_64 architecture. */ diff --git a/otherlibs/num/bng_digit.c b/otherlibs/num/bng_digit.c index 0095b439..bf1da7e7 100644 --- a/otherlibs/num/bng_digit.c +++ b/otherlibs/num/bng_digit.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: bng_digit.c,v 1.1 2003/10/24 09:17:33 xleroy Exp $ */ +/* $Id: bng_digit.c 5880 2003-10-24 09:18:01Z xleroy $ */ /**** Generic operations on digits ****/ diff --git a/otherlibs/num/bng_ia32.c b/otherlibs/num/bng_ia32.c index e19e5dbb..35035676 100644 --- a/otherlibs/num/bng_ia32.c +++ b/otherlibs/num/bng_ia32.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: bng_ia32.c,v 1.4 2005/08/13 20:59:37 doligez Exp $ */ +/* $Id: bng_ia32.c 7019 2005-08-13 20:59:37Z doligez $ */ /* Code specific to the Intel IA32 (x86) architecture. */ diff --git a/otherlibs/num/bng_mips.c b/otherlibs/num/bng_mips.c index d49b0333..0ee283e9 100644 --- a/otherlibs/num/bng_mips.c +++ b/otherlibs/num/bng_mips.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: bng_mips.c,v 1.1 2003/10/24 09:17:33 xleroy Exp $ */ +/* $Id: bng_mips.c 5880 2003-10-24 09:18:01Z xleroy $ */ /* Code specific to the MIPS architecture. */ diff --git a/otherlibs/num/bng_ppc.c b/otherlibs/num/bng_ppc.c index 0b4b5c7d..f566539e 100644 --- a/otherlibs/num/bng_ppc.c +++ b/otherlibs/num/bng_ppc.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: bng_ppc.c,v 1.3 2006/05/31 08:16:34 xleroy Exp $ */ +/* $Id: bng_ppc.c 7430 2006-05-31 08:16:34Z xleroy $ */ /* Code specific to the PowerPC architecture. */ diff --git a/otherlibs/num/bng_sparc.c b/otherlibs/num/bng_sparc.c index eb750ae2..55639f01 100644 --- a/otherlibs/num/bng_sparc.c +++ b/otherlibs/num/bng_sparc.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: bng_sparc.c,v 1.1 2003/10/24 09:17:34 xleroy Exp $ */ +/* $Id: bng_sparc.c 5880 2003-10-24 09:18:01Z xleroy $ */ /* Code specific to the SPARC (V8 and above) architecture. */ diff --git a/otherlibs/num/int_misc.ml b/otherlibs/num/int_misc.ml index 1c6f1b74..1560bf16 100644 --- a/otherlibs/num/int_misc.ml +++ b/otherlibs/num/int_misc.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: int_misc.ml,v 1.6 2002/05/27 12:06:49 weis Exp $ *) +(* $Id: int_misc.ml 4845 2002-05-27 12:06:49Z weis $ *) (* Some extra operations on integers *) diff --git a/otherlibs/num/int_misc.mli b/otherlibs/num/int_misc.mli index a7b4e10a..d20c56b0 100644 --- a/otherlibs/num/int_misc.mli +++ b/otherlibs/num/int_misc.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: int_misc.mli,v 1.4 2001/12/07 13:40:15 xleroy Exp $ *) +(* $Id: int_misc.mli 4144 2001-12-07 13:41:02Z xleroy $ *) (* Some extra operations on integers *) diff --git a/otherlibs/num/nat.h b/otherlibs/num/nat.h index d8988c7b..98bee6da 100644 --- a/otherlibs/num/nat.h +++ b/otherlibs/num/nat.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: nat.h,v 1.6 2003/10/24 09:17:34 xleroy Exp $ */ +/* $Id: nat.h 5880 2003-10-24 09:18:01Z xleroy $ */ /* Nats are represented as unstructured blocks with tag Custom_tag. */ diff --git a/otherlibs/num/nat.ml b/otherlibs/num/nat.ml index 36401d93..e1e0ae58 100644 --- a/otherlibs/num/nat.ml +++ b/otherlibs/num/nat.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: nat.ml,v 1.16 2008/01/04 13:15:52 xleroy Exp $ *) +(* $Id: nat.ml 8751 2008-01-04 13:15:52Z xleroy $ *) open Int_misc diff --git a/otherlibs/num/nat.mli b/otherlibs/num/nat.mli index 68142037..186239f8 100644 --- a/otherlibs/num/nat.mli +++ b/otherlibs/num/nat.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: nat.mli,v 1.12 2008/01/04 13:15:52 xleroy Exp $ *) +(* $Id: nat.mli 8751 2008-01-04 13:15:52Z xleroy $ *) (* Module [Nat]: operations on natural numbers *) diff --git a/otherlibs/num/nat_stubs.c b/otherlibs/num/nat_stubs.c index 2318ab3d..9c69e231 100644 --- a/otherlibs/num/nat_stubs.c +++ b/otherlibs/num/nat_stubs.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: nat_stubs.c,v 1.18 2008/01/11 16:13:16 doligez Exp $ */ +/* $Id: nat_stubs.c 9320 2009-07-22 15:36:28Z doligez $ */ #include "alloc.h" #include "config.h" @@ -368,14 +368,24 @@ static uintnat deserialize_nat(void * dst) #if defined(ARCH_SIXTYFOUR) && defined(ARCH_BIG_ENDIAN) { uint32 * p; mlsize_t i; - for (i = len, p = dst; i > 0; i -= 2, p += 2) { + for (i = len, p = dst; i > 1; i -= 2, p += 2) { p[1] = deserialize_uint_4(); /* low 32 bits of 64-bit digit */ p[0] = deserialize_uint_4(); /* high 32 bits of 64-bit digit */ } + if (i > 0){ + p[1] = deserialize_uint_4(); /* low 32 bits of 64-bit digit */ + p[0] = 0; /* high 32 bits of 64-bit digit */ + ++ len; + } } #else deserialize_block_4(dst, len); +#if defined(ARCH_SIXTYFOUR) + if (len & 1){ + ((uint32 *) dst)[len] = 0; + ++ len; + } +#endif #endif return len * 4; } - diff --git a/otherlibs/num/num.ml b/otherlibs/num/num.ml index 64eaed0e..e6565e02 100644 --- a/otherlibs/num/num.ml +++ b/otherlibs/num/num.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: num.ml,v 1.8 2008/09/10 16:12:05 weis Exp $ *) +(* $Id: num.ml 9022 2008-09-10 16:12:05Z weis $ *) open Int_misc open Nat diff --git a/otherlibs/num/num.mli b/otherlibs/num/num.mli index cd4d8ea2..88cd094b 100644 --- a/otherlibs/num/num.mli +++ b/otherlibs/num/num.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: num.mli,v 1.8 2001/12/28 23:15:23 guesdon Exp $ *) +(* $Id: num.mli 4199 2001-12-28 23:15:23Z guesdon $ *) (** Operation on arbitrary-precision numbers. diff --git a/otherlibs/num/ratio.mli b/otherlibs/num/ratio.mli index d6c2aff2..672abc34 100644 --- a/otherlibs/num/ratio.mli +++ b/otherlibs/num/ratio.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: ratio.mli,v 1.4 2001/12/07 13:40:16 xleroy Exp $ *) +(* $Id: ratio.mli 4144 2001-12-07 13:41:02Z xleroy $ *) (* Module [Ratio]: operations on rational numbers *) diff --git a/otherlibs/num/test/Makefile b/otherlibs/num/test/Makefile index 92f6a06f..7ee8570f 100644 --- a/otherlibs/num/test/Makefile +++ b/otherlibs/num/test/Makefile @@ -11,7 +11,7 @@ # # ######################################################################### -# $Id: Makefile,v 1.13 2008/09/10 16:02:52 weis Exp $ +# $Id: Makefile 9019 2008-09-10 16:02:52Z weis $ include ../../../config/Makefile diff --git a/otherlibs/num/test/Makefile.nt b/otherlibs/num/test/Makefile.nt index 3cb2e9c7..2858ee21 100644 --- a/otherlibs/num/test/Makefile.nt +++ b/otherlibs/num/test/Makefile.nt @@ -11,7 +11,7 @@ # # ######################################################################### -# $Id: Makefile.nt,v 1.9 2004/04/01 13:10:12 xleroy Exp $ +# $Id: Makefile.nt 6180 2004-04-01 13:10:12Z xleroy $ include ../../../config/Makefile diff --git a/otherlibs/num/test/test_bng.c b/otherlibs/num/test/test_bng.c index 7679f093..2d6a6e80 100644 --- a/otherlibs/num/test/test_bng.c +++ b/otherlibs/num/test/test_bng.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: test_bng.c,v 1.2 2003/11/07 07:59:10 xleroy Exp $ */ +/* $Id: test_bng.c 5900 2003-11-07 07:59:10Z xleroy $ */ /* Test harness for the BNG primitives. Use BigNum as a reference. */ diff --git a/otherlibs/str/.cvsignore b/otherlibs/str/.cvsignore index a37b133d..49c78e58 100644 --- a/otherlibs/str/.cvsignore +++ b/otherlibs/str/.cvsignore @@ -1,3 +1,5 @@ libstr.x *.c.x so_locations +*.so +*.a diff --git a/otherlibs/str/Makefile b/otherlibs/str/Makefile index 37388459..79ce0e57 100644 --- a/otherlibs/str/Makefile +++ b/otherlibs/str/Makefile @@ -11,7 +11,7 @@ # # ######################################################################### -# $Id: Makefile,v 1.35 2007/11/06 15:16:56 frisch Exp $ +# $Id: Makefile 8477 2007-11-06 15:16:56Z frisch $ # Makefile for the str library diff --git a/otherlibs/str/Makefile.nt b/otherlibs/str/Makefile.nt index d99abe21..34340739 100644 --- a/otherlibs/str/Makefile.nt +++ b/otherlibs/str/Makefile.nt @@ -11,7 +11,7 @@ # # ######################################################################### -# $Id: Makefile.nt,v 1.16 2007/11/06 15:16:56 frisch Exp $ +# $Id: Makefile.nt 8477 2007-11-06 15:16:56Z frisch $ # Makefile for the str library diff --git a/otherlibs/str/str.ml b/otherlibs/str/str.ml index a8453529..16832c7d 100644 --- a/otherlibs/str/str.ml +++ b/otherlibs/str/str.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: str.ml,v 1.22.2.1 2008/12/12 08:54:15 xleroy Exp $ *) +(* $Id: str.ml 9157 2008-12-12 08:54:15Z xleroy $ *) (** String utilities *) diff --git a/otherlibs/str/str.mli b/otherlibs/str/str.mli index 03c741d7..89d021e0 100644 --- a/otherlibs/str/str.mli +++ b/otherlibs/str/str.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: str.mli,v 1.24 2005/03/24 17:20:53 doligez Exp $ *) +(* $Id: str.mli 6824 2005-03-24 17:20:54Z doligez $ *) (** Regular expressions and high-level string processing *) diff --git a/otherlibs/str/strstubs.c b/otherlibs/str/strstubs.c index f4148d4c..5c1d8cad 100644 --- a/otherlibs/str/strstubs.c +++ b/otherlibs/str/strstubs.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: strstubs.c,v 1.27 2005/09/22 14:21:50 xleroy Exp $ */ +/* $Id: strstubs.c 7064 2005-09-22 14:21:50Z xleroy $ */ #include #include diff --git a/otherlibs/systhreads/.cvsignore b/otherlibs/systhreads/.cvsignore index b175e39d..1f1e6a38 100644 --- a/otherlibs/systhreads/.cvsignore +++ b/otherlibs/systhreads/.cvsignore @@ -1,3 +1,5 @@ *.x thread.ml so_locations +*.so +*.a diff --git a/otherlibs/systhreads/Makefile b/otherlibs/systhreads/Makefile index 2a768573..7887f03b 100644 --- a/otherlibs/systhreads/Makefile +++ b/otherlibs/systhreads/Makefile @@ -11,7 +11,7 @@ # # ######################################################################### -# $Id: Makefile,v 1.44 2008/07/15 15:31:32 frisch Exp $ +# $Id: Makefile 8916 2008-07-15 15:31:32Z frisch $ include ../../config/Makefile diff --git a/otherlibs/systhreads/Makefile.nt b/otherlibs/systhreads/Makefile.nt index b762ec9c..c9c0129a 100644 --- a/otherlibs/systhreads/Makefile.nt +++ b/otherlibs/systhreads/Makefile.nt @@ -11,7 +11,7 @@ # # ######################################################################### -# $Id: Makefile.nt,v 1.31 2007/11/06 15:16:56 frisch Exp $ +# $Id: Makefile.nt 8477 2007-11-06 15:16:56Z frisch $ include ../../config/Makefile diff --git a/otherlibs/systhreads/condition.ml b/otherlibs/systhreads/condition.ml index 08f64568..48055696 100644 --- a/otherlibs/systhreads/condition.ml +++ b/otherlibs/systhreads/condition.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: condition.ml,v 1.6 2001/12/07 13:40:18 xleroy Exp $ *) +(* $Id: condition.ml 4144 2001-12-07 13:41:02Z xleroy $ *) type t external create: unit -> t = "caml_condition_new" diff --git a/otherlibs/systhreads/condition.mli b/otherlibs/systhreads/condition.mli index 3edd9029..98dce638 100644 --- a/otherlibs/systhreads/condition.mli +++ b/otherlibs/systhreads/condition.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: condition.mli,v 1.6 2001/12/07 13:40:19 xleroy Exp $ *) +(* $Id: condition.mli 4144 2001-12-07 13:41:02Z xleroy $ *) (** Condition variables to synchronize between threads. diff --git a/otherlibs/systhreads/event.ml b/otherlibs/systhreads/event.ml index 174160c1..8d4a1c4e 100644 --- a/otherlibs/systhreads/event.ml +++ b/otherlibs/systhreads/event.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: event.ml,v 1.9 2001/12/07 13:40:19 xleroy Exp $ *) +(* $Id: event.ml 4144 2001-12-07 13:41:02Z xleroy $ *) (* Events *) type 'a basic_event = diff --git a/otherlibs/systhreads/event.mli b/otherlibs/systhreads/event.mli index 672fb78f..882ad889 100644 --- a/otherlibs/systhreads/event.mli +++ b/otherlibs/systhreads/event.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: event.mli,v 1.10 2006/01/12 03:24:56 garrigue Exp $ *) +(* $Id: event.mli 7322 2006-01-12 03:24:56Z garrigue $ *) (** First-class synchronous communication. diff --git a/otherlibs/systhreads/mutex.ml b/otherlibs/systhreads/mutex.ml index 4933f458..a7d1795a 100644 --- a/otherlibs/systhreads/mutex.ml +++ b/otherlibs/systhreads/mutex.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: mutex.ml,v 1.4 2001/12/07 13:40:19 xleroy Exp $ *) +(* $Id: mutex.ml 4144 2001-12-07 13:41:02Z xleroy $ *) type t external create: unit -> t = "caml_mutex_new" diff --git a/otherlibs/systhreads/mutex.mli b/otherlibs/systhreads/mutex.mli index 33bccae3..83c11bba 100644 --- a/otherlibs/systhreads/mutex.mli +++ b/otherlibs/systhreads/mutex.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: mutex.mli,v 1.6 2001/12/07 13:40:19 xleroy Exp $ *) +(* $Id: mutex.mli 4144 2001-12-07 13:41:02Z xleroy $ *) (** Locks for mutual exclusion. diff --git a/otherlibs/systhreads/posix.c b/otherlibs/systhreads/posix.c index 89a0b524..33f3b91e 100644 --- a/otherlibs/systhreads/posix.c +++ b/otherlibs/systhreads/posix.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: posix.c,v 1.58.2.2 2009/03/28 17:35:59 xleroy Exp $ */ +/* $Id: posix.c 9201 2009-03-28 17:35:59Z xleroy $ */ /* Thread interface for POSIX 1003.1c threads */ diff --git a/otherlibs/systhreads/thread.mli b/otherlibs/systhreads/thread.mli index 85fb1606..a7a81bbb 100644 --- a/otherlibs/systhreads/thread.mli +++ b/otherlibs/systhreads/thread.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: thread.mli,v 1.21 2008/01/11 16:13:16 doligez Exp $ *) +(* $Id: thread.mli 8768 2008-01-11 16:13:18Z doligez $ *) (** Lightweight threads for Posix [1003.1c] and Win32. *) diff --git a/otherlibs/systhreads/threadUnix.ml b/otherlibs/systhreads/threadUnix.ml index b83f5975..5b3fcfa5 100644 --- a/otherlibs/systhreads/threadUnix.ml +++ b/otherlibs/systhreads/threadUnix.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: threadUnix.ml,v 1.8 2001/12/07 13:40:20 xleroy Exp $ *) +(* $Id: threadUnix.ml 4144 2001-12-07 13:41:02Z xleroy $ *) (* Module [ThreadUnix]: thread-compatible system calls *) diff --git a/otherlibs/systhreads/threadUnix.mli b/otherlibs/systhreads/threadUnix.mli index fb1e67ac..bd03bad6 100644 --- a/otherlibs/systhreads/threadUnix.mli +++ b/otherlibs/systhreads/threadUnix.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: threadUnix.mli,v 1.19 2002/06/26 09:48:00 xleroy Exp $ *) +(* $Id: threadUnix.mli 4951 2002-06-26 09:48:00Z xleroy $ *) (** Thread-compatible system calls. diff --git a/otherlibs/systhreads/thread_posix.ml b/otherlibs/systhreads/thread_posix.ml index e362fa30..7c017975 100644 --- a/otherlibs/systhreads/thread_posix.ml +++ b/otherlibs/systhreads/thread_posix.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: thread_posix.ml,v 1.10 2005/07/31 12:32:41 xleroy Exp $ *) +(* $Id: thread_posix.ml 7000 2005-07-31 12:32:41Z xleroy $ *) (* User-level threads *) diff --git a/otherlibs/systhreads/thread_win32.ml b/otherlibs/systhreads/thread_win32.ml index 008fa068..6cd8690e 100644 --- a/otherlibs/systhreads/thread_win32.ml +++ b/otherlibs/systhreads/thread_win32.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: thread_win32.ml,v 1.9 2005/07/31 12:32:41 xleroy Exp $ *) +(* $Id: thread_win32.ml 7000 2005-07-31 12:32:41Z xleroy $ *) (* User-level threads *) diff --git a/otherlibs/systhreads/win32.c b/otherlibs/systhreads/win32.c index a84122cf..3875e4a6 100644 --- a/otherlibs/systhreads/win32.c +++ b/otherlibs/systhreads/win32.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: win32.c,v 1.45 2007/10/31 09:12:29 xleroy Exp $ */ +/* $Id: win32.c 8468 2007-10-31 09:12:29Z xleroy $ */ /* Thread interface for Win32 threads */ diff --git a/otherlibs/threads/.cvsignore b/otherlibs/threads/.cvsignore index fb2df562..c17596c7 100644 --- a/otherlibs/threads/.cvsignore +++ b/otherlibs/threads/.cvsignore @@ -1,3 +1,5 @@ marshal.mli pervasives.mli unix.mli +*.so +*.a diff --git a/otherlibs/threads/Makefile b/otherlibs/threads/Makefile index 6453f02d..94128849 100644 --- a/otherlibs/threads/Makefile +++ b/otherlibs/threads/Makefile @@ -11,7 +11,7 @@ # # ######################################################################### -# $Id: Makefile,v 1.61.2.1 2008/10/08 13:07:13 doligez Exp $ +# $Id: Makefile 9079 2008-10-08 13:09:39Z doligez $ include ../../config/Makefile diff --git a/otherlibs/threads/condition.ml b/otherlibs/threads/condition.ml index d6c6d426..cb6b05c8 100644 --- a/otherlibs/threads/condition.ml +++ b/otherlibs/threads/condition.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: condition.ml,v 1.8 2001/12/07 13:40:21 xleroy Exp $ *) +(* $Id: condition.ml 4144 2001-12-07 13:41:02Z xleroy $ *) type t = { mutable waiting: Thread.t list } diff --git a/otherlibs/threads/condition.mli b/otherlibs/threads/condition.mli index c54a3c27..98dce638 100644 --- a/otherlibs/threads/condition.mli +++ b/otherlibs/threads/condition.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: condition.mli,v 1.13 2001/12/07 13:40:21 xleroy Exp $ *) +(* $Id: condition.mli 4144 2001-12-07 13:41:02Z xleroy $ *) (** Condition variables to synchronize between threads. diff --git a/otherlibs/threads/event.ml b/otherlibs/threads/event.ml index 7fb5d53f..8d4a1c4e 100644 --- a/otherlibs/threads/event.ml +++ b/otherlibs/threads/event.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: event.ml,v 1.14 2001/12/07 13:40:21 xleroy Exp $ *) +(* $Id: event.ml 4144 2001-12-07 13:41:02Z xleroy $ *) (* Events *) type 'a basic_event = diff --git a/otherlibs/threads/event.mli b/otherlibs/threads/event.mli index 07e1bc90..882ad889 100644 --- a/otherlibs/threads/event.mli +++ b/otherlibs/threads/event.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: event.mli,v 1.15 2006/01/12 03:24:56 garrigue Exp $ *) +(* $Id: event.mli 7322 2006-01-12 03:24:56Z garrigue $ *) (** First-class synchronous communication. diff --git a/otherlibs/threads/marshal.ml b/otherlibs/threads/marshal.ml index 59f4cff5..90fc903b 100644 --- a/otherlibs/threads/marshal.ml +++ b/otherlibs/threads/marshal.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: marshal.ml,v 1.9 2004/05/27 15:28:05 doligez Exp $ *) +(* $Id: marshal.ml 6338 2004-05-27 15:28:05Z doligez $ *) type extern_flags = No_sharing diff --git a/otherlibs/threads/mutex.ml b/otherlibs/threads/mutex.ml index 3522a9d8..5b2e189b 100644 --- a/otherlibs/threads/mutex.ml +++ b/otherlibs/threads/mutex.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: mutex.ml,v 1.8 2001/12/07 13:40:22 xleroy Exp $ *) +(* $Id: mutex.ml 4144 2001-12-07 13:41:02Z xleroy $ *) type t = { mutable locked: bool; mutable waiting: Thread.t list } diff --git a/otherlibs/threads/mutex.mli b/otherlibs/threads/mutex.mli index 1ce82697..83c11bba 100644 --- a/otherlibs/threads/mutex.mli +++ b/otherlibs/threads/mutex.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: mutex.mli,v 1.11 2001/12/07 13:40:22 xleroy Exp $ *) +(* $Id: mutex.mli 4144 2001-12-07 13:41:02Z xleroy $ *) (** Locks for mutual exclusion. diff --git a/otherlibs/threads/pervasives.ml b/otherlibs/threads/pervasives.ml index cb8593eb..98ae5df5 100644 --- a/otherlibs/threads/pervasives.ml +++ b/otherlibs/threads/pervasives.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: pervasives.ml,v 1.52 2007/02/25 12:37:30 xleroy Exp $ *) +(* $Id: pervasives.ml 7918 2007-02-25 12:37:30Z xleroy $ *) (* Same as ../../stdlib/pervasives.ml, except that I/O functions have been redefined to not block the whole process, but only the calling diff --git a/otherlibs/threads/scheduler.c b/otherlibs/threads/scheduler.c index 36111313..0580b2d3 100644 --- a/otherlibs/threads/scheduler.c +++ b/otherlibs/threads/scheduler.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: scheduler.c,v 1.60 2005/09/22 14:21:50 xleroy Exp $ */ +/* $Id: scheduler.c 7064 2005-09-22 14:21:50Z xleroy $ */ /* The thread scheduler */ diff --git a/otherlibs/threads/thread.ml b/otherlibs/threads/thread.ml index 611cb069..c7df37cb 100644 --- a/otherlibs/threads/thread.ml +++ b/otherlibs/threads/thread.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: thread.ml,v 1.23 2003/03/20 16:23:04 xleroy Exp $ *) +(* $Id: thread.ml 5445 2003-03-20 16:23:04Z xleroy $ *) (* User-level threads *) diff --git a/otherlibs/threads/thread.mli b/otherlibs/threads/thread.mli index da687a53..4ea8e35d 100644 --- a/otherlibs/threads/thread.mli +++ b/otherlibs/threads/thread.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: thread.mli,v 1.28 2004/07/13 12:25:13 xleroy Exp $ *) +(* $Id: thread.mli 6553 2004-07-13 12:25:21Z xleroy $ *) (** Lightweight threads. *) diff --git a/otherlibs/threads/threadUnix.ml b/otherlibs/threads/threadUnix.ml index a2d697a8..9831db7e 100644 --- a/otherlibs/threads/threadUnix.ml +++ b/otherlibs/threads/threadUnix.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: threadUnix.ml,v 1.19 2004/07/13 12:25:13 xleroy Exp $ *) +(* $Id: threadUnix.ml 6553 2004-07-13 12:25:21Z xleroy $ *) (* Module [ThreadUnix]: thread-compatible system calls *) diff --git a/otherlibs/threads/threadUnix.mli b/otherlibs/threads/threadUnix.mli index 4bf00c93..0d45884b 100644 --- a/otherlibs/threads/threadUnix.mli +++ b/otherlibs/threads/threadUnix.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: threadUnix.mli,v 1.22 2004/07/13 12:25:14 xleroy Exp $ *) +(* $Id: threadUnix.mli 6553 2004-07-13 12:25:21Z xleroy $ *) (** Thread-compatible system calls. diff --git a/otherlibs/threads/unix.ml b/otherlibs/threads/unix.ml index 247cb109..6343b488 100644 --- a/otherlibs/threads/unix.ml +++ b/otherlibs/threads/unix.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: unix.ml,v 1.22 2008/08/01 16:29:44 mauny Exp $ *) +(* $Id: unix.ml 8972 2008-08-01 16:29:44Z mauny $ *) (* An alternate implementation of the Unix module from ../unix which is safe in conjunction with bytecode threads. *) diff --git a/otherlibs/unix/.cvsignore b/otherlibs/unix/.cvsignore index 074dd28a..29fea472 100644 --- a/otherlibs/unix/.cvsignore +++ b/otherlibs/unix/.cvsignore @@ -1 +1,3 @@ so_locations +*.so +*.a diff --git a/otherlibs/unix/Makefile b/otherlibs/unix/Makefile index 8b085196..d7211e88 100644 --- a/otherlibs/unix/Makefile +++ b/otherlibs/unix/Makefile @@ -11,7 +11,7 @@ # # ######################################################################### -# $Id: Makefile,v 1.46 2007/11/06 15:16:56 frisch Exp $ +# $Id: Makefile 8477 2007-11-06 15:16:56Z frisch $ # Makefile for the Unix interface library diff --git a/otherlibs/unix/accept.c b/otherlibs/unix/accept.c index 26fe03bb..64152a52 100644 --- a/otherlibs/unix/accept.c +++ b/otherlibs/unix/accept.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: accept.c,v 1.13 2005/03/24 17:20:53 doligez Exp $ */ +/* $Id: accept.c 6824 2005-03-24 17:20:54Z doligez $ */ #include #include diff --git a/otherlibs/unix/access.c b/otherlibs/unix/access.c index 52d3c7c0..f0c07ac7 100644 --- a/otherlibs/unix/access.c +++ b/otherlibs/unix/access.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: access.c,v 1.12 2008/01/11 16:13:16 doligez Exp $ */ +/* $Id: access.c 8768 2008-01-11 16:13:18Z doligez $ */ #include #include diff --git a/otherlibs/unix/addrofstr.c b/otherlibs/unix/addrofstr.c index ab2985f7..2fb125b9 100644 --- a/otherlibs/unix/addrofstr.c +++ b/otherlibs/unix/addrofstr.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: addrofstr.c,v 1.11 2004/04/09 13:25:20 xleroy Exp $ */ +/* $Id: addrofstr.c 6193 2004-04-09 13:25:23Z xleroy $ */ #include #include diff --git a/otherlibs/unix/alarm.c b/otherlibs/unix/alarm.c index 75a5d512..2cf2d019 100644 --- a/otherlibs/unix/alarm.c +++ b/otherlibs/unix/alarm.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: alarm.c,v 1.8 2005/03/24 17:20:53 doligez Exp $ */ +/* $Id: alarm.c 6824 2005-03-24 17:20:54Z doligez $ */ #include #include "unixsupport.h" diff --git a/otherlibs/unix/bind.c b/otherlibs/unix/bind.c index ccfa32a0..c02c6883 100644 --- a/otherlibs/unix/bind.c +++ b/otherlibs/unix/bind.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: bind.c,v 1.10 2005/03/24 17:20:53 doligez Exp $ */ +/* $Id: bind.c 6824 2005-03-24 17:20:54Z doligez $ */ #include #include diff --git a/otherlibs/unix/chdir.c b/otherlibs/unix/chdir.c index 4b66cc57..520891ae 100644 --- a/otherlibs/unix/chdir.c +++ b/otherlibs/unix/chdir.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: chdir.c,v 1.8 2001/12/07 13:40:24 xleroy Exp $ */ +/* $Id: chdir.c 4144 2001-12-07 13:41:02Z xleroy $ */ #include #include "unixsupport.h" diff --git a/otherlibs/unix/chmod.c b/otherlibs/unix/chmod.c index a85db5e3..443d54b6 100644 --- a/otherlibs/unix/chmod.c +++ b/otherlibs/unix/chmod.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: chmod.c,v 1.9 2001/12/07 13:40:26 xleroy Exp $ */ +/* $Id: chmod.c 4144 2001-12-07 13:41:02Z xleroy $ */ #include #include diff --git a/otherlibs/unix/chown.c b/otherlibs/unix/chown.c index 0ef4eada..15d89d5e 100644 --- a/otherlibs/unix/chown.c +++ b/otherlibs/unix/chown.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: chown.c,v 1.8 2001/12/07 13:40:26 xleroy Exp $ */ +/* $Id: chown.c 4144 2001-12-07 13:41:02Z xleroy $ */ #include #include "unixsupport.h" diff --git a/otherlibs/unix/chroot.c b/otherlibs/unix/chroot.c index 69e6b427..2ad88d44 100644 --- a/otherlibs/unix/chroot.c +++ b/otherlibs/unix/chroot.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: chroot.c,v 1.8 2001/12/07 13:40:26 xleroy Exp $ */ +/* $Id: chroot.c 4144 2001-12-07 13:41:02Z xleroy $ */ #include #include "unixsupport.h" diff --git a/otherlibs/unix/close.c b/otherlibs/unix/close.c index 17f7344e..043d3c74 100644 --- a/otherlibs/unix/close.c +++ b/otherlibs/unix/close.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: close.c,v 1.10 2001/12/07 13:40:26 xleroy Exp $ */ +/* $Id: close.c 4144 2001-12-07 13:41:02Z xleroy $ */ #include #include "unixsupport.h" diff --git a/otherlibs/unix/closedir.c b/otherlibs/unix/closedir.c index 1cb60553..a0ac5191 100644 --- a/otherlibs/unix/closedir.c +++ b/otherlibs/unix/closedir.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: closedir.c,v 1.9 2004/02/14 10:21:22 xleroy Exp $ */ +/* $Id: closedir.c 6113 2004-02-14 10:21:23Z xleroy $ */ #include #include "unixsupport.h" diff --git a/otherlibs/unix/connect.c b/otherlibs/unix/connect.c index 8c10253a..de0008ab 100644 --- a/otherlibs/unix/connect.c +++ b/otherlibs/unix/connect.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: connect.c,v 1.12 2005/03/24 17:20:53 doligez Exp $ */ +/* $Id: connect.c 6824 2005-03-24 17:20:54Z doligez $ */ #include #include diff --git a/otherlibs/unix/cst2constr.c b/otherlibs/unix/cst2constr.c index e85d9c9f..782ceed1 100644 --- a/otherlibs/unix/cst2constr.c +++ b/otherlibs/unix/cst2constr.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: cst2constr.c,v 1.7 2001/12/07 13:40:26 xleroy Exp $ */ +/* $Id: cst2constr.c 4144 2001-12-07 13:41:02Z xleroy $ */ #include #include diff --git a/otherlibs/unix/cst2constr.h b/otherlibs/unix/cst2constr.h index c6785e16..d404b007 100644 --- a/otherlibs/unix/cst2constr.h +++ b/otherlibs/unix/cst2constr.h @@ -11,6 +11,6 @@ /* */ /***********************************************************************/ -/* $Id: cst2constr.h,v 1.7 2004/04/09 13:25:21 xleroy Exp $ */ +/* $Id: cst2constr.h 6193 2004-04-09 13:25:23Z xleroy $ */ extern value cst_to_constr(int n, int * tbl, int size, int deflt); diff --git a/otherlibs/unix/cstringv.c b/otherlibs/unix/cstringv.c index a823f4f9..e4438b19 100644 --- a/otherlibs/unix/cstringv.c +++ b/otherlibs/unix/cstringv.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: cstringv.c,v 1.7 2001/12/07 13:40:27 xleroy Exp $ */ +/* $Id: cstringv.c 4144 2001-12-07 13:41:02Z xleroy $ */ #include #include diff --git a/otherlibs/unix/dup.c b/otherlibs/unix/dup.c index 5829d814..2a2e0099 100644 --- a/otherlibs/unix/dup.c +++ b/otherlibs/unix/dup.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: dup.c,v 1.8 2001/12/07 13:40:27 xleroy Exp $ */ +/* $Id: dup.c 4144 2001-12-07 13:41:02Z xleroy $ */ #include #include "unixsupport.h" diff --git a/otherlibs/unix/dup2.c b/otherlibs/unix/dup2.c index 8b4808f8..dec473e7 100644 --- a/otherlibs/unix/dup2.c +++ b/otherlibs/unix/dup2.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: dup2.c,v 1.9 2001/12/07 13:40:27 xleroy Exp $ */ +/* $Id: dup2.c 4144 2001-12-07 13:41:02Z xleroy $ */ #include #include "unixsupport.h" diff --git a/otherlibs/unix/envir.c b/otherlibs/unix/envir.c index 29932c53..b0291e88 100644 --- a/otherlibs/unix/envir.c +++ b/otherlibs/unix/envir.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: envir.c,v 1.10 2005/03/24 17:20:53 doligez Exp $ */ +/* $Id: envir.c 6824 2005-03-24 17:20:54Z doligez $ */ #include #include diff --git a/otherlibs/unix/errmsg.c b/otherlibs/unix/errmsg.c index a642779e..d1cd5a6e 100644 --- a/otherlibs/unix/errmsg.c +++ b/otherlibs/unix/errmsg.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: errmsg.c,v 1.12 2004/05/23 15:53:50 xleroy Exp $ */ +/* $Id: errmsg.c 6315 2004-05-23 15:53:50Z xleroy $ */ #include #include diff --git a/otherlibs/unix/execv.c b/otherlibs/unix/execv.c index 30163cd0..4ccc7887 100644 --- a/otherlibs/unix/execv.c +++ b/otherlibs/unix/execv.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: execv.c,v 1.8 2001/12/07 13:40:27 xleroy Exp $ */ +/* $Id: execv.c 4144 2001-12-07 13:41:02Z xleroy $ */ #include #include diff --git a/otherlibs/unix/execve.c b/otherlibs/unix/execve.c index a8d8101d..9aad005f 100644 --- a/otherlibs/unix/execve.c +++ b/otherlibs/unix/execve.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: execve.c,v 1.8 2001/12/07 13:40:27 xleroy Exp $ */ +/* $Id: execve.c 4144 2001-12-07 13:41:02Z xleroy $ */ #include #include diff --git a/otherlibs/unix/execvp.c b/otherlibs/unix/execvp.c index e2f64895..04555a73 100644 --- a/otherlibs/unix/execvp.c +++ b/otherlibs/unix/execvp.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: execvp.c,v 1.8 2001/12/07 13:40:27 xleroy Exp $ */ +/* $Id: execvp.c 4144 2001-12-07 13:41:02Z xleroy $ */ #include #include diff --git a/otherlibs/unix/exit.c b/otherlibs/unix/exit.c index 37fdab6d..21e2217e 100644 --- a/otherlibs/unix/exit.c +++ b/otherlibs/unix/exit.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: exit.c,v 1.9 2001/12/07 13:40:28 xleroy Exp $ */ +/* $Id: exit.c 4144 2001-12-07 13:41:02Z xleroy $ */ #include #include "unixsupport.h" diff --git a/otherlibs/unix/fchmod.c b/otherlibs/unix/fchmod.c index 857ad47f..76111409 100644 --- a/otherlibs/unix/fchmod.c +++ b/otherlibs/unix/fchmod.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: fchmod.c,v 1.10 2005/03/24 17:20:53 doligez Exp $ */ +/* $Id: fchmod.c 6824 2005-03-24 17:20:54Z doligez $ */ #include #include diff --git a/otherlibs/unix/fchown.c b/otherlibs/unix/fchown.c index e2e5cf6b..c2edb06c 100644 --- a/otherlibs/unix/fchown.c +++ b/otherlibs/unix/fchown.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: fchown.c,v 1.9 2005/03/24 17:20:53 doligez Exp $ */ +/* $Id: fchown.c 6824 2005-03-24 17:20:54Z doligez $ */ #include #include diff --git a/otherlibs/unix/fcntl.c b/otherlibs/unix/fcntl.c index b020b5ab..9cb6dca2 100644 --- a/otherlibs/unix/fcntl.c +++ b/otherlibs/unix/fcntl.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: fcntl.c,v 1.12 2005/03/24 17:20:53 doligez Exp $ */ +/* $Id: fcntl.c 6824 2005-03-24 17:20:54Z doligez $ */ #include #include diff --git a/otherlibs/unix/fork.c b/otherlibs/unix/fork.c index 8e6828fe..d4f3dc13 100644 --- a/otherlibs/unix/fork.c +++ b/otherlibs/unix/fork.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: fork.c,v 1.8 2001/12/07 13:40:28 xleroy Exp $ */ +/* $Id: fork.c 4144 2001-12-07 13:41:02Z xleroy $ */ #include #include "unixsupport.h" diff --git a/otherlibs/unix/ftruncate.c b/otherlibs/unix/ftruncate.c index 8830ad73..51560cc3 100644 --- a/otherlibs/unix/ftruncate.c +++ b/otherlibs/unix/ftruncate.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: ftruncate.c,v 1.11 2007/02/09 13:31:15 doligez Exp $ */ +/* $Id: ftruncate.c 7849 2007-02-09 13:31:15Z doligez $ */ #include #include diff --git a/otherlibs/unix/getaddrinfo.c b/otherlibs/unix/getaddrinfo.c index fb5ecd81..e390d18b 100644 --- a/otherlibs/unix/getaddrinfo.c +++ b/otherlibs/unix/getaddrinfo.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: getaddrinfo.c,v 1.3 2005/08/13 20:59:37 doligez Exp $ */ +/* $Id: getaddrinfo.c 7019 2005-08-13 20:59:37Z doligez $ */ #include #include diff --git a/otherlibs/unix/getcwd.c b/otherlibs/unix/getcwd.c index 9826c10b..a8c5b99b 100644 --- a/otherlibs/unix/getcwd.c +++ b/otherlibs/unix/getcwd.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: getcwd.c,v 1.15 2005/03/24 17:20:53 doligez Exp $ */ +/* $Id: getcwd.c 6824 2005-03-24 17:20:54Z doligez $ */ #include #include diff --git a/otherlibs/unix/getegid.c b/otherlibs/unix/getegid.c index a5e4daac..c76544bf 100644 --- a/otherlibs/unix/getegid.c +++ b/otherlibs/unix/getegid.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: getegid.c,v 1.9 2005/03/24 17:20:53 doligez Exp $ */ +/* $Id: getegid.c 6824 2005-03-24 17:20:54Z doligez $ */ #include #include "unixsupport.h" diff --git a/otherlibs/unix/geteuid.c b/otherlibs/unix/geteuid.c index f535f643..7b5fe2b2 100644 --- a/otherlibs/unix/geteuid.c +++ b/otherlibs/unix/geteuid.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: geteuid.c,v 1.9 2005/03/24 17:20:53 doligez Exp $ */ +/* $Id: geteuid.c 6824 2005-03-24 17:20:54Z doligez $ */ #include #include "unixsupport.h" diff --git a/otherlibs/unix/getgid.c b/otherlibs/unix/getgid.c index ff544b45..d2f8f4ba 100644 --- a/otherlibs/unix/getgid.c +++ b/otherlibs/unix/getgid.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: getgid.c,v 1.9 2005/03/24 17:20:53 doligez Exp $ */ +/* $Id: getgid.c 6824 2005-03-24 17:20:54Z doligez $ */ #include #include "unixsupport.h" diff --git a/otherlibs/unix/getgr.c b/otherlibs/unix/getgr.c index 62fb8ee6..1c61da11 100644 --- a/otherlibs/unix/getgr.c +++ b/otherlibs/unix/getgr.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: getgr.c,v 1.12 2001/12/07 13:40:29 xleroy Exp $ */ +/* $Id: getgr.c 4144 2001-12-07 13:41:02Z xleroy $ */ #include #include diff --git a/otherlibs/unix/getgroups.c b/otherlibs/unix/getgroups.c index ee733f43..ed07c8c6 100644 --- a/otherlibs/unix/getgroups.c +++ b/otherlibs/unix/getgroups.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: getgroups.c,v 1.11 2005/03/24 17:20:53 doligez Exp $ */ +/* $Id: getgroups.c 6824 2005-03-24 17:20:54Z doligez $ */ #include #include diff --git a/otherlibs/unix/gethost.c b/otherlibs/unix/gethost.c index e5be2594..714b5a7e 100644 --- a/otherlibs/unix/gethost.c +++ b/otherlibs/unix/gethost.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: gethost.c,v 1.27 2006/09/20 11:14:37 doligez Exp $ */ +/* $Id: gethost.c 7619 2006-09-20 11:14:37Z doligez $ */ #include #include diff --git a/otherlibs/unix/gethostname.c b/otherlibs/unix/gethostname.c index 9593f950..9f8c7c09 100644 --- a/otherlibs/unix/gethostname.c +++ b/otherlibs/unix/gethostname.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: gethostname.c,v 1.11 2005/03/24 17:20:53 doligez Exp $ */ +/* $Id: gethostname.c 6824 2005-03-24 17:20:54Z doligez $ */ #include #include diff --git a/otherlibs/unix/getlogin.c b/otherlibs/unix/getlogin.c index c0adb59f..afd3e2c8 100644 --- a/otherlibs/unix/getlogin.c +++ b/otherlibs/unix/getlogin.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: getlogin.c,v 1.9 2005/03/24 17:20:53 doligez Exp $ */ +/* $Id: getlogin.c 6824 2005-03-24 17:20:54Z doligez $ */ #include #include diff --git a/otherlibs/unix/getnameinfo.c b/otherlibs/unix/getnameinfo.c index 20742a04..8a49909e 100644 --- a/otherlibs/unix/getnameinfo.c +++ b/otherlibs/unix/getnameinfo.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: getnameinfo.c,v 1.2 2005/03/24 17:20:53 doligez Exp $ */ +/* $Id: getnameinfo.c 6824 2005-03-24 17:20:54Z doligez $ */ #include #include diff --git a/otherlibs/unix/getpeername.c b/otherlibs/unix/getpeername.c index 6985f0fb..e2d3463a 100644 --- a/otherlibs/unix/getpeername.c +++ b/otherlibs/unix/getpeername.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: getpeername.c,v 1.11 2005/03/24 17:20:53 doligez Exp $ */ +/* $Id: getpeername.c 6824 2005-03-24 17:20:54Z doligez $ */ #include #include diff --git a/otherlibs/unix/getpid.c b/otherlibs/unix/getpid.c index 01ab422b..891cc83f 100644 --- a/otherlibs/unix/getpid.c +++ b/otherlibs/unix/getpid.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: getpid.c,v 1.9 2005/03/24 17:20:53 doligez Exp $ */ +/* $Id: getpid.c 6824 2005-03-24 17:20:54Z doligez $ */ #include #include "unixsupport.h" diff --git a/otherlibs/unix/getppid.c b/otherlibs/unix/getppid.c index af798ecb..511e3f6d 100644 --- a/otherlibs/unix/getppid.c +++ b/otherlibs/unix/getppid.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: getppid.c,v 1.9 2005/03/24 17:20:53 doligez Exp $ */ +/* $Id: getppid.c 6824 2005-03-24 17:20:54Z doligez $ */ #include #include "unixsupport.h" diff --git a/otherlibs/unix/getproto.c b/otherlibs/unix/getproto.c index 73907505..696cb34e 100644 --- a/otherlibs/unix/getproto.c +++ b/otherlibs/unix/getproto.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: getproto.c,v 1.13 2005/03/24 17:20:53 doligez Exp $ */ +/* $Id: getproto.c 6824 2005-03-24 17:20:54Z doligez $ */ #include #include diff --git a/otherlibs/unix/getpw.c b/otherlibs/unix/getpw.c index 5aa9f6cb..d250cb8f 100644 --- a/otherlibs/unix/getpw.c +++ b/otherlibs/unix/getpw.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: getpw.c,v 1.12 2001/12/07 13:40:30 xleroy Exp $ */ +/* $Id: getpw.c 4144 2001-12-07 13:41:02Z xleroy $ */ #include #include diff --git a/otherlibs/unix/getserv.c b/otherlibs/unix/getserv.c index bec48ceb..55e13444 100644 --- a/otherlibs/unix/getserv.c +++ b/otherlibs/unix/getserv.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: getserv.c,v 1.14 2005/03/24 17:20:53 doligez Exp $ */ +/* $Id: getserv.c 6824 2005-03-24 17:20:54Z doligez $ */ #include #include diff --git a/otherlibs/unix/getsockname.c b/otherlibs/unix/getsockname.c index 5d93af7f..263cdd90 100644 --- a/otherlibs/unix/getsockname.c +++ b/otherlibs/unix/getsockname.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: getsockname.c,v 1.10 2005/03/24 17:20:53 doligez Exp $ */ +/* $Id: getsockname.c 6824 2005-03-24 17:20:54Z doligez $ */ #include #include diff --git a/otherlibs/unix/gettimeofday.c b/otherlibs/unix/gettimeofday.c index 6b6ea9d5..0575b2b2 100644 --- a/otherlibs/unix/gettimeofday.c +++ b/otherlibs/unix/gettimeofday.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: gettimeofday.c,v 1.8 2005/03/24 17:20:53 doligez Exp $ */ +/* $Id: gettimeofday.c 6824 2005-03-24 17:20:54Z doligez $ */ #include #include diff --git a/otherlibs/unix/getuid.c b/otherlibs/unix/getuid.c index 9acbc9af..a6f0efae 100644 --- a/otherlibs/unix/getuid.c +++ b/otherlibs/unix/getuid.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: getuid.c,v 1.9 2005/03/24 17:20:53 doligez Exp $ */ +/* $Id: getuid.c 6824 2005-03-24 17:20:54Z doligez $ */ #include #include "unixsupport.h" diff --git a/otherlibs/unix/gmtime.c b/otherlibs/unix/gmtime.c index b6d2091d..701a6fe3 100644 --- a/otherlibs/unix/gmtime.c +++ b/otherlibs/unix/gmtime.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: gmtime.c,v 1.17 2005/03/24 17:20:53 doligez Exp $ */ +/* $Id: gmtime.c 6824 2005-03-24 17:20:54Z doligez $ */ #include #include diff --git a/otherlibs/unix/isatty.c b/otherlibs/unix/isatty.c index 9d651aad..3b913bfd 100644 --- a/otherlibs/unix/isatty.c +++ b/otherlibs/unix/isatty.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: isatty.c,v 1.1 2006/09/21 13:54:26 xleroy Exp $ */ +/* $Id: isatty.c 7632 2006-09-21 13:54:26Z xleroy $ */ #include #include "unixsupport.h" diff --git a/otherlibs/unix/itimer.c b/otherlibs/unix/itimer.c index 4b96214d..f6ecb8b3 100644 --- a/otherlibs/unix/itimer.c +++ b/otherlibs/unix/itimer.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: itimer.c,v 1.14 2005/03/24 17:20:53 doligez Exp $ */ +/* $Id: itimer.c 6824 2005-03-24 17:20:54Z doligez $ */ #include #include diff --git a/otherlibs/unix/kill.c b/otherlibs/unix/kill.c index 0a08f450..78956d48 100644 --- a/otherlibs/unix/kill.c +++ b/otherlibs/unix/kill.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: kill.c,v 1.10 2001/12/07 13:40:31 xleroy Exp $ */ +/* $Id: kill.c 4144 2001-12-07 13:41:02Z xleroy $ */ #include #include diff --git a/otherlibs/unix/link.c b/otherlibs/unix/link.c index 81e78c0c..d24da919 100644 --- a/otherlibs/unix/link.c +++ b/otherlibs/unix/link.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: link.c,v 1.8 2001/12/07 13:40:31 xleroy Exp $ */ +/* $Id: link.c 4144 2001-12-07 13:41:02Z xleroy $ */ #include #include "unixsupport.h" diff --git a/otherlibs/unix/listen.c b/otherlibs/unix/listen.c index 215e6d53..cda2943e 100644 --- a/otherlibs/unix/listen.c +++ b/otherlibs/unix/listen.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: listen.c,v 1.11 2005/03/24 17:20:53 doligez Exp $ */ +/* $Id: listen.c 6824 2005-03-24 17:20:54Z doligez $ */ #include #include diff --git a/otherlibs/unix/lockf.c b/otherlibs/unix/lockf.c index 12f16736..d3a12d36 100644 --- a/otherlibs/unix/lockf.c +++ b/otherlibs/unix/lockf.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: lockf.c,v 1.14 2005/03/24 17:20:53 doligez Exp $ */ +/* $Id: lockf.c 6824 2005-03-24 17:20:54Z doligez $ */ #include #include diff --git a/otherlibs/unix/lseek.c b/otherlibs/unix/lseek.c index 14ba24b7..8d8d40c9 100644 --- a/otherlibs/unix/lseek.c +++ b/otherlibs/unix/lseek.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: lseek.c,v 1.10 2002/03/02 09:16:36 xleroy Exp $ */ +/* $Id: lseek.c 4474 2002-03-02 09:16:39Z xleroy $ */ #include #include diff --git a/otherlibs/unix/mkdir.c b/otherlibs/unix/mkdir.c index 469f688b..fc1606e9 100644 --- a/otherlibs/unix/mkdir.c +++ b/otherlibs/unix/mkdir.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: mkdir.c,v 1.9 2001/12/07 13:40:31 xleroy Exp $ */ +/* $Id: mkdir.c 4144 2001-12-07 13:41:02Z xleroy $ */ #include #include diff --git a/otherlibs/unix/mkfifo.c b/otherlibs/unix/mkfifo.c index 81c62ed3..8f2cfac5 100644 --- a/otherlibs/unix/mkfifo.c +++ b/otherlibs/unix/mkfifo.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: mkfifo.c,v 1.11 2005/03/24 17:20:53 doligez Exp $ */ +/* $Id: mkfifo.c 6824 2005-03-24 17:20:54Z doligez $ */ #include #include diff --git a/otherlibs/unix/nice.c b/otherlibs/unix/nice.c index c784ce82..5dc4caa7 100644 --- a/otherlibs/unix/nice.c +++ b/otherlibs/unix/nice.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: nice.c,v 1.11 2008/08/01 13:14:36 xleroy Exp $ */ +/* $Id: nice.c 8967 2008-08-01 13:14:36Z xleroy $ */ #include #include "unixsupport.h" diff --git a/otherlibs/unix/open.c b/otherlibs/unix/open.c index aa666042..c734e173 100644 --- a/otherlibs/unix/open.c +++ b/otherlibs/unix/open.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: open.c,v 1.12 2005/03/24 17:20:53 doligez Exp $ */ +/* $Id: open.c 6824 2005-03-24 17:20:54Z doligez $ */ #include #include diff --git a/otherlibs/unix/opendir.c b/otherlibs/unix/opendir.c index 467316a3..a5482308 100644 --- a/otherlibs/unix/opendir.c +++ b/otherlibs/unix/opendir.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: opendir.c,v 1.9 2004/02/14 10:21:22 xleroy Exp $ */ +/* $Id: opendir.c 6113 2004-02-14 10:21:23Z xleroy $ */ #include #include diff --git a/otherlibs/unix/pipe.c b/otherlibs/unix/pipe.c index 04b6023c..438b1332 100644 --- a/otherlibs/unix/pipe.c +++ b/otherlibs/unix/pipe.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: pipe.c,v 1.10 2005/03/24 17:20:53 doligez Exp $ */ +/* $Id: pipe.c 6824 2005-03-24 17:20:54Z doligez $ */ #include #include diff --git a/otherlibs/unix/putenv.c b/otherlibs/unix/putenv.c index f3d10aab..148d8fee 100644 --- a/otherlibs/unix/putenv.c +++ b/otherlibs/unix/putenv.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: putenv.c,v 1.9 2005/03/24 17:20:53 doligez Exp $ */ +/* $Id: putenv.c 6824 2005-03-24 17:20:54Z doligez $ */ #include #include diff --git a/otherlibs/unix/read.c b/otherlibs/unix/read.c index d68bb629..4479f6fc 100644 --- a/otherlibs/unix/read.c +++ b/otherlibs/unix/read.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: read.c,v 1.13 2001/12/07 13:40:32 xleroy Exp $ */ +/* $Id: read.c 4144 2001-12-07 13:41:02Z xleroy $ */ #include #include diff --git a/otherlibs/unix/readdir.c b/otherlibs/unix/readdir.c index 786a21f0..e7feb611 100644 --- a/otherlibs/unix/readdir.c +++ b/otherlibs/unix/readdir.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: readdir.c,v 1.12 2004/02/14 10:21:23 xleroy Exp $ */ +/* $Id: readdir.c 6113 2004-02-14 10:21:23Z xleroy $ */ #include #include diff --git a/otherlibs/unix/readlink.c b/otherlibs/unix/readlink.c index 980cee0c..7544eb7e 100644 --- a/otherlibs/unix/readlink.c +++ b/otherlibs/unix/readlink.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: readlink.c,v 1.11 2005/03/24 17:20:53 doligez Exp $ */ +/* $Id: readlink.c 6824 2005-03-24 17:20:54Z doligez $ */ #include #include diff --git a/otherlibs/unix/rename.c b/otherlibs/unix/rename.c index 26a24945..dac48a47 100644 --- a/otherlibs/unix/rename.c +++ b/otherlibs/unix/rename.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: rename.c,v 1.10 2001/12/07 13:40:33 xleroy Exp $ */ +/* $Id: rename.c 4144 2001-12-07 13:41:02Z xleroy $ */ #include #include diff --git a/otherlibs/unix/rewinddir.c b/otherlibs/unix/rewinddir.c index 6052b96e..61ce6af5 100644 --- a/otherlibs/unix/rewinddir.c +++ b/otherlibs/unix/rewinddir.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: rewinddir.c,v 1.12 2005/03/24 17:20:53 doligez Exp $ */ +/* $Id: rewinddir.c 6824 2005-03-24 17:20:54Z doligez $ */ #include #include diff --git a/otherlibs/unix/rmdir.c b/otherlibs/unix/rmdir.c index fe855b66..79d27c54 100644 --- a/otherlibs/unix/rmdir.c +++ b/otherlibs/unix/rmdir.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: rmdir.c,v 1.9 2001/12/07 13:40:33 xleroy Exp $ */ +/* $Id: rmdir.c 4144 2001-12-07 13:41:02Z xleroy $ */ #include #include "unixsupport.h" diff --git a/otherlibs/unix/select.c b/otherlibs/unix/select.c index 28dd8d96..5b63d273 100644 --- a/otherlibs/unix/select.c +++ b/otherlibs/unix/select.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: select.c,v 1.22 2005/03/24 17:20:53 doligez Exp $ */ +/* $Id: select.c 6824 2005-03-24 17:20:54Z doligez $ */ #include #include diff --git a/otherlibs/unix/sendrecv.c b/otherlibs/unix/sendrecv.c index 66d2eff4..bce164b6 100644 --- a/otherlibs/unix/sendrecv.c +++ b/otherlibs/unix/sendrecv.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: sendrecv.c,v 1.19 2005/03/24 17:20:53 doligez Exp $ */ +/* $Id: sendrecv.c 6824 2005-03-24 17:20:54Z doligez $ */ #include #include diff --git a/otherlibs/unix/setgid.c b/otherlibs/unix/setgid.c index 2de246f9..698e6e25 100644 --- a/otherlibs/unix/setgid.c +++ b/otherlibs/unix/setgid.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: setgid.c,v 1.8 2001/12/07 13:40:33 xleroy Exp $ */ +/* $Id: setgid.c 4144 2001-12-07 13:41:02Z xleroy $ */ #include #include "unixsupport.h" diff --git a/otherlibs/unix/setsid.c b/otherlibs/unix/setsid.c index d1315980..cfaa3e65 100644 --- a/otherlibs/unix/setsid.c +++ b/otherlibs/unix/setsid.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: setsid.c,v 1.6 2005/03/24 17:20:53 doligez Exp $ */ +/* $Id: setsid.c 6824 2005-03-24 17:20:54Z doligez $ */ #include #include diff --git a/otherlibs/unix/setuid.c b/otherlibs/unix/setuid.c index 8ac8a064..fb2a9ddc 100644 --- a/otherlibs/unix/setuid.c +++ b/otherlibs/unix/setuid.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: setuid.c,v 1.8 2001/12/07 13:40:33 xleroy Exp $ */ +/* $Id: setuid.c 4144 2001-12-07 13:41:02Z xleroy $ */ #include #include "unixsupport.h" diff --git a/otherlibs/unix/shutdown.c b/otherlibs/unix/shutdown.c index e325c59e..9a274529 100644 --- a/otherlibs/unix/shutdown.c +++ b/otherlibs/unix/shutdown.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: shutdown.c,v 1.11 2005/03/24 17:20:53 doligez Exp $ */ +/* $Id: shutdown.c 6824 2005-03-24 17:20:54Z doligez $ */ #include #include diff --git a/otherlibs/unix/signals.c b/otherlibs/unix/signals.c index 27c06499..7232739b 100644 --- a/otherlibs/unix/signals.c +++ b/otherlibs/unix/signals.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: signals.c,v 1.11 2008/01/11 16:13:16 doligez Exp $ */ +/* $Id: signals.c 8768 2008-01-11 16:13:18Z doligez $ */ #include #include diff --git a/otherlibs/unix/sleep.c b/otherlibs/unix/sleep.c index 93303f40..a5b97786 100644 --- a/otherlibs/unix/sleep.c +++ b/otherlibs/unix/sleep.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: sleep.c,v 1.9 2001/12/07 13:40:35 xleroy Exp $ */ +/* $Id: sleep.c 4144 2001-12-07 13:41:02Z xleroy $ */ #include #include diff --git a/otherlibs/unix/socket.c b/otherlibs/unix/socket.c index 1f547b6b..62f8428e 100644 --- a/otherlibs/unix/socket.c +++ b/otherlibs/unix/socket.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: socket.c,v 1.11 2005/03/24 17:20:53 doligez Exp $ */ +/* $Id: socket.c 6824 2005-03-24 17:20:54Z doligez $ */ #include #include diff --git a/otherlibs/unix/socketaddr.c b/otherlibs/unix/socketaddr.c index be5d467a..d3441252 100644 --- a/otherlibs/unix/socketaddr.c +++ b/otherlibs/unix/socketaddr.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: socketaddr.c,v 1.23 2005/03/24 17:20:53 doligez Exp $ */ +/* $Id: socketaddr.c 9377 2009-10-18 09:36:13Z xleroy $ */ #include #include @@ -80,6 +80,9 @@ void get_sockaddr(value mladr, adr->s_inet6.sin6_family = AF_INET6; adr->s_inet6.sin6_addr = GET_INET6_ADDR(Field(mladr, 0)); adr->s_inet6.sin6_port = htons(Int_val(Field(mladr, 1))); +#ifdef SIN6_LEN + adr->s_inet6.sin6_len = sizeof(struct sockaddr_in6); +#endif *adr_len = sizeof(struct sockaddr_in6); break; } @@ -88,6 +91,9 @@ void get_sockaddr(value mladr, adr->s_inet.sin_family = AF_INET; adr->s_inet.sin_addr = GET_INET_ADDR(Field(mladr, 0)); adr->s_inet.sin_port = htons(Int_val(Field(mladr, 1))); +#ifdef SIN6_LEN + adr->s_inet.sin_len = sizeof(struct sockaddr_in); +#endif *adr_len = sizeof(struct sockaddr_in); break; } diff --git a/otherlibs/unix/socketaddr.h b/otherlibs/unix/socketaddr.h index 6bdf1d91..9cc3a219 100644 --- a/otherlibs/unix/socketaddr.h +++ b/otherlibs/unix/socketaddr.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: socketaddr.h,v 1.16 2005/03/24 17:20:53 doligez Exp $ */ +/* $Id: socketaddr.h 6824 2005-03-24 17:20:54Z doligez $ */ #include #include diff --git a/otherlibs/unix/socketpair.c b/otherlibs/unix/socketpair.c index 7d6d60ad..9e5aeb0d 100644 --- a/otherlibs/unix/socketpair.c +++ b/otherlibs/unix/socketpair.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: socketpair.c,v 1.12 2005/03/24 17:20:53 doligez Exp $ */ +/* $Id: socketpair.c 6824 2005-03-24 17:20:54Z doligez $ */ #include #include diff --git a/otherlibs/unix/sockopt.c b/otherlibs/unix/sockopt.c index 78f5d3c4..524c2dd4 100644 --- a/otherlibs/unix/sockopt.c +++ b/otherlibs/unix/sockopt.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: sockopt.c,v 1.21 2008/08/01 13:46:08 xleroy Exp $ */ +/* $Id: sockopt.c 8968 2008-08-01 13:46:08Z xleroy $ */ #include #include diff --git a/otherlibs/unix/stat.c b/otherlibs/unix/stat.c index fbc55d2d..6c7470a1 100644 --- a/otherlibs/unix/stat.c +++ b/otherlibs/unix/stat.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: stat.c,v 1.15 2003/05/05 14:20:58 xleroy Exp $ */ +/* $Id: stat.c 5540 2003-05-05 14:20:58Z xleroy $ */ #include #include diff --git a/otherlibs/unix/strofaddr.c b/otherlibs/unix/strofaddr.c index 5d7a759f..51927873 100644 --- a/otherlibs/unix/strofaddr.c +++ b/otherlibs/unix/strofaddr.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: strofaddr.c,v 1.10 2005/03/24 17:20:53 doligez Exp $ */ +/* $Id: strofaddr.c 6824 2005-03-24 17:20:54Z doligez $ */ #include #include diff --git a/otherlibs/unix/symlink.c b/otherlibs/unix/symlink.c index 3a787aac..6fd7c1fd 100644 --- a/otherlibs/unix/symlink.c +++ b/otherlibs/unix/symlink.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: symlink.c,v 1.9 2005/03/24 17:20:53 doligez Exp $ */ +/* $Id: symlink.c 6824 2005-03-24 17:20:54Z doligez $ */ #include #include diff --git a/otherlibs/unix/termios.c b/otherlibs/unix/termios.c index 1df4e0f0..88e87870 100644 --- a/otherlibs/unix/termios.c +++ b/otherlibs/unix/termios.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: termios.c,v 1.15 2005/03/24 17:20:53 doligez Exp $ */ +/* $Id: termios.c 6824 2005-03-24 17:20:54Z doligez $ */ #include #include diff --git a/otherlibs/unix/time.c b/otherlibs/unix/time.c index 7c0e47d7..476abc3b 100644 --- a/otherlibs/unix/time.c +++ b/otherlibs/unix/time.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: time.c,v 1.10 2005/03/24 17:20:53 doligez Exp $ */ +/* $Id: time.c 6824 2005-03-24 17:20:54Z doligez $ */ #include #include diff --git a/otherlibs/unix/times.c b/otherlibs/unix/times.c index afa25278..e79f4ca0 100644 --- a/otherlibs/unix/times.c +++ b/otherlibs/unix/times.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: times.c,v 1.16 2006/04/16 23:28:21 doligez Exp $ */ +/* $Id: times.c 7382 2006-04-16 23:28:22Z doligez $ */ #include #include diff --git a/otherlibs/unix/truncate.c b/otherlibs/unix/truncate.c index 75ac4602..362b477e 100644 --- a/otherlibs/unix/truncate.c +++ b/otherlibs/unix/truncate.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: truncate.c,v 1.11 2007/02/09 13:31:15 doligez Exp $ */ +/* $Id: truncate.c 7849 2007-02-09 13:31:15Z doligez $ */ #include #include diff --git a/otherlibs/unix/umask.c b/otherlibs/unix/umask.c index 68d41e61..edd5cfae 100644 --- a/otherlibs/unix/umask.c +++ b/otherlibs/unix/umask.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: umask.c,v 1.9 2001/12/07 13:40:37 xleroy Exp $ */ +/* $Id: umask.c 4144 2001-12-07 13:41:02Z xleroy $ */ #include #include diff --git a/otherlibs/unix/unix.ml b/otherlibs/unix/unix.ml index 6f03043f..4e70ecc6 100644 --- a/otherlibs/unix/unix.ml +++ b/otherlibs/unix/unix.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: unix.ml,v 1.68 2008/08/01 13:46:08 xleroy Exp $ *) +(* $Id: unix.ml 8968 2008-08-01 13:46:08Z xleroy $ *) type error = E2BIG diff --git a/otherlibs/unix/unix.mli b/otherlibs/unix/unix.mli index 26d08a22..53d2c67e 100644 --- a/otherlibs/unix/unix.mli +++ b/otherlibs/unix/unix.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: unix.mli,v 1.89.2.1 2009/03/28 16:58:56 xleroy Exp $ *) +(* $Id: unix.mli 9200 2009-03-28 16:58:56Z xleroy $ *) (** Interface to the Unix system *) diff --git a/otherlibs/unix/unixLabels.ml b/otherlibs/unix/unixLabels.ml index f9be42b4..f69bef90 100644 --- a/otherlibs/unix/unixLabels.ml +++ b/otherlibs/unix/unixLabels.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: unixLabels.ml,v 1.3 2001/12/07 13:40:38 xleroy Exp $ *) +(* $Id: unixLabels.ml 4144 2001-12-07 13:41:02Z xleroy $ *) (* Module [UnixLabels]: labelled Unix module *) diff --git a/otherlibs/unix/unixLabels.mli b/otherlibs/unix/unixLabels.mli index 9af5f2d9..99b541d1 100644 --- a/otherlibs/unix/unixLabels.mli +++ b/otherlibs/unix/unixLabels.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: unixLabels.mli,v 1.19 2008/08/01 13:46:08 xleroy Exp $ *) +(* $Id: unixLabels.mli 8968 2008-08-01 13:46:08Z xleroy $ *) (** Interface to the Unix system. To use as replacement to default {!Unix} module, diff --git a/otherlibs/unix/unixsupport.c b/otherlibs/unix/unixsupport.c index 2e08fc5c..811b92c2 100644 --- a/otherlibs/unix/unixsupport.c +++ b/otherlibs/unix/unixsupport.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: unixsupport.c,v 1.18 2005/09/06 12:38:32 doligez Exp $ */ +/* $Id: unixsupport.c 7045 2005-09-06 12:38:32Z doligez $ */ #include #include diff --git a/otherlibs/unix/unixsupport.h b/otherlibs/unix/unixsupport.h index f2aa09cb..55c21f52 100644 --- a/otherlibs/unix/unixsupport.h +++ b/otherlibs/unix/unixsupport.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: unixsupport.h,v 1.8 2005/09/06 12:38:32 doligez Exp $ */ +/* $Id: unixsupport.h 7045 2005-09-06 12:38:32Z doligez $ */ #ifdef HAS_UNISTD #include diff --git a/otherlibs/unix/unlink.c b/otherlibs/unix/unlink.c index d2a4a92a..f1c9a058 100644 --- a/otherlibs/unix/unlink.c +++ b/otherlibs/unix/unlink.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: unlink.c,v 1.8 2001/12/07 13:40:39 xleroy Exp $ */ +/* $Id: unlink.c 4144 2001-12-07 13:41:02Z xleroy $ */ #include #include "unixsupport.h" diff --git a/otherlibs/unix/utimes.c b/otherlibs/unix/utimes.c index 5a07aa22..c424c2f4 100644 --- a/otherlibs/unix/utimes.c +++ b/otherlibs/unix/utimes.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: utimes.c,v 1.10 2005/03/24 17:20:53 doligez Exp $ */ +/* $Id: utimes.c 6824 2005-03-24 17:20:54Z doligez $ */ #include #include diff --git a/otherlibs/unix/wait.c b/otherlibs/unix/wait.c index 74d22dc5..d44d6ad2 100644 --- a/otherlibs/unix/wait.c +++ b/otherlibs/unix/wait.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: wait.c,v 1.19 2005/04/17 08:23:51 xleroy Exp $ */ +/* $Id: wait.c 6845 2005-04-17 08:23:51Z xleroy $ */ #include #include diff --git a/otherlibs/unix/write.c b/otherlibs/unix/write.c index 84f00380..bdc6d7de 100644 --- a/otherlibs/unix/write.c +++ b/otherlibs/unix/write.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: write.c,v 1.14 2004/07/13 12:25:15 xleroy Exp $ */ +/* $Id: write.c 6553 2004-07-13 12:25:21Z xleroy $ */ #include #include diff --git a/otherlibs/win32graph/Makefile.nt b/otherlibs/win32graph/Makefile.nt index 371507d5..92f244d5 100644 --- a/otherlibs/win32graph/Makefile.nt +++ b/otherlibs/win32graph/Makefile.nt @@ -11,7 +11,7 @@ # # ######################################################################### -# $Id: Makefile.nt,v 1.8 2007/11/06 15:16:56 frisch Exp $ +# $Id: Makefile.nt 8477 2007-11-06 15:16:56Z frisch $ LIBNAME=graphics COBJS=open.$(O) draw.$(O) events.$(O) dib.$(O) diff --git a/otherlibs/win32graph/dib.c b/otherlibs/win32graph/dib.c index 543b07e8..d6d0418d 100644 --- a/otherlibs/win32graph/dib.c +++ b/otherlibs/win32graph/dib.c @@ -10,7 +10,7 @@ /* */ /***********************************************************************/ -/* $Id: dib.c,v 1.3 2002/07/23 14:12:00 doligez Exp $ */ +/* $Id: dib.c 5029 2002-07-23 14:12:03Z doligez $ */ //----------------------------------------------------------------------------- // DIB.C diff --git a/otherlibs/win32graph/draw.c b/otherlibs/win32graph/draw.c index 50a2cda3..9e2e7ac4 100644 --- a/otherlibs/win32graph/draw.c +++ b/otherlibs/win32graph/draw.c @@ -10,7 +10,7 @@ /* */ /***********************************************************************/ -/* $Id: draw.c,v 1.11 2005/03/24 17:20:53 doligez Exp $ */ +/* $Id: draw.c 6824 2005-03-24 17:20:54Z doligez $ */ #include #include "mlvalues.h" diff --git a/otherlibs/win32graph/events.c b/otherlibs/win32graph/events.c index d439e8d1..e9482206 100755 --- a/otherlibs/win32graph/events.c +++ b/otherlibs/win32graph/events.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: events.c,v 1.2 2004/07/13 12:25:15 xleroy Exp $ */ +/* $Id: events.c 6553 2004-07-13 12:25:21Z xleroy $ */ #include "mlvalues.h" #include "alloc.h" diff --git a/otherlibs/win32graph/libgraph.h b/otherlibs/win32graph/libgraph.h index 6dc6e4ba..6fc2448d 100644 --- a/otherlibs/win32graph/libgraph.h +++ b/otherlibs/win32graph/libgraph.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: libgraph.h,v 1.9 2004/07/13 12:25:15 xleroy Exp $ */ +/* $Id: libgraph.h 6553 2004-07-13 12:25:21Z xleroy $ */ #include #include diff --git a/otherlibs/win32graph/open.c b/otherlibs/win32graph/open.c index a57a1472..1d260d77 100644 --- a/otherlibs/win32graph/open.c +++ b/otherlibs/win32graph/open.c @@ -10,7 +10,7 @@ /* */ /***********************************************************************/ -/* $Id: open.c,v 1.12 2007/11/06 15:16:56 frisch Exp $ */ +/* $Id: open.c 8477 2007-11-06 15:16:56Z frisch $ */ #include #include diff --git a/otherlibs/win32unix/Makefile.nt b/otherlibs/win32unix/Makefile.nt index d404c684..8c61587f 100644 --- a/otherlibs/win32unix/Makefile.nt +++ b/otherlibs/win32unix/Makefile.nt @@ -11,7 +11,7 @@ # # ######################################################################### -# $Id: Makefile.nt,v 1.37 2008/07/29 08:31:41 xleroy Exp $ +# $Id: Makefile.nt 8955 2008-07-29 08:31:41Z xleroy $ # Files in this directory WIN_FILES = accept.c bind.c channels.c close.c \ diff --git a/otherlibs/win32unix/accept.c b/otherlibs/win32unix/accept.c index d065885b..d0a7abd4 100644 --- a/otherlibs/win32unix/accept.c +++ b/otherlibs/win32unix/accept.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: accept.c,v 1.21 2006/10/18 08:26:54 xleroy Exp $ */ +/* $Id: accept.c 7697 2006-10-18 08:26:54Z xleroy $ */ #include #include diff --git a/otherlibs/win32unix/bind.c b/otherlibs/win32unix/bind.c index 6392db26..ba74ef7c 100644 --- a/otherlibs/win32unix/bind.c +++ b/otherlibs/win32unix/bind.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: bind.c,v 1.10 2002/04/30 15:00:45 xleroy Exp $ */ +/* $Id: bind.c 4765 2002-04-30 15:00:48Z xleroy $ */ #include #include "unixsupport.h" diff --git a/otherlibs/win32unix/channels.c b/otherlibs/win32unix/channels.c index d480cfdc..f719abbf 100644 --- a/otherlibs/win32unix/channels.c +++ b/otherlibs/win32unix/channels.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: channels.c,v 1.12 2006/09/21 09:41:04 xleroy Exp $ */ +/* $Id: channels.c 9450 2009-12-07 10:39:54Z xleroy $ */ #include #include @@ -82,7 +82,10 @@ CAMLprim value win_filedescr_of_channel(value vchan) CAMLprim value win_handle_fd(value vfd) { int crt_fd = Int_val(vfd); - value res = win_alloc_handle_or_socket((HANDLE) _get_osfhandle(crt_fd)); + /* PR#4750: do not use the _or_socket variant as it can cause performance + degradation and this function is only used with the standard + handles 0, 1, 2, which are not sockets. */ + value res = win_alloc_handle((HANDLE) _get_osfhandle(crt_fd)); CRT_fd_val(res) = crt_fd; return res; } diff --git a/otherlibs/win32unix/close.c b/otherlibs/win32unix/close.c index 77d70f38..4890ae0b 100644 --- a/otherlibs/win32unix/close.c +++ b/otherlibs/win32unix/close.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: close.c,v 1.5 2002/04/30 15:00:46 xleroy Exp $ */ +/* $Id: close.c 4765 2002-04-30 15:00:48Z xleroy $ */ #include #include "unixsupport.h" diff --git a/otherlibs/win32unix/close_on.c b/otherlibs/win32unix/close_on.c index 8a249356..69913608 100644 --- a/otherlibs/win32unix/close_on.c +++ b/otherlibs/win32unix/close_on.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: close_on.c,v 1.8 2001/12/07 13:40:43 xleroy Exp $ */ +/* $Id: close_on.c 4144 2001-12-07 13:41:02Z xleroy $ */ #include #include diff --git a/otherlibs/win32unix/connect.c b/otherlibs/win32unix/connect.c index c35985a0..a361d2ad 100644 --- a/otherlibs/win32unix/connect.c +++ b/otherlibs/win32unix/connect.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: connect.c,v 1.13 2006/10/18 08:26:54 xleroy Exp $ */ +/* $Id: connect.c 7697 2006-10-18 08:26:54Z xleroy $ */ #include #include diff --git a/otherlibs/win32unix/createprocess.c b/otherlibs/win32unix/createprocess.c index 6b439f78..ba405116 100644 --- a/otherlibs/win32unix/createprocess.c +++ b/otherlibs/win32unix/createprocess.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: createprocess.c,v 1.14.4.1 2009/06/02 13:12:53 xleroy Exp $ */ +/* $Id: createprocess.c 9284 2009-06-02 13:12:53Z xleroy $ */ #include #include diff --git a/otherlibs/win32unix/dup.c b/otherlibs/win32unix/dup.c index d187372a..0c4046b7 100644 --- a/otherlibs/win32unix/dup.c +++ b/otherlibs/win32unix/dup.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: dup.c,v 1.6 2002/04/30 15:00:46 xleroy Exp $ */ +/* $Id: dup.c 4765 2002-04-30 15:00:48Z xleroy $ */ #include #include "unixsupport.h" diff --git a/otherlibs/win32unix/dup2.c b/otherlibs/win32unix/dup2.c index 288d6df7..848c1869 100644 --- a/otherlibs/win32unix/dup2.c +++ b/otherlibs/win32unix/dup2.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: dup2.c,v 1.9 2006/09/21 09:43:58 xleroy Exp $ */ +/* $Id: dup2.c 7630 2006-09-21 09:43:58Z xleroy $ */ #include #include "unixsupport.h" diff --git a/otherlibs/win32unix/errmsg.c b/otherlibs/win32unix/errmsg.c index ba7eb3c3..08ef2c00 100644 --- a/otherlibs/win32unix/errmsg.c +++ b/otherlibs/win32unix/errmsg.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: errmsg.c,v 1.5 2003/12/31 00:00:14 doligez Exp $ */ +/* $Id: errmsg.c 6043 2003-12-31 00:00:57Z doligez $ */ #include #include diff --git a/otherlibs/win32unix/getpeername.c b/otherlibs/win32unix/getpeername.c index d734d964..ff1e634c 100644 --- a/otherlibs/win32unix/getpeername.c +++ b/otherlibs/win32unix/getpeername.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: getpeername.c,v 1.10 2005/03/24 17:20:53 doligez Exp $ */ +/* $Id: getpeername.c 6824 2005-03-24 17:20:54Z doligez $ */ #include #include "unixsupport.h" diff --git a/otherlibs/win32unix/getpid.c b/otherlibs/win32unix/getpid.c index 2bfbf1a7..92ba55af 100644 --- a/otherlibs/win32unix/getpid.c +++ b/otherlibs/win32unix/getpid.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: getpid.c,v 1.4 2001/12/07 13:40:44 xleroy Exp $ */ +/* $Id: getpid.c 4144 2001-12-07 13:41:02Z xleroy $ */ #include #include "unixsupport.h" diff --git a/otherlibs/win32unix/getsockname.c b/otherlibs/win32unix/getsockname.c index 1a21ad68..5b6ea300 100644 --- a/otherlibs/win32unix/getsockname.c +++ b/otherlibs/win32unix/getsockname.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: getsockname.c,v 1.8 2005/03/24 17:20:53 doligez Exp $ */ +/* $Id: getsockname.c 6824 2005-03-24 17:20:54Z doligez $ */ #include #include "unixsupport.h" diff --git a/otherlibs/win32unix/gettimeofday.c b/otherlibs/win32unix/gettimeofday.c index 971acdc9..622ef4dd 100644 --- a/otherlibs/win32unix/gettimeofday.c +++ b/otherlibs/win32unix/gettimeofday.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: gettimeofday.c,v 1.7 2007/03/01 13:51:24 xleroy Exp $ */ +/* $Id: gettimeofday.c 7946 2007-03-01 13:51:24Z xleroy $ */ #include #include diff --git a/otherlibs/win32unix/link.c b/otherlibs/win32unix/link.c index e66d4673..f0097e2a 100644 --- a/otherlibs/win32unix/link.c +++ b/otherlibs/win32unix/link.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: link.c,v 1.3 2001/12/07 13:40:44 xleroy Exp $ */ +/* $Id: link.c 4144 2001-12-07 13:41:02Z xleroy $ */ #include #include diff --git a/otherlibs/win32unix/listen.c b/otherlibs/win32unix/listen.c index 305250a5..cd61bdbd 100644 --- a/otherlibs/win32unix/listen.c +++ b/otherlibs/win32unix/listen.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: listen.c,v 1.9 2002/04/30 15:00:46 xleroy Exp $ */ +/* $Id: listen.c 4765 2002-04-30 15:00:48Z xleroy $ */ #include #include "unixsupport.h" diff --git a/otherlibs/win32unix/lockf.c b/otherlibs/win32unix/lockf.c index 821363ff..668932ae 100644 --- a/otherlibs/win32unix/lockf.c +++ b/otherlibs/win32unix/lockf.c @@ -13,7 +13,7 @@ /* */ /***********************************************************************/ -/* $Id: lockf.c,v 1.7.2.1 2008/10/08 13:05:42 xleroy Exp $ */ +/* $Id: lockf.c 9078 2008-10-08 13:05:48Z xleroy $ */ #include #include diff --git a/otherlibs/win32unix/lseek.c b/otherlibs/win32unix/lseek.c index 583b2871..95be0093 100644 --- a/otherlibs/win32unix/lseek.c +++ b/otherlibs/win32unix/lseek.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: lseek.c,v 1.7 2005/02/02 15:52:26 xleroy Exp $ */ +/* $Id: lseek.c 6774 2005-02-02 15:52:26Z xleroy $ */ #include #include diff --git a/otherlibs/win32unix/mkdir.c b/otherlibs/win32unix/mkdir.c index 3bafc899..d2895253 100644 --- a/otherlibs/win32unix/mkdir.c +++ b/otherlibs/win32unix/mkdir.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: mkdir.c,v 1.5 2001/12/07 13:40:45 xleroy Exp $ */ +/* $Id: mkdir.c 4144 2001-12-07 13:41:02Z xleroy $ */ #include #include "unixsupport.h" diff --git a/otherlibs/win32unix/nonblock.c b/otherlibs/win32unix/nonblock.c index 54664295..b5bc1471 100755 --- a/otherlibs/win32unix/nonblock.c +++ b/otherlibs/win32unix/nonblock.c @@ -1,42 +1,42 @@ -/***********************************************************************/ -/* */ -/* Objective Caml */ -/* */ -/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */ -/* */ -/* Copyright 2002 Institut National de Recherche en Informatique et */ -/* en Automatique. All rights reserved. This file is distributed */ -/* under the terms of the GNU Library General Public License, with */ -/* the special exception on linking described in file ../../LICENSE. */ -/* */ -/***********************************************************************/ - -/* $Id: nonblock.c,v 1.1 2003/01/06 16:44:21 xleroy Exp $ */ - -#include -#include -#include "unixsupport.h" - -CAMLprim value unix_set_nonblock(socket) - value socket; -{ - u_long non_block = 1; - - if (ioctlsocket(Socket_val(socket), FIONBIO, &non_block) != 0) { - win32_maperr(WSAGetLastError()); - uerror("unix_set_nonblock", Nothing); - } - return Val_unit; -} - -CAMLprim value unix_clear_nonblock(socket) - value socket; -{ - u_long non_block = 0; - - if (ioctlsocket(Socket_val(socket), FIONBIO, &non_block) != 0) { - win32_maperr(WSAGetLastError()); - uerror("unix_clear_nonblock", Nothing); - } - return Val_unit; -} +/***********************************************************************/ +/* */ +/* Objective Caml */ +/* */ +/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */ +/* */ +/* Copyright 2002 Institut National de Recherche en Informatique et */ +/* en Automatique. All rights reserved. This file is distributed */ +/* under the terms of the GNU Library General Public License, with */ +/* the special exception on linking described in file ../../LICENSE. */ +/* */ +/***********************************************************************/ + +/* $Id: nonblock.c 5375 2003-01-06 16:44:21Z xleroy $ */ + +#include +#include +#include "unixsupport.h" + +CAMLprim value unix_set_nonblock(socket) + value socket; +{ + u_long non_block = 1; + + if (ioctlsocket(Socket_val(socket), FIONBIO, &non_block) != 0) { + win32_maperr(WSAGetLastError()); + uerror("unix_set_nonblock", Nothing); + } + return Val_unit; +} + +CAMLprim value unix_clear_nonblock(socket) + value socket; +{ + u_long non_block = 0; + + if (ioctlsocket(Socket_val(socket), FIONBIO, &non_block) != 0) { + win32_maperr(WSAGetLastError()); + uerror("unix_clear_nonblock", Nothing); + } + return Val_unit; +} diff --git a/otherlibs/win32unix/open.c b/otherlibs/win32unix/open.c index ebcc9c81..60fa80bd 100644 --- a/otherlibs/win32unix/open.c +++ b/otherlibs/win32unix/open.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: open.c,v 1.10 2008/01/11 16:13:16 doligez Exp $ */ +/* $Id: open.c 8768 2008-01-11 16:13:18Z doligez $ */ #include #include diff --git a/otherlibs/win32unix/pipe.c b/otherlibs/win32unix/pipe.c index 9a7ced3c..765f1aa7 100644 --- a/otherlibs/win32unix/pipe.c +++ b/otherlibs/win32unix/pipe.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: pipe.c,v 1.7.28.1 2009/03/28 15:30:08 xleroy Exp $ */ +/* $Id: pipe.c 9196 2009-03-28 15:30:08Z xleroy $ */ #include #include diff --git a/otherlibs/win32unix/read.c b/otherlibs/win32unix/read.c index 944c72ad..2319cb67 100644 --- a/otherlibs/win32unix/read.c +++ b/otherlibs/win32unix/read.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: read.c,v 1.9 2006/10/18 08:26:54 xleroy Exp $ */ +/* $Id: read.c 7697 2006-10-18 08:26:54Z xleroy $ */ #include #include diff --git a/otherlibs/win32unix/rename.c b/otherlibs/win32unix/rename.c index 8e3a7fcb..d5280ffb 100644 --- a/otherlibs/win32unix/rename.c +++ b/otherlibs/win32unix/rename.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: rename.c,v 1.3 2004/07/13 12:25:15 xleroy Exp $ */ +/* $Id: rename.c 6553 2004-07-13 12:25:21Z xleroy $ */ #include #include diff --git a/otherlibs/win32unix/select.c b/otherlibs/win32unix/select.c index e919d359..9de11351 100644 --- a/otherlibs/win32unix/select.c +++ b/otherlibs/win32unix/select.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: select.c,v 1.14.2.2 2008/11/26 13:27:21 xleroy Exp $ */ +/* $Id: select.c 9143 2008-11-26 13:27:21Z xleroy $ */ #include #include diff --git a/otherlibs/win32unix/sendrecv.c b/otherlibs/win32unix/sendrecv.c index 054f8ba1..9141f3d0 100644 --- a/otherlibs/win32unix/sendrecv.c +++ b/otherlibs/win32unix/sendrecv.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: sendrecv.c,v 1.21 2006/10/18 08:26:54 xleroy Exp $ */ +/* $Id: sendrecv.c 7697 2006-10-18 08:26:54Z xleroy $ */ #include #include diff --git a/otherlibs/win32unix/shutdown.c b/otherlibs/win32unix/shutdown.c index 8c8e20ca..ae968727 100644 --- a/otherlibs/win32unix/shutdown.c +++ b/otherlibs/win32unix/shutdown.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: shutdown.c,v 1.9 2002/04/30 15:00:47 xleroy Exp $ */ +/* $Id: shutdown.c 4765 2002-04-30 15:00:48Z xleroy $ */ #include #include "unixsupport.h" diff --git a/otherlibs/win32unix/sleep.c b/otherlibs/win32unix/sleep.c index 969ed38c..e5054a6f 100644 --- a/otherlibs/win32unix/sleep.c +++ b/otherlibs/win32unix/sleep.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: sleep.c,v 1.5 2002/06/07 09:49:41 xleroy Exp $ */ +/* $Id: sleep.c 4899 2002-06-07 09:49:45Z xleroy $ */ #include #include diff --git a/otherlibs/win32unix/socket.c b/otherlibs/win32unix/socket.c index 6b155d76..15f0bafd 100644 --- a/otherlibs/win32unix/socket.c +++ b/otherlibs/win32unix/socket.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: socket.c,v 1.12 2002/04/30 15:00:47 xleroy Exp $ */ +/* $Id: socket.c 4765 2002-04-30 15:00:48Z xleroy $ */ #include #include "unixsupport.h" diff --git a/otherlibs/win32unix/socketaddr.h b/otherlibs/win32unix/socketaddr.h index 497133cd..0a05dfff 100644 --- a/otherlibs/win32unix/socketaddr.h +++ b/otherlibs/win32unix/socketaddr.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: socketaddr.h,v 1.8 2005/03/24 17:20:53 doligez Exp $ */ +/* $Id: socketaddr.h 6824 2005-03-24 17:20:54Z doligez $ */ #include diff --git a/otherlibs/win32unix/sockopt.c b/otherlibs/win32unix/sockopt.c index 2af9b002..9ffa315e 100644 --- a/otherlibs/win32unix/sockopt.c +++ b/otherlibs/win32unix/sockopt.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: sockopt.c,v 1.19 2008/08/01 13:46:08 xleroy Exp $ */ +/* $Id: sockopt.c 8968 2008-08-01 13:46:08Z xleroy $ */ #include #include diff --git a/otherlibs/win32unix/stat.c b/otherlibs/win32unix/stat.c index d5f9b52f..813788d5 100644 --- a/otherlibs/win32unix/stat.c +++ b/otherlibs/win32unix/stat.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: stat.c,v 1.3.14.1 2009/03/28 16:39:50 xleroy Exp $ */ +/* $Id: stat.c 9199 2009-03-28 16:39:50Z xleroy $ */ #include #include diff --git a/otherlibs/win32unix/system.c b/otherlibs/win32unix/system.c index cca39fca..5885e03b 100644 --- a/otherlibs/win32unix/system.c +++ b/otherlibs/win32unix/system.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: system.c,v 1.9 2006/09/21 08:03:56 xleroy Exp $ */ +/* $Id: system.c 7626 2006-09-21 08:03:56Z xleroy $ */ #include #include diff --git a/otherlibs/win32unix/unix.ml b/otherlibs/win32unix/unix.ml index 0d4b190e..8385ec51 100644 --- a/otherlibs/win32unix/unix.ml +++ b/otherlibs/win32unix/unix.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: unix.ml,v 1.48 2008/08/01 13:46:08 xleroy Exp $ *) +(* $Id: unix.ml 8968 2008-08-01 13:46:08Z xleroy $ *) (* Initialization *) diff --git a/otherlibs/win32unix/unixsupport.c b/otherlibs/win32unix/unixsupport.c index 792b424f..d01b228c 100644 --- a/otherlibs/win32unix/unixsupport.c +++ b/otherlibs/win32unix/unixsupport.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: unixsupport.c,v 1.21.12.1 2009/05/19 12:32:36 xleroy Exp $ */ +/* $Id: unixsupport.c 9450 2009-12-07 10:39:54Z xleroy $ */ #include #include @@ -65,6 +65,8 @@ value win_alloc_socket(SOCKET s) return res; } +#if 0 +/* PR#4750: this function is no longer used */ value win_alloc_handle_or_socket(HANDLE h) { value res = win_alloc_handle(h); @@ -74,6 +76,7 @@ value win_alloc_handle_or_socket(HANDLE h) Descr_kind_val(res) = KIND_SOCKET; return res; } +#endif /* Mapping of Windows error codes to POSIX error codes */ diff --git a/otherlibs/win32unix/unixsupport.h b/otherlibs/win32unix/unixsupport.h index 07fc8017..faeb5c18 100644 --- a/otherlibs/win32unix/unixsupport.h +++ b/otherlibs/win32unix/unixsupport.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: unixsupport.h,v 1.19 2007/02/07 14:45:46 doligez Exp $ */ +/* $Id: unixsupport.h 9450 2009-12-07 10:39:54Z xleroy $ */ #define WIN32_LEAN_AND_MEAN #include @@ -36,7 +36,7 @@ struct filedescr { #define Descr_kind_val(v) (((struct filedescr *) Data_custom_val(v))->kind) #define CRT_fd_val(v) (((struct filedescr *) Data_custom_val(v))->crt_fd) -extern value win_alloc_handle_or_socket(HANDLE); +/* extern value win_alloc_handle_or_socket(HANDLE); */ extern value win_alloc_handle(HANDLE); extern value win_alloc_socket(SOCKET); extern int win_CRT_fd_of_filedescr(value handle); diff --git a/otherlibs/win32unix/windbug.c b/otherlibs/win32unix/windbug.c index 8f022cc9..313f2aff 100644 --- a/otherlibs/win32unix/windbug.c +++ b/otherlibs/win32unix/windbug.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: windbug.c,v 1.2.2.2 2008/11/26 13:41:01 xleroy Exp $ */ +/* $Id: windbug.c 9144 2008-11-26 13:41:01Z xleroy $ */ #include #include diff --git a/otherlibs/win32unix/windbug.h b/otherlibs/win32unix/windbug.h index 58066c73..d0c4f260 100644 --- a/otherlibs/win32unix/windbug.h +++ b/otherlibs/win32unix/windbug.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: windbug.h,v 1.2.2.1 2008/11/26 13:27:21 xleroy Exp $ */ +/* $Id: windbug.h 9143 2008-11-26 13:27:21Z xleroy $ */ /*#define DBUG*/ diff --git a/otherlibs/win32unix/windir.c b/otherlibs/win32unix/windir.c index f0f78a4b..23ce8c22 100644 --- a/otherlibs/win32unix/windir.c +++ b/otherlibs/win32unix/windir.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: windir.c,v 1.13 2002/07/23 14:12:01 doligez Exp $ */ +/* $Id: windir.c 5029 2002-07-23 14:12:03Z doligez $ */ #include #include diff --git a/otherlibs/win32unix/winlist.c b/otherlibs/win32unix/winlist.c index af5000df..52a9525c 100644 --- a/otherlibs/win32unix/winlist.c +++ b/otherlibs/win32unix/winlist.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: winlist.c,v 1.2 2008/07/31 12:09:18 xleroy Exp $ */ +/* $Id: winlist.c 8961 2008-07-31 12:09:18Z xleroy $ */ /* Basic list function in C. */ diff --git a/otherlibs/win32unix/winlist.h b/otherlibs/win32unix/winlist.h index aa838756..6f86c1b2 100644 --- a/otherlibs/win32unix/winlist.h +++ b/otherlibs/win32unix/winlist.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: winlist.h,v 1.2 2008/07/31 12:09:18 xleroy Exp $ */ +/* $Id: winlist.h 8961 2008-07-31 12:09:18Z xleroy $ */ #ifndef _WINLIST_H #define _WINLIST_H diff --git a/otherlibs/win32unix/winwait.c b/otherlibs/win32unix/winwait.c index fa5cbe36..4de4818c 100644 --- a/otherlibs/win32unix/winwait.c +++ b/otherlibs/win32unix/winwait.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: winwait.c,v 1.20 2008/01/11 16:13:16 doligez Exp $ */ +/* $Id: winwait.c 8768 2008-01-11 16:13:18Z doligez $ */ #include #include diff --git a/otherlibs/win32unix/winworker.c b/otherlibs/win32unix/winworker.c index 5c5909e6..0b66892e 100644 --- a/otherlibs/win32unix/winworker.c +++ b/otherlibs/win32unix/winworker.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: winworker.c,v 1.2.2.2 2008/11/26 13:41:01 xleroy Exp $ */ +/* $Id: winworker.c 9144 2008-11-26 13:41:01Z xleroy $ */ #include "winworker.h" #include "winlist.h" diff --git a/otherlibs/win32unix/winworker.h b/otherlibs/win32unix/winworker.h index 2f841c02..6597619a 100644 --- a/otherlibs/win32unix/winworker.h +++ b/otherlibs/win32unix/winworker.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: winworker.h,v 1.2 2008/07/31 12:09:18 xleroy Exp $ */ +/* $Id: winworker.h 8961 2008-07-31 12:09:18Z xleroy $ */ #ifndef _WINWORKER_H #define _WINWORKER_H diff --git a/otherlibs/win32unix/write.c b/otherlibs/win32unix/write.c index c1f1916a..e739f4ba 100644 --- a/otherlibs/win32unix/write.c +++ b/otherlibs/win32unix/write.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: write.c,v 1.11 2006/10/18 08:26:54 xleroy Exp $ */ +/* $Id: write.c 9315 2009-07-15 12:19:12Z xleroy $ */ #include #include @@ -66,7 +66,7 @@ CAMLprim value unix_single_write(value fd, value buf, value vofs, value vlen) intnat ofs, len, written; DWORD numbytes, numwritten; char iobuf[UNIX_BUFFER_SIZE]; - DWORD err; + DWORD err = 0; Begin_root (buf); ofs = Long_val(vofs); diff --git a/parsing/asttypes.mli b/parsing/asttypes.mli index 020c00ce..cd6d8c12 100644 --- a/parsing/asttypes.mli +++ b/parsing/asttypes.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: asttypes.mli,v 1.9 2003/04/25 12:27:30 xleroy Exp $ *) +(* $Id: asttypes.mli 5510 2003-04-25 12:27:31Z xleroy $ *) (* Auxiliary a.s.t. types used by parsetree and typedtree. *) diff --git a/parsing/lexer.mli b/parsing/lexer.mli index 2a2f7080..2e6ff1bc 100644 --- a/parsing/lexer.mli +++ b/parsing/lexer.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: lexer.mli,v 1.14 2003/11/21 16:01:13 xleroy Exp $ *) +(* $Id: lexer.mli 5961 2003-11-21 16:01:13Z xleroy $ *) (* The lexical analyzer *) diff --git a/parsing/lexer.mll b/parsing/lexer.mll index 6ddbb5ce..a5b0fd37 100644 --- a/parsing/lexer.mll +++ b/parsing/lexer.mll @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: lexer.mll,v 1.73.24.1 2008/10/08 13:07:13 doligez Exp $ *) +(* $Id: lexer.mll 9079 2008-10-08 13:09:39Z doligez $ *) (* The lexer definition *) diff --git a/parsing/linenum.mli b/parsing/linenum.mli index 6e3ba472..0dc4978d 100644 --- a/parsing/linenum.mli +++ b/parsing/linenum.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: linenum.mli,v 1.2 1999/11/17 18:58:17 xleroy Exp $ *) +(* $Id: linenum.mli 2553 1999-11-17 18:59:06Z xleroy $ *) (* An auxiliary lexer for determining the line number corresponding to a file position, honoring the directives # linenum "filename" *) diff --git a/parsing/linenum.mll b/parsing/linenum.mll index 1225f8c9..13924738 100644 --- a/parsing/linenum.mll +++ b/parsing/linenum.mll @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: linenum.mll,v 1.7 1999/11/17 18:58:17 xleroy Exp $ *) +(* $Id: linenum.mll 2553 1999-11-17 18:59:06Z xleroy $ *) (* An auxiliary lexer for determining the line number corresponding to a file position, honoring the directives # linenum "filename" *) diff --git a/parsing/location.ml b/parsing/location.ml index 2cbe917c..a9b73597 100644 --- a/parsing/location.ml +++ b/parsing/location.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: location.ml,v 1.50 2008/01/11 16:13:16 doligez Exp $ *) +(* $Id: location.ml 8768 2008-01-11 16:13:18Z doligez $ *) open Lexing diff --git a/parsing/location.mli b/parsing/location.mli index 8218946a..9ca64c1f 100644 --- a/parsing/location.mli +++ b/parsing/location.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: location.mli,v 1.17 2007/12/04 13:38:58 doligez Exp $ *) +(* $Id: location.mli 8705 2007-12-04 13:38:58Z doligez $ *) (* Source code locations (ranges of positions), used in parsetree. *) diff --git a/parsing/longident.ml b/parsing/longident.ml index dac8a5b6..a54a33c6 100644 --- a/parsing/longident.ml +++ b/parsing/longident.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: longident.ml,v 1.4 2000/03/25 18:55:44 xleroy Exp $ *) +(* $Id: longident.ml 2990 2000-03-25 18:55:45Z xleroy $ *) type t = Lident of string diff --git a/parsing/longident.mli b/parsing/longident.mli index d4e71bc0..fd360c44 100644 --- a/parsing/longident.mli +++ b/parsing/longident.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: longident.mli,v 1.7 2000/03/25 18:55:44 xleroy Exp $ *) +(* $Id: longident.mli 2990 2000-03-25 18:55:45Z xleroy $ *) (* Long identifiers, used in parsetree. *) diff --git a/parsing/parse.ml b/parsing/parse.ml index 7f9a028e..0ec6abf0 100644 --- a/parsing/parse.ml +++ b/parsing/parse.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: parse.ml,v 1.15 2002/11/01 17:06:46 doligez Exp $ *) +(* $Id: parse.ml 5224 2002-11-01 17:06:47Z doligez $ *) (* Entry points in the parser *) diff --git a/parsing/parse.mli b/parsing/parse.mli index 2f8444a5..8fc222c5 100644 --- a/parsing/parse.mli +++ b/parsing/parse.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: parse.mli,v 1.6 1999/11/17 18:58:19 xleroy Exp $ *) +(* $Id: parse.mli 2553 1999-11-17 18:59:06Z xleroy $ *) (* Entry points in the parser *) diff --git a/parsing/parser.mly b/parsing/parser.mly index 9971af7e..65b9ca34 100644 --- a/parsing/parser.mly +++ b/parsing/parser.mly @@ -10,7 +10,7 @@ /* */ /***********************************************************************/ -/* $Id: parser.mly,v 1.131 2008/07/14 09:09:53 xleroy Exp $ */ +/* $Id: parser.mly 9412 2009-11-09 11:42:39Z weis $ */ /* The parser definition */ @@ -1403,7 +1403,13 @@ signed_constant: | MINUS INT32 { Const_int32(Int32.neg $2) } | MINUS INT64 { Const_int64(Int64.neg $2) } | MINUS NATIVEINT { Const_nativeint(Nativeint.neg $2) } + | PLUS INT { Const_int $2 } + | PLUS FLOAT { Const_float $2 } + | PLUS INT32 { Const_int32 $2 } + | PLUS INT64 { Const_int64 $2 } + | PLUS NATIVEINT { Const_nativeint $2 } ; + /* Identifiers and long identifiers */ ident: diff --git a/parsing/parsetree.mli b/parsing/parsetree.mli index cad68268..3d6ceef9 100644 --- a/parsing/parsetree.mli +++ b/parsing/parsetree.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: parsetree.mli,v 1.45 2008/07/09 13:03:37 mauny Exp $ *) +(* $Id: parsetree.mli 8906 2008-07-09 13:03:38Z mauny $ *) (* Abstract syntax tree produced by parsing *) diff --git a/parsing/printast.ml b/parsing/printast.ml index 181f91e1..aa5b1fd1 100644 --- a/parsing/printast.ml +++ b/parsing/printast.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: printast.ml,v 1.34 2008/07/09 13:03:37 mauny Exp $ *) +(* $Id: printast.ml 8906 2008-07-09 13:03:38Z mauny $ *) open Asttypes;; open Format;; diff --git a/parsing/printast.mli b/parsing/printast.mli index 502d06fa..4a33e3fe 100644 --- a/parsing/printast.mli +++ b/parsing/printast.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: printast.mli,v 1.2 2000/03/06 22:11:39 weis Exp $ *) +(* $Id: printast.mli 2908 2000-03-06 22:12:09Z weis $ *) open Parsetree;; open Format;; diff --git a/parsing/syntaxerr.ml b/parsing/syntaxerr.ml index c5617357..ddaf72ce 100644 --- a/parsing/syntaxerr.ml +++ b/parsing/syntaxerr.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: syntaxerr.ml,v 1.9 2007/12/04 13:38:58 doligez Exp $ *) +(* $Id: syntaxerr.ml 8705 2007-12-04 13:38:58Z doligez $ *) (* Auxiliary type for reporting syntax errors *) diff --git a/parsing/syntaxerr.mli b/parsing/syntaxerr.mli index f129010c..4aa715a2 100644 --- a/parsing/syntaxerr.mli +++ b/parsing/syntaxerr.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: syntaxerr.mli,v 1.4 2000/03/06 22:11:40 weis Exp $ *) +(* $Id: syntaxerr.mli 2908 2000-03-06 22:12:09Z weis $ *) (* Auxiliary type for reporting syntax errors *) diff --git a/stdlib/.cvsignore b/stdlib/.cvsignore index 343f6abd..6aa0cd42 100644 --- a/stdlib/.cvsignore +++ b/stdlib/.cvsignore @@ -4,3 +4,4 @@ labelled-* caml *.annot sys.ml +*.a diff --git a/stdlib/.depend b/stdlib/.depend index faa33821..e3bbebea 100644 --- a/stdlib/.depend +++ b/stdlib/.depend @@ -10,7 +10,7 @@ char.cmi: complex.cmi: digest.cmi: filename.cmi: -format.cmi: buffer.cmi +format.cmi: pervasives.cmi buffer.cmi gc.cmi: genlex.cmi: stream.cmi hashtbl.cmi: @@ -98,8 +98,8 @@ moreLabels.cmo: set.cmi map.cmi hashtbl.cmi moreLabels.cmi moreLabels.cmx: set.cmx map.cmx hashtbl.cmx moreLabels.cmi nativeint.cmo: sys.cmi pervasives.cmi nativeint.cmi nativeint.cmx: sys.cmx pervasives.cmx nativeint.cmi -obj.cmo: marshal.cmi obj.cmi -obj.cmx: marshal.cmx obj.cmi +obj.cmo: marshal.cmi array.cmi obj.cmi +obj.cmx: marshal.cmx array.cmx obj.cmi oo.cmo: camlinternalOO.cmi oo.cmi oo.cmx: camlinternalOO.cmx oo.cmi parsing.cmo: obj.cmi lexing.cmi array.cmi parsing.cmi @@ -108,10 +108,10 @@ pervasives.cmo: pervasives.cmi pervasives.cmx: pervasives.cmi printexc.cmo: printf.cmi obj.cmi buffer.cmi array.cmi printexc.cmi printexc.cmx: printf.cmx obj.cmx buffer.cmx array.cmx printexc.cmi -printf.cmo: string.cmi obj.cmi list.cmi char.cmi buffer.cmi array.cmi \ - printf.cmi -printf.cmx: string.cmx obj.cmx list.cmx char.cmx buffer.cmx array.cmx \ - printf.cmi +printf.cmo: string.cmi pervasives.cmi obj.cmi list.cmi char.cmi buffer.cmi \ + array.cmi printf.cmi +printf.cmx: string.cmx pervasives.cmx obj.cmx list.cmx char.cmx buffer.cmx \ + array.cmx printf.cmi queue.cmo: obj.cmi queue.cmi queue.cmx: obj.cmx queue.cmi random.cmo: string.cmi pervasives.cmi nativeint.cmi int64.cmi int32.cmi \ diff --git a/stdlib/Compflags b/stdlib/Compflags index b95a3257..deaef912 100755 --- a/stdlib/Compflags +++ b/stdlib/Compflags @@ -12,7 +12,7 @@ # # ######################################################################### -# $Id: Compflags,v 1.5 2004/11/25 00:04:15 doligez Exp $ +# $Id: Compflags 6694 2004-11-25 00:06:06Z doligez $ case $1 in pervasives.cm[iox]|pervasives.p.cmx) echo ' -nopervasives';; diff --git a/stdlib/Makefile b/stdlib/Makefile index 502905c6..fb66e0bf 100644 --- a/stdlib/Makefile +++ b/stdlib/Makefile @@ -11,7 +11,7 @@ # # ######################################################################### -# $Id: Makefile,v 1.91 2008/07/24 05:18:31 frisch Exp $ +# $Id: Makefile 8929 2008-07-24 05:18:31Z frisch $ include Makefile.shared diff --git a/stdlib/Makefile.nt b/stdlib/Makefile.nt index a586e770..bdf59c24 100644 --- a/stdlib/Makefile.nt +++ b/stdlib/Makefile.nt @@ -11,7 +11,7 @@ # # ######################################################################### -# $Id: Makefile.nt,v 1.46 2008/07/24 05:18:31 frisch Exp $ +# $Id: Makefile.nt 8929 2008-07-24 05:18:31Z frisch $ include Makefile.shared diff --git a/stdlib/Makefile.shared b/stdlib/Makefile.shared index d214c49a..78343ff4 100755 --- a/stdlib/Makefile.shared +++ b/stdlib/Makefile.shared @@ -11,7 +11,7 @@ # # ######################################################################### -# $Id: Makefile.shared,v 1.2 2008/08/01 16:57:10 mauny Exp $ +# $Id: Makefile.shared 8974 2008-08-01 16:57:10Z mauny $ include ../config/Makefile RUNTIME=../boot/ocamlrun diff --git a/stdlib/StdlibModules b/stdlib/StdlibModules index 498dcc28..5a5246a1 100644 --- a/stdlib/StdlibModules +++ b/stdlib/StdlibModules @@ -1,6 +1,6 @@ # This file lists all standard library modules. -*- Makefile -*- # It is used in particular to know what to expunge in toplevels. -# $Id: StdlibModules,v 1.4 2008/08/01 16:57:10 mauny Exp $ +# $Id: StdlibModules 8974 2008-08-01 16:57:10Z mauny $ STDLIB_MODULES=\ arg \ diff --git a/stdlib/arg.ml b/stdlib/arg.ml index 71706281..af6c9f28 100644 --- a/stdlib/arg.ml +++ b/stdlib/arg.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: arg.ml,v 1.36 2008/01/11 16:13:16 doligez Exp $ *) +(* $Id: arg.ml 8768 2008-01-11 16:13:18Z doligez $ *) type key = string type doc = string diff --git a/stdlib/arg.mli b/stdlib/arg.mli index f4687e74..778ef312 100644 --- a/stdlib/arg.mli +++ b/stdlib/arg.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: arg.mli,v 1.37 2008/01/11 16:13:16 doligez Exp $ *) +(* $Id: arg.mli 8768 2008-01-11 16:13:18Z doligez $ *) (** Parsing of command line arguments. diff --git a/stdlib/array.ml b/stdlib/array.ml index 67844b22..10cb9886 100644 --- a/stdlib/array.ml +++ b/stdlib/array.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: array.ml,v 1.24 2005/04/11 16:43:19 doligez Exp $ *) +(* $Id: array.ml 6834 2005-04-11 16:44:26Z doligez $ *) (* Array operations *) diff --git a/stdlib/array.mli b/stdlib/array.mli index 459a0df4..7ba565b5 100644 --- a/stdlib/array.mli +++ b/stdlib/array.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: array.mli,v 1.40 2005/10/25 18:34:07 doligez Exp $ *) +(* $Id: array.mli 7164 2005-10-25 18:34:07Z doligez $ *) (** Array operations. *) diff --git a/stdlib/arrayLabels.ml b/stdlib/arrayLabels.ml index 238f3a56..1ff61349 100644 --- a/stdlib/arrayLabels.ml +++ b/stdlib/arrayLabels.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: arrayLabels.ml,v 1.3 2001/12/07 13:40:49 xleroy Exp $ *) +(* $Id: arrayLabels.ml 4144 2001-12-07 13:41:02Z xleroy $ *) (* Module [ArrayLabels]: labelled Array module *) diff --git a/stdlib/arrayLabels.mli b/stdlib/arrayLabels.mli index 8bd10255..0b08227d 100644 --- a/stdlib/arrayLabels.mli +++ b/stdlib/arrayLabels.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: arrayLabels.mli,v 1.12 2007/01/22 08:06:09 garrigue Exp $ *) +(* $Id: arrayLabels.mli 7805 2007-01-22 08:06:09Z garrigue $ *) (** Array operations. *) diff --git a/stdlib/buffer.ml b/stdlib/buffer.ml index 666f563e..f43be1d0 100644 --- a/stdlib/buffer.ml +++ b/stdlib/buffer.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: buffer.ml,v 1.19 2008/09/09 08:50:39 weis Exp $ *) +(* $Id: buffer.ml 9340 2009-09-16 15:52:46Z xclerc $ *) (* Extensible buffers *) @@ -39,6 +39,14 @@ let sub b ofs len = end ;; +let blit src srcoff dst dstoff len = + if len < 0 || srcoff < 0 || srcoff > src.position - len + || dstoff < 0 || dstoff > (String.length dst) - len + then invalid_arg "Buffer.blit" + else + String.blit src.buffer srcoff dst dstoff len +;; + let nth b ofs = if ofs < 0 || ofs >= b.position then invalid_arg "Buffer.nth" diff --git a/stdlib/buffer.mli b/stdlib/buffer.mli index d8d74f90..831e9c3a 100644 --- a/stdlib/buffer.mli +++ b/stdlib/buffer.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: buffer.mli,v 1.21 2005/10/25 18:34:07 doligez Exp $ *) +(* $Id: buffer.mli 9340 2009-09-16 15:52:46Z xclerc $ *) (** Extensible string buffers. @@ -48,6 +48,15 @@ current contents of the buffer [b] starting at offset [off] of length [len] bytes. May raise [Invalid_argument] if out of bounds request. The buffer itself is unaffected. *) +val blit : t -> int -> string -> int -> int -> unit +(** [Buffer.blit src srcoff dst dstoff len] copies [len] characters from + the current contents of the buffer [src], starting at offset [srcoff] + to string [dst], starting at character [dstoff]. + + Raise [Invalid_argument] if [srcoff] and [len] do not designate a valid + substring of [src], or if [dstoff] and [len] do not designate a valid + substring of [dst]. *) + val nth : t -> int -> char (** get the n-th character of the buffer. Raise [Invalid_argument] if index out of bounds *) diff --git a/stdlib/callback.ml b/stdlib/callback.ml index 9a3c5db7..29a2031a 100644 --- a/stdlib/callback.ml +++ b/stdlib/callback.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: callback.ml,v 1.5 2003/12/31 14:20:39 doligez Exp $ *) +(* $Id: callback.ml 6044 2003-12-31 14:20:40Z doligez $ *) (* Registering Caml values with the C runtime for later callbacks *) diff --git a/stdlib/callback.mli b/stdlib/callback.mli index b7866fa4..ce0fdc93 100644 --- a/stdlib/callback.mli +++ b/stdlib/callback.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: callback.mli,v 1.6 2005/10/25 18:34:07 doligez Exp $ *) +(* $Id: callback.mli 7164 2005-10-25 18:34:07Z doligez $ *) (** Registering Caml values with the C runtime. diff --git a/stdlib/camlinternalLazy.ml b/stdlib/camlinternalLazy.ml index 2cd2ff64..820e20b4 100644 --- a/stdlib/camlinternalLazy.ml +++ b/stdlib/camlinternalLazy.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: camlinternalLazy.ml,v 1.1 2008/08/01 16:57:10 mauny Exp $ *) +(* $Id: camlinternalLazy.ml 8974 2008-08-01 16:57:10Z mauny $ *) (* Internals of forcing lazy values. *) diff --git a/stdlib/camlinternalLazy.mli b/stdlib/camlinternalLazy.mli index 31c260fa..019fce30 100644 --- a/stdlib/camlinternalLazy.mli +++ b/stdlib/camlinternalLazy.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: camlinternalLazy.mli,v 1.1 2008/08/01 16:57:10 mauny Exp $ *) +(* $Id: camlinternalLazy.mli 8974 2008-08-01 16:57:10Z mauny $ *) (* Internals of forcing lazy values *) diff --git a/stdlib/camlinternalMod.ml b/stdlib/camlinternalMod.ml index f9ba7c8e..e2e82031 100644 --- a/stdlib/camlinternalMod.ml +++ b/stdlib/camlinternalMod.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: camlinternalMod.ml,v 1.6 2008/01/11 16:13:16 doligez Exp $ *) +(* $Id: camlinternalMod.ml 8768 2008-01-11 16:13:18Z doligez $ *) type shape = | Function diff --git a/stdlib/camlinternalMod.mli b/stdlib/camlinternalMod.mli index 7d1c41cb..34006784 100644 --- a/stdlib/camlinternalMod.mli +++ b/stdlib/camlinternalMod.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: camlinternalMod.mli,v 1.1 2004/08/12 12:57:00 xleroy Exp $ *) +(* $Id: camlinternalMod.mli 6586 2004-08-12 12:57:00Z xleroy $ *) type shape = | Function diff --git a/stdlib/camlinternalOO.ml b/stdlib/camlinternalOO.ml index b48b59ed..e5ae4590 100644 --- a/stdlib/camlinternalOO.ml +++ b/stdlib/camlinternalOO.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: camlinternalOO.ml,v 1.16 2008/01/11 16:13:16 doligez Exp $ *) +(* $Id: camlinternalOO.ml 8768 2008-01-11 16:13:18Z doligez $ *) open Obj diff --git a/stdlib/camlinternalOO.mli b/stdlib/camlinternalOO.mli index fb6d4f2d..81113211 100644 --- a/stdlib/camlinternalOO.mli +++ b/stdlib/camlinternalOO.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: camlinternalOO.mli,v 1.10 2006/04/05 02:28:13 garrigue Exp $ *) +(* $Id: camlinternalOO.mli 7372 2006-04-05 02:28:13Z garrigue $ *) (** Run-time support for objects and classes. All functions in this module are for system use only, not for the diff --git a/stdlib/char.ml b/stdlib/char.ml index 91e8cac3..a6b8a5f7 100644 --- a/stdlib/char.ml +++ b/stdlib/char.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: char.ml,v 1.14 2007/04/16 11:06:51 weis Exp $ *) +(* $Id: char.ml 8189 2007-04-16 11:06:51Z weis $ *) (* Character operations *) diff --git a/stdlib/char.mli b/stdlib/char.mli index 4977245b..c3637ac8 100644 --- a/stdlib/char.mli +++ b/stdlib/char.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: char.mli,v 1.17 2005/10/25 18:34:07 doligez Exp $ *) +(* $Id: char.mli 7164 2005-10-25 18:34:07Z doligez $ *) (** Character operations. *) diff --git a/stdlib/complex.ml b/stdlib/complex.ml index 84fbc492..90d42331 100644 --- a/stdlib/complex.ml +++ b/stdlib/complex.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: complex.ml,v 1.6 2005/10/25 18:34:07 doligez Exp $ *) +(* $Id: complex.ml 7164 2005-10-25 18:34:07Z doligez $ *) (* Complex numbers *) diff --git a/stdlib/complex.mli b/stdlib/complex.mli index 84be0843..8c80b5e2 100644 --- a/stdlib/complex.mli +++ b/stdlib/complex.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: complex.mli,v 1.4 2005/10/25 18:34:07 doligez Exp $ *) +(* $Id: complex.mli 7164 2005-10-25 18:34:07Z doligez $ *) (** Complex numbers. diff --git a/stdlib/digest.ml b/stdlib/digest.ml index 39a8d3df..2d030666 100644 --- a/stdlib/digest.ml +++ b/stdlib/digest.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: digest.ml,v 1.10 2003/12/31 14:20:39 doligez Exp $ *) +(* $Id: digest.ml 6044 2003-12-31 14:20:40Z doligez $ *) (* Message digest (MD5) *) diff --git a/stdlib/digest.mli b/stdlib/digest.mli index 065d4864..d3359029 100644 --- a/stdlib/digest.mli +++ b/stdlib/digest.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: digest.mli,v 1.17 2005/10/25 18:34:07 doligez Exp $ *) +(* $Id: digest.mli 7164 2005-10-25 18:34:07Z doligez $ *) (** MD5 message digest. diff --git a/stdlib/filename.ml b/stdlib/filename.ml index b7849968..2fef43af 100644 --- a/stdlib/filename.ml +++ b/stdlib/filename.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: filename.ml,v 1.41.12.1 2008/11/20 18:36:52 doligez Exp $ *) +(* $Id: filename.ml 9339 2009-09-16 14:24:11Z xclerc $ *) let generic_quote quotequote s = let l = String.length s in @@ -194,14 +194,14 @@ external close_desc: int -> unit = "caml_sys_close" let prng = Random.State.make_self_init ();; -let temp_file_name prefix suffix = +let temp_file_name temp_dir prefix suffix = let rnd = (Random.State.bits prng) land 0xFFFFFF in - concat temp_dir_name (Printf.sprintf "%s%06x%s" prefix rnd suffix) + concat temp_dir (Printf.sprintf "%s%06x%s" prefix rnd suffix) ;; -let temp_file prefix suffix = +let temp_file ?(temp_dir=temp_dir_name) prefix suffix = let rec try_name counter = - let name = temp_file_name prefix suffix in + let name = temp_file_name temp_dir prefix suffix in try close_desc(open_desc name [Open_wronly; Open_creat; Open_excl] 0o600); name @@ -209,9 +209,9 @@ let temp_file prefix suffix = if counter >= 1000 then raise e else try_name (counter + 1) in try_name 0 -let open_temp_file ?(mode = [Open_text]) prefix suffix = +let open_temp_file ?(mode = [Open_text]) ?(temp_dir=temp_dir_name) prefix suffix = let rec try_name counter = - let name = temp_file_name prefix suffix in + let name = temp_file_name temp_dir prefix suffix in try (name, open_out_gen (Open_wronly::Open_creat::Open_excl::mode) 0o600 name) diff --git a/stdlib/filename.mli b/stdlib/filename.mli index a9c78379..7d93fd99 100644 --- a/stdlib/filename.mli +++ b/stdlib/filename.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: filename.mli,v 1.35 2007/01/09 13:42:17 doligez Exp $ *) +(* $Id: filename.mli 9339 2009-09-16 14:24:11Z xclerc $ *) (** Operations on file names. *) @@ -22,6 +22,9 @@ val parent_dir_name : string (** The conventional name for the parent of the current directory (e.g. [..] in Unix). *) +val dir_sep : string +(** The directory separator (e.g. [/] in Unix). *) + val concat : string -> string -> string (** [concat dir file] returns a file name that designates file [file] in directory [dir]. *) @@ -68,11 +71,13 @@ val basename : string -> string val dirname : string -> string (** See {!Filename.basename}. *) -val temp_file : string -> string -> string +val temp_file : ?temp_dir: string -> string -> string -> string (** [temp_file prefix suffix] returns the name of a fresh temporary file in the temporary directory. The base name of the temporary file is formed by concatenating [prefix], then a suitably chosen integer number, then [suffix]. + The optional argument [temp_dir] indicates the temporary directory + to use, defaulting to {!Filename.temp_dir_name}. The temporary file is created empty, with permissions [0o600] (readable and writable only by the file owner). The file is guaranteed to be different from any other file that existed when @@ -80,7 +85,7 @@ val temp_file : string -> string -> string *) val open_temp_file : - ?mode: open_flag list -> string -> string -> string * out_channel + ?mode: open_flag list -> ?temp_dir: string -> string -> string -> string * out_channel (** Same as {!Filename.temp_file}, but returns both the name of a fresh temporary file, and an output channel opened (atomically) on this file. This function is more secure than [temp_file]: there diff --git a/stdlib/format.ml b/stdlib/format.ml index 1a41375e..f3545f32 100644 --- a/stdlib/format.ml +++ b/stdlib/format.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: format.ml,v 1.74.2.1 2009/04/29 18:33:31 weis Exp $ *) +(* $Id: format.ml 9244 2009-04-29 18:33:31Z weis $ *) (* A pretty-printing facility and definition of formatters for ``parallel'' (i.e. unrelated or independent) pretty-printing on multiple out channels. *) diff --git a/stdlib/format.mli b/stdlib/format.mli index f0266e57..3af97b25 100644 --- a/stdlib/format.mli +++ b/stdlib/format.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: format.mli,v 1.74 2006/11/17 08:37:07 weis Exp $ *) +(* $Id: format.mli 9420 2009-11-19 10:17:41Z weis $ *) (** Pretty printing. @@ -72,7 +72,6 @@ the evaluation order of printing commands. *) - (** {6 Boxes} *) val open_box : int -> unit;; @@ -112,7 +111,6 @@ val print_char : char -> unit;; val print_bool : bool -> unit;; (** Prints a boolean in the current box. *) - (** {6 Break hints} *) val print_space : unit -> unit;; @@ -156,7 +154,6 @@ val print_if_newline : unit -> unit;; has just been split. Otherwise, ignore the next formatting command. *) - (** {6 Margin} *) val set_margin : int -> unit;; @@ -170,7 +167,6 @@ val set_margin : int -> unit;; val get_margin : unit -> int;; (** Returns the position of the right margin. *) - (** {6 Maximum indentation limit} *) val set_max_indent : int -> unit;; @@ -201,7 +197,6 @@ val get_max_boxes : unit -> int;; val over_max_boxes : unit -> bool;; (** Tests if the maximum number of boxes allowed have already been opened. *) - (** {6 Advanced formatting} *) val open_hbox : unit -> unit;; @@ -235,7 +230,6 @@ val open_hovbox : int -> unit;; When a new line is printed in the box, [d] is added to the current indentation. *) - (** {6 Tabulations} *) val open_tbox : unit -> unit;; @@ -260,8 +254,7 @@ val set_tab : unit -> unit;; (** Sets a tabulation mark at the current insertion point. *) val print_tab : unit -> unit;; -(** [print_tab ()] is equivalent to [print_tbreak (0,0)]. *) - +(** [print_tab ()] is equivalent to [print_tbreak 0 0]. *) (** {6 Ellipsis} *) @@ -272,14 +265,13 @@ val set_ellipsis_text : string -> unit;; val get_ellipsis_text : unit -> string;; (** Return the text of the ellipsis. *) - -(** {6 Tags} *) +(** {6 Semantics Tags} *) type tag = string;; -(** Tags are used to decorate printed entities for user's defined - purposes, e.g. setting font and giving size indications for a - display device, or marking delimitations of semantics entities +(** {i Semantics tags} (or simply {e tags}) are used to decorate printed + entities for user's defined purposes, e.g. setting font and giving size + indications for a display device, or marking delimitation of semantics entities (e.g. HTML or TeX elements or terminal escape sequences). By default, those tags do not influence line breaking calculation: @@ -293,7 +285,7 @@ type tag = string;; material or richer decorated output depending on the treatment of tags. By default, tags are not active, hence the output is not decorated with tag information. Once [set_tags] is set to [true], - the pretty printer engine honors tags and decorates the output + the pretty printer engine honours tags and decorates the output accordingly. When a tag has been opened (or closed), it is both and successively @@ -345,10 +337,9 @@ val get_print_tags : unit -> bool;; val get_mark_tags : unit -> bool;; (** Return the current status of tags printing and tags marking. *) +(** {6 Redirecting the standard formatter output} *) -(** {6 Redirecting formatter output} *) - -val set_formatter_out_channel : out_channel -> unit;; +val set_formatter_out_channel : Pervasives.out_channel -> unit;; (** Redirect the pretty-printer output to the given channel. *) val set_formatter_output_functions : @@ -356,17 +347,56 @@ val set_formatter_output_functions : (** [set_formatter_output_functions out flush] redirects the pretty-printer output to the functions [out] and [flush]. - The [out] function performs the pretty-printer output. It is called + The [out] function performs the pretty-printer string output. It is called with a string [s], a start position [p], and a number of characters [n]; it is supposed to output characters [p] to [p + n - 1] of [s]. The [flush] function is called whenever the pretty-printer is - flushed using [print_flush] or [print_newline]. *) + flushed (via conversion [%!], pretty-printing indications [@?] or [@.], + or using low level function [print_flush] or [print_newline]). *) val get_formatter_output_functions : unit -> (string -> int -> int -> unit) * (unit -> unit);; (** Return the current output functions of the pretty-printer. *) -(** {6 Changing the meaning of printing tags} *) +(** {6 Changing the meaning of standard formatter pretty printing} *) + +(** The [Format] module is versatile enough to let you completely redefine + the meaning of pretty printing: you may provide your own functions to define + how to handle indentation, line breaking, and even printing of all the + characters that have to be printed! *) + +val set_all_formatter_output_functions : + out:(string -> int -> int -> unit) -> + flush:(unit -> unit) -> + newline:(unit -> unit) -> + spaces:(int -> unit) -> + unit;; +(** [set_all_formatter_output_functions out flush outnewline outspace] + redirects the pretty-printer output to the functions [out] and + [flush] as described in [set_formatter_output_functions]. In + addition, the pretty-printer function that outputs a newline is set + to the function [outnewline] and the function that outputs + indentation spaces is set to the function [outspace]. + + This way, you can change the meaning of indentation (which can be + something else than just printing space characters) and the + meaning of new lines opening (which can be connected to any other + action needed by the application at hand). The two functions + [outspace] and [outnewline] are normally connected to [out] and + [flush]: respective default values for [outspace] and [outnewline] + are [out (String.make n ' ') 0 n] and [out "\n" 0 1]. *) + +val get_all_formatter_output_functions : + unit -> + (string -> int -> int -> unit) * + (unit -> unit) * + (unit -> unit) * + (int -> unit);; +(** Return the current output functions of the pretty-printer, + including line breaking and indentation functions. Useful to record the + current setting and restore it afterwards. *) + +(** {6 Changing the meaning of printing semantics tags} *) type formatter_tag_functions = { mark_open_tag : tag -> string; @@ -403,56 +433,22 @@ val get_formatter_tag_functions : unit -> formatter_tag_functions;; (** Return the current tag functions of the pretty-printer. *) -(** {6 Changing the meaning of pretty printing (indentation, line breaking, - and printing material)} *) - -val set_all_formatter_output_functions : - out:(string -> int -> int -> unit) -> - flush:(unit -> unit) -> - newline:(unit -> unit) -> - spaces:(int -> unit) -> - unit;; -(** [set_all_formatter_output_functions out flush outnewline outspace] - redirects the pretty-printer output to the functions [out] and - [flush] as described in [set_formatter_output_functions]. In - addition, the pretty-printer function that outputs a newline is set - to the function [outnewline] and the function that outputs - indentation spaces is set to the function [outspace]. - - This way, you can change the meaning of indentation (which can be - something else than just printing space characters) and the - meaning of new lines opening (which can be connected to any other - action needed by the application at hand). The two functions - [outspace] and [outnewline] are normally connected to [out] and - [flush]: respective default values for [outspace] and [outnewline] - are [out (String.make n ' ') 0 n] and [out "\n" 0 1]. *) - -val get_all_formatter_output_functions : - unit -> - (string -> int -> int -> unit) * - (unit -> unit) * - (unit -> unit) * - (int -> unit);; -(** Return the current output functions of the pretty-printer, - including line breaking and indentation functions. *) - - (** {6 Multiple formatted output} *) type formatter;; (** Abstract data type corresponding to a pretty-printer (also called a - formatter) and all its machinery. - Defining new pretty-printers permits the output of - material in parallel on several channels. - Parameters of a pretty-printer are local to this pretty-printer: - margin, maximum indentation limit, maximum number of boxes - simultaneously opened, ellipsis, and so on, are specific to - each pretty-printer and may be fixed independently. - Given an output channel [oc], a new formatter writing to - that channel is obtained by calling [formatter_of_out_channel oc]. - Alternatively, the [make_formatter] function allocates a new - formatter with explicit output and flushing functions - (convenient to output material to strings for instance). *) + formatter) and all its machinery. + Defining new pretty-printers permits the output of + material in parallel on several channels. + Parameters of a pretty-printer are local to this pretty-printer: + margin, maximum indentation limit, maximum number of boxes + simultaneously opened, ellipsis, and so on, are specific to + each pretty-printer and may be fixed independently. + Given an output channel [oc], a new formatter writing to + that channel is obtained by calling [formatter_of_out_channel oc]. + Alternatively, the [make_formatter] function allocates a new + formatter with explicit output and flushing functions + (convenient to output material to strings for instance). *) val formatter_of_out_channel : out_channel -> formatter;; (** [formatter_of_out_channel oc] returns a new formatter that diff --git a/stdlib/gc.ml b/stdlib/gc.ml index faed5cf9..ca97665b 100644 --- a/stdlib/gc.ml +++ b/stdlib/gc.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: gc.ml,v 1.20.24.1 2008/11/18 10:24:43 doligez Exp $ *) +(* $Id: gc.ml 9131 2008-11-18 10:24:43Z doligez $ *) type stat = { minor_words : float; diff --git a/stdlib/gc.mli b/stdlib/gc.mli index ee56196d..c399bcdd 100644 --- a/stdlib/gc.mli +++ b/stdlib/gc.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: gc.mli,v 1.44.4.1 2008/11/18 10:24:43 doligez Exp $ *) +(* $Id: gc.mli 9131 2008-11-18 10:24:43Z doligez $ *) (** Memory management control and statistics; finalised values. *) diff --git a/stdlib/genlex.ml b/stdlib/genlex.ml index c3dc50bb..12837de6 100644 --- a/stdlib/genlex.ml +++ b/stdlib/genlex.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: genlex.ml,v 1.9 2002/04/18 07:27:42 garrigue Exp $ *) +(* $Id: genlex.ml 4694 2002-04-18 07:27:47Z garrigue $ *) type token = Kwd of string diff --git a/stdlib/genlex.mli b/stdlib/genlex.mli index a9611596..c03ef294 100644 --- a/stdlib/genlex.mli +++ b/stdlib/genlex.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: genlex.mli,v 1.9 2005/10/25 18:34:07 doligez Exp $ *) +(* $Id: genlex.mli 7164 2005-10-25 18:34:07Z doligez $ *) (** A generic lexical analyzer. diff --git a/stdlib/hashtbl.ml b/stdlib/hashtbl.ml index 6e627449..b65c5dc4 100644 --- a/stdlib/hashtbl.ml +++ b/stdlib/hashtbl.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: hashtbl.ml,v 1.27 2005/10/25 18:34:07 doligez Exp $ *) +(* $Id: hashtbl.ml 7164 2005-10-25 18:34:07Z doligez $ *) (* Hash tables *) diff --git a/stdlib/hashtbl.mli b/stdlib/hashtbl.mli index 52c4994b..e66c4864 100644 --- a/stdlib/hashtbl.mli +++ b/stdlib/hashtbl.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: hashtbl.mli,v 1.39 2005/05/04 13:36:47 doligez Exp $ *) +(* $Id: hashtbl.mli 6854 2005-05-04 13:36:47Z doligez $ *) (** Hash tables and hash functions. diff --git a/stdlib/header.c b/stdlib/header.c index 9ec345d2..f3d8a983 100644 --- a/stdlib/header.c +++ b/stdlib/header.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: header.c,v 1.17 2001/12/07 13:40:52 xleroy Exp $ */ +/* $Id: header.c 4144 2001-12-07 13:41:02Z xleroy $ */ /* The launcher for bytecode executables (if #! is not working) */ diff --git a/stdlib/headernt.c b/stdlib/headernt.c index cf459fa5..6e742541 100644 --- a/stdlib/headernt.c +++ b/stdlib/headernt.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: headernt.c,v 1.20 2007/02/07 10:31:36 ertai Exp $ */ +/* $Id: headernt.c 7829 2007-02-07 10:31:36Z ertai $ */ #define STRICT #define WIN32_LEAN_AND_MEAN diff --git a/stdlib/int32.ml b/stdlib/int32.ml index a81acec0..3eb10285 100644 --- a/stdlib/int32.ml +++ b/stdlib/int32.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: int32.ml,v 1.10 2007/01/30 09:34:36 xleroy Exp $ *) +(* $Id: int32.ml 7818 2007-01-30 09:34:36Z xleroy $ *) (* Module [Int32]: 32-bit integers *) diff --git a/stdlib/int32.mli b/stdlib/int32.mli index 63c2ffd3..eef35333 100644 --- a/stdlib/int32.mli +++ b/stdlib/int32.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: int32.mli,v 1.19 2008/01/11 16:13:16 doligez Exp $ *) +(* $Id: int32.mli 8768 2008-01-11 16:13:18Z doligez $ *) (** 32-bit integers. diff --git a/stdlib/int64.ml b/stdlib/int64.ml index 58f71f40..6d7168a2 100644 --- a/stdlib/int64.ml +++ b/stdlib/int64.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: int64.ml,v 1.12 2007/01/30 09:34:36 xleroy Exp $ *) +(* $Id: int64.ml 7818 2007-01-30 09:34:36Z xleroy $ *) (* Module [Int64]: 64-bit integers *) diff --git a/stdlib/int64.mli b/stdlib/int64.mli index c50dd746..44fabfe3 100644 --- a/stdlib/int64.mli +++ b/stdlib/int64.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: int64.mli,v 1.20 2008/01/11 16:13:16 doligez Exp $ *) +(* $Id: int64.mli 8768 2008-01-11 16:13:18Z doligez $ *) (** 64-bit integers. diff --git a/stdlib/lazy.ml b/stdlib/lazy.ml index 57c41fd9..15becc85 100644 --- a/stdlib/lazy.ml +++ b/stdlib/lazy.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: lazy.ml,v 1.13 2008/08/01 16:57:10 mauny Exp $ *) +(* $Id: lazy.ml 8974 2008-08-01 16:57:10Z mauny $ *) (* Module [Lazy]: deferred computations *) diff --git a/stdlib/lazy.mli b/stdlib/lazy.mli index cb613e0d..6d929044 100644 --- a/stdlib/lazy.mli +++ b/stdlib/lazy.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: lazy.mli,v 1.11 2008/08/01 16:57:10 mauny Exp $ *) +(* $Id: lazy.mli 8974 2008-08-01 16:57:10Z mauny $ *) (** Deferred computations. *) diff --git a/stdlib/lexing.ml b/stdlib/lexing.ml index a82ae352..78b41517 100644 --- a/stdlib/lexing.ml +++ b/stdlib/lexing.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: lexing.ml,v 1.25 2008/01/22 16:27:53 doligez Exp $ *) +(* $Id: lexing.ml 8787 2008-01-22 16:27:53Z doligez $ *) (* The run-time library for lexers generated by camllex *) diff --git a/stdlib/lexing.mli b/stdlib/lexing.mli index 482d2cc8..591a74d0 100644 --- a/stdlib/lexing.mli +++ b/stdlib/lexing.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: lexing.mli,v 1.33.4.1 2008/10/08 13:07:13 doligez Exp $ *) +(* $Id: lexing.mli 9079 2008-10-08 13:09:39Z doligez $ *) (** The run-time library for lexers generated by [ocamllex]. *) diff --git a/stdlib/list.ml b/stdlib/list.ml index e51b0b76..80a76c49 100644 --- a/stdlib/list.ml +++ b/stdlib/list.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: list.ml,v 1.33 2006/09/11 12:18:00 doligez Exp $ *) +(* $Id: list.ml 7597 2006-09-11 12:18:00Z doligez $ *) (* List operations *) diff --git a/stdlib/list.mli b/stdlib/list.mli index 0ee4adca..26c53869 100644 --- a/stdlib/list.mli +++ b/stdlib/list.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: list.mli,v 1.47 2006/09/11 12:18:00 doligez Exp $ *) +(* $Id: list.mli 7597 2006-09-11 12:18:00Z doligez $ *) (** List operations. diff --git a/stdlib/listLabels.ml b/stdlib/listLabels.ml index e7f31fc2..896caf9b 100644 --- a/stdlib/listLabels.ml +++ b/stdlib/listLabels.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: listLabels.ml,v 1.3 2001/12/07 13:40:54 xleroy Exp $ *) +(* $Id: listLabels.ml 4144 2001-12-07 13:41:02Z xleroy $ *) (* Module [ListLabels]: labelled List module *) diff --git a/stdlib/listLabels.mli b/stdlib/listLabels.mli index 730a974f..b9f39366 100644 --- a/stdlib/listLabels.mli +++ b/stdlib/listLabels.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: listLabels.mli,v 1.12 2007/01/22 08:06:09 garrigue Exp $ *) +(* $Id: listLabels.mli 7805 2007-01-22 08:06:09Z garrigue $ *) (** List operations. diff --git a/stdlib/map.ml b/stdlib/map.ml index 9423ae85..fefbee68 100644 --- a/stdlib/map.ml +++ b/stdlib/map.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: map.ml,v 1.17 2005/08/13 20:59:37 doligez Exp $ *) +(* $Id: map.ml 7019 2005-08-13 20:59:37Z doligez $ *) module type OrderedType = sig diff --git a/stdlib/map.mli b/stdlib/map.mli index 877b0f9e..08290248 100644 --- a/stdlib/map.mli +++ b/stdlib/map.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: map.mli,v 1.33.18.1 2009/03/21 16:35:48 xleroy Exp $ *) +(* $Id: map.mli 9190 2009-03-21 16:35:48Z xleroy $ *) (** Association tables over ordered types. diff --git a/stdlib/marshal.ml b/stdlib/marshal.ml index 41f299c6..f2eaf00d 100644 --- a/stdlib/marshal.ml +++ b/stdlib/marshal.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: marshal.ml,v 1.9 2005/10/25 18:34:07 doligez Exp $ *) +(* $Id: marshal.ml 7164 2005-10-25 18:34:07Z doligez $ *) type extern_flags = No_sharing diff --git a/stdlib/marshal.mli b/stdlib/marshal.mli index a453708b..16ba32c1 100644 --- a/stdlib/marshal.mli +++ b/stdlib/marshal.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: marshal.mli,v 1.14 2005/10/25 18:34:07 doligez Exp $ *) +(* $Id: marshal.mli 7164 2005-10-25 18:34:07Z doligez $ *) (** Marshaling of data structures. diff --git a/stdlib/moreLabels.ml b/stdlib/moreLabels.ml index 19a97442..567c316f 100644 --- a/stdlib/moreLabels.ml +++ b/stdlib/moreLabels.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: moreLabels.ml,v 1.2 2001/12/07 13:40:55 xleroy Exp $ *) +(* $Id: moreLabels.ml 4144 2001-12-07 13:41:02Z xleroy $ *) (* Module [MoreLabels]: meta-module for compatibility labelled libraries *) diff --git a/stdlib/moreLabels.mli b/stdlib/moreLabels.mli index fa6b3550..96d98a29 100644 --- a/stdlib/moreLabels.mli +++ b/stdlib/moreLabels.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: moreLabels.mli,v 1.12 2004/04/23 10:01:34 xleroy Exp $ *) +(* $Id: moreLabels.mli 6250 2004-04-23 10:01:34Z xleroy $ *) (** Extra labeled libraries. diff --git a/stdlib/nativeint.ml b/stdlib/nativeint.ml index 83c2a9ba..126e4d38 100644 --- a/stdlib/nativeint.ml +++ b/stdlib/nativeint.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: nativeint.ml,v 1.11 2007/01/30 09:34:36 xleroy Exp $ *) +(* $Id: nativeint.ml 7818 2007-01-30 09:34:36Z xleroy $ *) (* Module [Nativeint]: processor-native integers *) diff --git a/stdlib/nativeint.mli b/stdlib/nativeint.mli index 19f7bb42..dd3fd7f7 100644 --- a/stdlib/nativeint.mli +++ b/stdlib/nativeint.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: nativeint.mli,v 1.18 2005/10/25 18:34:07 doligez Exp $ *) +(* $Id: nativeint.mli 7164 2005-10-25 18:34:07Z doligez $ *) (** Processor-native integers. diff --git a/stdlib/obj.ml b/stdlib/obj.ml index 86d06258..32154e56 100644 --- a/stdlib/obj.ml +++ b/stdlib/obj.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: obj.ml,v 1.24 2008/01/29 13:11:15 doligez Exp $ *) +(* $Id: obj.ml 9482 2009-12-22 13:32:12Z doligez $ *) (* Operations on internal representations of values *) @@ -27,9 +27,12 @@ external set_tag : t -> int -> unit = "caml_obj_set_tag" external size : t -> int = "%obj_size" external field : t -> int -> t = "%obj_field" external set_field : t -> int -> t -> unit = "%obj_set_field" +let double_field x i = Array.get (obj x : float array) i +let set_double_field x i v = Array.set (obj x : float array) i v external new_block : int -> int -> t = "caml_obj_block" external dup : t -> t = "caml_obj_dup" external truncate : t -> int -> unit = "caml_obj_truncate" +external add_offset : t -> int -> t = "caml_obj_add_offset" let marshal (obj : t) = Marshal.to_string obj [] diff --git a/stdlib/obj.mli b/stdlib/obj.mli index 1d693081..d3a8c064 100644 --- a/stdlib/obj.mli +++ b/stdlib/obj.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: obj.mli,v 1.30 2008/01/29 13:11:15 doligez Exp $ *) +(* $Id: obj.mli 9482 2009-12-22 13:32:12Z doligez $ *) (** Operations on internal representations of values. @@ -28,11 +28,14 @@ external is_int : t -> bool = "%obj_is_int" external tag : t -> int = "caml_obj_tag" external set_tag : t -> int -> unit = "caml_obj_set_tag" external size : t -> int = "%obj_size" -external truncate : t -> int -> unit = "caml_obj_truncate" external field : t -> int -> t = "%obj_field" external set_field : t -> int -> t -> unit = "%obj_set_field" +val double_field : t -> int -> float +val set_double_field : t -> int -> float -> unit external new_block : int -> int -> t = "caml_obj_block" external dup : t -> t = "caml_obj_dup" +external truncate : t -> int -> unit = "caml_obj_truncate" +external add_offset : t -> int -> t = "caml_obj_add_offset" val lazy_tag : int val closure_tag : int diff --git a/stdlib/oo.ml b/stdlib/oo.ml index 33245e3c..c7322c84 100644 --- a/stdlib/oo.ml +++ b/stdlib/oo.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: oo.ml,v 1.27 2004/05/26 11:10:52 garrigue Exp $ *) +(* $Id: oo.ml 6331 2004-05-26 11:10:52Z garrigue $ *) let copy = CamlinternalOO.copy external id : < .. > -> int = "%field1" diff --git a/stdlib/oo.mli b/stdlib/oo.mli index 623fe1eb..7ff2f1bc 100644 --- a/stdlib/oo.mli +++ b/stdlib/oo.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: oo.mli,v 1.28 2004/05/26 11:10:52 garrigue Exp $ *) +(* $Id: oo.mli 6331 2004-05-26 11:10:52Z garrigue $ *) (** Operations on objects *) diff --git a/stdlib/parsing.ml b/stdlib/parsing.ml index 476a04da..ce249174 100644 --- a/stdlib/parsing.ml +++ b/stdlib/parsing.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: parsing.ml,v 1.19.2.1 2009/01/13 15:17:51 doligez Exp $ *) +(* $Id: parsing.ml 9163 2009-01-13 15:17:51Z doligez $ *) (* The parsing engine *) diff --git a/stdlib/parsing.mli b/stdlib/parsing.mli index a546a092..250a10cf 100644 --- a/stdlib/parsing.mli +++ b/stdlib/parsing.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: parsing.mli,v 1.19 2008/08/06 09:38:21 xleroy Exp $ *) +(* $Id: parsing.mli 8983 2008-08-06 09:38:25Z xleroy $ *) (** The run-time library for parsers generated by [ocamlyacc]. *) diff --git a/stdlib/pervasives.ml b/stdlib/pervasives.ml index 01667568..1c8c3d4e 100644 --- a/stdlib/pervasives.ml +++ b/stdlib/pervasives.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: pervasives.ml,v 1.81 2006/11/17 08:34:01 weis Exp $ *) +(* $Id: pervasives.ml 9412 2009-11-09 11:42:39Z weis $ *) (* type 'a option = None | Some of 'a *) @@ -398,7 +398,7 @@ external incr: int ref -> unit = "%incr" external decr: int ref -> unit = "%decr" (* Formats *) -type ('a, 'b, 'c, 'd) format4 = ('a, 'b, 'c, 'c, 'c, 'd) format6 +type ('a, 'b, 'c, 'd) format4 = ('a, 'b, 'c, 'c, 'c, 'd) format6 type ('a, 'b, 'c) format = ('a, 'b, 'c, 'c) format4 @@ -416,7 +416,8 @@ let (( ^^ ) : ('f, 'b, 'c, 'e, 'g, 'h) format6 -> ('a, 'b, 'c, 'd, 'g, 'h) format6) = fun fmt1 fmt2 -> - string_to_format (format_to_string fmt1 ^ format_to_string fmt2);; + string_to_format (format_to_string fmt1 ^ "%," ^ format_to_string fmt2) +;; let string_of_format fmt = let s = format_to_string fmt in diff --git a/stdlib/pervasives.mli b/stdlib/pervasives.mli index 935db8de..e07eeda8 100644 --- a/stdlib/pervasives.mli +++ b/stdlib/pervasives.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: pervasives.mli,v 1.113.2.2 2009/04/30 09:05:57 weis Exp $ *) +(* $Id: pervasives.mli 9352 2009-09-24 09:17:01Z doligez $ *) (** The initially opened module. @@ -71,7 +71,7 @@ external ( >= ) : 'a -> 'a -> bool = "%greaterequal" The ordering is compatible with [(=)]. As in the case of [(=)], mutable structures are compared by contents. Comparison between functional values raises [Invalid_argument]. - Comparison between cyclic structures does not terminate. *) + Comparison between cyclic structures may not terminate. *) external compare : 'a -> 'a -> int = "%compare" (** [compare x y] returns [0] if [x] is equal to [y], @@ -93,10 +93,14 @@ external compare : 'a -> 'a -> int = "%compare" the {!List.sort} and {!Array.sort} functions. *) val min : 'a -> 'a -> 'a -(** Return the smaller of the two arguments. *) +(** Return the smaller of the two arguments. + The result is unspecified if one of the arguments contains + the float value [nan]. *) val max : 'a -> 'a -> 'a -(** Return the greater of the two arguments. *) +(** Return the greater of the two arguments. + The result is unspecified if one of the arguments contains + the float value [nan]. *) external ( == ) : 'a -> 'a -> bool = "%eq" (** [e1 == e2] tests for physical equality of [e1] and [e2]. @@ -226,8 +230,8 @@ external ( asr ) : int -> int -> int = "%asrint" [neg_infinity] for [-1.0 /. 0.0], and [nan] (``not a number'') for [0.0 /. 0.0]. These special numbers then propagate through floating-point computations as expected: for instance, - [1.0 /. infinity] is [0.0], and any operation with [nan] as - argument returns [nan] as result. + [1.0 /. infinity] is [0.0], and any arithmetic operation with [nan] + as argument returns [nan] as result. *) external ( ~-. ) : float -> float = "%negfloat" diff --git a/stdlib/printexc.ml b/stdlib/printexc.ml index 4cd0eeca..42dda408 100644 --- a/stdlib/printexc.ml +++ b/stdlib/printexc.ml @@ -11,10 +11,12 @@ (* *) (***********************************************************************) -(* $Id: printexc.ml,v 1.19 2008/03/14 13:47:24 xleroy Exp $ *) +(* $Id: printexc.ml 9335 2009-09-16 13:34:57Z xclerc $ *) open Printf;; +let printers = ref [] + let locfmt = format_of_string "File \"%s\", line %d, characters %d-%d: %s";; let field x i = @@ -48,9 +50,16 @@ let to_string = function | Assert_failure(file, line, char) -> sprintf locfmt file line char (char+6) "Assertion failed" | x -> - let x = Obj.repr x in - let constructor = (Obj.magic(Obj.field (Obj.field x 0) 0) : string) in - constructor ^ (fields x) + let rec conv = function + | hd :: tl -> + (match try hd x with _ -> None with + | Some s -> s + | None -> conv tl) + | [] -> + let x = Obj.repr x in + let constructor = (Obj.magic(Obj.field (Obj.field x 0) 0) : string) in + constructor ^ (fields x) in + conv !printers ;; let print fct arg = @@ -125,3 +134,5 @@ let get_backtrace () = external record_backtrace: bool -> unit = "caml_record_backtrace" external backtrace_status: unit -> bool = "caml_backtrace_status" +let register_printer fn = + printers := fn :: !printers diff --git a/stdlib/printexc.mli b/stdlib/printexc.mli index 32cdc67f..21d3e9af 100644 --- a/stdlib/printexc.mli +++ b/stdlib/printexc.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: printexc.mli,v 1.13 2008/03/14 13:47:24 xleroy Exp $ *) +(* $Id: printexc.mli 9335 2009-09-16 13:34:57Z xclerc $ *) (** Facilities for printing exceptions. *) @@ -57,3 +57,13 @@ val record_backtrace: bool -> unit val backtrace_status: unit -> bool (** [Printexc.backtrace_status()] returns [true] if exception backtraces are currently recorded, [false] if not. *) + +val register_printer : (exn -> string option) -> unit +(** [Printexc.register_printer fn] registers [fn] as an exception printer. + The printer should return [None] if it does not know how to convert + the passed exception, and [Some s] with [s] the resulting string if + it can convert the passed exception. + When converting an exception into a string, the printers will be invoked + in the reverse order of their registrations, until a printer returns + a [Some s] value (if no such printer exists, the runtime will use a + generic printer). *) diff --git a/stdlib/printf.ml b/stdlib/printf.ml index 920afdb4..bc50ca75 100644 --- a/stdlib/printf.ml +++ b/stdlib/printf.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: printf.ml,v 1.58.2.2 2009/04/29 19:02:05 weis Exp $ *) +(* $Id: printf.ml 9412 2009-11-09 11:42:39Z weis $ *) external format_float: string -> float -> string = "caml_format_float" @@ -39,8 +39,8 @@ module Sformat = struct let add_int_index i idx = index_of_int (i + int_of_index idx);; let succ_index = add_int_index 1;; - (* Litteral position are one-based (hence pred p instead of p). *) - let index_of_litteral_position p = index_of_int (pred p);; + (* Literal position are one-based (hence pred p instead of p). *) + let index_of_literal_position p = index_of_int (pred p);; external length : ('a, 'b, 'c, 'd, 'e, 'f) format6 -> int = "%string_length" @@ -122,12 +122,12 @@ let extract_format fmt start stop widths = let skip_positional_spec start = match Sformat.unsafe_get fmt start with | '0'..'9' -> - let rec skip_int_litteral i = + let rec skip_int_literal i = match Sformat.unsafe_get fmt i with - | '0'..'9' -> skip_int_litteral (succ i) + | '0'..'9' -> skip_int_literal (succ i) | '$' -> succ i | _ -> start in - skip_int_litteral (succ start) + skip_int_literal (succ start) | _ -> start in let start = skip_positional_spec (succ start) in let b = Buffer.create (stop - start + 10) in @@ -140,7 +140,7 @@ let extract_format fmt start stop widths = let i = skip_positional_spec (succ i) in fill_format i t | ('*', []) -> - assert false (* should not happen *) + assert false (* Should not happen since this is ill-typed. *) | (c, _) -> Buffer.add_char b c; fill_format (succ i) widths in @@ -161,7 +161,7 @@ let extract_format_float conv fmt start stop widths = let sfmt = extract_format fmt start stop widths in match conv with | 'F' -> - sfmt.[String.length sfmt - 1] <- 'f'; + sfmt.[String.length sfmt - 1] <- 'g'; sfmt | _ -> sfmt ;; @@ -169,7 +169,7 @@ let extract_format_float conv fmt start stop widths = (* Returns the position of the next character following the meta format string, starting from position [i], inside a given format [fmt]. According to the character [conv], the meta format string is - enclosed by the delimitors %{ and %} (when [conv = '{']) or %( and + enclosed by the delimiters %{ and %} (when [conv = '{']) or %( and %) (when [conv = '(']). Hence, [sub_format] returns the index of the character following the [')'] or ['}'] that ends the meta format, according to the character [conv]. *) @@ -215,7 +215,7 @@ let iter_on_format_args fmt add_conv add_char = and scan_conv skip i = if i > lim then incomplete_format fmt else match Sformat.unsafe_get fmt i with - | '%' | '!' -> succ i + | '%' | '!' | ',' -> succ i | 's' | 'S' | '[' -> add_conv skip i 's' | 'c' | 'C' -> add_conv skip i 'c' | 'd' | 'i' |'o' | 'u' | 'x' | 'X' | 'N' -> add_conv skip i 'i' @@ -307,6 +307,7 @@ let ac_of_format fmt = let count_arguments_of_format fmt = let ac = ac_of_format fmt in + (* For printing only regular arguments have to be counted. *) ac.ac_rglr ;; @@ -384,7 +385,7 @@ type positional_specification = Unfortunately, the type of a parameter specified via a [*$] positional specification should be the type of the corresponding argument to - [printf], hence this sould be the type of the $n$-th argument to [printf] + [printf], hence this should be the type of the $n$-th argument to [printf] with $n$ being the {\em value} of the integer argument defining [*]; we clearly cannot statically guess the value of this parameter in the general case. Put it another way: this means type dependency, which is completely @@ -393,19 +394,19 @@ type positional_specification = let scan_positional_spec fmt got_spec n i = match Sformat.unsafe_get fmt i with | '0'..'9' as d -> - let rec get_int_litteral accu j = + let rec get_int_literal accu j = match Sformat.unsafe_get fmt j with | '0'..'9' as d -> - get_int_litteral (10 * accu + (int_of_char d - 48)) (succ j) + get_int_literal (10 * accu + (int_of_char d - 48)) (succ j) | '$' -> if accu = 0 then failwith "printf: bad positional specification (0)." else - got_spec (Spec_index (Sformat.index_of_litteral_position accu)) (succ j) + got_spec (Spec_index (Sformat.index_of_literal_position accu)) (succ j) (* Not a positional specification: tell so the caller, and go back to scanning the format from the original [i] position we were called at first. *) | _ -> got_spec Spec_none i in - get_int_litteral (int_of_char d - 48) (succ i) + get_int_literal (int_of_char d - 48) (succ i) (* No positional specification: tell so the caller, and go back to scanning the format from the original [i] position. *) | _ -> got_spec Spec_none i @@ -427,15 +428,12 @@ let get_index spec n = | Spec_index p -> p ;; -(* Format a float argument as a valid Caml lexem. *) -let format_float_lexem = - let valid_float_lexem sfmt s = +(* Format a float argument as a valid Caml lexeme. *) +let format_float_lexeme = + let valid_float_lexeme sfmt s = let l = String.length s in if l = 0 then "nan" else - let add_dot sfmt s = - if s.[0] = ' ' || s.[0] = '+' || s.[0] = '0' - then String.sub s 1 (l - 1) ^ "." - else String.sub s 0 (l - 1) ^ "." in + let add_dot sfmt s = s ^ "." in let rec loop i = if i >= l then add_dot sfmt s else @@ -448,7 +446,7 @@ let format_float_lexem = (fun sfmt x -> let s = format_float sfmt x in match classify_float x with - | FP_normal | FP_subnormal | FP_zero -> valid_float_lexem sfmt s + | FP_normal | FP_subnormal | FP_zero -> valid_float_lexeme sfmt s | FP_nan | FP_infinite -> s) ;; @@ -470,8 +468,8 @@ let format_float_lexem = (* Note: here, rather than test explicitly against [Sformat.length fmt] to detect the end of the format, we use [Sformat.unsafe_get] and - rely on the fact that we'll get a "nul" character if we access - one past the end of the string. These "nul" characters are then + rely on the fact that we'll get a "null" character if we access + one past the end of the string. These "null" characters are then caught by the [_ -> bad_conversion] clauses below. Don't do this at home, kids. *) let scan_format fmt args n pos cont_s cont_a cont_t cont_f cont_m = @@ -502,7 +500,7 @@ let scan_format fmt args n pos cont_s cont_a cont_t cont_f cont_m = let (x : string) = get_arg spec n in let x = if conv = 's' then x else "\"" ^ String.escaped x ^ "\"" in let s = - (* optimize for common case %s *) + (* Optimize for common case %s *) if i = succ pos then x else format_string (extract_format fmt pos i widths) x in cont_s (next_index spec n) s (succ i) @@ -523,7 +521,8 @@ let scan_format fmt args n pos cont_s cont_a cont_t cont_f cont_m = | 'F' as conv -> let (x : float) = get_arg spec n in let s = - format_float_lexem (extract_format_float conv fmt pos i widths) x in + if widths = [] then Pervasives.string_of_float x else + format_float_lexeme (extract_format_float conv fmt pos i widths) x in cont_s (next_index spec n) s (succ i) | 'B' | 'b' -> let (x : bool) = get_arg spec n in @@ -560,6 +559,7 @@ let scan_format fmt args n pos cont_s cont_a cont_t cont_f cont_m = let s = format_int (extract_format_int 'n' fmt pos i widths) x in cont_s (next_index spec n) s (succ i) end + | ',' -> cont_s n "" (succ i) | '!' -> cont_f n (succ i) | '{' | '(' as conv (* ')' '}' *) -> let (xf : ('a, 'b, 'c, 'd, 'e, 'f) format6) = get_arg spec n in diff --git a/stdlib/printf.mli b/stdlib/printf.mli index 6249bcc0..450b497e 100644 --- a/stdlib/printf.mli +++ b/stdlib/printf.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: printf.mli,v 1.57 2008/09/27 20:50:01 weis Exp $ *) +(* $Id: printf.mli 9421 2009-11-19 10:21:42Z weis $ *) (** Formatted output functions. *) @@ -78,6 +78,7 @@ val fprintf : out_channel -> ('a, out_channel, unit) format -> 'a type as [fmt]. - [!]: take no argument and flush the output. - [%]: take no argument and output one [%] character. + - [,]: the no-op delimiter for conversion specifications. The optional [flags] are: - [-]: left-justify the output (default is right justification). diff --git a/stdlib/queue.ml b/stdlib/queue.ml index be4305a0..d7d66a84 100644 --- a/stdlib/queue.ml +++ b/stdlib/queue.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: queue.ml,v 1.10 2005/08/26 12:10:47 doligez Exp $ *) +(* $Id: queue.ml 7032 2005-08-26 12:10:47Z doligez $ *) exception Empty diff --git a/stdlib/queue.mli b/stdlib/queue.mli index f3466400..d8b802e9 100644 --- a/stdlib/queue.mli +++ b/stdlib/queue.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: queue.mli,v 1.16 2002/06/27 08:48:26 xleroy Exp $ *) +(* $Id: queue.mli 4956 2002-06-27 08:48:26Z xleroy $ *) (** First-in first-out queues. diff --git a/stdlib/random.ml b/stdlib/random.ml index acdb3343..f38a067e 100644 --- a/stdlib/random.ml +++ b/stdlib/random.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: random.ml,v 1.22 2003/12/16 18:09:43 doligez Exp $ *) +(* $Id: random.ml 6023 2003-12-16 18:09:44Z doligez $ *) (* "Linear feedback shift register" pseudo-random number generator. *) (* References: Robert Sedgewick, "Algorithms", Addison-Wesley *) diff --git a/stdlib/random.mli b/stdlib/random.mli index 37f05306..56785e0b 100644 --- a/stdlib/random.mli +++ b/stdlib/random.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: random.mli,v 1.17 2007/02/09 13:31:15 doligez Exp $ *) +(* $Id: random.mli 7849 2007-02-09 13:31:15Z doligez $ *) (** Pseudo-random number generators (PRNG). *) diff --git a/stdlib/scanf.ml b/stdlib/scanf.ml index 7ec4f83d..93c1ace8 100644 --- a/stdlib/scanf.ml +++ b/stdlib/scanf.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: scanf.ml,v 1.80.2.2 2009/04/29 18:27:37 weis Exp $ *) +(* $Id: scanf.ml 9417 2009-11-19 09:46:46Z weis $ *) (* The run-time library for scanners. *) @@ -47,16 +47,16 @@ val checked_peek_char : scanbuf -> char;; input buffer has reached an end of file, the function raises exception [End_of_file]. *) -val store_char : scanbuf -> char -> int -> int;; -(* [Scanning.store_char ib c lim] adds [c] to the token buffer +val store_char : int -> scanbuf -> char -> int;; +(* [Scanning.store_char lim ib c] adds [c] to the token buffer of the scanning buffer. It also advances the scanning buffer for one character and returns [lim - 1], indicating the new limit for the length of the current token. *) -val skip_char : scanbuf -> int -> int;; -(* [Scanning.skip_char ib lim] ignores the current character. *) +val skip_char : int -> scanbuf -> int;; +(* [Scanning.skip_char lim ib] ignores the current character. *) -val ignore_char : scanbuf -> int -> int;; +val ignore_char : int -> scanbuf -> int;; (* [Scanning.ignore_char ib lim] ignores the current character and decrements the limit. *) @@ -186,16 +186,16 @@ let token ib = let token_count ib = ib.token_count;; -let skip_char ib max = +let skip_char max ib = invalidate_current_char ib; max ;; -let ignore_char ib max = skip_char ib (max - 1);; +let ignore_char max ib = skip_char (max - 1) ib;; -let store_char ib c max = +let store_char max ib c = Buffer.add_char ib.tokbuf c; - ignore_char ib max + ignore_char max ib ;; let default_token_buffer_size = 1024;; @@ -379,8 +379,8 @@ let incomplete_format fmt = (Sformat.to_string fmt)) ;; -let bad_float () = bad_input "no dot or exponent part found in -float token" +let bad_float () = + bad_input "no dot or exponent part found in float token" ;; let character_mismatch_err c ci = @@ -407,11 +407,18 @@ let compatible_format_type fmt1 fmt2 = In this case, the character c has been explicitely specified in the format as being mandatory in the input; hence we should fail with End_of_file in case of end_of_input. - That's why we use checked_peek_char here. *) -let check_char ib c = + That's why we use checked_peek_char here. + We are also careful to treat "\r\n" in the input as a end of line marker: it + always matches a '\n' specification in the input format string. + *) +let rec check_char ib c = let ci = Scanning.checked_peek_char ib in - if ci = c then Scanning.invalidate_current_char ib else - character_mismatch c ci + if ci = c then Scanning.invalidate_current_char ib else begin + match ci with + | '\r' when c = '\n' -> + Scanning.invalidate_current_char ib; check_char ib '\n' + | _ -> character_mismatch c ci + end ;; (* Checks that the current char is indeed one of the stopper characters, @@ -500,10 +507,10 @@ let rec scan_decimal_digits max ib = if Scanning.eof ib then max else match c with | '0' .. '9' as c -> - let max = Scanning.store_char ib c max in + let max = Scanning.store_char max ib c in scan_decimal_digits max ib | '_' -> - let max = Scanning.ignore_char ib max in + let max = Scanning.ignore_char max ib in scan_decimal_digits max ib | _ -> max ;; @@ -512,7 +519,7 @@ let scan_decimal_digits_plus max ib = let c = Scanning.checked_peek_char ib in match c with | '0' .. '9' -> - let max = Scanning.store_char ib c max in + let max = Scanning.store_char max ib c in scan_decimal_digits max ib | c -> bad_input_char c ;; @@ -526,16 +533,16 @@ let scan_digits_plus digitp max ib = if Scanning.eof ib then max else match c with | c when digitp c -> - let max = Scanning.store_char ib c max in + let max = Scanning.store_char max ib c in scan_digits max | '_' -> - let max = Scanning.ignore_char ib max in + let max = Scanning.ignore_char max ib in scan_digits max | _ -> max in let c = Scanning.checked_peek_char ib in if digitp c then - let max = Scanning.store_char ib c max in + let max = Scanning.store_char max ib c in scan_digits max else bad_input_char c ;; @@ -567,8 +574,8 @@ let scan_unsigned_decimal_int = scan_decimal_digits_plus;; let scan_sign max ib = let c = Scanning.checked_peek_char ib in match c with - | '+' -> Scanning.store_char ib c max - | '-' -> Scanning.store_char ib c max + | '+' -> Scanning.store_char max ib c + | '-' -> Scanning.store_char max ib c | c -> max ;; @@ -584,14 +591,14 @@ let scan_optionally_signed_decimal_int max ib = let scan_unsigned_int max ib = match Scanning.checked_peek_char ib with | '0' as c -> - let max = Scanning.store_char ib c max in + let max = Scanning.store_char max ib c in if max = 0 then max else let c = Scanning.peek_char ib in if Scanning.eof ib then max else begin match c with - | 'x' | 'X' -> scan_hexadecimal_int (Scanning.store_char ib c max) ib - | 'o' -> scan_octal_int (Scanning.store_char ib c max) ib - | 'b' -> scan_binary_int (Scanning.store_char ib c max) ib + | 'x' | 'X' -> scan_hexadecimal_int (Scanning.store_char max ib c) ib + | 'o' -> scan_octal_int (Scanning.store_char max ib c) ib + | 'b' -> scan_binary_int (Scanning.store_char max ib c) ib | c -> scan_decimal_digits max ib end | c -> scan_unsigned_decimal_int max ib ;; @@ -620,7 +627,7 @@ let scan_frac_part max ib = if Scanning.eof ib then max else match c with | '0' .. '9' as c -> - scan_decimal_digits (Scanning.store_char ib c max) ib + scan_decimal_digits (Scanning.store_char max ib c) ib | _ -> max ;; @@ -631,7 +638,7 @@ let scan_exp_part max ib = if Scanning.eof ib then max else match c with | 'e' | 'E' as c -> - scan_optionally_signed_decimal_int (Scanning.store_char ib c max) ib + scan_optionally_signed_decimal_int (Scanning.store_char max ib c) ib | _ -> max ;; @@ -651,7 +658,7 @@ let scan_float max ib = if Scanning.eof ib then max else match c with | '.' -> - let max = Scanning.store_char ib c max in + let max = Scanning.store_char max ib c in let max = scan_frac_part max ib in scan_exp_part max ib | c -> scan_exp_part max ib @@ -664,7 +671,7 @@ let scan_Float max ib = if Scanning.eof ib then bad_float () else match c with | '.' -> - let max = Scanning.store_char ib c max in + let max = Scanning.store_char max ib c in let max = scan_frac_part max ib in scan_exp_part max ib | 'e' | 'E' -> @@ -683,15 +690,15 @@ let scan_string stp max ib = if stp = [] then match c with | ' ' | '\t' | '\n' | '\r' -> max - | c -> loop (Scanning.store_char ib c max) else - if List.memq c stp then Scanning.skip_char ib max else - loop (Scanning.store_char ib c max) in + | c -> loop (Scanning.store_char max ib c) else + if List.memq c stp then Scanning.skip_char max ib else + loop (Scanning.store_char max ib c) in loop max ;; (* Scan a char: peek strictly one character in the input, whatsoever. *) let scan_char max ib = - Scanning.store_char ib (Scanning.checked_peek_char ib) max + Scanning.store_char max ib (Scanning.checked_peek_char ib) ;; let char_for_backslash = function @@ -704,27 +711,58 @@ let char_for_backslash = function (* The integer value corresponding to the facial value of a valid decimal digit character. *) -let int_value_of_char c = int_of_char c - 48;; +let decimal_value_of_char c = int_of_char c - int_of_char '0';; let char_for_decimal_code c0 c1 c2 = let c = - 100 * int_value_of_char c0 + - 10 * int_value_of_char c1 + - int_value_of_char c2 in + 100 * decimal_value_of_char c0 + + 10 * decimal_value_of_char c1 + + decimal_value_of_char c2 in if c < 0 || c > 255 then bad_input (Printf.sprintf "bad char \\%c%c%c" c0 c1 c2) else char_of_int c ;; +(* The integer value corresponding to the facial value of a valid + hexadecimal digit character. *) +let hexadecimal_value_of_char c = + let d = int_of_char c in + (* Could also be: + if d <= int_of_char '9' then d - int_of_char '0' else + if d <= int_of_char 'F' then 10 + d - int_of_char 'A' else + if d <= int_of_char 'f' then 10 + d - int_of_char 'a' else assert false + *) + if d >= int_of_char 'a' then + d - 87 (* 10 + int_of_char c - int_of_char 'a' *) else + if d >= int_of_char 'A' then + d - 55 (* 10 + int_of_char c - int_of_char 'A' *) else + d - int_of_char '0' +;; + +let char_for_hexadecimal_code c1 c2 = + let c = + 16 * hexadecimal_value_of_char c1 + + hexadecimal_value_of_char c2 in + if c < 0 || c > 255 + then bad_input (Printf.sprintf "bad char \\%c%c" c1 c2) + else char_of_int c +;; + (* Called when encountering '\\' as starter of a char. Stops before the corresponding '\''. *) -let scan_backslash_char max ib = - if max = 0 then bad_input "a char" else +let check_next_char message max ib = + if max = 0 then bad_input message else let c = Scanning.peek_char ib in - if Scanning.eof ib then bad_input "a char" else - match c with - | '\\' | '\'' | '"' | 'n' | 't' | 'b' | 'r' (* '"' helping Emacs *) -> - Scanning.store_char ib (char_for_backslash c) max + if Scanning.eof ib then bad_input message else c +;; + +let check_next_char_for_char = check_next_char "a char";; +let check_next_char_for_string = check_next_char "a string";; + +let scan_backslash_char max ib = + match check_next_char_for_char max ib with + | '\\' | '\'' | '\"' | 'n' | 't' | 'b' | 'r' as c -> + Scanning.store_char max ib (char_for_backslash c) | '0' .. '9' as c -> let get_digit () = let c = Scanning.next_char ib in @@ -734,57 +772,69 @@ let scan_backslash_char max ib = let c0 = c in let c1 = get_digit () in let c2 = get_digit () in - Scanning.store_char ib (char_for_decimal_code c0 c1 c2) (max - 2) + Scanning.store_char (max - 2) ib (char_for_decimal_code c0 c1 c2) + | 'x' -> + let get_digit () = + let c = Scanning.next_char ib in + match c with + | '0' .. '9' | 'A' .. 'F' | 'a' .. 'f' as c -> c + | c -> bad_input_escape c in + let c1 = get_digit () in + let c2 = get_digit () in + Scanning.store_char (max - 2) ib (char_for_hexadecimal_code c1 c2) | c -> bad_input_char c ;; let scan_Char max ib = - let rec loop s max = - if max = 0 then bad_input "a char" else - let c = Scanning.checked_peek_char ib in - if Scanning.eof ib then bad_input "a char" else - match c, s with - (* Looking for the '\'' at the beginning of the delimited char. *) - | '\'', 3 -> loop 2 (Scanning.ignore_char ib max) - (* Looking for the '\'' at the end of the delimited char. *) - | '\'', 1 -> Scanning.ignore_char ib max - (* Any other char at the beginning or end of the delimited char should be - '\''. *) - | c, (3 | 1) -> character_mismatch '\'' c - (* Found a '\\': check and read this escape char. *) - | '\\', 2 -> loop 1 (scan_backslash_char (Scanning.ignore_char ib max) ib) - (* The regular case, remember the char, then look for the terminal '\\'. *) - | c, 2 -> loop 1 (Scanning.store_char ib c max) - (* Any other case is an error, *) - | c, _ -> bad_input_char c in - loop 3 max + + let rec find_start max = + match check_next_char_for_char max ib with + | '\'' -> find_char (Scanning.ignore_char max ib) + | c -> character_mismatch '\'' c + + and find_char max = + match check_next_char_for_char max ib with + | '\\' -> find_stop (scan_backslash_char (Scanning.ignore_char max ib) ib) + | c -> find_stop (Scanning.store_char max ib c) + + and find_stop max = + match check_next_char_for_char max ib with + | '\'' -> Scanning.ignore_char max ib + | c -> character_mismatch '\'' c in + + find_start max ;; let scan_String max ib = - let rec loop s max = - if max = 0 then bad_input "a string" else - let c = Scanning.checked_peek_char ib in - if Scanning.eof ib then bad_input "a string" else - match c, s with - | '"', true (* '"' helping Emacs *) -> - loop false (Scanning.ignore_char ib max) - | '"', false (* '"' helping Emacs *) -> - Scanning.ignore_char ib max - | '\\', false -> - skip_spaces true (Scanning.ignore_char ib max) - | c, false -> loop false (Scanning.store_char ib c max) - | c, _ -> bad_input_char c - and skip_spaces s max = - if max = 0 then bad_input "a string" else - let c = Scanning.checked_peek_char ib in - if Scanning.eof ib then bad_input "a string" else - match c, s with - | '\n', true - | ' ', false -> - skip_spaces false (Scanning.ignore_char ib max) - | c, false -> loop false max - | _, _ -> loop false (scan_backslash_char (max - 1) ib) in - loop true max + + let rec find_start max = + match check_next_char_for_string max ib with + | '\"' -> find_stop (Scanning.ignore_char max ib) + | c -> character_mismatch '\"' c + + and find_stop max = + match check_next_char_for_string max ib with + | '\"' -> Scanning.ignore_char max ib + | '\\' -> scan_backslash (Scanning.ignore_char max ib) + | c -> find_stop (Scanning.store_char max ib c) + + and scan_backslash max = + match check_next_char_for_string max ib with + | '\r' -> skip_newline (Scanning.ignore_char max ib) + | '\n' -> skip_spaces (Scanning.ignore_char max ib) + | c -> find_stop (scan_backslash_char max ib) + + and skip_newline max = + match check_next_char_for_string max ib with + | '\n' -> skip_spaces (Scanning.ignore_char max ib) + | _ -> find_stop (Scanning.store_char max ib '\r') + + and skip_spaces max = + match check_next_char_for_string max ib with + | ' ' -> skip_spaces (Scanning.ignore_char max ib) + | _ -> find_stop max in + + find_start max ;; let scan_bool max ib = @@ -964,49 +1014,49 @@ let scan_chars_in_char_set stp char_set max ib = let c = Scanning.peek_char ib in if Scanning.eof ib then max else if c == cp1 - then loop_pos1 cp1 (Scanning.store_char ib c max) + then loop_pos1 cp1 (Scanning.store_char max ib c) else max and loop_pos2 cp1 cp2 max = if max = 0 then max else let c = Scanning.peek_char ib in if Scanning.eof ib then max else if c == cp1 || c == cp2 - then loop_pos2 cp1 cp2 (Scanning.store_char ib c max) + then loop_pos2 cp1 cp2 (Scanning.store_char max ib c) else max and loop_pos3 cp1 cp2 cp3 max = if max = 0 then max else let c = Scanning.peek_char ib in if Scanning.eof ib then max else if c == cp1 || c == cp2 || c == cp3 - then loop_pos3 cp1 cp2 cp3 (Scanning.store_char ib c max) + then loop_pos3 cp1 cp2 cp3 (Scanning.store_char max ib c) else max and loop_neg1 cp1 max = if max = 0 then max else let c = Scanning.peek_char ib in if Scanning.eof ib then max else if c != cp1 - then loop_neg1 cp1 (Scanning.store_char ib c max) + then loop_neg1 cp1 (Scanning.store_char max ib c) else max and loop_neg2 cp1 cp2 max = if max = 0 then max else let c = Scanning.peek_char ib in if Scanning.eof ib then max else if c != cp1 && c != cp2 - then loop_neg2 cp1 cp2 (Scanning.store_char ib c max) + then loop_neg2 cp1 cp2 (Scanning.store_char max ib c) else max and loop_neg3 cp1 cp2 cp3 max = if max = 0 then max else let c = Scanning.peek_char ib in if Scanning.eof ib then max else if c != cp1 && c != cp2 && c != cp3 - then loop_neg3 cp1 cp2 cp3 (Scanning.store_char ib c max) + then loop_neg3 cp1 cp2 cp3 (Scanning.store_char max ib c) else max and loop setp max = if max = 0 then max else let c = Scanning.peek_char ib in if Scanning.eof ib then max else if setp c == 1 - then loop setp (Scanning.store_char ib c max) + then loop setp (Scanning.store_char max ib c) else max in let max = @@ -1175,25 +1225,27 @@ let scan_format ib ef fmt rv f = if ir > limr then assert false else let token = Obj.magic rv.(ir) ib in scan_fmt (succ ir) (stack f token) (succ i) - | 'l' | 'n' | 'L' as conv -> + | 'l' | 'n' | 'L' as conv0 -> let i = succ i in - if i > lim then scan_fmt ir (stack f (get_count conv ib)) i else begin + if i > lim then scan_fmt ir (stack f (get_count conv0 ib)) i else begin match Sformat.get fmt i with (* This is in fact an integer conversion (e.g. %ld, %ni, or %Lo). *) - | 'd' | 'i' | 'o' | 'u' | 'x' | 'X' as conv -> - let _x = scan_int_conv conv max ib in + | 'd' | 'i' | 'o' | 'u' | 'x' | 'X' as conv1 -> + let _x = scan_int_conv conv1 max ib in (* Look back to the character that triggered the integer conversion - (this character is either 'l', 'n' or 'L'), to find the + (this character is either 'l', 'n' or 'L') to find the conversion to apply to the integer token read. *) - begin match Sformat.get fmt (i - 1) with - | 'l' -> scan_fmt ir (stack f (token_int32 conv ib)) (succ i) - | 'n' -> scan_fmt ir (stack f (token_nativeint conv ib)) (succ i) - | _ -> scan_fmt ir (stack f (token_int64 conv ib)) (succ i) end + begin match conv0 with + | 'l' -> scan_fmt ir (stack f (token_int32 conv1 ib)) (succ i) + | 'n' -> scan_fmt ir (stack f (token_nativeint conv1 ib)) (succ i) + | _ -> scan_fmt ir (stack f (token_int64 conv1 ib)) (succ i) end (* This is not an integer conversion, but a regular %l, %n or %L. *) - | _ -> scan_fmt ir (stack f (get_count conv ib)) i end + | _ -> scan_fmt ir (stack f (get_count conv0 ib)) i end | '!' -> if Scanning.end_of_input ib then scan_fmt ir f (succ i) else bad_input "end of input not found" + | ',' -> + scan_fmt ir f (succ i) | '_' -> if i > lim then incomplete_format fmt else scan_conversion true max ir f (succ i) @@ -1202,10 +1254,10 @@ let scan_format ib ef fmt rv f = if i > lim then accu, i else match Sformat.get fmt i with | '0' .. '9' as c -> - let accu = 10 * accu + int_value_of_char c in + let accu = 10 * accu + decimal_value_of_char c in read_width accu (succ i) | _ -> accu, i in - let max, i = read_width (int_value_of_char conv) (succ i) in + let max, i = read_width (decimal_value_of_char conv) (succ i) in if i > lim then incomplete_format fmt else begin match Sformat.get fmt i with | '.' -> diff --git a/stdlib/scanf.mli b/stdlib/scanf.mli index ca4c0668..9f35a740 100644 --- a/stdlib/scanf.mli +++ b/stdlib/scanf.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: scanf.mli,v 1.79 2008/09/27 20:45:05 weis Exp $ *) +(* $Id: scanf.mli 9421 2009-11-19 10:21:42Z weis $ *) (** Formatted input functions. *) @@ -69,7 +69,7 @@ However, it is also largely different, simpler, and yet more powerful: the formatted input functions are higher-order functionals and the parameter passing mechanism is just the regular function application not - the variable assigment based mechanism which is typical for formatted + the variable assignment based mechanism which is typical for formatted input in imperative languages; the Caml format strings also feature useful additions to easily define complex tokens; as expected within a functional programming language, the formatted input functions also @@ -197,16 +197,19 @@ val bscanf : Scanning.scanbuf -> ('a, 'b, 'c, 'd) scanner;; (** {7 The space character in format strings} *) (** As mentioned above, a plain character in the format string is just - matched with the characters of the input; however, one character is a - special exception to this simple rule: the space character (ASCII code - 32) does not match a single space character, but any amount of + matched with the next character of the input; however, two characters are + special exceptions to this rule: the space character ([' '] or ASCII code + 32) and the line feed character (['\n'] or ASCII code 10). + A space does not match a single space character, but any amount of ``whitespace'' in the input. More precisely, a space inside the format string matches {e any number} of tab, space, line feed and carriage - return characters. + return characters. Similarly, a line feed character in the format string + matches either a single line feed or a carriage return followed by a line + feed. Matching {e any} amount of whitespace, a space in the format string also matches no amount of whitespace at all; hence, the call [bscanf ib - "Price = %d $" (fun p -> p)] succeds and returns [1] when reading an + "Price = %d $" (fun p -> p)] succeeds and returns [1] when reading an input with various whitespace in it, such as [Price = 1 $], [Price = 1 $], or even [Price=1$]. *) @@ -287,6 +290,7 @@ val bscanf : Scanning.scanbuf -> ('a, 'b, 'c, 'd) scanner;; - [N] or [L]: returns the number of tokens read so far. - [!]: matches the end of input condition. - [%]: matches one [%] character in the input. + - [,]: the no-op delimiter for conversion specifications. Following the [%] character that introduces a conversion, there may be the special flag [_]: the conversion that follows occurs as usual, @@ -303,7 +307,7 @@ val bscanf : Scanning.scanbuf -> ('a, 'b, 'c, 'd) scanner;; Notes: - - as mentioned above, a [%s] convertion always succeeds, even if there is + - as mentioned above, a [%s] conversion always succeeds, even if there is nothing to read in the input: it simply returns [""]. - in addition to the relevant digits, ['_'] characters may appear @@ -361,7 +365,7 @@ val bscanf : Scanning.scanbuf -> ('a, 'b, 'c, 'd) scanner;; [End_of_file]: if the end of input is reached the conversion succeeds and simply returns the characters read so far, or [""] if none were read. *) -(** {6 Specialized formatted input functions} *) +(** {6 Specialised formatted input functions} *) val fscanf : in_channel -> ('a, 'b, 'c, 'd) scanner;; (** Same as {!Scanf.bscanf}, but reads from the given channel. @@ -373,7 +377,7 @@ val fscanf : in_channel -> ('a, 'b, 'c, 'd) scanner;; primitives on the channel (reading characters, seeking the reading position, and so on). - As a consequence, never mixt direct low level reading and high level + As a consequence, never mix direct low level reading and high level scanning from the same input channel. *) val sscanf : string -> ('a, 'b, 'c, 'd) scanner;; @@ -397,7 +401,7 @@ val kscanf : val bscanf_format : Scanning.scanbuf -> ('a, 'b, 'c, 'd, 'e, 'f) format6 -> (('a, 'b, 'c, 'd, 'e, 'f) format6 -> 'g) -> 'g;; -(** [bscanf_format ib fmt f] reads a format string token from the scannning +(** [bscanf_format ib fmt f] reads a format string token from the scanning buffer [ib], according to the given format string [fmt], and applies [f] to the resulting format string value. Raise [Scan_failure] if the format string value read does not have the diff --git a/stdlib/set.ml b/stdlib/set.ml index 79797687..103595e3 100644 --- a/stdlib/set.ml +++ b/stdlib/set.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: set.ml,v 1.19 2004/11/25 00:04:15 doligez Exp $ *) +(* $Id: set.ml 6694 2004-11-25 00:06:06Z doligez $ *) (* Sets over ordered types *) diff --git a/stdlib/set.mli b/stdlib/set.mli index ad18a7af..d8317bc2 100644 --- a/stdlib/set.mli +++ b/stdlib/set.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: set.mli,v 1.33 2005/07/21 14:52:45 doligez Exp $ *) +(* $Id: set.mli 6974 2005-07-21 14:52:45Z doligez $ *) (** Sets over ordered types. diff --git a/stdlib/sort.ml b/stdlib/sort.ml index 70939016..4bc0b8f5 100644 --- a/stdlib/sort.ml +++ b/stdlib/sort.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: sort.ml,v 1.10 2005/10/25 18:34:07 doligez Exp $ *) +(* $Id: sort.ml 7164 2005-10-25 18:34:07Z doligez $ *) (* Merging and sorting *) diff --git a/stdlib/sort.mli b/stdlib/sort.mli index 8b0d9678..4a2a217b 100644 --- a/stdlib/sort.mli +++ b/stdlib/sort.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: sort.mli,v 1.14 2005/10/25 18:34:07 doligez Exp $ *) +(* $Id: sort.mli 7164 2005-10-25 18:34:07Z doligez $ *) (** Sorting and merging lists. diff --git a/stdlib/stack.ml b/stdlib/stack.ml index 56d4ba80..94008f5a 100644 --- a/stdlib/stack.ml +++ b/stdlib/stack.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: stack.ml,v 1.9 2002/06/27 08:48:26 xleroy Exp $ *) +(* $Id: stack.ml 4956 2002-06-27 08:48:26Z xleroy $ *) type 'a t = { mutable c : 'a list } diff --git a/stdlib/stack.mli b/stdlib/stack.mli index 2a41b150..dc305898 100644 --- a/stdlib/stack.mli +++ b/stdlib/stack.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: stack.mli,v 1.19 2005/10/25 18:34:07 doligez Exp $ *) +(* $Id: stack.mli 7164 2005-10-25 18:34:07Z doligez $ *) (** Last-in first-out stacks. diff --git a/stdlib/stdLabels.ml b/stdlib/stdLabels.ml index 05a11985..d0f9730a 100644 --- a/stdlib/stdLabels.ml +++ b/stdlib/stdLabels.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: stdLabels.ml,v 1.3 2001/12/07 13:40:59 xleroy Exp $ *) +(* $Id: stdLabels.ml 4144 2001-12-07 13:41:02Z xleroy $ *) (* Module [StdLabels]: meta-module for labelled libraries *) diff --git a/stdlib/stdLabels.mli b/stdlib/stdLabels.mli index 43200b57..325afd6b 100644 --- a/stdlib/stdLabels.mli +++ b/stdlib/stdLabels.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: stdLabels.mli,v 1.13 2004/11/25 00:04:15 doligez Exp $ *) +(* $Id: stdLabels.mli 6694 2004-11-25 00:06:06Z doligez $ *) (** Standard labeled libraries. diff --git a/stdlib/std_exit.ml b/stdlib/std_exit.ml index 7b045e7b..f000f4b4 100644 --- a/stdlib/std_exit.ml +++ b/stdlib/std_exit.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: std_exit.ml,v 1.5 2001/12/07 13:40:59 xleroy Exp $ *) +(* $Id: std_exit.ml 4144 2001-12-07 13:41:02Z xleroy $ *) (* Ensure that [at_exit] functions are called at the end of every program *) diff --git a/stdlib/stdlib.mllib b/stdlib/stdlib.mllib index c23f5045..0858e0aa 100644 --- a/stdlib/stdlib.mllib +++ b/stdlib/stdlib.mllib @@ -1,48 +1,49 @@ -# This file lists all standard library modules. +# This file lists all standard library modules +# (in the same order as Makefile.shared). # It is used in particular to know what to expunge in toplevels. -# $Id: stdlib.mllib,v 1.2 2008/08/01 16:57:10 mauny Exp $ +# $Id: stdlib.mllib 9353 2009-09-24 09:17:39Z doligez $ Pervasives -Arg Array -ArrayLabels -Buffer -Callback -CamlinternalLazy -CamlinternalMod -CamlinternalOO +List Char -Complex -Digest -Filename -Format -Gc -Genlex +String +Sys Hashtbl +Sort +Marshal +Obj Int32 Int64 -Lazy -Lexing -List -ListLabels -Map -Marshal -MoreLabels Nativeint -Obj -Oo +Lexing Parsing -Printexc -Printf -Queue -Random -Scanf Set -Sort +Map Stack -StdLabels +Queue +CamlinternalLazy +Lazy Stream -String -StringLabels -Sys +Buffer +Printf +Format +Scanf +Arg +Printexc +Gc +Digest +Random +Callback +CamlinternalOO +Oo +CamlinternalMod +Genlex Weak +Filename +Complex +ArrayLabels +ListLabels +StringLabels +MoreLabels +StdLabels diff --git a/stdlib/stream.ml b/stdlib/stream.ml index 755e7434..c1a74ac8 100644 --- a/stdlib/stream.ml +++ b/stdlib/stream.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: stream.ml,v 1.14 2008/06/18 15:35:02 mauny Exp $ *) +(* $Id: stream.ml 8893 2008-06-18 15:35:02Z mauny $ *) (* 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 diff --git a/stdlib/stream.mli b/stdlib/stream.mli index 28f82ec5..05b9b523 100644 --- a/stdlib/stream.mli +++ b/stdlib/stream.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: stream.mli,v 1.25 2005/10/25 18:34:07 doligez Exp $ *) +(* $Id: stream.mli 7164 2005-10-25 18:34:07Z doligez $ *) (** Streams and parsers. *) diff --git a/stdlib/string.ml b/stdlib/string.ml index 908be652..63e2367d 100644 --- a/stdlib/string.ml +++ b/stdlib/string.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: string.ml,v 1.28.2.1 2008/11/12 10:53:47 doligez Exp $ *) +(* $Id: string.ml 9128 2008-11-12 10:55:15Z doligez $ *) (* String operations *) diff --git a/stdlib/string.mli b/stdlib/string.mli index 57ba2524..00d69ab1 100644 --- a/stdlib/string.mli +++ b/stdlib/string.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: string.mli,v 1.37.20.1 2008/10/08 13:07:13 doligez Exp $ *) +(* $Id: string.mli 9079 2008-10-08 13:09:39Z doligez $ *) (** String operations. Given a string [s] of length [l], we call character number in [s] diff --git a/stdlib/stringLabels.ml b/stdlib/stringLabels.ml index 77eb3451..86701dcc 100644 --- a/stdlib/stringLabels.ml +++ b/stdlib/stringLabels.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: stringLabels.ml,v 1.4 2004/01/03 22:08:38 doligez Exp $ *) +(* $Id: stringLabels.ml 6054 2004-01-03 22:08:38Z doligez $ *) (* Module [StringLabels]: labelled String module *) diff --git a/stdlib/stringLabels.mli b/stdlib/stringLabels.mli index 0489ba9f..3e16254c 100644 --- a/stdlib/stringLabels.mli +++ b/stdlib/stringLabels.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: stringLabels.mli,v 1.11 2007/01/22 08:06:09 garrigue Exp $ *) +(* $Id: stringLabels.mli 7805 2007-01-22 08:06:09Z garrigue $ *) (** String operations. *) diff --git a/stdlib/sys.mli b/stdlib/sys.mli index d209e705..eb1db4bf 100644 --- a/stdlib/sys.mli +++ b/stdlib/sys.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: sys.mli,v 1.49 2007/02/26 14:21:57 xleroy Exp $ *) +(* $Id: sys.mli 7927 2007-02-26 14:21:57Z xleroy $ *) (** System interface. *) diff --git a/stdlib/sys.mlp b/stdlib/sys.mlp index 97e7318c..03e2b91f 100644 --- a/stdlib/sys.mlp +++ b/stdlib/sys.mlp @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: sys.mlp,v 1.2 2007/02/26 14:21:57 xleroy Exp $ *) +(* $Id: sys.mlp 7927 2007-02-26 14:21:57Z xleroy $ *) (* WARNING: sys.ml is generated from sys.mlp. DO NOT EDIT sys.ml or your changes will be lost. diff --git a/stdlib/weak.ml b/stdlib/weak.ml index 8358d6e3..4799c74c 100644 --- a/stdlib/weak.ml +++ b/stdlib/weak.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: weak.ml,v 1.17 2008/02/29 14:21:22 doligez Exp $ *) +(* $Id: weak.ml 8823 2008-02-29 14:21:22Z doligez $ *) (** Weak array operations *) diff --git a/stdlib/weak.mli b/stdlib/weak.mli index b2dcf606..fdc561f2 100644 --- a/stdlib/weak.mli +++ b/stdlib/weak.mli @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: weak.mli,v 1.16.2.1 2008/11/13 10:39:46 doligez Exp $ *) +(* $Id: weak.mli 9130 2008-11-13 10:39:46Z doligez $ *) (** Arrays of weak pointers and hash tables of weak pointers. *) diff --git a/tools/Characters b/tools/Characters index 3c21adbf..2cd82df8 100644 --- a/tools/Characters +++ b/tools/Characters @@ -1,6 +1,6 @@ # Characters -# $Id: Characters,v 1.3 1999/11/29 19:04:21 doligez Exp $ +# $Id: Characters 2629 1999-11-29 19:04:21Z doligez $ # Usage: # Characters n1 to n2 diff --git a/tools/DoMake b/tools/DoMake index 28564909..87bd7ba3 100644 --- a/tools/DoMake +++ b/tools/DoMake @@ -1,6 +1,6 @@ # DoMake -# $Id: DoMake,v 1.5 1999/11/29 19:04:23 doligez Exp $ +# $Id: DoMake 2630 1999-11-29 19:04:23Z doligez $ # Execute the output of "Make -f Makefile.Mac -f Makefile.Mac.depend" # or "Make -f Makefile -f Makefile.depend" if "Makefile.Mac" does not exist diff --git a/tools/MakeDepend b/tools/MakeDepend index fb1e8a2e..0ca8e3d4 100644 --- a/tools/MakeDepend +++ b/tools/MakeDepend @@ -1,6 +1,6 @@ # MakeDepend -# $Id: MakeDepend,v 1.3 1999/11/29 19:04:25 doligez Exp $ +# $Id: MakeDepend 2631 1999-11-29 19:04:25Z doligez $ # Usage: MakeDepend fileÉ diff --git a/tools/Makefile b/tools/Makefile index 6d80e35c..f7997e85 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -10,7 +10,7 @@ # # ######################################################################### -# $Id: Makefile,v 1.66 2007/11/22 22:14:43 doligez Exp $ +# $Id: Makefile 8616 2007-11-22 22:14:43Z doligez $ include Makefile.shared diff --git a/tools/Makefile.nt b/tools/Makefile.nt index 0fc67a6a..66b4598e 100644 --- a/tools/Makefile.nt +++ b/tools/Makefile.nt @@ -10,7 +10,7 @@ # # ######################################################################### -# $Id: Makefile.nt,v 1.26 2007/11/07 10:14:21 frisch Exp $ +# $Id: Makefile.nt 8485 2007-11-07 10:14:21Z frisch $ include Makefile.shared diff --git a/tools/Makefile.shared b/tools/Makefile.shared index 9e847456..7ec1fa49 100644 --- a/tools/Makefile.shared +++ b/tools/Makefile.shared @@ -10,7 +10,7 @@ # # ######################################################################### -# $Id: Makefile.shared,v 1.5 2007/11/22 22:14:43 doligez Exp $ +# $Id: Makefile.shared 8616 2007-11-22 22:14:43Z doligez $ include ../config/Makefile diff --git a/tools/addlabels.ml b/tools/addlabels.ml index a89fbe51..9464a02b 100644 --- a/tools/addlabels.ml +++ b/tools/addlabels.ml @@ -1,4 +1,4 @@ -(* $Id: addlabels.ml,v 1.12 2008/07/09 13:03:37 mauny Exp $ *) +(* $Id: addlabels.ml 8906 2008-07-09 13:03:38Z mauny $ *) open StdLabels open Asttypes diff --git a/tools/checkstack.c b/tools/checkstack.c index 8abbd1e1..8a295800 100644 --- a/tools/checkstack.c +++ b/tools/checkstack.c @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: checkstack.c,v 1.3 2006/04/16 23:28:21 doligez Exp $ */ +/* $Id: checkstack.c 7382 2006-04-16 23:28:22Z doligez $ */ #include #include diff --git a/tools/cvt_emit.mll b/tools/cvt_emit.mll index de291abe..23ea61f4 100644 --- a/tools/cvt_emit.mll +++ b/tools/cvt_emit.mll @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: cvt_emit.mll,v 1.4 2000/10/02 14:17:55 maranget Exp $ *) +(* $Id: cvt_emit.mll 3304 2000-10-02 14:18:05Z maranget $ *) { let first_item = ref false diff --git a/tools/depend.ml b/tools/depend.ml index 0f33d18b..3936981b 100644 --- a/tools/depend.ml +++ b/tools/depend.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: depend.ml,v 1.13 2008/07/09 13:03:37 mauny Exp $ *) +(* $Id: depend.ml 8906 2008-07-09 13:03:38Z mauny $ *) open Format open Location diff --git a/tools/depend.mli b/tools/depend.mli index fc022b04..682d2c6d 100644 --- a/tools/depend.mli +++ b/tools/depend.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: depend.mli,v 1.2 2002/04/18 07:27:43 garrigue Exp $ *) +(* $Id: depend.mli 4694 2002-04-18 07:27:47Z garrigue $ *) (** Module dependencies. *) diff --git a/tools/dumpapprox.ml b/tools/dumpapprox.ml index 321de7ad..0021052e 100644 --- a/tools/dumpapprox.ml +++ b/tools/dumpapprox.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: dumpapprox.ml,v 1.15 2003/03/06 16:00:16 xleroy Exp $ *) +(* $Id: dumpapprox.ml 5423 2003-03-06 16:00:16Z xleroy $ *) (* Dump a .cmx file *) diff --git a/tools/dumpobj.ml b/tools/dumpobj.ml index 6132de6b..62fe18c8 100644 --- a/tools/dumpobj.ml +++ b/tools/dumpobj.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: dumpobj.ml,v 1.38 2008/09/10 12:53:05 doligez Exp $ *) +(* $Id: dumpobj.ml 9015 2008-09-10 12:53:05Z doligez $ *) (* Disassembler for executable and .cmo object files *) diff --git a/tools/keywords.r b/tools/keywords.r index 3c208b8b..1e849518 100644 --- a/tools/keywords.r +++ b/tools/keywords.r @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: keywords.r,v 1.3 2001/12/07 13:41:01 xleroy Exp $ */ +/* $Id: keywords.r 4144 2001-12-07 13:41:02Z xleroy $ */ type 'Odds' { longint; /* resource ID of corresponding 'Sods' */ diff --git a/tools/lexer299.mll b/tools/lexer299.mll index 871bd287..e85c73c3 100644 --- a/tools/lexer299.mll +++ b/tools/lexer299.mll @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: lexer299.mll,v 1.4 2005/06/22 13:52:36 doligez Exp $ *) +(* $Id: lexer299.mll 6924 2005-06-22 13:52:36Z doligez $ *) (* The lexer definition *) diff --git a/tools/lexer301.mll b/tools/lexer301.mll index a73cc343..c05db338 100644 --- a/tools/lexer301.mll +++ b/tools/lexer301.mll @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: lexer301.mll,v 1.5 2004/11/30 18:57:04 doligez Exp $ *) +(* $Id: lexer301.mll 6720 2004-11-30 18:57:04Z doligez $ *) (* The lexer definition *) diff --git a/tools/make-package-macosx b/tools/make-package-macosx index 2b9ee1fb..0c01190a 100755 --- a/tools/make-package-macosx +++ b/tools/make-package-macosx @@ -12,7 +12,7 @@ # # ######################################################################### -# $Id: make-package-macosx,v 1.16.4.1 2008/10/16 15:57:00 doligez Exp $ +# $Id: make-package-macosx 9093 2008-10-16 15:57:00Z doligez $ cd package-macosx rm -rf ocaml.pkg ocaml-rw.dmg diff --git a/tools/objinfo.ml b/tools/objinfo.ml index 4b262627..f5141686 100644 --- a/tools/objinfo.ml +++ b/tools/objinfo.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: objinfo.ml,v 1.11 2006/07/05 12:09:18 pouillar Exp $ *) +(* $Id: objinfo.ml 7469 2006-07-05 12:09:18Z pouillar $ *) (* Dump a compilation unit description *) diff --git a/tools/ocaml-objcopy-macosx b/tools/ocaml-objcopy-macosx index 23589f17..99279cf8 100755 --- a/tools/ocaml-objcopy-macosx +++ b/tools/ocaml-objcopy-macosx @@ -12,7 +12,7 @@ # # ######################################################################### -# $Id: ocaml-objcopy-macosx,v 1.2 2006/01/04 16:55:50 doligez Exp $ +# $Id: ocaml-objcopy-macosx 7307 2006-01-04 16:55:50Z doligez $ TMP="${TMPDIR=/tmp}" diff --git a/tools/ocaml299to3.ml b/tools/ocaml299to3.ml index 6727958e..e30d71c9 100644 --- a/tools/ocaml299to3.ml +++ b/tools/ocaml299to3.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: ocaml299to3.ml,v 1.6 2001/10/03 01:34:05 garrigue Exp $ *) +(* $Id: ocaml299to3.ml 3838 2001-10-03 01:34:05Z garrigue $ *) open Lexer299 diff --git a/tools/ocamlcp.ml b/tools/ocamlcp.ml index 2aff55b1..178a3b5e 100644 --- a/tools/ocamlcp.ml +++ b/tools/ocamlcp.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: ocamlcp.ml,v 1.41 2007/05/16 08:21:40 doligez Exp $ *) +(* $Id: ocamlcp.ml 8232 2007-05-16 08:21:41Z doligez $ *) open Printf diff --git a/tools/ocamldep.ml b/tools/ocamldep.ml index fc399f72..7d3c90c4 100644 --- a/tools/ocamldep.ml +++ b/tools/ocamldep.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: ocamldep.ml,v 1.44 2008/08/01 09:02:55 xleroy Exp $ *) +(* $Id: ocamldep.ml 8963 2008-08-01 09:02:55Z xleroy $ *) open Format open Location diff --git a/tools/ocamlmklib.mlp b/tools/ocamlmklib.mlp index cec48773..9b047123 100644 --- a/tools/ocamlmklib.mlp +++ b/tools/ocamlmklib.mlp @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: ocamlmklib.mlp,v 1.16 2008/01/08 15:39:47 doligez Exp $ *) +(* $Id: ocamlmklib.mlp 9365 2009-10-02 12:32:45Z doligez $ *) open Printf open Myocamlbuild_config @@ -123,9 +123,8 @@ let parse_arguments argv = done; List.iter (fun r -> r := List.rev !r) - [ bytecode_objs; native_objs; c_objs; caml_libs; caml_opts; + [ bytecode_objs; native_objs; caml_libs; caml_opts; c_libs; c_objs; c_opts; ld_opts; rpath ]; - (* On retourne deux fois c_objs ?? -- AF *) if !output_c = "" then output_c := !output @@ -184,7 +183,7 @@ let make_rpath flag = else flag ^ String.concat ":" (make_set !rpath) let make_rpath_ccopt flag = - if !rpath = [] || flag = "" + if !rpath = [] || flag = "" then "" else "-ccopt " ^ flag ^ String.concat ":" (make_set !rpath) @@ -200,10 +199,10 @@ let prepostfix pre name post = let transl_path s = match Sys.os_type with | "Win32" -> - let rec aux i = - if i = String.length s || s.[i] = ' ' then s - else (if s.[i] = '/' then s.[i] <- '\\'; aux (i + 1)) - in aux 0 + let rec aux i = + if i = String.length s || s.[i] = ' ' then s + else (if s.[i] = '/' then s.[i] <- '\\'; aux (i + 1)) + in aux 0 | _ -> s let build_libs () = diff --git a/tools/ocamlmktop.ml b/tools/ocamlmktop.ml index a64f50d5..8104607d 100644 --- a/tools/ocamlmktop.ml +++ b/tools/ocamlmktop.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: ocamlmktop.ml,v 1.6 2003/03/24 15:27:01 xleroy Exp $ *) +(* $Id: ocamlmktop.ml 5454 2003-03-24 15:27:01Z xleroy $ *) let _ = let args = Ccomp.quote_files (List.tl (Array.to_list Sys.argv)) in diff --git a/tools/ocamlmktop.tpl b/tools/ocamlmktop.tpl index 9ee3529b..f8395e94 100644 --- a/tools/ocamlmktop.tpl +++ b/tools/ocamlmktop.tpl @@ -11,6 +11,6 @@ # # ######################################################################### -# $Id: ocamlmktop.tpl,v 1.5 2004/02/22 14:52:50 xleroy Exp $ +# $Id: ocamlmktop.tpl 6128 2004-02-22 14:52:50Z xleroy $ exec %%BINDIR%%/ocamlc -linkall toplevellib.cma "$@" topstart.cmo diff --git a/tools/ocamlprof.ml b/tools/ocamlprof.ml index 7eeca94d..f1d6e557 100644 --- a/tools/ocamlprof.ml +++ b/tools/ocamlprof.ml @@ -11,7 +11,7 @@ (* *) (***********************************************************************) -(* $Id: ocamlprof.ml,v 1.42 2007/12/04 13:38:58 doligez Exp $ *) +(* $Id: ocamlprof.ml 8705 2007-12-04 13:38:58Z doligez $ *) open Printf diff --git a/tools/primreq.ml b/tools/primreq.ml index 81c68ad7..74b6aa36 100644 --- a/tools/primreq.ml +++ b/tools/primreq.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: primreq.ml,v 1.5 2006/07/05 12:09:18 pouillar Exp $ *) +(* $Id: primreq.ml 7469 2006-07-05 12:09:18Z pouillar $ *) (* Determine the set of C primitives required by the given .cmo and .cma files *) diff --git a/tools/profiling.ml b/tools/profiling.ml index b6339def..e9bd5f9f 100644 --- a/tools/profiling.ml +++ b/tools/profiling.ml @@ -12,7 +12,7 @@ (* *) (***********************************************************************) -(* $Id: profiling.ml,v 1.8 2006/11/28 15:59:35 doligez Exp $ *) +(* $Id: profiling.ml 7762 2006-11-28 15:59:35Z doligez $ *) (* Run-time library for profiled programs *) diff --git a/tools/profiling.mli b/tools/profiling.mli index b7b4d1ab..01dc1215 100644 --- a/tools/profiling.mli +++ b/tools/profiling.mli @@ -12,7 +12,7 @@ (* *) (***********************************************************************) -(* $Id: profiling.mli,v 1.6 2005/03/24 17:20:54 doligez Exp $ *) +(* $Id: profiling.mli 6824 2005-03-24 17:20:54Z doligez $ *) (* Run-time library for profiled programs *) diff --git a/tools/scrapelabels.ml b/tools/scrapelabels.ml index b17cab96..67bbc309 100644 --- a/tools/scrapelabels.ml +++ b/tools/scrapelabels.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: scrapelabels.ml,v 1.6 2001/10/04 01:55:02 garrigue Exp $ *) +(* $Id: scrapelabels.ml 3850 2001-10-04 01:55:02Z garrigue $ *) open StdLabels open Lexer301 diff --git a/toplevel/expunge.ml b/toplevel/expunge.ml index a78c5555..81800907 100644 --- a/toplevel/expunge.ml +++ b/toplevel/expunge.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: expunge.ml,v 1.16 2004/01/16 15:24:03 doligez Exp $ *) +(* $Id: expunge.ml 6074 2004-01-16 15:24:03Z doligez $ *) (* "Expunge" a toplevel by removing compiler modules from the global List.map. Usage: expunge *) diff --git a/toplevel/genprintval.ml b/toplevel/genprintval.ml index c108811e..52cf376d 100644 --- a/toplevel/genprintval.ml +++ b/toplevel/genprintval.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: genprintval.ml,v 1.39 2007/10/09 10:29:37 weis Exp $ *) +(* $Id: genprintval.ml 8418 2007-10-09 10:29:37Z weis $ *) (* To print values *) diff --git a/toplevel/genprintval.mli b/toplevel/genprintval.mli index 05a1c283..edb8a4a3 100644 --- a/toplevel/genprintval.mli +++ b/toplevel/genprintval.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: genprintval.mli,v 1.10 2002/04/18 07:27:44 garrigue Exp $ *) +(* $Id: genprintval.mli 4694 2002-04-18 07:27:47Z garrigue $ *) (* Printing of values *) diff --git a/toplevel/opttopdirs.ml b/toplevel/opttopdirs.ml index 7b389f32..4a39a283 100644 --- a/toplevel/opttopdirs.ml +++ b/toplevel/opttopdirs.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: opttopdirs.ml,v 1.2.4.1 2008/11/19 02:35:40 garrigue Exp $ *) +(* $Id: opttopdirs.ml 9134 2008-11-19 02:35:40Z garrigue $ *) (* Toplevel directives *) diff --git a/toplevel/opttopdirs.mli b/toplevel/opttopdirs.mli index da877169..77330bda 100644 --- a/toplevel/opttopdirs.mli +++ b/toplevel/opttopdirs.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: opttopdirs.mli,v 1.2 2007/11/06 15:16:56 frisch Exp $ *) +(* $Id: opttopdirs.mli 8477 2007-11-06 15:16:56Z frisch $ *) (* The toplevel directives. *) diff --git a/toplevel/opttoploop.ml b/toplevel/opttoploop.ml index aa5dcccc..95baaf79 100644 --- a/toplevel/opttoploop.ml +++ b/toplevel/opttoploop.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: opttoploop.ml,v 1.3 2007/12/04 13:38:58 doligez Exp $ *) +(* $Id: opttoploop.ml 8705 2007-12-04 13:38:58Z doligez $ *) (* The interactive toplevel loop *) diff --git a/toplevel/opttoploop.mli b/toplevel/opttoploop.mli index e1261b24..86363ba7 100644 --- a/toplevel/opttoploop.mli +++ b/toplevel/opttoploop.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: opttoploop.mli,v 1.3 2007/12/04 13:38:58 doligez Exp $ *) +(* $Id: opttoploop.mli 8705 2007-12-04 13:38:58Z doligez $ *) open Format diff --git a/toplevel/opttopmain.ml b/toplevel/opttopmain.ml index cb312d1f..76e41492 100644 --- a/toplevel/opttopmain.ml +++ b/toplevel/opttopmain.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: opttopmain.ml,v 1.2 2007/11/06 15:16:56 frisch Exp $ *) +(* $Id: opttopmain.ml 8477 2007-11-06 15:16:56Z frisch $ *) open Clflags diff --git a/toplevel/opttopmain.mli b/toplevel/opttopmain.mli index 70d24a5a..119cb000 100644 --- a/toplevel/opttopmain.mli +++ b/toplevel/opttopmain.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: opttopmain.mli,v 1.2 2007/11/06 15:16:56 frisch Exp $ *) +(* $Id: opttopmain.mli 8477 2007-11-06 15:16:56Z frisch $ *) (* Start the [ocaml] toplevel loop *) diff --git a/toplevel/opttopstart.ml b/toplevel/opttopstart.ml index 1071a683..c13cfcbb 100644 --- a/toplevel/opttopstart.ml +++ b/toplevel/opttopstart.ml @@ -10,6 +10,6 @@ (* *) (***********************************************************************) -(* $Id: opttopstart.ml,v 1.2 2007/11/06 15:16:56 frisch Exp $ *) +(* $Id: opttopstart.ml 8477 2007-11-06 15:16:56Z frisch $ *) let _ = Opttopmain.main() diff --git a/toplevel/topdirs.ml b/toplevel/topdirs.ml index 50cbc4ed..d45b4f72 100644 --- a/toplevel/topdirs.ml +++ b/toplevel/topdirs.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: topdirs.ml,v 1.66.14.1 2008/11/19 02:35:40 garrigue Exp $ *) +(* $Id: topdirs.ml 9134 2008-11-19 02:35:40Z garrigue $ *) (* Toplevel directives *) diff --git a/toplevel/topdirs.mli b/toplevel/topdirs.mli index 0dde52d1..1aa70859 100644 --- a/toplevel/topdirs.mli +++ b/toplevel/topdirs.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: topdirs.mli,v 1.12 2002/04/18 07:27:44 garrigue Exp $ *) +(* $Id: topdirs.mli 4694 2002-04-18 07:27:47Z garrigue $ *) (* The toplevel directives. *) diff --git a/toplevel/toploop.ml b/toplevel/toploop.ml index 42f4a848..2a6ff83f 100644 --- a/toplevel/toploop.ml +++ b/toplevel/toploop.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: toploop.ml,v 1.95 2007/12/04 13:38:58 doligez Exp $ *) +(* $Id: toploop.ml 8705 2007-12-04 13:38:58Z doligez $ *) (* The interactive toplevel loop *) diff --git a/toplevel/toploop.mli b/toplevel/toploop.mli index 06c7d71f..be9c27b8 100644 --- a/toplevel/toploop.mli +++ b/toplevel/toploop.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: toploop.mli,v 1.26 2007/12/04 13:38:58 doligez Exp $ *) +(* $Id: toploop.mli 8705 2007-12-04 13:38:58Z doligez $ *) open Format diff --git a/toplevel/topmain.ml b/toplevel/topmain.ml index 6abfdb26..95e6a051 100644 --- a/toplevel/topmain.ml +++ b/toplevel/topmain.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: topmain.ml,v 1.39 2005/01/28 17:52:58 doligez Exp $ *) +(* $Id: topmain.ml 6758 2005-01-28 17:52:58Z doligez $ *) open Clflags diff --git a/toplevel/topmain.mli b/toplevel/topmain.mli index 21591de3..c2a7c896 100644 --- a/toplevel/topmain.mli +++ b/toplevel/topmain.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: topmain.mli,v 1.1 2002/04/24 08:02:51 xleroy Exp $ *) +(* $Id: topmain.mli 4731 2002-04-24 08:02:51Z xleroy $ *) (* Start the [ocaml] toplevel loop *) diff --git a/toplevel/topstart.ml b/toplevel/topstart.ml index 367015bd..7d853f51 100644 --- a/toplevel/topstart.ml +++ b/toplevel/topstart.ml @@ -10,6 +10,6 @@ (* *) (***********************************************************************) -(* $Id: topstart.ml,v 1.1 2002/04/24 08:02:51 xleroy Exp $ *) +(* $Id: topstart.ml 4731 2002-04-24 08:02:51Z xleroy $ *) let _ = Topmain.main() diff --git a/toplevel/trace.ml b/toplevel/trace.ml index f5ca4ef0..a306d9b4 100644 --- a/toplevel/trace.ml +++ b/toplevel/trace.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: trace.ml,v 1.20 2001/04/19 08:34:20 garrigue Exp $ *) +(* $Id: trace.ml 3490 2001-04-19 08:34:21Z garrigue $ *) (* The "trace" facility *) diff --git a/toplevel/trace.mli b/toplevel/trace.mli index 22cf754b..853509af 100644 --- a/toplevel/trace.mli +++ b/toplevel/trace.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: trace.mli,v 1.9 2000/03/06 22:11:55 weis Exp $ *) +(* $Id: trace.mli 2908 2000-03-06 22:12:09Z weis $ *) (* The "trace" facility *) diff --git a/typing/annot.mli b/typing/annot.mli index 1dfdbaae..95e72437 100644 --- a/typing/annot.mli +++ b/typing/annot.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: annot.mli,v 1.2 2008/07/29 15:42:44 doligez Exp $ *) +(* $Id: annot.mli 8958 2008-07-29 15:42:44Z doligez $ *) (* Data types for annotations (Stypes.ml) *) diff --git a/typing/btype.ml b/typing/btype.ml index ab6ee5ef..70fa4486 100644 --- a/typing/btype.ml +++ b/typing/btype.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: btype.ml,v 1.42 2008/07/19 02:13:09 garrigue Exp $ *) +(* $Id: btype.ml 8922 2008-07-19 02:13:09Z garrigue $ *) (* Basic operations on core types *) diff --git a/typing/btype.mli b/typing/btype.mli index 96a0bcad..dad6c4a0 100644 --- a/typing/btype.mli +++ b/typing/btype.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: btype.mli,v 1.20 2008/07/19 02:13:09 garrigue Exp $ *) +(* $Id: btype.mli 8922 2008-07-19 02:13:09Z garrigue $ *) (* Basic operations on core types *) diff --git a/typing/ctype.ml b/typing/ctype.ml index d84f765c..9b9024bb 100644 --- a/typing/ctype.ml +++ b/typing/ctype.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: ctype.ml,v 1.216.2.5 2009/05/19 05:51:03 garrigue Exp $ *) +(* $Id: ctype.ml 9453 2009-12-07 13:04:54Z garrigue $ *) (* Operations on core types *) @@ -3336,39 +3336,29 @@ let nondep_type env id ty = let nondep_type_decl env mid id is_covariant decl = try let params = List.map (nondep_type_rec env mid) decl.type_params in - let decl = - { type_params = params; - type_arity = decl.type_arity; - type_kind = - begin try - match decl.type_kind with - Type_abstract -> - Type_abstract - | Type_variant cstrs -> - Type_variant(List.map - (fun (c, tl) -> (c, List.map (nondep_type_rec env mid) tl)) - cstrs) - | Type_record(lbls, rep) -> - Type_record( - List.map - (fun (c, mut, t) -> (c, mut, nondep_type_rec env mid t)) - lbls, - rep) - with Not_found when is_covariant -> - Type_abstract - end; - type_manifest = - begin try - match decl.type_manifest with - None -> None - | Some ty -> - Some (unroll_abbrev id params (nondep_type_rec env mid ty)) - with Not_found when is_covariant -> - None - end; - type_private = decl.type_private; - type_variance = decl.type_variance; - } + let tk = + try match decl.type_kind with + Type_abstract -> + Type_abstract + | Type_variant cstrs -> + Type_variant + (List.map + (fun (c, tl) -> (c, List.map (nondep_type_rec env mid) tl)) + cstrs) + | Type_record(lbls, rep) -> + Type_record + (List.map + (fun (c, mut, t) -> (c, mut, nondep_type_rec env mid t)) + lbls, + rep) + with Not_found when is_covariant -> Type_abstract + and tm = + try match decl.type_manifest with + None -> None + | Some ty -> + Some (unroll_abbrev id params (nondep_type_rec env mid ty)) + with Not_found when is_covariant -> + None in cleanup_types (); List.iter unmark_type decl.type_params; @@ -3383,7 +3373,18 @@ let nondep_type_decl env mid id is_covariant decl = None -> () | Some ty -> unmark_type ty end; - decl + let priv = + match tm with + | Some ty when Btype.has_constr_row ty -> Private + | _ -> decl.type_private + in + { type_params = params; + type_arity = decl.type_arity; + type_kind = tk; + type_manifest = tm; + type_private = priv; + type_variance = decl.type_variance; + } with Not_found -> cleanup_types (); raise Not_found diff --git a/typing/ctype.mli b/typing/ctype.mli index 9444d820..eea10b49 100644 --- a/typing/ctype.mli +++ b/typing/ctype.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: ctype.mli,v 1.55.4.2 2009/02/13 05:05:36 garrigue Exp $ *) +(* $Id: ctype.mli 9168 2009-02-13 05:05:36Z garrigue $ *) (* Operations on core types *) diff --git a/typing/datarepr.ml b/typing/datarepr.ml index 694f9123..157dd75e 100644 --- a/typing/datarepr.ml +++ b/typing/datarepr.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: datarepr.ml,v 1.13 2003/07/02 09:14:32 xleroy Exp $ *) +(* $Id: datarepr.ml 5643 2003-07-02 09:14:35Z xleroy $ *) (* Compute constructor and label descriptions from type declarations, determining their representation. *) diff --git a/typing/datarepr.mli b/typing/datarepr.mli index e87335a7..563d5f77 100644 --- a/typing/datarepr.mli +++ b/typing/datarepr.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: datarepr.mli,v 1.9 2003/07/02 09:14:32 xleroy Exp $ *) +(* $Id: datarepr.mli 5643 2003-07-02 09:14:35Z xleroy $ *) (* Compute constructor and label descriptions from type declarations, determining their representation. *) diff --git a/typing/env.ml b/typing/env.ml index 06c0ec69..2fcf9c1b 100644 --- a/typing/env.ml +++ b/typing/env.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: env.ml,v 1.66.2.1 2009/04/28 05:11:54 garrigue Exp $ *) +(* $Id: env.ml 9240 2009-04-28 05:11:54Z garrigue $ *) (* Environment handling *) diff --git a/typing/env.mli b/typing/env.mli index 76252ba6..5ee7af39 100644 --- a/typing/env.mli +++ b/typing/env.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: env.mli,v 1.35 2008/10/06 13:53:54 doligez Exp $ *) +(* $Id: env.mli 9074 2008-10-06 13:53:54Z doligez $ *) (* Environment handling *) diff --git a/typing/ident.ml b/typing/ident.ml index a30aa7a4..4cd5c811 100644 --- a/typing/ident.ml +++ b/typing/ident.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: ident.ml,v 1.23 2004/01/04 14:32:34 doligez Exp $ *) +(* $Id: ident.ml 6055 2004-01-04 14:32:34Z doligez $ *) open Format diff --git a/typing/ident.mli b/typing/ident.mli index 9f7372cb..a6d0a190 100644 --- a/typing/ident.mli +++ b/typing/ident.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: ident.mli,v 1.17 2004/01/04 14:32:34 doligez Exp $ *) +(* $Id: ident.mli 6055 2004-01-04 14:32:34Z doligez $ *) (* Identifiers (unique names) *) diff --git a/typing/includeclass.ml b/typing/includeclass.ml index 2f06f122..c722ae72 100644 --- a/typing/includeclass.ml +++ b/typing/includeclass.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: includeclass.ml,v 1.8.16.1 2009/04/19 08:42:43 xleroy Exp $ *) +(* $Id: includeclass.ml 9236 2009-04-19 08:42:43Z xleroy $ *) (* Inclusion checks for the class language *) diff --git a/typing/includeclass.mli b/typing/includeclass.mli index 5e584b05..8f9cdca1 100644 --- a/typing/includeclass.mli +++ b/typing/includeclass.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: includeclass.mli,v 1.3 2000/03/06 22:11:58 weis Exp $ *) +(* $Id: includeclass.mli 2908 2000-03-06 22:12:09Z weis $ *) (* Inclusion checks for the class language *) diff --git a/typing/includecore.ml b/typing/includecore.ml index ba4d1120..5b6d66fe 100644 --- a/typing/includecore.ml +++ b/typing/includecore.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: includecore.ml,v 1.35.4.2 2008/10/16 03:05:26 garrigue Exp $ *) +(* $Id: includecore.ml 9298 2009-06-13 10:26:05Z garrigue $ *) (* Inclusion checks for the core language *) @@ -40,7 +40,8 @@ let value_descriptions env vd1 vd2 = let private_flags decl1 decl2 = match decl1.type_private, decl2.type_private with | Private, Public -> - decl2.type_kind = Type_abstract && decl2.type_manifest = None + decl2.type_kind = Type_abstract && + (decl2.type_manifest = None || decl1.type_kind <> Type_abstract) | _, _ -> true (* Inclusion between manifest types (particularly for private row types) *) diff --git a/typing/includecore.mli b/typing/includecore.mli index d21f50ae..2336c028 100644 --- a/typing/includecore.mli +++ b/typing/includecore.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: includecore.mli,v 1.10 1999/11/17 18:58:54 xleroy Exp $ *) +(* $Id: includecore.mli 2553 1999-11-17 18:59:06Z xleroy $ *) (* Inclusion checks for the core language *) diff --git a/typing/includemod.ml b/typing/includemod.ml index fa7e2fd1..3d7efe1d 100644 --- a/typing/includemod.ml +++ b/typing/includemod.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: includemod.ml,v 1.39 2008/01/11 16:13:16 doligez Exp $ *) +(* $Id: includemod.ml 8768 2008-01-11 16:13:18Z doligez $ *) (* Inclusion checks for the module language *) diff --git a/typing/includemod.mli b/typing/includemod.mli index 1ea68be9..cc50b134 100644 --- a/typing/includemod.mli +++ b/typing/includemod.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: includemod.mli,v 1.13 2006/09/20 11:14:37 doligez Exp $ *) +(* $Id: includemod.mli 7619 2006-09-20 11:14:37Z doligez $ *) (* Inclusion checks for the module language *) diff --git a/typing/mtype.ml b/typing/mtype.ml index 882d0f3f..485b6be7 100644 --- a/typing/mtype.ml +++ b/typing/mtype.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: mtype.ml,v 1.28.4.1 2009/06/08 02:35:15 garrigue Exp $ *) +(* $Id: mtype.ml 9291 2009-06-08 02:35:15Z garrigue $ *) (* Operations on module types *) diff --git a/typing/mtype.mli b/typing/mtype.mli index be0f7577..855b35df 100644 --- a/typing/mtype.mli +++ b/typing/mtype.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: mtype.mli,v 1.10 2004/04/09 13:32:28 xleroy Exp $ *) +(* $Id: mtype.mli 6196 2004-04-09 13:32:28Z xleroy $ *) (* Operations on module types *) diff --git a/typing/oprint.ml b/typing/oprint.ml index dfc15639..63d31034 100644 --- a/typing/oprint.ml +++ b/typing/oprint.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: oprint.ml,v 1.26.4.1 2008/10/08 13:07:14 doligez Exp $ *) +(* $Id: oprint.ml 9079 2008-10-08 13:09:39Z doligez $ *) open Format open Outcometree diff --git a/typing/oprint.mli b/typing/oprint.mli index 6569cb8b..7687b999 100644 --- a/typing/oprint.mli +++ b/typing/oprint.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: oprint.mli,v 1.2 2002/04/18 07:27:45 garrigue Exp $ *) +(* $Id: oprint.mli 4694 2002-04-18 07:27:47Z garrigue $ *) open Format open Outcometree diff --git a/typing/outcometree.mli b/typing/outcometree.mli index 63b53caf..42d68d3d 100644 --- a/typing/outcometree.mli +++ b/typing/outcometree.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: outcometree.mli,v 1.15 2006/04/05 02:28:13 garrigue Exp $ *) +(* $Id: outcometree.mli 7372 2006-04-05 02:28:13Z garrigue $ *) (* Module [Outcometree]: results displayed by the toplevel *) diff --git a/typing/parmatch.ml b/typing/parmatch.ml index 48e9821b..518cd9eb 100644 --- a/typing/parmatch.ml +++ b/typing/parmatch.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: parmatch.ml,v 1.76.2.2 2009/03/16 04:24:05 garrigue Exp $ *) +(* $Id: parmatch.ml 9187 2009-03-16 04:24:05Z garrigue $ *) (* Detection of partial matches and unused match cases. *) diff --git a/typing/parmatch.mli b/typing/parmatch.mli index 29767c0f..3080749f 100644 --- a/typing/parmatch.mli +++ b/typing/parmatch.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: parmatch.mli,v 1.12 2008/07/09 13:03:37 mauny Exp $ *) +(* $Id: parmatch.mli 8906 2008-07-09 13:03:38Z mauny $ *) (* Detection of partial matches and unused match cases. *) open Types diff --git a/typing/path.ml b/typing/path.ml index 678fc406..aaadb873 100644 --- a/typing/path.ml +++ b/typing/path.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: path.ml,v 1.9 2003/07/01 13:05:43 xleroy Exp $ *) +(* $Id: path.ml 5640 2003-07-01 13:05:43Z xleroy $ *) type t = Pident of Ident.t diff --git a/typing/path.mli b/typing/path.mli index 12d36097..e4d06324 100644 --- a/typing/path.mli +++ b/typing/path.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: path.mli,v 1.8 2003/07/01 13:05:43 xleroy Exp $ *) +(* $Id: path.mli 5640 2003-07-01 13:05:43Z xleroy $ *) (* Access paths *) diff --git a/typing/predef.ml b/typing/predef.ml index ae452723..240f0734 100644 --- a/typing/predef.ml +++ b/typing/predef.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: predef.ml,v 1.32 2007/10/09 10:29:37 weis Exp $ *) +(* $Id: predef.ml 8418 2007-10-09 10:29:37Z weis $ *) (* Predefined type constructors (with special typing rules in typecore) *) diff --git a/typing/predef.mli b/typing/predef.mli index 34ff2a7e..3cf8b25d 100644 --- a/typing/predef.mli +++ b/typing/predef.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: predef.mli,v 1.16 2006/10/24 20:54:58 weis Exp $ *) +(* $Id: predef.mli 7702 2006-10-24 20:54:58Z weis $ *) (* Predefined type constructors (with special typing rules in typecore) *) diff --git a/typing/primitive.ml b/typing/primitive.ml index c14a1f3b..c7ff9528 100644 --- a/typing/primitive.ml +++ b/typing/primitive.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: primitive.ml,v 1.9 2008/07/24 05:35:22 frisch Exp $ *) +(* $Id: primitive.ml 8930 2008-07-24 05:35:22Z frisch $ *) (* Description of primitive functions *) diff --git a/typing/primitive.mli b/typing/primitive.mli index 8b39244c..70050229 100644 --- a/typing/primitive.mli +++ b/typing/primitive.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: primitive.mli,v 1.8 2008/07/24 05:35:22 frisch Exp $ *) +(* $Id: primitive.mli 8930 2008-07-24 05:35:22Z frisch $ *) (* Description of primitive functions *) diff --git a/typing/printtyp.ml b/typing/printtyp.ml index 32f3d571..571241d3 100644 --- a/typing/printtyp.ml +++ b/typing/printtyp.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: printtyp.ml,v 1.147 2008/07/19 02:13:09 garrigue Exp $ *) +(* $Id: printtyp.ml 8922 2008-07-19 02:13:09Z garrigue $ *) (* Printing functions *) diff --git a/typing/printtyp.mli b/typing/printtyp.mli index 2e2f7189..6f56d164 100644 --- a/typing/printtyp.mli +++ b/typing/printtyp.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: printtyp.mli,v 1.27 2006/04/16 23:28:22 doligez Exp $ *) +(* $Id: printtyp.mli 7382 2006-04-16 23:28:22Z doligez $ *) (* Printing functions *) diff --git a/typing/stypes.ml b/typing/stypes.ml index 23065daf..64028e10 100644 --- a/typing/stypes.ml +++ b/typing/stypes.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: stypes.ml,v 1.11 2008/07/29 15:42:44 doligez Exp $ *) +(* $Id: stypes.ml 8958 2008-07-29 15:42:44Z doligez $ *) (* Recording and dumping (partial) type information *) diff --git a/typing/stypes.mli b/typing/stypes.mli index 17663ec3..06aea2c1 100644 --- a/typing/stypes.mli +++ b/typing/stypes.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: stypes.mli,v 1.5 2008/07/29 15:42:44 doligez Exp $ *) +(* $Id: stypes.mli 8958 2008-07-29 15:42:44Z doligez $ *) (* Recording and dumping (partial) type information *) diff --git a/typing/subst.ml b/typing/subst.ml index dc3fb212..cff3c64f 100644 --- a/typing/subst.ml +++ b/typing/subst.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: subst.ml,v 1.52.4.1 2009/04/02 09:06:32 xclerc Exp $ *) +(* $Id: subst.ml 9221 2009-04-02 09:06:33Z xclerc $ *) (* Substitutions *) diff --git a/typing/subst.mli b/typing/subst.mli index bf9f0652..e0e91cf0 100644 --- a/typing/subst.mli +++ b/typing/subst.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: subst.mli,v 1.13.4.1 2009/04/02 09:06:33 xclerc Exp $ *) +(* $Id: subst.mli 9221 2009-04-02 09:06:33Z xclerc $ *) (* Substitutions *) diff --git a/typing/typeclass.ml b/typing/typeclass.ml index b18a0aa0..53bd1548 100644 --- a/typing/typeclass.ml +++ b/typing/typeclass.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: typeclass.ml,v 1.93.4.1 2009/04/19 08:42:43 xleroy Exp $ *) +(* $Id: typeclass.ml 9236 2009-04-19 08:42:43Z xleroy $ *) open Misc open Parsetree diff --git a/typing/typeclass.mli b/typing/typeclass.mli index f85f6ece..67acf896 100644 --- a/typing/typeclass.mli +++ b/typing/typeclass.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: typeclass.mli,v 1.19 2006/04/05 02:28:13 garrigue Exp $ *) +(* $Id: typeclass.mli 7372 2006-04-05 02:28:13Z garrigue $ *) open Asttypes open Types diff --git a/typing/typecore.ml b/typing/typecore.ml index 55e112b9..488a7b6d 100644 --- a/typing/typecore.ml +++ b/typing/typecore.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: typecore.ml,v 1.199.2.3 2009/04/19 09:21:08 xleroy Exp $ *) +(* $Id: typecore.ml 9412 2009-11-09 11:42:39Z weis $ *) (* Typechecking for the core language *) @@ -752,7 +752,7 @@ let type_format loc fmt = and scan_conversion i j = if j >= len then incomplete_format fmt else match fmt.[j] with - | '%' | '!' -> scan_format (j + 1) + | '%' | '!' | ',' -> scan_format (j + 1) | 's' | 'S' -> conversion j Predef.type_string | '[' -> let j = range_closing_index fmt j in diff --git a/typing/typecore.mli b/typing/typecore.mli index 7e8bea36..b7a6ebc0 100644 --- a/typing/typecore.mli +++ b/typing/typecore.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: typecore.mli,v 1.41 2008/01/11 16:13:16 doligez Exp $ *) +(* $Id: typecore.mli 8768 2008-01-11 16:13:18Z doligez $ *) (* Type inference for the core language *) diff --git a/typing/typedecl.ml b/typing/typedecl.ml index 6e546fed..c6dd602f 100644 --- a/typing/typedecl.ml +++ b/typing/typedecl.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: typedecl.ml,v 1.82.2.3 2009/06/08 04:08:14 garrigue Exp $ *) +(* $Id: typedecl.ml 9292 2009-06-08 04:08:14Z garrigue $ *) (**** Typing of type definitions ****) diff --git a/typing/typedecl.mli b/typing/typedecl.mli index 56452455..d6d6bb36 100644 --- a/typing/typedecl.mli +++ b/typing/typedecl.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: typedecl.mli,v 1.31.4.1 2009/06/08 04:08:14 garrigue Exp $ *) +(* $Id: typedecl.mli 9292 2009-06-08 04:08:14Z garrigue $ *) (* Typing of type definitions and primitive definitions *) diff --git a/typing/typedtree.ml b/typing/typedtree.ml index e2697d23..c6f6eed1 100644 --- a/typing/typedtree.ml +++ b/typing/typedtree.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: typedtree.ml,v 1.39 2008/07/09 13:03:38 mauny Exp $ *) +(* $Id: typedtree.ml 8906 2008-07-09 13:03:38Z mauny $ *) (* Abstract syntax tree after typing *) diff --git a/typing/typedtree.mli b/typing/typedtree.mli index dfd41711..9780b34c 100644 --- a/typing/typedtree.mli +++ b/typing/typedtree.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: typedtree.mli,v 1.37 2008/07/09 13:03:38 mauny Exp $ *) +(* $Id: typedtree.mli 8906 2008-07-09 13:03:38Z mauny $ *) (* Abstract syntax tree after typing *) diff --git a/typing/typemod.ml b/typing/typemod.ml index 85722ad3..be810851 100644 --- a/typing/typemod.ml +++ b/typing/typemod.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: typemod.ml,v 1.86.2.1 2008/10/08 13:07:14 doligez Exp $ *) +(* $Id: typemod.ml 9079 2008-10-08 13:09:39Z doligez $ *) (* Type-checking of the module language *) diff --git a/typing/typemod.mli b/typing/typemod.mli index 33d49c93..5f96f308 100644 --- a/typing/typemod.mli +++ b/typing/typemod.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: typemod.mli,v 1.27 2007/05/16 08:21:40 doligez Exp $ *) +(* $Id: typemod.mli 8232 2007-05-16 08:21:41Z doligez $ *) (* Type-checking of the module language *) diff --git a/typing/types.ml b/typing/types.ml index 1e9b762a..7a02a500 100644 --- a/typing/types.ml +++ b/typing/types.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: types.ml,v 1.29 2008/07/19 02:13:09 garrigue Exp $ *) +(* $Id: types.ml 8922 2008-07-19 02:13:09Z garrigue $ *) (* Representation of types and declarations *) diff --git a/typing/types.mli b/typing/types.mli index 8340d95b..3941bc98 100644 --- a/typing/types.mli +++ b/typing/types.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: types.mli,v 1.29 2008/07/19 02:13:09 garrigue Exp $ *) +(* $Id: types.mli 8922 2008-07-19 02:13:09Z garrigue $ *) (* Representation of types and declarations *) diff --git a/typing/typetexp.ml b/typing/typetexp.ml index ec2b7ed8..52046b66 100644 --- a/typing/typetexp.ml +++ b/typing/typetexp.ml @@ -39,6 +39,7 @@ type error = | Variant_tags of string * string | Invalid_variable_name of string | Cannot_quantify of string * type_expr + | Repeated_method_label of string exception Error of Location.t * error @@ -156,7 +157,7 @@ let rec transl_type env policy styp = end; constr | Ptyp_object fields -> - newobj (transl_fields env policy fields) + newobj (transl_fields env policy [] fields) | Ptyp_class(lid, stl, present) -> let (path, decl, is_variant) = try @@ -384,15 +385,16 @@ let rec transl_type env policy styp = unify_var env (newvar()) ty'; ty' -and transl_fields env policy = +and transl_fields env policy seen = function [] -> newty Tnil | {pfield_desc = Pfield_var}::_ -> if policy = Univars then new_pre_univar () else newvar () - | {pfield_desc = Pfield(s, e)}::l -> + | {pfield_desc = Pfield(s, e); pfield_loc = loc}::l -> + if List.mem s seen then raise (Error (loc, Repeated_method_label s)); let ty1 = transl_type env policy e in - let ty2 = transl_fields env policy l in + let ty2 = transl_fields env policy (s::seen) l in newty (Tfield (s, Fpresent, ty1, ty2)) @@ -557,3 +559,6 @@ let report_error ppf = function (if v.desc = Tvar then "it escapes this scope" else if v.desc = Tunivar then "it is aliased to another variable" else "it is not a variable") + | Repeated_method_label s -> + fprintf ppf "@[This is the second method `%s' of this object type.@ %s@]" + s "Multiple occurences are not allowed." diff --git a/typing/typetexp.mli b/typing/typetexp.mli index b7d3a559..52a32e9f 100644 --- a/typing/typetexp.mli +++ b/typing/typetexp.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: typetexp.mli,v 1.19 2003/05/19 09:21:17 garrigue Exp $ *) +(* $Id: typetexp.mli 9297 2009-06-12 12:40:55Z garrigue $ *) (* Typechecking of type expressions for the core language *) @@ -54,6 +54,7 @@ type error = | Variant_tags of string * string | Invalid_variable_name of string | Cannot_quantify of string * Types.type_expr + | Repeated_method_label of string exception Error of Location.t * error diff --git a/typing/unused_var.ml b/typing/unused_var.ml index 3d44a85f..d0c63a33 100644 --- a/typing/unused_var.ml +++ b/typing/unused_var.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: unused_var.ml,v 1.7 2008/07/09 13:03:38 mauny Exp $ *) +(* $Id: unused_var.ml 8906 2008-07-09 13:03:38Z mauny $ *) open Parsetree diff --git a/typing/unused_var.mli b/typing/unused_var.mli index 7945ef30..6d408686 100644 --- a/typing/unused_var.mli +++ b/typing/unused_var.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: unused_var.mli,v 1.2 2006/01/04 16:55:50 doligez Exp $ *) +(* $Id: unused_var.mli 7307 2006-01-04 16:55:50Z doligez $ *) val warn : Format.formatter -> Parsetree.structure -> Parsetree.structure;; (* Warn on unused variables; return the second argument. *) diff --git a/utils/ccomp.ml b/utils/ccomp.ml index 91a6a9d4..58e4947e 100644 --- a/utils/ccomp.ml +++ b/utils/ccomp.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: ccomp.ml,v 1.28.4.2 2008/10/16 15:57:00 doligez Exp $ *) +(* $Id: ccomp.ml 9093 2008-10-16 15:57:00Z doligez $ *) (* Compiling C files and building C libraries *) diff --git a/utils/ccomp.mli b/utils/ccomp.mli index 3843a6d4..47f15059 100644 --- a/utils/ccomp.mli +++ b/utils/ccomp.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: ccomp.mli,v 1.16 2008/01/11 16:13:18 doligez Exp $ *) +(* $Id: ccomp.mli 8768 2008-01-11 16:13:18Z doligez $ *) (* Compiling C files and building C libraries *) diff --git a/utils/clflags.ml b/utils/clflags.ml index 4ac0de8c..a4c58c43 100644 --- a/utils/clflags.ml +++ b/utils/clflags.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: clflags.ml,v 1.53.2.1 2008/10/15 08:48:51 xleroy Exp $ *) +(* $Id: clflags.ml 9084 2008-10-15 08:48:51Z xleroy $ *) (* Command-line parameters *) diff --git a/utils/clflags.mli b/utils/clflags.mli index eba4f9ee..6914904f 100644 --- a/utils/clflags.mli +++ b/utils/clflags.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: clflags.mli,v 1.4.2.1 2008/10/15 08:48:51 xleroy Exp $ *) +(* $Id: clflags.mli 9084 2008-10-15 08:48:51Z xleroy $ *) val objfiles : string list ref val ccobjs : string list ref diff --git a/utils/config.mlbuild b/utils/config.mlbuild index ee8e66a0..d49ff623 100644 --- a/utils/config.mlbuild +++ b/utils/config.mlbuild @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: config.mlbuild,v 1.3.4.4 2009/05/19 14:41:21 doligez Exp $ *) +(* $Id: config.mlbuild 9266 2009-05-19 14:41:21Z doligez $ *) (***********************************************************************) (** **) diff --git a/utils/config.mli b/utils/config.mli index b3b71ca1..92894b65 100644 --- a/utils/config.mli +++ b/utils/config.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: config.mli,v 1.41 2008/04/16 06:50:31 frisch Exp $ *) +(* $Id: config.mli 8868 2008-04-16 06:50:31Z frisch $ *) (* System configuration *) diff --git a/utils/config.mlp b/utils/config.mlp index ce6bc7d5..3f6d14ec 100644 --- a/utils/config.mlp +++ b/utils/config.mlp @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: config.mlp,v 1.208.2.2 2009/05/18 09:38:16 doligez Exp $ *) +(* $Id: config.mlp 9260 2009-05-18 09:38:16Z doligez $ *) (***********************************************************************) (** **) diff --git a/utils/consistbl.ml b/utils/consistbl.ml index 527de764..c9ffaf25 100644 --- a/utils/consistbl.ml +++ b/utils/consistbl.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: consistbl.ml,v 1.2 2002/11/18 10:41:26 xleroy Exp $ *) +(* $Id: consistbl.ml 5275 2002-11-18 10:41:26Z xleroy $ *) (* Consistency tables: for checking consistency of module CRCs *) diff --git a/utils/consistbl.mli b/utils/consistbl.mli index ca5f73ea..0e58dd57 100644 --- a/utils/consistbl.mli +++ b/utils/consistbl.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: consistbl.mli,v 1.2 2002/11/18 10:41:26 xleroy Exp $ *) +(* $Id: consistbl.mli 5275 2002-11-18 10:41:26Z xleroy $ *) (* Consistency tables: for checking consistency of module CRCs *) diff --git a/utils/misc.ml b/utils/misc.ml index 0ad0c0d7..04a07125 100644 --- a/utils/misc.ml +++ b/utils/misc.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: misc.ml,v 1.35 2007/02/23 13:44:51 ertai Exp $ *) +(* $Id: misc.ml 7909 2007-02-23 13:44:51Z ertai $ *) (* Errors *) diff --git a/utils/misc.mli b/utils/misc.mli index 2b4f7cf4..73af6fa9 100644 --- a/utils/misc.mli +++ b/utils/misc.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: misc.mli,v 1.26 2007/02/23 13:44:51 ertai Exp $ *) +(* $Id: misc.mli 7909 2007-02-23 13:44:51Z ertai $ *) (* Miscellaneous useful types and functions *) diff --git a/utils/tbl.ml b/utils/tbl.ml index eaa9f140..c6391279 100644 --- a/utils/tbl.ml +++ b/utils/tbl.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: tbl.ml,v 1.13.22.1 2009/04/02 09:06:33 xclerc Exp $ *) +(* $Id: tbl.ml 9221 2009-04-02 09:06:33Z xclerc $ *) type ('a, 'b) t = Empty diff --git a/utils/tbl.mli b/utils/tbl.mli index ee840dd4..e869f26e 100644 --- a/utils/tbl.mli +++ b/utils/tbl.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: tbl.mli,v 1.7.44.1 2009/04/02 09:06:33 xclerc Exp $ *) +(* $Id: tbl.mli 9221 2009-04-02 09:06:33Z xclerc $ *) (* Association tables from any ordered type to any type. We use the generic ordering to compare keys. *) diff --git a/utils/terminfo.ml b/utils/terminfo.ml index d2f98312..8f1d5af8 100644 --- a/utils/terminfo.ml +++ b/utils/terminfo.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: terminfo.ml,v 1.6 2004/01/01 16:42:42 doligez Exp $ *) +(* $Id: terminfo.ml 6045 2004-01-01 16:42:43Z doligez $ *) (* Basic interface to the terminfo database *) diff --git a/utils/terminfo.mli b/utils/terminfo.mli index d8a07651..9198c13b 100644 --- a/utils/terminfo.mli +++ b/utils/terminfo.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: terminfo.mli,v 1.7 2004/01/01 16:42:43 doligez Exp $ *) +(* $Id: terminfo.mli 6045 2004-01-01 16:42:43Z doligez $ *) (* Basic interface to the terminfo database *) diff --git a/utils/warnings.ml b/utils/warnings.ml index c0fbe9f2..37851593 100644 --- a/utils/warnings.ml +++ b/utils/warnings.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: warnings.ml,v 1.28 2008/10/06 13:53:54 doligez Exp $ *) +(* $Id: warnings.ml 9074 2008-10-06 13:53:54Z doligez $ *) (* Please keep them in alphabetical order *) diff --git a/utils/warnings.mli b/utils/warnings.mli index 42af60cc..3e7a61e9 100644 --- a/utils/warnings.mli +++ b/utils/warnings.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: warnings.mli,v 1.19 2008/10/06 13:53:54 doligez Exp $ *) +(* $Id: warnings.mli 9074 2008-10-06 13:53:54Z doligez $ *) open Format diff --git a/win32caml/Makefile b/win32caml/Makefile index c803ace7..518ce9e7 100644 --- a/win32caml/Makefile +++ b/win32caml/Makefile @@ -11,7 +11,7 @@ # # ######################################################################### -# $Id: Makefile,v 1.12 2007/11/15 13:21:15 frisch Exp $ +# $Id: Makefile 8521 2007-11-15 13:21:15Z frisch $ include ../config/Makefile diff --git a/win32caml/editbuffer.h b/win32caml/editbuffer.h index ce8dccfd..91e2999c 100644 --- a/win32caml/editbuffer.h +++ b/win32caml/editbuffer.h @@ -31,17 +31,17 @@ typedef struct tagEditBuffer { int LineCount; struct tagLineList *Lines; BOOL isCorrect; -} EditBuffer; - -BOOL editbuffer_addline (EditBuffer* edBuf, char* line); -BOOL editbuffer_updateline (EditBuffer* edBuf, int idx, char* line); -BOOL editbuffer_updateoraddline (EditBuffer* edBuf, int idx, char* line); -BOOL editbuffer_removeline (EditBuffer* edBuf, int idx); -char* editbuffer_getasline (EditBuffer* edBuf); -char* editbuffer_getasbuffer (EditBuffer* edBuf); -char* editbuffer_lastline (EditBuffer* edBuf); -EditBuffer* editbuffer_copy (EditBuffer* edBuf); -void editbuffer_destroy (EditBuffer* edBuf); -EditBuffer* editbuffer_new (void); - +} EditBuffer; + +BOOL editbuffer_addline (EditBuffer* edBuf, char* line); +BOOL editbuffer_updateline (EditBuffer* edBuf, int idx, char* line); +BOOL editbuffer_updateoraddline (EditBuffer* edBuf, int idx, char* line); +BOOL editbuffer_removeline (EditBuffer* edBuf, int idx); +char* editbuffer_getasline (EditBuffer* edBuf); +char* editbuffer_getasbuffer (EditBuffer* edBuf); +char* editbuffer_lastline (EditBuffer* edBuf); +EditBuffer* editbuffer_copy (EditBuffer* edBuf); +void editbuffer_destroy (EditBuffer* edBuf); +EditBuffer* editbuffer_new (void); + #endif diff --git a/win32caml/inria.h b/win32caml/inria.h index 446c1fe1..7f8e6efb 100644 --- a/win32caml/inria.h +++ b/win32caml/inria.h @@ -10,7 +10,7 @@ /* */ /***********************************************************************/ -/* $Id: inria.h,v 1.6.4.1 2008/10/08 13:07:14 doligez Exp $ */ +/* $Id: inria.h 9079 2008-10-08 13:09:39Z doligez $ */ /*------------------------------------------------------------------------ Module: D:\lcc\inria\inria.h diff --git a/win32caml/libgraph.h b/win32caml/libgraph.h index 8423f225..f36c0752 100644 --- a/win32caml/libgraph.h +++ b/win32caml/libgraph.h @@ -11,7 +11,7 @@ /* */ /***********************************************************************/ -/* $Id: libgraph.h,v 1.3 2002/07/23 14:12:02 doligez Exp $ */ +/* $Id: libgraph.h 5029 2002-07-23 14:12:03Z doligez $ */ #include #include diff --git a/win32caml/menu.c b/win32caml/menu.c index f09c5cc6..ba7af01e 100644 --- a/win32caml/menu.c +++ b/win32caml/menu.c @@ -15,7 +15,7 @@ /* Began 14 Sept 2003 - watford@uiuc.edu */ /***********************************************************************/ -/* $Id: menu.c,v 1.8 2006/05/09 16:03:48 xleroy Exp $ */ +/* $Id: menu.c 7411 2006-05-09 16:03:48Z xleroy $ */ #include #include @@ -627,33 +627,33 @@ static void SaveML(char *fname) ------------------------------------------------------------------------*/ static void Add_Clipboard_To_Queue(void) { - if (IsClipboardFormatAvailable(CF_TEXT) && OpenClipboard(hwndMain)) - { - HANDLE hClipData = GetClipboardData(CF_TEXT); - - if (hClipData != NULL) - { - char *str = GlobalLock(hClipData); - - if (str != NULL) - { - while ((*str) != 0) - { - if (*str != '\r') - Add_Char_To_Queue(*str); - - str++; - } - - // added to fix odd errors - RefreshCurrentEditBuffer(); - } - - GlobalUnlock(hClipData); - } - - CloseClipboard(); - } + if (IsClipboardFormatAvailable(CF_TEXT) && OpenClipboard(hwndMain)) + { + HANDLE hClipData = GetClipboardData(CF_TEXT); + + if (hClipData != NULL) + { + char *str = GlobalLock(hClipData); + + if (str != NULL) + { + while ((*str) != 0) + { + if (*str != '\r') + Add_Char_To_Queue(*str); + + str++; + } + + // added to fix odd errors + RefreshCurrentEditBuffer(); + } + + GlobalUnlock(hClipData); + } + + CloseClipboard(); + } } /*------------------------------------------------------------------------ diff --git a/win32caml/ocaml.c b/win32caml/ocaml.c index 17ef689e..cd50cb9d 100644 --- a/win32caml/ocaml.c +++ b/win32caml/ocaml.c @@ -14,7 +14,7 @@ /* Began 14 Sept 2003 - watford@uiuc.edu */ /***********************************************************************/ -/* $Id: ocaml.c,v 1.9 2006/05/09 16:03:48 xleroy Exp $ */ +/* $Id: ocaml.c 7411 2006-05-09 16:03:48Z xleroy $ */ /*@@ Wedit generated application. Written Sat Jun 02 18:22:38 2001 @@header: D:\lcc\inria\inriares.h diff --git a/win32caml/ocaml.rc b/win32caml/ocaml.rc index c10ecdba..52ae9497 100644 --- a/win32caml/ocaml.rc +++ b/win32caml/ocaml.rc @@ -1,255 +1,255 @@ -// Microsoft Visual C++ generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#define APSTUDIO_HIDDEN_SYMBOLS -#include "windows.h" -#undef APSTUDIO_HIDDEN_SYMBOLS -#include "inriares.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -1000 ICON "ocaml.ico" - -///////////////////////////////////////////////////////////////////////////// -// -// Menu -// - -IDMAINMENU MENU -BEGIN - POPUP "&File" - BEGIN - MENUITEM "&Open...", IDM_OPEN - MENUITEM "&Save ML...", IDM_SAVE - MENUITEM "Save &Transcript...", IDM_SAVEAS - MENUITEM SEPARATOR - MENUITEM "&Print", IDM_PRINT, GRAYED - MENUITEM "P&rint Setup...", IDM_PRINTSU, GRAYED - MENUITEM SEPARATOR - MENUITEM "E&xit", IDM_EXIT - END - POPUP "&Edit" - BEGIN - MENUITEM "&Undo\tAlt+BkSp", IDM_EDITUNDO - MENUITEM SEPARATOR - MENUITEM "Cu&t\t Shift+Del", IDM_EDITCUT - MENUITEM "&Copy\tCtrl+Ins", IDM_EDITCOPY - MENUITEM "&Paste\tShift+Ins", IDM_EDITPASTE - END - POPUP "Workspace" - BEGIN - MENUITEM "&Font...", IDM_FONT - MENUITEM "Text &Color...", IDM_COLORTEXT - MENUITEM "&Background Color...", IDM_BACKCOLOR - MENUITEM SEPARATOR - MENUITEM "&History...", IDM_HISTORY - MENUITEM "&Garbage Collect", IDM_GC - MENUITEM "&Interrupt", IDCTRLC - END - POPUP "&Window", GRAYED - BEGIN - MENUITEM "&Tile", IDM_WINDOWTILE, INACTIVE - MENUITEM "&Cascade", IDM_WINDOWCASCADE, INACTIVE - MENUITEM "Arrange &Icons", IDM_WINDOWICONS, INACTIVE - MENUITEM "Close &All", IDM_WINDOWCLOSEALL, INACTIVE - END - POPUP "&Help" - BEGIN - MENUITEM "&About...", IDM_ABOUT - END -END - - -///////////////////////////////////////////////////////////////////////////// -// -// Accelerator -// - -BARMDI ACCELERATORS -BEGIN - "Q", IDM_EXIT, VIRTKEY, CONTROL -END - - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - -IDD_ABOUT DIALOGEX 7, 29, 236, 81 -STYLE DS_SETFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | - WS_SYSMENU -EXSTYLE WS_EX_TOOLWINDOW | WS_EX_CLIENTEDGE -CAPTION "About OCamlWinPlus" -FONT 8, "MS Sans Serif", 0, 0, 0x1 -BEGIN - LTEXT "Objective Caml for Windows",101,75,7,90,12 - LTEXT "New Windows Interface 1.9RC4",102,68,15,104,12 - CTEXT "Copyright 1996-2001\nUpdated 2003",103,88,25,66,23 - CTEXT "Institut National de Recherche en Informatique et Automatique", - 104,16,46,211,10 - CTEXT "Réalisé par Jacob Navia 2001. Updated by Chris Watford 2003.\nwatford@uiuc.edu", - 105,18,54,207,19 -END - -IDD_HISTORY DIALOGEX 6, 18, 261, 184 -STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | - WS_SYSMENU | WS_THICKFRAME -EXSTYLE WS_EX_TOOLWINDOW -CAPTION "Session History" -FONT 8, "MS Sans Serif", 0, 0, 0x1 -BEGIN - LISTBOX IDLIST,7,7,247,173,LBS_USETABSTOPS | WS_VSCROLL | - WS_HSCROLL | WS_TABSTOP -END - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE -BEGIN - "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""windows.h""\r\n" - "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""inriares.h""\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -STRINGTABLE -BEGIN - 3010 "Switches to " -END - -STRINGTABLE -BEGIN - 2000 "Create, open, save, or print documents" - 2010 "Get help" -END - -STRINGTABLE -BEGIN - 500 "Displays information about this application" -END - -STRINGTABLE -BEGIN - 440 "Closes all open windows" -END - -STRINGTABLE -BEGIN - 420 "Arranges windows as overlapping tiles" - 430 "Arranges minimized window icons" -END - -STRINGTABLE -BEGIN - 410 "Arranges windows as non-overlapping tiles" -END - -STRINGTABLE -BEGIN - 340 "Inserts the clipboard contents at the insertion point" - 350 "Removes the selection without putting it on the clipboard" -END - -STRINGTABLE -BEGIN - 320 "Cuts the selection and puts it on the clipboard" - 330 "Copies the selection and puts it on the clipboard" -END - -STRINGTABLE -BEGIN - 310 "Reverses the last action" -END - -STRINGTABLE -BEGIN - 260 "Changes the printer selection or configuration" - 270 "Quits this application" -END - -STRINGTABLE -BEGIN - 240 "Closes the active document" - 250 "Prints the active document" -END - -STRINGTABLE -BEGIN - 230 "Saves the active document under a different name" -END - -STRINGTABLE -BEGIN - 210 "Opens an existing document" - 220 "Saves the active document" -END - -STRINGTABLE -BEGIN - 200 "Creates a new session" -END - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - +// Microsoft Visual C++ generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#define APSTUDIO_HIDDEN_SYMBOLS +#include "windows.h" +#undef APSTUDIO_HIDDEN_SYMBOLS +#include "inriares.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +1000 ICON "ocaml.ico" + +///////////////////////////////////////////////////////////////////////////// +// +// Menu +// + +IDMAINMENU MENU +BEGIN + POPUP "&File" + BEGIN + MENUITEM "&Open...", IDM_OPEN + MENUITEM "&Save ML...", IDM_SAVE + MENUITEM "Save &Transcript...", IDM_SAVEAS + MENUITEM SEPARATOR + MENUITEM "&Print", IDM_PRINT, GRAYED + MENUITEM "P&rint Setup...", IDM_PRINTSU, GRAYED + MENUITEM SEPARATOR + MENUITEM "E&xit", IDM_EXIT + END + POPUP "&Edit" + BEGIN + MENUITEM "&Undo\tAlt+BkSp", IDM_EDITUNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\t Shift+Del", IDM_EDITCUT + MENUITEM "&Copy\tCtrl+Ins", IDM_EDITCOPY + MENUITEM "&Paste\tShift+Ins", IDM_EDITPASTE + END + POPUP "Workspace" + BEGIN + MENUITEM "&Font...", IDM_FONT + MENUITEM "Text &Color...", IDM_COLORTEXT + MENUITEM "&Background Color...", IDM_BACKCOLOR + MENUITEM SEPARATOR + MENUITEM "&History...", IDM_HISTORY + MENUITEM "&Garbage Collect", IDM_GC + MENUITEM "&Interrupt", IDCTRLC + END + POPUP "&Window", GRAYED + BEGIN + MENUITEM "&Tile", IDM_WINDOWTILE, INACTIVE + MENUITEM "&Cascade", IDM_WINDOWCASCADE, INACTIVE + MENUITEM "Arrange &Icons", IDM_WINDOWICONS, INACTIVE + MENUITEM "Close &All", IDM_WINDOWCLOSEALL, INACTIVE + END + POPUP "&Help" + BEGIN + MENUITEM "&About...", IDM_ABOUT + END +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Accelerator +// + +BARMDI ACCELERATORS +BEGIN + "Q", IDM_EXIT, VIRTKEY, CONTROL +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_ABOUT DIALOGEX 7, 29, 236, 81 +STYLE DS_SETFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +EXSTYLE WS_EX_TOOLWINDOW | WS_EX_CLIENTEDGE +CAPTION "About OCamlWinPlus" +FONT 8, "MS Sans Serif", 0, 0, 0x1 +BEGIN + LTEXT "Objective Caml for Windows",101,75,7,90,12 + LTEXT "New Windows Interface 1.9RC4",102,68,15,104,12 + CTEXT "Copyright 1996-2001\nUpdated 2003",103,88,25,66,23 + CTEXT "Institut National de Recherche en Informatique et Automatique", + 104,16,46,211,10 + CTEXT "Réalisé par Jacob Navia 2001. Updated by Chris Watford 2003.\nwatford@uiuc.edu", + 105,18,54,207,19 +END + +IDD_HISTORY DIALOGEX 6, 18, 261, 184 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME +EXSTYLE WS_EX_TOOLWINDOW +CAPTION "Session History" +FONT 8, "MS Sans Serif", 0, 0, 0x1 +BEGIN + LISTBOX IDLIST,7,7,247,173,LBS_USETABSTOPS | WS_VSCROLL | + WS_HSCROLL | WS_TABSTOP +END + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""windows.h""\r\n" + "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""inriares.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE +BEGIN + 3010 "Switches to " +END + +STRINGTABLE +BEGIN + 2000 "Create, open, save, or print documents" + 2010 "Get help" +END + +STRINGTABLE +BEGIN + 500 "Displays information about this application" +END + +STRINGTABLE +BEGIN + 440 "Closes all open windows" +END + +STRINGTABLE +BEGIN + 420 "Arranges windows as overlapping tiles" + 430 "Arranges minimized window icons" +END + +STRINGTABLE +BEGIN + 410 "Arranges windows as non-overlapping tiles" +END + +STRINGTABLE +BEGIN + 340 "Inserts the clipboard contents at the insertion point" + 350 "Removes the selection without putting it on the clipboard" +END + +STRINGTABLE +BEGIN + 320 "Cuts the selection and puts it on the clipboard" + 330 "Copies the selection and puts it on the clipboard" +END + +STRINGTABLE +BEGIN + 310 "Reverses the last action" +END + +STRINGTABLE +BEGIN + 260 "Changes the printer selection or configuration" + 270 "Quits this application" +END + +STRINGTABLE +BEGIN + 240 "Closes the active document" + 250 "Prints the active document" +END + +STRINGTABLE +BEGIN + 230 "Saves the active document under a different name" +END + +STRINGTABLE +BEGIN + 210 "Opens an existing document" + 220 "Saves the active document" +END + +STRINGTABLE +BEGIN + 200 "Creates a new session" +END + +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/win32caml/resource.h b/win32caml/resource.h index 27bf5ea1..67625979 100644 --- a/win32caml/resource.h +++ b/win32caml/resource.h @@ -1,16 +1,16 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Visual C++ generated include file. -// Used by ocaml.rc -// - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NO_MFC 1 -#define _APS_NEXT_RESOURCE_VALUE 101 -#define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1000 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by ocaml.rc +// + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NO_MFC 1 +#define _APS_NEXT_RESOURCE_VALUE 101 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1000 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/win32caml/startocaml.c b/win32caml/startocaml.c index 3f6dbaa3..8b0ae8c5 100644 --- a/win32caml/startocaml.c +++ b/win32caml/startocaml.c @@ -15,7 +15,7 @@ /* Began 14 Sept 2003 - watford@uiuc.edu */ /***********************************************************************/ -/* $Id: startocaml.c,v 1.11 2005/03/24 17:20:54 doligez Exp $ */ +/* $Id: startocaml.c 6824 2005-03-24 17:20:54Z doligez $ */ #include #include diff --git a/yacc/Makefile b/yacc/Makefile index bd153375..c51d0fc2 100644 --- a/yacc/Makefile +++ b/yacc/Makefile @@ -10,7 +10,7 @@ # # ######################################################################### -# $Id: Makefile,v 1.10 2007/02/07 14:49:42 doligez Exp $ +# $Id: Makefile 7833 2007-02-07 14:49:42Z doligez $ # Makefile for the parser generator. diff --git a/yacc/Makefile.nt b/yacc/Makefile.nt index 3ec232df..c90e17da 100644 --- a/yacc/Makefile.nt +++ b/yacc/Makefile.nt @@ -10,7 +10,7 @@ # # ######################################################################### -# $Id: Makefile.nt,v 1.11 2007/11/15 13:21:15 frisch Exp $ +# $Id: Makefile.nt 8521 2007-11-15 13:21:15Z frisch $ # Makefile for the parser generator. diff --git a/yacc/closure.c b/yacc/closure.c index 7ea396dc..dfb32be1 100644 --- a/yacc/closure.c +++ b/yacc/closure.c @@ -12,7 +12,7 @@ /* Based on public-domain code from Berkeley Yacc */ -/* $Id: closure.c,v 1.9 2001/07/12 12:54:22 doligez Exp $ */ +/* $Id: closure.c 3573 2001-07-12 12:54:24Z doligez $ */ #include "defs.h" diff --git a/yacc/defs.h b/yacc/defs.h index 7991b590..522c54c4 100644 --- a/yacc/defs.h +++ b/yacc/defs.h @@ -12,7 +12,7 @@ /* Based on public-domain code from Berkeley Yacc */ -/* $Id: defs.h,v 1.22 2004/04/21 23:26:05 doligez Exp $ */ +/* $Id: defs.h 6244 2004-04-21 23:26:06Z doligez $ */ #include #include diff --git a/yacc/error.c b/yacc/error.c index 9bc29a77..bae9c194 100644 --- a/yacc/error.c +++ b/yacc/error.c @@ -12,7 +12,7 @@ /* Based on public-domain code from Berkeley Yacc */ -/* $Id: error.c,v 1.15 2004/11/02 10:48:14 doligez Exp $ */ +/* $Id: error.c 6654 2004-11-02 10:48:14Z doligez $ */ /* routines for printing error messages */ diff --git a/yacc/lalr.c b/yacc/lalr.c index a89d8a3f..196fa37d 100644 --- a/yacc/lalr.c +++ b/yacc/lalr.c @@ -12,7 +12,7 @@ /* Based on public-domain code from Berkeley Yacc */ -/* $Id: lalr.c,v 1.8 2001/07/12 12:54:23 doligez Exp $ */ +/* $Id: lalr.c 3573 2001-07-12 12:54:24Z doligez $ */ #include "defs.h" diff --git a/yacc/lr0.c b/yacc/lr0.c index 55109bac..58bf42ef 100644 --- a/yacc/lr0.c +++ b/yacc/lr0.c @@ -12,7 +12,7 @@ /* Based on public-domain code from Berkeley Yacc */ -/* $Id: lr0.c,v 1.8 2001/07/12 12:54:23 doligez Exp $ */ +/* $Id: lr0.c 3573 2001-07-12 12:54:24Z doligez $ */ #include "defs.h" diff --git a/yacc/main.c b/yacc/main.c index 5d79e558..818be35e 100644 --- a/yacc/main.c +++ b/yacc/main.c @@ -12,7 +12,7 @@ /* Based on public-domain code from Berkeley Yacc */ -/* $Id: main.c,v 1.20 2006/04/16 23:28:22 doligez Exp $ */ +/* $Id: main.c 7382 2006-04-16 23:28:22Z doligez $ */ #include #include diff --git a/yacc/mkpar.c b/yacc/mkpar.c index 46dfb6d5..1086a632 100644 --- a/yacc/mkpar.c +++ b/yacc/mkpar.c @@ -12,7 +12,7 @@ /* Based on public-domain code from Berkeley Yacc */ -/* $Id: mkpar.c,v 1.11 2001/07/12 12:54:23 doligez Exp $ */ +/* $Id: mkpar.c 3573 2001-07-12 12:54:24Z doligez $ */ #include "defs.h" diff --git a/yacc/output.c b/yacc/output.c index 5b968785..b293ae74 100644 --- a/yacc/output.c +++ b/yacc/output.c @@ -12,7 +12,7 @@ /* Based on public-domain code from Berkeley Yacc */ -/* $Id: output.c,v 1.14 2002/11/02 22:36:46 doligez Exp $ */ +/* $Id: output.c 5232 2002-11-02 22:36:46Z doligez $ */ #include "defs.h" diff --git a/yacc/reader.c b/yacc/reader.c index a8f751d3..b4990585 100644 --- a/yacc/reader.c +++ b/yacc/reader.c @@ -12,7 +12,7 @@ /* Based on public-domain code from Berkeley Yacc */ -/* $Id: reader.c,v 1.32.18.1 2009/05/20 11:58:43 doligez Exp $ */ +/* $Id: reader.c 9271 2009-05-20 11:58:43Z doligez $ */ #include #include "defs.h" diff --git a/yacc/skeleton.c b/yacc/skeleton.c index fef9dbe6..7b12a633 100644 --- a/yacc/skeleton.c +++ b/yacc/skeleton.c @@ -12,7 +12,7 @@ /* Based on public-domain code from Berkeley Yacc */ -/* $Id: skeleton.c,v 1.13 2005/08/13 20:59:37 doligez Exp $ */ +/* $Id: skeleton.c 7019 2005-08-13 20:59:37Z doligez $ */ #include "defs.h" diff --git a/yacc/symtab.c b/yacc/symtab.c index e29ba390..92ad7d39 100644 --- a/yacc/symtab.c +++ b/yacc/symtab.c @@ -12,7 +12,7 @@ /* Based on public-domain code from Berkeley Yacc */ -/* $Id: symtab.c,v 1.8 2001/07/12 12:54:23 doligez Exp $ */ +/* $Id: symtab.c 3573 2001-07-12 12:54:24Z doligez $ */ #include #include "defs.h" diff --git a/yacc/verbose.c b/yacc/verbose.c index 2ab794f6..a1219793 100644 --- a/yacc/verbose.c +++ b/yacc/verbose.c @@ -12,7 +12,7 @@ /* Based on public-domain code from Berkeley Yacc */ -/* $Id: verbose.c,v 1.9 2001/07/12 12:54:23 doligez Exp $ */ +/* $Id: verbose.c 3573 2001-07-12 12:54:24Z doligez $ */ #include "defs.h" diff --git a/yacc/warshall.c b/yacc/warshall.c index 72b59402..f1caabb6 100644 --- a/yacc/warshall.c +++ b/yacc/warshall.c @@ -12,7 +12,7 @@ /* Based on public-domain code from Berkeley Yacc */ -/* $Id: warshall.c,v 1.8 2001/07/12 12:54:23 doligez Exp $ */ +/* $Id: warshall.c 3573 2001-07-12 12:54:24Z doligez $ */ #include "defs.h"