Commit Graph

8312 Commits (b7271628a25d208c90e77dce62ff0244a1c2fcdd)

Author SHA1 Message Date
Damien Doligez b7271628a2 fix TABs and whitespace
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12797 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-30 11:52:38 +00:00
Alain Frisch f6f54d325d #4762: QUESTIONQUESTION is no longer a token.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12795 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-30 10:15:10 +00:00
Fabrice Le Fessant 1641d2d16e Remove -g for ocamlopt in Makefile
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12794 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-30 10:00:51 +00:00
Fabrice Le Fessant 5ae3458a4d Remove dependency from typing/envaux.ml to bytecomp/instruct.ml
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12793 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-30 10:00:10 +00:00
Damien Doligez 4ea3208584 fix encoding bugs by replacing all non-ASCII characters
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12792 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-30 09:48:32 +00:00
Alain Frisch e81cd4ac29 Automatically wrap fields with Ptyp_poly.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12789 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-27 17:11:05 +00:00
Alain Frisch b827363738 Document -ppx in ocamldep.m.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12788 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-27 12:56:38 +00:00
Damien Doligez 3bb278c944 merge changes from 4.00 branching to 4.00.0 (part 2: testsuite)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12787 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-27 11:31:21 +00:00
Fabrice Le Fessant 9f2955dbea Fix PR#5702: remove never used value Bytelibrarian.lib_sharedobjs
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12786 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-27 09:23:46 +00:00
Damien Doligez 0c3a7de507 merge changes from 4.00 branching to 4.00.0 (part 1)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12784 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-26 19:21:54 +00:00
Fabrice Le Fessant 229044d83a Fix PR#5698: remove harcoded limit of 200000 labels in emitaux.ml
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12770 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-24 17:33:46 +00:00
Alain Frisch 936914100b Add support for -ppx in ocamldep (and reuse preprocessing code in Pparse).
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12769 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-24 16:24:44 +00:00
Alain Frisch aebeab4cae Polishing.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12768 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-24 14:32:47 +00:00
Alain Frisch 451fb8ab52 Continue js syntax example.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12767 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-24 13:59:30 +00:00
Alain Frisch 9174ed2a4a Another example: syntax for javascript properties in js_of_ocaml.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12766 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-24 12:48:39 +00:00
Alain Frisch c0634a67ac One more example: instrument method calls.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12764 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-24 09:53:48 +00:00
Alain Frisch 504f620fc7 #5697: better location for warnings on statement expressions.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12763 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-24 08:57:52 +00:00
Alain Frisch 0e45ab3961 Continue AST mapper.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12762 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-24 08:40:50 +00:00
Fabrice Le Fessant 930864c9cc Fix PR#5695 (Redoing commit 12756 without unwanted changes)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12758 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-22 15:18:52 +00:00
Fabrice Le Fessant 808d083b9f Revert commit r12756 containing unwanted changes
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12757 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-22 15:15:55 +00:00
Fabrice Le Fessant 5e74e6f0cc Fix PR#5695
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12756 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-22 15:12:43 +00:00
Jacques Garrigue 8f165f2c30 forgot to promote
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12754 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-21 01:18:36 +00:00
Jacques Garrigue d94c59240f Fix PR#5694 by checking that the number of parameters is identical
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12753 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-21 01:12:51 +00:00
Jérémie Dimino a2ad11e98c PR#5692: fix computation of locations in the camlp4 parser
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12751 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-20 09:26:12 +00:00
Wojciech Meyer cc6726aa62 Install topdirs.cmi in stdlib - update Makefile.nt too
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12749 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-19 22:56:59 +00:00
Wojciech Meyer f786ea843d Install topdirs.cmi in stdlib (problem reported on the mailing list - unable to use install_printer)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12748 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-19 22:45:45 +00:00
Jacques Garrigue 19a650aa7f Fix PR#5689
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12725 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-18 03:21:12 +00:00
Damien Doligez d90643aab8 PR#5659: ocamlmklib -L option breaks with MSVC
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12724 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-17 18:32:05 +00:00
Damien Doligez c74d9836f0 removed bogus $Id lines
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12721 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-17 15:57:37 +00:00
Damien Doligez 392d70698e removed all keyword expansion
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12720 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-17 15:31:12 +00:00
Alain Frisch 95107f7bae #5687: Fix dynlink when used from output-obj'ed main bytecode program.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12714 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-16 10:36:00 +00:00
Xavier Clerc e17f1f82f2 PR#5214: ocamlfind plugin invokes 'cut' utility
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12713 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-16 08:53:51 +00:00
Alain Frisch 7ce309af1b Small tweak to avoid creating delayed checks after delayed checks have been executed.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12711 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-13 16:47:12 +00:00
Jonathan Protzenko 7bb9ab2e0c PR#5676: add ipv6 support on Windows.
Patch by Jérôme Vouillon <Jerome.Vouillon@pps.jussieu.fr>

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12710 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-13 12:15:57 +00:00
Fabrice Le Fessant 776c46fce8 Fix problem of size of bin-annot files
- Reset most of the fields of Env.t when saving bin-annot files
- Move debugger/envaux.ml to typing/, and add a function to 
    recover environements from bin-annot files.
