Commit Graph

575 Commits (3a14bd5091e13c78354da3f61d321069444aecec)

Author SHA1 Message Date
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
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 70add65225 camlp4: fix the revised printer of functor apps
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9067 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-10-05 16:30:55 +00:00
Nicolas Pouillard 926961ed06 camlp4,printer: Fix a printing bug, parens in "include(struct end:sig end)"
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9066 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-10-05 16:25:28 +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
Nicolas Pouillard 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
Nicolas Pouillard a577f8d889 camlp4: quick fix the previous patch
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9063 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-10-04 17:08:02 +00:00
Nicolas Pouillard 3ea6411500 camlp4: Fix the PR#4420 bug, object...end is sadly not a simple expression
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9062 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-10-04 16:54:05 +00:00
Nicolas Pouillard 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
Nicolas Pouillard 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
Nicolas Pouillard 4379a09dc3 camlp4: Fix the PR#4520 about the conversion of special cases (like A.False).
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9059 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-10-04 11:11:09 +00:00
Nicolas Pouillard 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
Nicolas Pouillard 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
Nicolas Pouillard dc27d2774b camlp4: fix mkcamlp4 by pointing to the real lib name
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9056 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-10-03 15:50:09 +00:00
Nicolas Pouillard 2446372311 camlp4: remove the buggy/unfinished Camlp4Tracer filter.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9055 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-10-03 15:41:25 +00:00
Nicolas Pouillard db5e084aa2 camlp4: little cleanup in Grammar.Static
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9054 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-10-03 15:28:05 +00:00
Nicolas Pouillard cdd0860804 camlp4: Fix PR#4603, PR#4330, PR#4551 all at one (thanks to Jerome Vouillon)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9053 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-10-03 15:18:37 +00:00
Nicolas Pouillard 5b5ef4a8d2 camlp4,tests: be more precise in pr4330.ml
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9052 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-10-03 15:18:22 +00:00
Nicolas Pouillard 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
Nicolas Pouillard 20703cd0e3 camlp4,tests: more test for macros.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9049 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-10-03 14:16:05 +00:00
Nicolas Pouillard 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
Nicolas Pouillard d58c21272e camlp4,examples: add examples for FreeVars
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9047 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-10-03 13:06:37 +00:00
Nicolas Pouillard 6335958c20 camlp4,fix,freevars: now handle all binding cases.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9046 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-10-03 13:06:19 +00:00
Nicolas Pouillard 7b822718b8 camlp4,fix,bug,loc: Fix the PR#4521 bug about locations (thanks to Jerome Vouillon)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9035 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-09-23 00:07:45 +00:00
Nicolas Pouillard ff4580e3b8 camlp4: even more test fixtures
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9034 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-09-19 12:56:26 +00:00
Nicolas Pouillard f0de463f28 camlp4: more test fixtures
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9033 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-09-19 12:54:10 +00:00
Nicolas Pouillard d385cf8591 camlp4: more examples and tests
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9032 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-09-19 12:50:41 +00:00
Nicolas Pouillard 47a482380a camlp4: Fix the printer of lazy-patterns (since the are irrefutables).
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8984 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-08-06 17:26:08 +00:00
Nicolas Pouillard 4db872fd10 camlp4: extend the is_irrefutable function
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8923 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-07-21 14:05:59 +00:00
Michel Mauny 6ba024a12e Add lazy patterns.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8906 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-07-09 13:03:38 +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 df984fdca7 camlp4,bootstrap,head: Regen camlp4/boot/*.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8728 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-12-18 10:31:34 +00:00
Nicolas Pouillard 63bfcc74c6 camlp4,fix,quot: Properly handle <:patt< $`bool:p$ >>.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8721 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-12-18 09:02:19 +00:00
Nicolas Pouillard ebb6348c1e camlp4,fix: Correctly parse type quotations containing uppercase polymorphic variant (<:ctyp< `A >>)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8720 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-12-18 09:00:37 +00:00
Nicolas Pouillard 756c4697ae camlp4,fix: Generate only qualified names in Camlp4GrammarParser.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8719 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-12-18 08:59:38 +00:00
Nicolas Pouillard f8841fe8c1 camlp4,cleanup: Remove some dead code in Camlp4GrammarParser.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8718 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-12-18 08:59:11 +00:00
Nicolas Pouillard 196ce9283e camlp4,fix,original,quot: Parse correctly <:ctyp< ? $ : int -> unit >>.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8711 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-12-18 08:53:44 +00:00
Nicolas Pouillard bf1081ab07 [camlp4] Report about invalid characters escapings (a note in PR#4337).
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8710 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-12-18 08:51:25 +00:00
Nicolas Pouillard 9f3fcc249e [camlp4] Fix a location bug inside quotations (PR#4357).
Take in account the fact that the two first characters of a quotation literal
in the case of "<:" or "<@" are already counted. So decrement by 2 the shifts
made on these locations.


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8660 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-11-27 14:38:21 +00:00
Nicolas Pouillard af74b19b24 [camlp4] Constrain a little more the printer before a <- or :=.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8658 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-11-27 14:35:48 +00:00
Nicolas Pouillard f5a6924be6 [camlp4] [Printers.Ocaml] Protect list items from semicolons (PR#4427).
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8657 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-11-27 14:34:24 +00:00
Nicolas Pouillard 8d0b054177 [camlp4] More printing fixtures.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8656 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-11-27 14:33:31 +00:00
Nicolas Pouillard efc1254793 [camlp4] Use the constraint keyword instead of type in class signatures too (PR#4419).
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8655 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-11-27 14:32:08 +00:00
Nicolas Pouillard bf56fe7082 [camlp4] Print a break after the unary minus (PR#4417).
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8654 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-11-27 14:31:31 +00:00
Nicolas Pouillard e3ade8ec81 [camlp4] Parse also <<val mutable virtual id : ty>> (PR#4417).
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8653 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-11-27 13:37:47 +00:00
Nicolas Pouillard 51285046e8 [camlp4] Add the test case for PR#4337.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8652 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-11-27 13:36:17 +00:00
Nicolas Pouillard e4bd83e07f [camlp4] Now supports the useless syntax: <<fun patt when guard -> expr>> (PR#4331).
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8651 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-11-27 13:34:33 +00:00
Nicolas Pouillard bba53a1bc8 [camlp4] Fix a bug in the printer of negative numeric values (PR#4332).
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8650 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-11-27 13:32:38 +00:00