Commit Graph

390 Commits (0a9bf33ba3ae789cb55df6605a5ea13aef15af7e)

Author SHA1 Message Date
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
Damien Doligez 88c6ce7d94 ignore generated file
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13201 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-01-03 16:01:58 +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 238814e293 #5770: Syntax error messages involving unclosed parens are sometimes incorrect.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13019 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-10-16 14:04:33 +00:00
Damien Doligez de1ac52bc6 PR#5715: change the fix to avoid breaking the mingw port
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12978 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-09-30 12:31:27 +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 4e320be745 remove spurious whitespace at EOF
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12844 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-08-09 06:05:28 +00:00
Damien Doligez b1e5cde2e7 PR#5715 (partial?) disabling shared libraries does not work under cygwin
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12841 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-08-08 14:36:51 +00:00
Damien Doligez 6be05dae42 add some missing copyright headers
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12814 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-08-02 08:17:59 +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
Damien Doligez 0c3a7de507 merge changes from 4.00 branching to 4.00.0 (part 1)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12784 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-26 19:21:54 +00:00
Jacques Garrigue 43c7d1b51c fix PR#5674: move Texp_poly and Texp_newtype to exp_extra
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12680 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-10 08:25:58 +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
Alain Frisch 05c973e6ed Compile with warning 33, and remove unused opens.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12497 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-05-29 11:10:03 +00:00
Xavier Leroy 8b5b5f9df5 Makefile: typo in installoptopt entry
otherlibs/labltk: toplevellib.cma is no more, use the new compilerlibs/*.cma stuff instead


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12471 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-05-21 13:23:08 +00:00
Jacques Garrigue 57c5658f54 Follow-up on PR#5553
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12258 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-03-23 02:35:00 +00:00
Alain Frisch ab918e2078 Detect unused exception declarations (#5524).
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12195 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-03-06 19:47:07 +00:00
Alain Frisch f0b95f3349 Keep locations for exception declaration. This gives better error messages and paves the way to #5524.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12193 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-03-06 19:03:17 +00:00
Damien Doligez 5b14388ad0 refactoring the "read n bytes from a channel into a new string" idiom
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12184 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-02-23 19:54:44 +00:00
Damien Doligez d4522f062c Change "Ocaml" to "OCaml" everywhere
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12152 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-02-13 17:48:41 +00:00
Damien Doligez e7f5b858c2 More renaming to OCaml
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12149 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-02-10 16:15:24 +00:00
Benedikt Meurer d0f04172e7 Fix various compiler warnings in labltk.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12126 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-02-05 09:20:46 +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
Jacques Garrigue db66874712 Attempt at shortening paths on printing
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/short-paths@12064 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-01-22 01:47:52 +00:00
Alain Frisch ff476d8431 Merge the unused_declarations branch.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12035 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-01-18 09:15:27 +00:00
Alain Frisch c45bcb892d Synchronize with trunk.
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/unused_declarations@12034 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-01-18 08:31:11 +00:00
Fabrice Le Fessant 28c7bcd42d Fix PR#5475
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12032 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-01-17 21:47:36 +00:00
Alain Frisch 33eefe4874 Remove unused constructors in the AST: Cf_let, Pcf_let.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11968 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-12-28 13:27:07 +00:00
Alain Frisch 9d17272024 Create a branch to experiment with better warnings on unused declarations.
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/unused_declarations@11911 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-12-21 09:39:30 +00:00
Jacques Garrigue b1f8048f39 merge branches/located_errors
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11228 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-10-21 03:26:35 +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
Xavier Leroy 9ef7e04cf3 Jonathan's updates to the Windows/Mingw port
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11197 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-09-15 13:38:45 +00:00
Damien Doligez d9eb848d86 PR#5238, PR#5277: Sys_error when getting error location
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11166 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-08-04 14:59:13 +00:00
Jacques Garrigue 9dc661c3bf merge branches/gadts
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11160 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-07-29 10:32:43 +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 db1e7c7e23 file "modules" is not auto-generated
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11155 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-07-27 11:52:13 +00:00
Damien Doligez 6712010b6b file "modules" is not auto-generated
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11154 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-07-27 11:51:01 +00:00
Damien Doligez 9286fd5a70 file "modules" is not auto-generated
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11153 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-07-27 11:50:08 +00:00
Damien Doligez 90664f4ea1 uniform .ignore system
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11133 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-07-20 15:37:36 +00:00
Damien Doligez c91db736b1 merge changes from 3.12.0 to 3.12.1
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11123 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-07-20 09:17:07 +00:00
Pierre Weis e1fda3d23a New module dependency.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11099 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-06-20 21:44:27 +00:00
Pierre Weis dc2472c8dd Ignoring compiled files.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10986 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-03-17 23:25:14 +00:00
Jacques Le Normand 3ec9bc692b complete_constrs in parmatch.ml now works with gadts. Reverted changes to the syntax tree which are no longer needed.
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/gadts@10805 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-11-16 06:01:59 +00:00
Jacques Le Normand 1680403fb9 clean up
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/gadts@10784 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-11-10 06:01:27 +00:00
Jacques Le Normand ad30b17be1 updated references to Tpat_record to accomodate the extra field
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/gadts@10771 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-11-08 09:14:57 +00:00
Jacques Garrigue f368f4e0d5 allow variance in GADTs
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/gadts@10763 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-11-08 06:59:46 +00:00
Jacques Le Normand c2777a43d0 merged with trunk. specifically, merged with implicit unpack patch
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/gadts@10742 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-10-25 08:19:48 +00:00
Jacques Garrigue 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
Jacques Le Normand 87898cb3e9 internally, we can now refer to constructors with the help of their type, thus avoiding shadowing
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/gadts@10737 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-10-21 08:17:17 +00:00
Jacques Le Normand 304dba8a0f removed Type_variant, fixed bug in GADT exhaustive check
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/gadts@10734 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-10-21 04:02:02 +00:00