Damien Doligez
2352bbfa8b
bootstrap camlp4
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12855 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-08-10 07:20:10 +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
053f75b9ca
bootstrap camlp4 to fix PR#5633 (slow parsing)
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12615 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-06-19 10:50:11 +00:00
Jérémie Dimino
318f731baa
PR#5646: reapply the fix for PR#5442
...
It was reverted when the bin-annot branch was merged
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12595 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-06-12 16:18:36 +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
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
Jérémie Dimino
6075cd4c6d
PR#5442: use safe_string_escaped instead of String.escaped
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11984 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-12-30 20:00:14 +00:00
Jérémie Dimino
3bea22baaf
PR#5442: strings must be escaped when the ast meta-expansed by Camlp4
...
Because strings in the Camlp4 Ast are escaped.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11948 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-12-23 16:30:23 +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
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
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
Xavier Clerc
90e27e2019
Minor fix in display of float values in errors messages (camlp4)
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11124 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-07-20 12:07:05 +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 Le Normand
421d864cca
camlp4 -> caml ast transformations done
...
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/gadts@10841 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-11-22 12:30:08 +00:00
Jacques Le Normand
3d99be4287
Camlp4 finally works. This is probably not the most elegant implementation
...
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/gadts@10836 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-11-19 16:40:08 +00:00
Jacques Le Normand
86f1604d06
undid all changes to camlp4
...
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/gadts@10831 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-11-19 08:28:32 +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
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
f24d678e39
bootstrapped camlp4 gadts extension
...
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/gadts@10798 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-11-12 11:33:41 +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
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
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
Nicolas Pouillard
bac01e4446
camlp4: bootstrap
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10439 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-05-19 14:49:22 +00:00
Nicolas Pouillard
e9f1c5e6dc
camlp4: bootstrap first class modules
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10428 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-05-19 12:20:49 +00:00
Nicolas Pouillard
17a6330d29
camlp4: support polymorphic recursion and bootstrap
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10410 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-05-17 13:44:14 +00:00
Nicolas Pouillard
cc123f5ea7
camlp4: bootstrap
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10405 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-05-17 11:59:12 +00:00
Nicolas Pouillard
964b1fa0dd
camlp4: bootstrapping part of last commit
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10401 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-05-17 09:32:52 +00:00
Nicolas Pouillard
d162777be3
Remove an old camlp4 makefile
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10399 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-05-17 09:30:30 +00:00
Nicolas Pouillard
f40a38533b
camlp4: add support for let-open-in
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10395 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-05-12 16:00:06 +00:00
Nicolas Pouillard
7c5ae7af4c
camlp4: bootstrap
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10392 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-05-11 15:19:17 +00:00
Nicolas Pouillard
c786bb358f
camlp4: bootstrap
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10390 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-05-11 14:56:28 +00:00
Nicolas Pouillard
03aaba0aae
Merge remote branch 'ocaml-git/buildsys' into trunk
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10388 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-05-11 14:24:44 +00:00
Nicolas Pouillard
b8cef86ba3
Merge remote branch 'ocaml-git/buildsys' into trunk
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10387 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-05-11 13:34:38 +00:00
Jacques Garrigue
ee36e1d1c5
merge branches/override
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10250 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-04-08 03:58:41 +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
Xavier Leroy
9c6c8fb47e
As discussed at the latest consortium meeting:
...
Syntactic sugar {x} for {x=x} in record expressions and patterns.
Syntax { lbl=pat; _ } to mark record patterns where the user explicitly wants not to list all labels.
Warning (activated by E, the fragile match warning) to signal record patterns without '; _' that fail to list all labels.
To be done: adjust Camlp4 parser accordingly.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9331 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2009-09-12 12:41:07 +00:00
Nicolas Pouillard
c487f4e957
camlp4: bootstrap
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9180 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2009-03-05 16:11:37 +00:00
Pierre Weis
a548eb3a13
Understanding the notion of standard channel for Format and Scanf.
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9166 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2009-01-25 22:46:15 +00:00
Nicolas Pouillard
d4e4bdaaa2
camlp4: kill last $Id$s
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9108 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-10-27 14:03:57 +00:00
Nicolas Pouillard
17843562ad
camlp4: kill # $Id$
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9107 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-10-27 14:03:31 +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
35205da90c
camlp4,bootstrap: again
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9068 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-10-05 17:18:25 +00:00
Nicolas Pouillard
a71f5a0fe2
camlp4,bootstrap
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9065 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-10-05 15:27:04 +00:00