ce605c042a
merge branches/implicit-unpack + update camlp4
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10738 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-10-21 23:59:33 +00:00
575555eecd
merge changes from branching of 3.12 to release/3.12.0
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10643 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-08-02 14:37:22 +00:00
ffa66ded92
PR#4964: parenthesized names for infix functions in annot files
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10486 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-05-31 13:18:11 +00:00
bcb5a6b669
error reporting
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10458 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-05-24 06:52:16 +00:00
05ce8f5414
improve error messages for type declaration mismatch
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10455 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-05-21 15:13:47 +00:00
9cc00da0d0
Need to check record representation as well.
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10452 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-05-21 12:42:34 +00:00
5e67123bf6
PR#4975: spelling mistakes "overriden" and "informations"
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10450 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-05-21 12:00:49 +00:00
1772822057
PR#4478: better error messages for type definition mismatches
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10447 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-05-21 03:36:52 +00:00
9c79ec9120
fix PR#5057, must adjust levels in row fields
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10446 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-05-21 01:26:16 +00:00
f4d1cef51d
Error narrowing for class type lookups.
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10422 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-05-18 17:25:02 +00:00
fb4a2f7070
Cleanup.
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10421 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-05-18 17:21:21 +00:00
635cde5279
Error narrowing for class lookups.
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10420 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-05-18 17:20:05 +00:00
ccb1381991
Error narrowing for module type lookups.
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10419 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-05-18 17:18:24 +00:00
5d64f0e504
Error narrowing for module lookups.
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10418 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-05-18 17:14:31 +00:00
c81ff4bb19
Improve error narrowing, and (partially) fix #5046 .
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10417 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-05-18 16:46:46 +00:00
8625a5c6f1
Simpler implementation of error narrowing. Factorization of lid finding code.
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10378 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-05-05 20:51:54 +00:00
f14587620c
Generalization of unbound identier error narrowing to all kind of qualified
...
idents (constructors, labels, types, classes).
Bump version.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10365 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-05-04 16:26:33 +00:00
ad42f8a8f6
Extend nondep_type to deal with 1st class modules.
...
For instance, in:
module F(X : sig module type S end) = struct type t = (module X.S) end
include F(struct module type S = sig end end)
the resulting type t is turned into an abstract type.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10336 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-04-30 11:59:50 +00:00
8e60370dbb
distinguish conflicting identifiers with same name (PR#4716)
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10333 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-04-30 07:11:27 +00:00
80b48b7a69
make duplicate definitions a warning rather than an error
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10332 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-04-30 06:26:51 +00:00
b2730e0f81
check for duplicate labels and constructors across recursive type definitions (PR#3601)
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10331 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-04-30 05:59:40 +00:00
7312e2e22c
fix order for PR#5036
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10330 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-04-30 05:12:44 +00:00
7b8e39b8ea
fix PR#4884, using same technique as rev. 8888
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10329 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-04-30 03:07:35 +00:00
a51b04dec7
remove spurious code
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10328 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-04-30 01:56:21 +00:00
236ffb982a
PR#5036: check for nongeneralized type variables in "module type of".
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10321 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-04-28 07:53:19 +00:00
3810a32f6f
fix PR#5037
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10320 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-04-28 04:54:57 +00:00
bfdf476b69
merge last changes from 3.11 branch (rev 10307)
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10309 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-04-26 12:54:11 +00:00
7f758d5c1f
fix PR#5026: recursive type checks should use _opt versions
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10306 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-04-26 08:55:20 +00:00
b6de85daad
Reserve identifiers below 1000 for typing/predef.ml. This facilitates
...
extensions and patches like MetaOCaml.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10288 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-04-21 08:13:10 +00:00
b6f408ecc6
PR#4996: Subst.compose revised; Tbl.fold added.
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10285 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-04-20 14:11:28 +00:00
49a83dd965
merge branches/sigsubst 9626:10205
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10263 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-04-17 14:45:12 +00:00
ee36e1d1c5
merge branches/override
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10250 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-04-08 03:58:41 +00:00
ab550592ef
Adding "module type of <module-expr>" in the class of <module-type>.
...
Merge of branches/moduletypeof -r 9636:10226
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10227 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-04-02 12:53:33 +00:00
04b1656222
clean up spaces and tabs
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9547 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-01-22 12:48:24 +00:00
bdc0fadee2
merge changes from release/3.11.1 to release/3.11.2
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9540 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-01-20 16:26:46 +00:00
341d13f279
Error report in case of -strict-sequence has been triggered.
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9466 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2009-12-09 09:32:39 +00:00
700da01338
Adding the -strict-sequence option.
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9464 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2009-12-09 09:17:12 +00:00
7e68ecf265
Typing %, noop conversion.
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9432 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2009-11-30 22:02:08 +00:00
b2090f66b0
added warning 28: wildcard arg to constant constructor
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9424 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2009-11-19 12:27:15 +00:00
89107ae6ff
Merge the letopenin branch in (svn merge -r9386:9397 /svn/ocaml/branches/letopenin) and update Changes.
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9406 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2009-11-01 21:52:29 +00:00
1e5b4a4857
Merge first class modules: svn merge -r 9369:9396 $caml/branches/fstclassmod.
...
Adapt the Changes file. Bump magic numbers. Bootstrap.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9397 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2009-10-26 10:53:16 +00:00
023fda3fb4
merge polymorphic recursion
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9396 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2009-10-26 07:11:36 +00:00
db5a053fb4
Import changes from the newtypein branch (svn merge -r 9361:9367 https://frisch@yquem.inria.fr/caml/svn/ocaml/branches/newtypein ).
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9368 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2009-10-06 12:51:42 +00:00
9c6c8fb47e
As discussed at the latest consortium meeting:
...
Syntactic sugar {x} for {x=x} in record expressions and patterns.
Syntax { lbl=pat; _ } to mark record patterns where the user explicitly wants not to list all labels.
Warning (activated by E, the fragile match warning) to signal record patterns without '; _' that fail to list all labels.
To be done: adjust Camlp4 parser accordingly.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9331 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2009-09-12 12:41:07 +00:00
25d7f8fdc1
Refined error message for unbound identifiers: if M.ident is unbound and M is unbound, then unbound module M is reported.
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9326 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2009-09-04 16:19:35 +00:00
71b94fa3e8
merge changes from ocaml3111rc0 to ocaml3111
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9319 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2009-07-20 11:51:50 +00:00
11217e8f70
Added option -no-app-funct to turn off applicative functors
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9316 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2009-07-15 14:06:37 +00:00
ed32f569e3
merge changes from ocaml3110 to ocaml3111rc0
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9270 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2009-05-20 11:52:42 +00:00
7795eafa89
use TypeHash for nondep_type, and add env to nondep_mty
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9263 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2009-05-19 08:17:02 +00:00
44a068fc92
fix PR#4730
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9170 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2009-03-02 06:41:07 +00:00
Jacques Garrigue
Damien Doligez
Xavier Clerc
Alain Frisch
Pierre Weis
Xavier Leroy