Commit Graph

271 Commits (a034508f080b883d3b3f96ec2dfe5c545070f3e8)

Author SHA1 Message Date
Xavier Leroy ab550592ef Adding "module type of <module-expr>" in the class of <module-type>.
Merge of branches/moduletypeof -r 9636:10226


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10227 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-04-02 12:53:33 +00:00
Maxence Guesdon 799acd88ba PR#4668: ocamldoc: fix name clashes when generating html files
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9640 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-03-08 17:34:31 +00:00
Maxence Guesdon ae64d53c2f PR#5162: highlight the element we jumped to in html output
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9639 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-03-08 17:25:04 +00:00
Maxence Guesdon 470d7e9d26 PR#4915: new syntax {%format: code %} to put target format specific code
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9638 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-03-08 16:54:13 +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
Damien Doligez 1b8095f404 PR#4940: get rid of naked end-of-lines in string constants + add warning 29
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9512 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-01-07 15:15:07 +00:00
Maxence Guesdon 1a69d6b156 PR#4913: fix output of index file wehn given a custom index text
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9479 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2009-12-18 12:10:56 +00:00
Maxence Guesdon f2f0f0efec PR#4806: ocamldoc: display the exception causing the message 'Compilation error. Use the ocaml compiler to get more details'
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9478 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2009-12-18 12:05:34 +00:00
Maxence Guesdon e904577b6b PR#4914: ability to specify a text for links to elements
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9477 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2009-12-18 11:52:23 +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
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
Maxence Guesdon 6317d017cd fix compilatin of ocamldoc for NT with no odoc_opt.ml any more
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9228 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2009-04-09 13:55:53 +00:00
Maxence Guesdon e93f6dd12b option -g also for native code version (loading custom generators)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9184 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2009-03-11 07:04:39 +00:00
Damien Doligez 1f95b17570 merge changes from 3.10.2merged to 3.11.0
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9153 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-12-03 18:09:09 +00:00
Maxence Guesdon 3a95d57eda PR#4630: minor fix in ocamldoc man page generation
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9112 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-10-29 13:30:24 +00:00
Maxence Guesdon c0820f079f add option -no-module-constraint-filter for PR#4588
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8932 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-07-25 13:28:23 +00:00
Maxence Guesdon 2a1bc6f15e fix bug #4587: unescaping escaped '@' in @-tags
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8928 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-07-23 11:14:22 +00:00
Maxence Guesdon a6ae8b88a5 fix bug #4585 and handle virtual flag for class value in all generators
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8927 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-07-23 08:55:36 +00:00
Maxence Guesdon 39a65f59dc expose definition of private_flag so it can be used by users of the ocamldoc library
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8883 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-05-21 05:56:39 +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 e9a9bf9613 PR#3114 make all error messages start with a location and "Error: "
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8705 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-12-04 13:38:58 +00:00
Alain Frisch 3958a92c72 Merge the natdynlink branch into HEAD.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8477 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-11-06 15:16:56 +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
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
Damien Doligez 773ff5b883 probleme avec les .depend
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8415 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-10-08 12:30:31 +00:00
Maxence Guesdon a99f54d484 fix PR#4215: ocamldoc hand '?' in value names when generating html files
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7923 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-02-26 09:58:50 +00:00
Nicolas Pouillard 72d1e146ed Fix a bug in texi generation (module types)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7859 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-02-12 10:27:29 +00:00
Damien Doligez f700284aac fusion des changements 3.09.3 -> release309_merge310
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7849 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-02-09 13:31:15 +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
Nicolas Pouillard 225f05fb80 Fix Odoc_misc.string_of_longident and Odoc_name.from_longident to handle functor applications
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7470 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2006-07-06 07:19:06 +00:00
Nicolas Pouillard 279ef952dd Update the ocamldoc makefile to ignore the manpages install if they are not built
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7454 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2006-06-29 12:07:35 +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
Jacques Garrigue 12349a56be fix PR#3946
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7316 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2006-01-06 02:25:38 +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
Xavier Leroy f55d676d2c Interdire les references Foo.x lorsqu'on compile foo.ml ou foo.mli (PR#3100, 3304, 3457)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6998 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2005-07-31 12:03:40 +00:00
Damien Doligez 9a9886022f depend
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6992 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2005-07-29 15:54:25 +00:00
Pierre Habouzit 4803624ae5 fix parralelization of the compilation for targets world and opt
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6893 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2005-05-31 11:52:16 +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
Maxence Guesdon 1179789c0c fix unused variables
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6723 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2004-12-03 14:42:09 +00:00
Damien Doligez 1971a6ba83 changements sur les warnings
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6720 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2004-11-30 18:57:04 +00:00
Damien Doligez 454835e868 activation du warning Y (unused var)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6713 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2004-11-29 14:52:56 +00:00
Jacques Garrigue 0edba97cf6 new warning for black holes
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6703 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2004-11-29 02:27:25 +00:00
Damien Doligez 7519fe8f6b fusion des bugfixes de 3.08.2
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6694 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2004-11-25 00:06:06 +00:00
Jacques Garrigue 71d44d5940 declare virtuals
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6693 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2004-11-24 01:55:37 +00:00