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
d940182de5
bootstrap camlp4 to snapshot previous changes before fixing #0006001
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13745 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-06-05 02:57:41 +00:00
a3b1c67fff
#5980 : explicit way to silence the new warning (open! X).
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13685 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-05-16 13:34:53 +00:00
733654abab
raise an error when multiple private keywords are used in type declarations
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13157 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-12-24 05:09:22 +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
def31744f9
remove all $Id keywords
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13013 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-10-15 17:50:56 +00:00
9a718352b9
PR#5778: convert constructors on the right hand side of exception ... = ...
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12994 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-10-09 12:42:13 +00:00
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
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
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
a2ad11e98c
PR#5692: fix computation of locations in the camlp4 parser
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12751 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-20 09:26:12 +00:00
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
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
6d308ad574
PR#5668: print using the syntax "let f x y z = ..." only when the pattern is an identifier
...
This form is incorrect when the pattern is not an identifier.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12656 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-04 16:29:35 +00:00
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
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
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
546d88ca52
PR#5620: invalid printing of type manifest (camlp4 revised syntax)
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12473 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-05-23 08:19:46 +00:00
11741a8df7
Ensure that character literals are always escaped by the camlp4 printer.
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12463 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-05-16 09:13:30 +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
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
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
8c478a926a
PR#5481: update camlp4 ast magic numbers and add a comment before the ast definition
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12155 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-02-15 09:30:45 +00:00
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
e4d22f63b7
PR#5159: better documentation of locations
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12150 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-02-13 17:45:53 +00:00
ff476d8431
Merge the unused_declarations branch.
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12035 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-01-18 09:15:27 +00:00
c45bcb892d
Synchronize with trunk.
...
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/unused_declarations@12034 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-01-18 08:31:11 +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
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
12d6154526
Remove some useless declarations of recursive functions (now captured with warning 26).
...
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/unused_declarations@11975 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-12-29 17:35:15 +00:00
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
7396974e1a
PR#5120: fix the output function of Camlp4.Debug.formatter
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11945 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-12-22 21:11:29 +00:00
72865b7342
PR#5410: fix printing of class application with Camlp4
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11917 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-12-21 13:15:57 +00:00
9d17272024
Create a branch to experiment with better warnings on unused declarations.
...
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/unused_declarations@11911 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-12-21 09:39:30 +00:00
8c16e88983
PR#5374: be consistent for locations of type declarations between Camlp4 and the OCaml parser
...
Camlp4 used only the location of the rhs of type declarations, while
OCaml used the location of the whole type declaration. The location of
abstract types was then wrong when using Camlp4.
Thanks to furuse for his contribution.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11903 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-12-20 17:40:23 +00:00
dfcbd7fc56
Avoid creating malformed location in Camlp4 when no token is consumed
...
When no token was consumed, Camlp4 created a location with start-pos > stop-pos.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11902 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-12-20 17:40:18 +00:00
4db01f01b6
#5358 : update the Camlp4 ast translator to support constraints on types in sub-modules in package types.
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11322 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-12-16 21:33:15 +00:00
ac3d343a25
Fix printing of GADTs by Camlp4 with original syntax
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11321 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-12-16 20:33:18 +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
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
8b918bfe94
Removed some spurious references to 'Linenum' (the latter one preventing the build of camlp4).
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11171 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-08-11 07:46:05 +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
Hongbo Zhang
Alain Frisch
Xavier Clerc
Damien Doligez
Jérémie Dimino
Jacques Garrigue
Fabrice Le Fessant