Commit Graph

807 Commits (d9337d856de05f5203ef6887fc4b077fe0657a5f)

Author SHA1 Message Date
Thomas Refis d9337d856d Better type error location in presence of constraints 2016-01-26 10:48:34 +00:00
alainfrisch 0b7542ddd8 Fix testsuite. 2016-01-22 21:36:34 +01:00
Damien Doligez 031d4ac095 disable asmcomp tests for msvc64 2016-01-22 18:25:25 +01:00
Marc Lasson 934dd9a40b More errors with unboxed and untagged attributes
This commit adds errors for bad uses of @untagged and
@unboxed attributes in external declarations.

There are three possible new errors:
  - One when the external does not contain a native version of
the primitive,
  - One when the attribute occurs deeply into the type,
  - One when the attribute is applied to the whole function type.
2016-01-20 11:51:26 +01:00
alainfrisch 129df0ae09 Fix Changes file. 2016-01-18 11:11:39 +01:00
Alain Frisch b0eed463b7 Merge pull request #436 from dra27/msvc-asmcomp-tests
Enable tests/asmcomp for MSVC
2016-01-18 09:26:13 +01:00
David Allsopp 8ca04e3b7f Use ocamlc as a C compiler in the testsuite
ocamlc and ocamlopt both provide convenient mechanisms to invoke the C
compiler for .c files. Given the filtering out of the .c line for MSVC
now performed by ocamlc and ocamlopt, changing the testsuite to invoke
the C compiler via ocamlc reduces noise from the testsuite _log file.
2016-01-17 19:21:48 +00:00
David Allsopp bfe91a097e Fix running outside bash! 2016-01-16 14:12:18 +00:00
David Allsopp 8386733a87 Initial fixes for tests/asmcomp on MSVC 32-bit 2016-01-16 11:53:55 +00:00
David Allsopp b46843fb69 Allow compilation using bootstrapped FlexDLL
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.
2016-01-15 17:07:12 +00:00
Mark Shinwell ea24052e5e test 2016-01-14 16:52:47 +00:00
Pierre Chambart 9c60ae1692 Add the opaque primitive 2016-01-12 19:24:22 +01:00
Mark Shinwell 0ac2fc54b5 Merge pull request #369 from mshinwell/flambda_prereq-scc
GPR#369: Strongly connected components
2016-01-12 18:18:45 +01:00
Mark Shinwell 89cb79b18c fix testsuite 2016-01-12 18:01:45 +01:00
Mark Shinwell f0f9627dc2 Merge remote-tracking branch 'chambart/flambda_prereq-init_assign' into flambda_prereq-init_assign 2016-01-12 17:06:13 +01:00
Pierre Chambart f00807aace Fix asmcomp testsuite 2016-01-12 17:04:08 +01:00
Pierre Chambart ce63c499b1 Fix merge problems 2016-01-12 16:29:22 +01:00
Mark Shinwell c00323309c Merge remote-tracking branch 'chambart/flambda_prereq-scc' into flambda_prereq-scc 2016-01-12 15:15:23 +01:00
Pierre Chambart 09d4bc9025 Fix testsuite for strongly_connect_components 2016-01-12 14:43:17 +01:00
Mark Shinwell bf22a9a524 fixes 2016-01-12 14:14:37 +01:00
Alain Frisch 4b59df83e0 Merge pull request #80 from dbuenzli/uchar
Add Uchar module to the standard library.
2016-01-06 16:21:04 +01:00
Pierre Chambart 42b180efe7 Fix typing testsuite after introduction of Map.union 2016-01-06 15:41:32 +01:00
alainfrisch 4e8cb78bf5 Fix #7115: shadowing in a branch of a GADT match breaks unused variable warning. 2016-01-05 11:19:10 +01:00
Gabriel Scherer c5ecb70e2c Merge pull request #396 from mshinwell/flambda_prereq-testsuite
Some more test cases
2016-01-04 22:47:49 +01:00
alainfrisch 324ed6b711 PR#6449: add Map.union. 2016-01-04 18:21:18 +01:00
Mark Shinwell 32864fd4c8 Import non-flambda-specific tests from flambda_trunk 2016-01-04 16:49:32 +00:00
Mark Shinwell cc6ce9fe15 Import non-flambda-specific tests from flambda_trunk 2016-01-04 16:47:18 +00:00
Gabriel Scherer 2d5f22d968 testsuite: use -opaque in lib-dynlink-native to avoid new .cmx warning
(with proper BASEDIR handling)
2015-12-27 10:00:36 +01:00
Gabriel Scherer 9fe4a898aa Revert "testsuite: use -opaque in lib-dynlink-native to avoid new .cmx warning"
The Makefile of testsuite is a bit too complex for its own good and
I should have thought deeper about what it meant that the test would
work from the "make tests" target, and not when run locally. My
previous commit fixed local runs and broke the "make tests" target. We
should fix this, but later.

