Commit Graph

423 Commits (b7271628a25d208c90e77dce62ff0244a1c2fcdd)

Author SHA1 Message Date
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
Alain Frisch 936914100b Add support for -ppx in ocamldep (and reuse preprocessing code in Pparse).
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12769 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-24 16:24:44 +00:00
Damien Doligez d90643aab8 PR#5659: ocamlmklib -L option breaks with MSVC
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12724 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-17 18:32:05 +00:00
Fabrice Le Fessant 776c46fce8 Fix problem of size of bin-annot files
- Reset most of the fields of Env.t when saving bin-annot files
- Move debugger/envaux.ml to typing/, and add a function to 
    recover environements from bin-annot files.
- Move tools/typedtreeIter.ml to typing/
- Move the code of typing/typedtreeMap.ml from cmt_format.ml



git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12702 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-12 11:02:18 +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
Alain Frisch 60d0694e9f #5634: parstree rewriters (merge with ast_rewriter branch).
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12597 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-06-13 08:00:27 +00:00
Fabrice Le Fessant c3b08c9149 merge with bin-annot: add missing files
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12517 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-05-30 15:25:49 +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 Leroy 1e3bd1c332 Install compiler internals (as libraries + compiled interfaces + start modules)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12469 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-05-17 16:04:13 +00:00
Fabrice Le Fessant e8d1f584d4 Improve ocamldep error handling
In case of syntax error while reading a file, ocamldep used to completely
ignore the file. The new behavior is to compute no dependency from the file
content, but still print dependencies between implementations and
interfaces if needed.



git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12214 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-03-09 08:45:49 +00:00
Damien Doligez 6c24f4f90b merge version 3.12 from 3.12.1 to r12205
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12210 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-03-08 19:52:03 +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
Wojciech Meyer 1ac0f462bc PR#5510: Fix
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12168 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-02-19 17:00:39 +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
Fabrice Le Fessant 82d5630bab Small fix on the previous commit
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12092 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-01-27 13:58:04 +00:00
Fabrice Le Fessant f48f2f229c Fix PR#5396
Add the following options to ocamldep:
-sort: print files sorted according to their dependencies
-all: print all dependencies, not only the ones wanted by make
-one-line: don't break lines when they become too long



git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12089 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-01-27 13:46:00 +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 c1f154ea70 New option to force the compilers to show absolute paths in error messages.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11890 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-12-20 10:35:43 +00:00
Xavier Clerc 6b6e39a3f3 PR#5331: ocamlmktop is not always a shell script
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11184 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-09-07 14:28:24 +00:00
Xavier Clerc b61ac6c575 PR#5316: objinfo now shows ccopts/ccobjs/force_link when applicable
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11183 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-09-07 13:57:28 +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 8814f3fa3c remove obsolete MPW scripts
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11149 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-07-26 22:36:54 +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
Damien Doligez 31b0292413 renaming "Objective Caml" to "OCaml" (first pass)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11015 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-04-26 12:16:50 +00:00
Pierre Weis 64195886f4 Ignoring compiled files.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10991 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-03-17 23:33:36 +00:00
Damien Doligez a53ce2df70 add option -runtime-variant
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10982 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-03-17 16:18:05 +00:00
Jacques Le Normand 93d0eb2df1 updated addlabels
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/gadts@10810 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-11-17 05:05:00 +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 d2fedeb703 updated addlabels.ml
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/gadts@10797 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-11-12 09:41:49 +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 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 61d816352c forgot this file in last commit
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/gadts@10735 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-10-21 07:24:46 +00:00
Jacques Le Normand 6de25fef2f first commit
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/gadts@10679 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-09-13 05:28:30 +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
Damien Doligez 2146210d4e ignore objinfo_helper
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10484 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-05-31 12:49:35 +00:00
Xavier Leroy cd648ee2dd PR#5059: split objinfo into a pure Caml part and a pure C part.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10459 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-05-24 14:27:50 +00:00
Damien Doligez b29bc9fd2b PR#5055: head -1 doesn't work
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10448 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-05-21 11:28:21 +00:00
Damien Doligez 3bba52b91c PR#4857: add -vnum option to all executables
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10444 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-05-20 14:06:29 +00:00
Xavier Leroy ebdb1eba29 PR#5033, continued: forgot to add new files.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10432 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-05-19 12:39:46 +00:00
Xavier Leroy 2adec7d747 PR#5033: tools/objinfo made more general.
tools/dumpapprox removed, now subsumed by tools/objinfo.
Introduced asmcomp/cmx_format.mli and used consistently in asmcomp,
  tools/objinfo, and otherlibs/dynlink
Note: ocamlbuild -based build procedure not updated yet.


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10424 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-05-19 11:29:38 +00:00
Damien Doligez 50864fb4b3 rename -help-warnings to -warn-help
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10384 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-05-08 20:11:27 +00:00
Alain Frisch e09a12388f New -help-warnings command-line option.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10369 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-05-04 18:44:38 +00:00
Jacques Garrigue 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
Damien Doligez 83fb41dcf7 unified command-line arguments
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10260 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-04-13 10:44:25 +00:00