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
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
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
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
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
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
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
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
2b0441401a
merge changes between 3.10.2 and the end of branch 3.10
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9079 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-10-08 13:09:39 +00:00
636d845eed
PR#4261: expand abbreviations one at a time, because we do not know whether expanding to HNF will terminate.
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8985 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-08-07 08:22:15 +00:00
671013f72a
distingue expansions publiques et privees dans le cache
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8922 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-07-19 02:13:09 +00:00
b190aa533a
reset abbreviation cache when calling expand_abbrev after expand_abbrev_opt
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8920 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-07-18 13:45:02 +00:00
8e03390daf
Cleanup.
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8878 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-04-22 15:45:55 +00:00
04aa158cb6
merge changes from 3.10.1 to 3.10.2
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8823 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-02-29 14:21:22 +00:00
9ea5edac9a
merge changes 3.10.0 -> 3.10.1
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8768 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-01-11 16:13:18 +00:00
f0bbfb7043
sous-typage des abbreviations privees et methodes polymorphes
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8697 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-11-30 12:37:45 +00:00
3013dc544d
Documentation.
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8683 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-11-28 22:26:05 +00:00
2a99b8737b
Expanding the usual compiler's type-based optimisations to private abbreviations.
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8474 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-11-01 18:36:43 +00:00
59e0723455
It works: compilers and camlp4 are fully bootstrapped. The ast magic number is not yet changed.
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8418 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-10-09 10:29:37 +00:00
4167841b16
fusion de la version 3.10.0
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8416 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-10-08 14:19:34 +00:00
af7cc2dcb8
fix Carette's bug 2007-02-18
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7884 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-02-19 00:49:16 +00:00
4024589fba
subtyping errors
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7875 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-02-16 11:18:36 +00:00
84b420f2fe
expand only once in update_level
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7713 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2006-11-02 02:19:49 +00:00
fbea66a95e
fusion des changements 3.09.2 -> 3.09.3
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7619 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2006-09-20 11:14:37 +00:00
602146f892
add virtual instance variables
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7372 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2006-04-05 02:28:13 +00:00
1e003d6855
dead code
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7314 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2006-01-06 02:16:24 +00:00
125ea40d4c
fusion 3.09.0 -> 3.09.1
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7307 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2006-01-04 16:55:50 +00:00
86e7954b73
fix PR#3855
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7232 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2005-11-14 08:07:12 +00:00
e8927c7a5f
fix bug Wohlwend caml-list 2005-09-19
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7058 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2005-09-20 04:08:49 +00:00
f752003267
subtyping polymorphic variants
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7024 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2005-08-19 03:50:12 +00:00
5bef38ba93
bug in object subtyping + subtyping forget constraints
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7023 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2005-08-17 05:38:23 +00:00
c78bc94a7a
subtyping private types
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7022 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2005-08-16 09:47:31 +00:00
3aa312d98b
do not force presence for variants with only 1 constructor
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6911 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2005-06-13 01:11:02 +00:00
5a34c088cc
when using -rectypes, expand abbreviations to detect cycles
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6905 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2005-06-03 01:42:00 +00:00
ef396b4e5a
merge fixedtypes branch
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6821 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2005-03-23 03:08:37 +00:00
36f117f200
fix poly method subtyping
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6806 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2005-03-10 08:20:08 +00:00
972209dd6b
fix variance bug
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6731 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2004-12-09 12:40:53 +00:00
b00a5d154b
solve warnings
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6673 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2004-11-10 02:00:55 +00:00
50fdbb8e0f
do not assume all quantified Tunivar occur
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6643 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2004-10-15 12:28:48 +00:00
be7d100b73
different Tpoly's may share the same vl
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6642 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2004-10-15 03:15:34 +00:00
242b03f8e9
allow for phantom univars
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6641 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2004-10-14 02:36:19 +00:00
e34f9f2ea6
accept more cases
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6639 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2004-10-14 00:54:20 +00:00
ca88844599
do Fmu checks for moregeneral/eqtype/subtype
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6638 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2004-10-13 10:05:26 +00:00
91b18ff473
check for escaping variables in Fmu
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6636 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2004-10-13 09:33:09 +00:00
281e9b9867
fix limited_generalize for variants
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6620 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2004-09-21 12:08:12 +00:00
63c1789b5e
Fusion des modifs faites sur la branche release jusqu'a la release 3.08.0
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6553 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2004-07-13 12:25:21 +00:00
4f0631da37
symmetry of unify_univar
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6376 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2004-06-08 06:34:56 +00:00
Damien Doligez
Jacques Garrigue
Alain Frisch
Xavier Leroy
Pierre Weis