This reverts commit e48fce7263.
2015-12-26 16:53:23 +01:00
Gabriel Scherer e48fce7263 testsuite: use -opaque in lib-dynlink-native to avoid new .cmx warning 2015-12-26 16:41:15 +01:00
Leo White c9f6e35c77 Add test for warning 58 2015-12-26 08:29:49 +00:00
Leo White 4e606305b7 Add tests for opaque option 2015-12-26 08:29:49 +00:00
Mark Shinwell c7aee2de1d fixes 2015-12-23 11:57:55 +00:00
Mark Shinwell 852efd270e Merge with trunk; remake dependencies 2015-12-22 16:28:35 +00:00
Hugo Heuzard 1720d9f42d fix pr7103
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]"
2015-12-21 13:24:59 +00:00
Pierre Chambart 42f56dc069 Add tests for the inline attribute on functors 2015-12-18 20:02:13 +00:00
Pierre Chambart fc5acece95 Rename type build_kind and sourcefile arguments to source_provenance 2015-12-18 13:54:47 +00:00
Pierre Chambart 8afcaeeac0 Fix testsuite 2015-12-18 13:35:44 +00:00
octachron 160045a33e Test suite: check ocamldoc generated tex files
Basic safety net for ocaml manual
2015-12-17 23:46:03 +01:00
maranget 57e031d86d PR#7031 Oups, bug in merged code: union changed into intersection. 2015-12-15 16:39:00 +01:00
David Allsopp cf5daba9fc Normalised line endings in Git repository
Some files were added with CRLF line-endings rather than normalised LF
line-endings which interferes with the .gitattributes file change made
in d8b7a4f48e

Only alteration is line-endings (i.e. git diff --ignore-space-at-eol
returns no differences)
2015-12-14 17:45:28 +00:00
Luc Maranget e2309b424a PR#7031 Handle module variables in patterns. 2015-12-14 15:58:12 +01:00
Luc Maranget c54df509c0 PR#7031, Change file + Tests + error message 2015-12-14 15:58:11 +01:00
Jacques Garrigue 7bcfced414 Fix PR#7082 2015-12-14 12:49:51 +09:00
Jacques Garrigue 655f2f3108 Merge branch 'trunk' of github.com:ocaml/ocaml into trunk 2015-12-12 23:20:56 +09:00
Jacques Garrigue 482ecaa185 add more warning tests around PR#7085 2015-12-12 23:20:32 +09:00
Gabriel Scherer d071da2880 Revert GPR#305 (exception patterns under or-patterns) from trunk
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.
2015-12-12 11:20:21 +01:00
Jacques Garrigue 1919465538 order of warnings back again 2015-12-12 18:44:13 +09:00
Jacques Garrigue e0aec3391c Fix PR#7085 2015-12-12 18:06:47 +09:00
Thomas Refis de7176b02f PR7083: fix assertion failure when polymorphic variants and exception cases are part of the same match .. with 2015-12-11 10:31:33 +00:00