Commit Graph

23 Commits (d3d363a1a65a21ae55669607ea792ce860069d2f)

Author SHA1 Message Date
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
Xavier Clerc da7078d07b PR#5637: invalid printing of anonymous type parameters (camlp4 revised syntax)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12668 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-09 09:43:49 +00:00
Xavier Clerc c922570d0f PR#5651: printer for abstract data type (camlp4 revised syntax)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12666 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-09 09:07:43 +00:00
Jérémie Dimino ef8d15d4a1 PR#5579: always create a new token stream before parsing a phrase so new filters are applied
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12336 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-04-10 21:18:00 +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 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
Jacques Garrigue 229b27364e cancel commit in wrong branch
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10830 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-11-19 08:06:54 +00:00
Jacques Le Normand 047127cdff removed all changes to camlp4
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10829 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-11-19 07:19:56 +00:00
Jacques Le Normand 7af69814ac camlp4 now updated, but completely untested. I reverted camlp4 back to revision 10660 and then changed it from there
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/gadts@10697 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-10-01 02:46:07 +00:00
Jacques Le Normand 10214937fe fixed several bugs, bootstrap finally works!
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/gadts@10686 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-09-22 07:04:22 +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
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
Nicolas Pouillard 3a14bd5091 camlp4: kill some (* $Id$ *)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9106 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-10-27 14:03:15 +00:00
Nicolas Pouillard a0a0277a0e camlp4: resolve PR#4543 about filters on topphrase (thanks to Martin Jambon for this patch)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9104 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-10-27 13:45:09 +00:00
Nicolas Pouillard 253a5f6364 camlp4: Fix two toplevel bugs: PR#4495 and PR#4593 at once
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9080 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-10-13 13:34:06 +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
Nicolas Pouillard aeb05b1cb9 [camlp4] Merge 3.10 on trunk for camlp4
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8557 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-11-21 18:11:24 +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
Nicolas Pouillard fa5e0979f2 Some renamings, moving, and changements in camlp4
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7828 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-02-07 10:09:29 +00:00
Nicolas Pouillard 5422545d53 Keep the last loc to have a correct loc for subsequent implem or interf
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7509 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2006-07-17 14:18:26 +00:00
Nicolas Pouillard 00b144ff5c Fix a bug in camlp4 toplevels: flush the module registration queue at each phrase.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7472 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2006-07-06 15:40:10 +00:00
Nicolas Pouillard e6b3b5b05f Start the merge of the new Camlp4 version
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7445 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2006-06-29 08:12:46 +00:00