Commit Graph

93 Commits (2dcbc1718b81440ee0ee6580b0c0a4a94a66fb35)

Author SHA1 Message Date
Damien Doligez e69730e0d6 extend warning 3 to other deprecated features: Latin1, (&) and (or)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13706 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-05-28 11:05:58 +00:00
Alain Frisch 7fa05e12d4 Fix error message.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13664 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-05-13 12:15:31 +00:00
Alain Frisch 96fc2316ed Fix #5965.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13619 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-04-29 15:39:00 +00:00
Jacques Garrigue 26e1ff7138 Merge short-paths into a fresh branch of trunk.
Also fix a bit unification and subtyping errors.
You now need the flag -short-path to activate short paths.



git-svn-id: http://caml.inria.fr/svn/ocaml/branches/short-paths-4.01@13285 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-01-29 14:21:12 +00:00
Jacques Garrigue d573c40608 Fix PR#5865
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13161 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-12-27 02:34:49 +00:00
Jacques Garrigue 17fc404e78 merge patch new-error.diff by lpw25
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/record-disambiguation@13090 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-11-11 03:46:59 +00:00
Jacques Garrigue 57c80844f5 add spellchecking for Wrong_name
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/record-disambiguation@13057 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-11-01 03:32:34 +00:00
Jacques Garrigue 8fac736f31 clean up and merge the patch disambiguate-with-warning from PR#5759
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/record-disambiguation@13048 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-10-29 07:54:06 +00:00
Alain Frisch 0b37b27356 Stop keeping a Path.t to refer to labels and constructors in the Typedtree AST. This is not used internally and it is not a robust way to identify these objects unambiguously anyway
(especially when we will add more powerful disambiguation strategies).  The correct way to identify an item is through the pair (type,name), which can be deduced from the
label_description/constructor_description stored in the Typedtree.



git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13043 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-10-24 12:03:00 +00:00
Alain Frisch e7546ca216 PR#5768: On 'unbound identifier' errors, use spell-checking to suggest names present in the environment.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13018 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-10-16 13:54:24 +00:00
Jacques Garrigue 35185d610b merge version/4.00 at revision 12866
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/short-paths@12869 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-08-21 07:10:35 +00:00
Damien Doligez 997a678d5e clean up TABs and whitespace
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12799 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-30 18:04:46 +00:00
Jacques Garrigue d8f8f9ee3b keep the text width to 80 columns
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12522 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-05-31 08:07:31 +00:00
Fabrice Le Fessant d39d43e55f merge with branch bin-annot
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12516 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-05-30 14:52:37 +00:00
Xavier Clerc acc19ff167 Removal of unnecessary "rec" clauses (to please warning #39).
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12508 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-05-29 13:41:14 +00:00
Jacques Garrigue f186ac5cb8 disable shortening for errors in Typetexp
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/short-paths@12076 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-01-24 05:33:50 +00:00
Jacques Garrigue 477b2dd743 propagate path-expansion environment everywhere
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/short-paths@12068 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-01-23 07:59:45 +00:00
Alain Frisch ece3353035 #5358: package types allow constraints on typed in sub-modules. Camlp4 compiles but does not support this new feature yet.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11311 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-12-14 10:26:15 +00:00
Jacques Garrigue 6c78f42d36 merge branches/gadts-devel
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11284 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-11-24 09:02:48 +00:00
Jacques Garrigue 156fff1b8a Keep type variable names
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11210 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-09-22 09:05:42 +00:00
Damien Doligez 3b507dd1aa renaming of Objective Caml to OCaml and cleanup of copyright headers
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11156 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-07-27 14:17:02 +00:00
Damien Doligez 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
Alain Frisch 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
Alain Frisch 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
Alain Frisch 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
Alain Frisch 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
Damien Doligez 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
Damien Doligez 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
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 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
Damien Doligez 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
Damien Doligez 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
Jun FURUSE / 古瀬 淳 db0afa58a4 workaround for the problem of optional argument type parsing caused when we redefine option type
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8888 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-06-11 23:47:12 +00:00
Damien Doligez 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
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
Damien Doligez 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
Jacques Garrigue a4fe6ac960 keep sharing when not using -principal
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7778 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2006-12-21 12:07:53 +00:00
Damien Doligez 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
Jacques Garrigue b06093c109 fix PR#4002
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7384 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2006-04-18 00:28:12 +00:00
Jacques Garrigue 8c87123e86 portee des variables de type
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6977 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2005-07-22 06:42:36 +00:00
Jacques Garrigue c9fb98c676 error message
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6976 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2005-07-22 04:30:19 +00:00
Jacques Garrigue 8e25cec9c4 definition plus claire du partage des variables de types
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6975 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2005-07-22 04:11:47 +00:00
Jacques Garrigue 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
Jacques Garrigue 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
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 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
Jacques Garrigue 5db155fee3 check partly defined types
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5461 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-03-26 08:24:02 +00:00
Jacques Garrigue e4476bbc30 fix PR#1606: allow aliases in implicit polymorphic method types
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5443 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-03-20 07:36:55 +00:00
Jacques Garrigue 51fc697ee2 fix PR#1559 and improve error messages
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5424 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-03-07 08:59:15 +00:00
Jacques Garrigue 0f434a2e17 corrige PR#1374: univar aliasee en variable de rangee
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5123 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-09-07 01:36:08 +00:00