- Move tools/typedtreeIter.ml to typing/
- Move the code of typing/typedtreeMap.ml from cmt_format.ml



git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12702 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-12 11:02:18 +00:00
Damien Doligez 5b7fbfba8a PR#5137: caml-types-explore does not work
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12696 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-10 17:51:04 +00:00
Damien Doligez 9d10503a1d PR#5218: use $(MAKE) instead of "make" in Makefiles
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12694 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-10 15:29:19 +00:00
Damien Doligez b6a8a7b56e ignore generated files
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12691 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-10 15:11:02 +00:00
Damien Doligez 1330131d70 PR#5677: do not use "value" as identifier (genprintval.ml)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12690 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-10 15:03:11 +00:00
Damien Doligez 9c3b2b4784 PR#5279: executable name is not initialized properly in caml_startup_code
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12688 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-10 12:58:12 +00:00
Gabriel Scherer 9c275a2e7a PR#5312: remove the Windows @responsefile feature, that conflicted
with '-w @...' command-line warning specifications [breaking change]

This change has relatively wide consequences as it modifies the windows
OCaml runtime: when the runtime computed the argument vector "argv"
passed to the program, it automatically expanded arguments of the form
@foo into the content of the filename "foo" (parsed as a sequence of
command-line arguments). This means that this "feature" was
automatically enabled for all user programs written in OCaml and
linking to the usual runtime.

This conflicted with the more recent feature of the OCaml *compiler*
(which is affected, as an OCaml program), that allows to pass warning
specifications of the form "-w @...", for example -w @ae. On windows,
it would try to replace it by the content of the file "ae", leading to
an error.

Given the warning specifications are widely used in OCaml programs
(causing silly Windows portability problems), and the @reponsefile is
anecdotical at best (at poll [1] on the Caml-list revealed no user
using this feature), it was decided to remove @responsefile
altogether.

[1] see mailing-list thread "[community poll for PR#5312] Do some
OCaml Windows users still use the @responsefile feature?"

This change affects all OCaml programs compiled under Windows. Users
previously relying on the @responsefile feature should now explicitely
expand Sys.argv themselves; use Arg.parse_argv to rerun Arg
command-line handlers on user-provided string arrays.


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12685 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-10 11:33:00 +00:00
Gabriel Scherer bc139ae14e PR#5644: Stream.count broken when used with Sapp or Slazy nodes
There is a bug in the way concatenating operations work when combined
with `Sgen`-defined stream (Stream.from, Stream.of_string): the
concatenation functions reset the `count` field to 0, which disturbs
the Sgen producer.

While the fix in the Scons case is easy (instead of 0, set
the count to `original_count - 1`), fixing the Sapp case is more
delicate (we can't predict the size of the prepended stream). Our
technique is to change the stored left-hand-side to not the stream
data only, but the whole stream, count included.
Once we detect the prepended stream was completely consumed, we can
then restore the count to its previous value, so that Sgen's function
can be provided correct count information. This required a change in
the internal `get_data` implementation.

Slazy-constructed streams have the exact same issue: we don't know
their count before forcin them. Again, `get_data` is changed to
dynamically update the count at forcing time.



git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12682 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-10 09:58:38 +00:00
Jacques Garrigue 43c7d1b51c fix PR#5674: move Texp_poly and Texp_newtype to exp_extra
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12680 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-10 08:25:58 +00:00
Damien Doligez d04453c5de PR#5597: register names for instrtrace primitives in embedded bytecode
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12679 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-09 15:38:19 +00:00
Xavier Clerc 1a06299d24 Follow-up for PR#5655
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12675 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-09 13:15:10 +00:00
Fabrice Le Fessant 1b81bef5b9 Add more CFI directives in i386/amd64 assembly files in asmrun
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12674 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-09 13:08:20 +00:00
Xavier Clerc fa0e0b6ba7 PR#5647: Cannot use install_printer in debugger
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12672 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-09 12:40:43 +00:00
Xavier Clerc 61ff6edc27 PR#5655: ocamlbuild doesn't pass cflags when building C stubs
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12670 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-09 10:07:26 +00:00
Xavier Clerc da7078d07b PR#5637: invalid printing of anonymous type parameters (camlp4 revised syntax)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12668 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-09 09:43:49 +00:00
Xavier Clerc c922570d0f PR#5651: printer for abstract data type (camlp4 revised syntax)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12666 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-09 09:07:43 +00:00