Microsoft's C Compiler displays several lines on every invocation - most
of this is removed by specifying the /nologo command line option, but
the compiler still displays the name of every C file it compiles. The
Microsoft Macro Assembler (MASM) does the same thing, but ocamlopt by
default is able to pipe the output of that command directly to NUL, as
the assembler code should never produce errors.
The same cannot be done for invocations of the C compiler, as obviously
syntax errors must be displayed. This relative small cosmetic change
pipes the output of cl to a temporary file and filters out the first
line if it is exactly as expected. The most elegant solution would
require pipes and process handling to be merged from the Unix module
into the compilers.
Extend the previous patch allowing make -f Makefile.nt flexdll
install-flexdll not to require the install-flexdll stage.
OCAML_FLEXLINK is utilised as required to allow compilation of the entire
system using an in-tree compiled flexlink. The build process simply
required the flexdll target to appear before world.
opt.opt compiles a native code version of flexlink.exe as flexlink.opt.
install always installs flexlink.exe if it was compiled along with any
required .manifest files. It also installs the appropriate .o/.obj files
to $(INSTALL_LIBDIR).
At present, the bootstrapping is not extended to the Cygwin ports.
OCAML_FLEXLINK is inspected by ocamlopt, ocamlc and ocamlmklib and allows
the flexlink command to be overriden. This is primarily intended as a
solution for bootstrapping OCaml with FlexDLL, thus allowing a bytecode
image of flexlink launched with ocamlrun to be executed, instead of
requiring flexlink to be in PATH.
Visual Studio 2015 is the first version incorporating Microsoft's
Universal CRT. In this new version, rather than just linking msvcrt.lib,
ucrt.lib and vcruntime.lib must also be linked.
In virtually all instances, the linker handles this automatically. One
of the highly specific cases in which it appears not to is when there
are #pragma directives specifying linker libraries and options and then
the final program is linked using link directly rather than cl.
Fixes stdlib/headernt.c to add ucrt.lib and vcruntime.lib when compiling
against the Universal CRT.
The current fix is to rely on the parsing rules for generic module types, and then
extract a package type, enabling more explicit error messages. Alternatively, one
could keep the generic module type in the Parsetree and extract the package type
at type-checking time. But I don't feel like touching the Parsetree definition so
close from a release, consider the impact on Camlp4/5, PPX mappers and other
syntactic tools.
Previsously
ocamldoc -g better_html.cmo -html
would just use the standard HTML generator instead of keeping the
generator extended by better_html.cmo. This patch makes sure that when
a standard option (-html, -latex, -texi, -man, -dot) is requested,
extended generators for the same format are chosen if they are
present.
Note that there is still a global "current generator setting", so in particular
-g better_html.cmo -man
will throw away the extended generator, and
-g better_html.cmo -man -html
corresponds to the old behaviour.
the following type error
"Type a is not compatible with type 'a"
should contain the constraint on 'a.
"Type a is not compatible with type 'a = < .. >"
"Type a is not compatible with type 'a = [> `b]"
When a ppx raised an exception, it was returned as an error "extension node" to
the caller, without including the "ppx context" which includes in particular ppx
cookies. This was fine when only one ppx was used, since in that case, the
missing context was not restored.
When multiple ppx are chained, however, the second ppx sees the result of the
first one, and it it does not contains a context, an empty one is created and
returned to the caller, which has the effect of destroying the context for the
next invocation of ppxs.
The current fix is to ensure that when a "error extension node" is returned, the
context is correctly added to it. In addition to fixing the reported bug, it also
allow ppx to update their cookies before raising an exception, which can be
useful.
This week we merged several changes from Thomas Refis, to allow the
use of exception patterns under or-patterns, to write code such as
match foo x with
| None | exception Not_found -> ...
| Some -> ...
Unfortunately, I failed to properly assess the impact of this change,
and in particular to make sure that Luc Maranget had properly reviewed
this code -- any change to the pattern-matching machinery should be
reviewed by Luc.
The problem that I had not foreseen and that he would have immediately
realized is that, while adapting the pattern-matching *compiler* is
relatively easy (Thomas inserted a transformation at the right place
to separate exception patterns from the others and handle them
separately, using the staticraise construct used by the
pattern-matching compiler to avoid duplicating the
right-hand-side branch), adapting the pattern-matching warnings
machinery is both more subtle and easier to overlook (it may fail
silently and nobody notices, unlike wrong code production). This part
of the compiler is subtle and best understood by Luc, but he does not
have the time to do a proper review of those changes in the timeframe
for the 4.03 feature freeze (mid-December).
I believe the right move in this case, implemented in the present
commit, is to revert the change from trunk (this is not a feature that
we must *imperatively* have in 4.03), do a proper job of understanding
the changes, and integrate the change when we are confident it is
ready. I hope to do this in 2016, together with Luc Maranget and
Thomas Refis -- hopefully this would allow Thomas and I to be more
confident when changing the pattern-matching machinery in the future.
Revert "Merge pull request #343 from trefis/pr7083"
This reverts commit 22681b8d2a, reversing
changes made to a24e4edf0a.
Revert "Merge pull request #341 from trefis/or-exception"
This reverts commit f8f68bd329, reversing
changes made to 1534fe8082.
Revert "Merge pull request #305 from trefis/or-exception"
This reverts commit cfeda89396, reversing
changes made to 77cf36cf82.
1. Revert "Switch to -custom for bytecode tests."
This reverts commit 6b7f81caf5.
2. Revert "Fix Changelog."
This reverts commit d94488d7b5.
3.Revert "Fix testsuite: use binary channels."
This reverts commit 840f7ca506.
4. Revert "Fix testsuite: do not require a globally installed ocamlrun."
This reverts commit 0388ef46d9.
5. Revert "Merge branch 'trunk' of https://github.com/bvaugon/ocaml into bvaugon-trunk"
This reverts commit 1ff6db10bf, reversing
changes made to 89d116c514.
alainfrisch
Mark Shinwell
David Allsopp
Hezekiah M. Carty
Mark Shinwell
Armael
tkob
octachron
Gabriel Scherer
Leo White
Damien Doligez
Jacques Garrigue
Hugo Heuzard
Pierre Chambart
Thomas Refis
Jeremie Dimino
Luc Maranget
Xavier Leroy
Drup
Xavier Leroy