Commit Graph

151 Commits (4fd6cd82750051e930451963b5f9a67831cac5dc)

Author SHA1 Message Date
Jacques Garrigue 4fd6cd8275 use free univars for explicit polymorphic types
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/gadts@10663 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-08-31 06:34:43 +00:00
Jacques Garrigue 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
Damien Doligez 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
Alain Frisch 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
Jacques Garrigue 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
Damien Doligez 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
Jacques Garrigue 8c5ed4dd1f corrige rangees privees apres introduction abbreviations privees par PW
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8435 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-10-18 03:38:28 +00:00
Pierre Weis 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
Jacques Garrigue d78838fdd3 typo
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7876 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-02-16 11:18:54 +00:00
Damien Doligez 1279ab4b76 fusion des changements 3.09.1 -> 3.09.2
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7382 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2006-04-16 23:28:22 +00:00
Jacques Garrigue 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
Damien Doligez 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
Jacques Garrigue 83c0f7bb46 fix merge problems with 3.08.4 (PR#3758)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7020 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2005-08-16 00:48:56 +00:00
Damien Doligez a4a3c10e70 fusion des modifs de 3.08.4
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7019 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2005-08-13 20:59:37 +00:00
Jacques Garrigue eb57cd1912 pas de conflit avec 3.08.3
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6826 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2005-03-25 00:42:54 +00:00
Damien Doligez e6007f6057 fusion des changements jusqu'a 3.08.3
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6824 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2005-03-24 17:20:54 +00:00
Jacques Garrigue 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
Jacques Garrigue ca3abc51a8 fix poly method printing
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6805 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2005-03-10 08:19:22 +00:00
Jacques Garrigue 2b9fbaf3c0 print variance only when needed
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6733 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2004-12-09 12:51:55 +00:00
Jacques Garrigue 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
Xavier Leroy 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
Xavier Leroy 762a006652 Impression des 'rec' et des 'and' dans les signatures inferees (PR#1981,2585)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6386 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2004-06-12 08:55:49 +00:00
Jacques Garrigue 51c870d62e messages d'erreur plus courts et plus explicites
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6260 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2004-04-27 07:37:30 +00:00
Jacques Garrigue c1d371aa3e seules les methodes publiques peuvent etre implicitement polymorphes
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6080 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2004-01-27 07:06:54 +00:00
Jacques Garrigue f2095623ff fast and compact classes
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5977 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-11-25 09:20:45 +00:00
Jacques Garrigue 303ca193e8 tools for debugging the type checker
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5897 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-11-07 01:07:32 +00:00
Xavier Leroy 3e4bf9252b Revu representation des declarations de type private
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5643 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-07-02 09:14:35 +00:00
Jacques Garrigue b8f3f07141 coherent handling of type declarations
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5632 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-06-30 08:04:42 +00:00
Jacques Garrigue 789d53cecf fix PR#1727
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5625 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-06-25 07:52:27 +00:00
Jacques Garrigue 4202eb8c4d add weak contravariance for types (PR#1692)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5569 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-05-21 09:04:54 +00:00
Jacques Garrigue c5790aa417 fix PR#1559
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5568 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-05-19 09:21:17 +00:00
Pierre Weis e77055aad9 Complete move from virtual to private for concrete types with private
constructors (or labels).


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5524 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-05-01 22:22:37 +00:00
Jacques Garrigue b8311b53d0 fix PR#1599 and PR#1616
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5502 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-04-22 10:46:57 +00:00
Pierre Weis 79f3791c04 Introduction des types virtuels etape 2: introduction dans camlp4.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5410 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-02-28 07:53:08 +00:00
Pierre Weis b5d0102c05 Nouveau format %$. Introduction des types virtuels: step 1 sans inclusion dans Camlp4
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5409 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-02-28 06:59:19 +00:00
Jacques Garrigue 6a56c7ed49 do not mark aliases as non-gen
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5249 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-11-07 08:45:57 +00:00
Damien Doligez 37bf95c248 detabisation
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5029 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-07-23 14:12:03 +00:00
Jacques Garrigue a3c76a6264 improve error messages
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4929 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-06-18 10:47:33 +00:00
Jacques Garrigue 4a9e0cb904 remove coercion warning, add it only on error
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4923 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-06-12 09:52:08 +00:00
Jacques Garrigue d13715755c clean-up of universal and recursive types
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4912 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-06-10 02:39:35 +00:00
Jacques Garrigue 21e57202d4 limit enlarge_type to 2 expansions involving object/variants
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4862 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-05-30 06:24:45 +00:00
Jacques Garrigue 0a8236066f vive les methodes polymorphes!
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4694 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-04-18 07:27:47 +00:00
Daniel de Rauglaudre 50161b7513 Regroupement des impressions "outcometree" dans un seul module oprint.ml.
Ajout de hooks de print dans toploop.mli.


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4396 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-02-13 11:09:19 +00:00
Jacques Garrigue 1dd02127e7 corrige ordre dans type de classe
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4244 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-01-10 08:15:44 +00:00
Jacques Garrigue 228ca372d0 pretty-printing of type declarations
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4187 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2001-12-26 07:42:42 +00:00
Jacques Garrigue af5ee6951f solve PR#3 (type abbreviation hides constraints)
pitfall: all constraints are shown, even if no new constraint was
introduced.


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4020 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2001-11-19 09:49:56 +00:00
Jacques Garrigue e98cbab81d un print_space de trop dans print_out_type_decl
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@3895 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2001-10-19 03:05:30 +00:00
Maxence Guesdon 6cadb65dba Ajout d'une fonction type_cheme_max utilisée pour ocamldoc. Elle est susceptible d'etre modifiée selon les besoins d'ocamldoc. Elle est identique à type_scheme à ceci près qu'elle ne fait pas de reset_names.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@3818 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2001-10-01 14:09:52 +00:00
Jacques Garrigue 0697c6771b change tree_of_* functions to produce type variables in the right order
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@3813 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2001-09-29 02:40:59 +00:00
Jacques Garrigue a0620def39 bug in report_subtyping_error
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@3792 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2001-09-26 07:34:19 +00:00