842f6794a9
Synchronize with trunk.
...
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/extension_points@14042 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-08-28 17:10:04 +00:00
58d23575b7
fix let a = ( *) 1 problem
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14012 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-08-18 02:26:00 +00:00
525ef9d703
Synchronize with trunk.
...
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/extension_points@13897 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-07-16 13:34:30 +00:00
72af5c7cd0
fix PR#6062: camlp4 macro parser uncaught exception
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13875 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-07-07 14:21:35 +00:00
034351e37b
simplify the change on open! a bit
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13833 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-06-22 16:53:34 +00:00
f0231fcc21
upgrade camlp4 to support open! and let open!
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13832 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-06-22 16:12:01 +00:00
997e739fd5
Fix Excessive memory consumption while compiling Camlp4
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13749 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-06-06 01:32:44 +00:00
cf273fb995
Continue to add support for attributes to Camlp4, a little bit.
...
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/extension_points@13599 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-04-23 13:54:18 +00:00
af3b4790e7
First attempt at adding attributes to expressions in Camlp4 (not bootstrapped).
...
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/extension_points@13594 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-04-23 11:45:18 +00:00
b570a86fa7
PR#5119: camlp4 now raises a specific exception when 'DELETE_RULE' fails, rather than raising 'Not_found'
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13047 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-10-25 12:28:15 +00:00
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
e884da3bdc
Fixes a camlp4 50x slowdown by changing the order of grammar rules.
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12391 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-04-23 11:58:40 +00:00
7fa1f303c7
Set the revised syntax of GADTs
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12346 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-04-11 21:34:51 +00:00
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
62fc590a47
PR#5495: add "or" to the list of infix keywords in the camlp4 parser
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12162 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-02-17 12:52:04 +00:00
25065da568
PR#5387: typo in commit 11986
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12012 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-01-10 20:19:33 +00:00
76ff25a586
PR#5456: replace __LOCATION__ after macro expansion and add LOCATION_OF
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11992 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-01-05 14:33:56 +00:00
b0cf87a335
PR#5231: fix parsing of <:str_item< type t = $x$ >>
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11990 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-01-05 10:29:11 +00:00
0c37ea4c27
PR#5387: avoid extra Ast.CrNil and Ast.CgNil
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11987 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-01-05 09:43:50 +00:00
01b9028cb0
PR#5387: avoid extra Ast.StNil and Ast.SgNil
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11986 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-01-05 09:35:47 +00:00
b50f1df8ff
#5358 : update Camlp4 to support constraints on types in sub-modules in package types.
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11320 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-12-16 18:00:40 +00:00
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
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
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
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
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
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
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
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
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
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
d20d7acfc3
camlp4: add support for fun (type t) ...
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10438 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-05-19 14:45:14 +00:00
f4276be20e
camlp4: Add support for firstclass modules
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10430 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-05-19 12:25:27 +00:00
432bb22c1a
camlp4: initial support for polymorphic recursion
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10404 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-05-17 11:59:06 +00:00
89c1468463
camlp4: add support for "type :=" and "module :="
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10400 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-05-17 09:32:09 +00:00
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
add4cd9692
camlp4: record punning in expressions as well
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10391 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-05-11 15:18:42 +00:00
bf809e1ad1
camlp4: add support for record punning
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10389 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-05-11 14:54:35 +00:00
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
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
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
436a615911
camlp4: restore the empty data type (e.g. <<type t = [];>> in revised)
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9179 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2009-03-05 16:11:15 +00:00
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
22e2f4b84a
camlp4: yet another fix about seq_expr.
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9064 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-10-05 15:26:54 +00:00
bc3b901b30
camlp4: Fix a bug about the parsing of sequences
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9061 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-10-04 16:50:21 +00:00
91af8d2477
camlp4: Fix the PR#4532 bug about parsing of tuples vs list or sequences
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9060 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-10-04 16:49:54 +00:00
22d5cc125e
camlp4,fix: Deeply fix the grammar about extra semicolons
...
Indeed longstanding series of bugs PR#4603, PR#4330,
PR#4551 were hiding some flaws in the grammars.
So the extra semicolon allowed in record expressions,
record patterns, record declarations, objects ({<...>}),
object types (< ... >), was allowed by this bug and
not by the grammar.
This patch fix the grammars.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9058 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-10-04 10:47:56 +00:00
042b344ab2
camlp4: fix a bug hidden by a previous one (extra semicolon in {a=b;})
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9057 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-10-03 16:20:02 +00:00
da8f0e0b96
camlp4: add Jean-vincent Loddo to contributors of camlp4 macros.
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9050 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-10-03 14:19:19 +00:00
6c2b921c79
camlp4,macro: Fix the difinition/expansion of macros that are inside IFDEFs
...
Thanks to Jean-vincent Loddo for providing this patch.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9048 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-10-03 14:15:52 +00:00
Alain Frisch
Hongbo Zhang
Xavier Clerc
Damien Doligez
Jérémie Dimino
Jacques Garrigue
Jacques Le Normand
Nicolas Pouillard