Alain Frisch
42a33460ed
Item attributes on classes.
...
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/extension_points@13348 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-03-05 12:06:38 +00:00
Alain Frisch
7de8a9688e
Allow to put 'item' attributes before the 'type' or 'module rec' keywords. They apply to the first item in the declaration.
...
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/extension_points@13347 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-03-05 11:51:51 +00:00
Alain Frisch
db579b0a1e
Extension as structure/signature items [%%lid expr].
...
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/extension_points@13346 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-03-05 11:46:25 +00:00
Alain Frisch
a64152ae6e
Use [%lid expr] syntax for extensions.
...
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/extension_points@13345 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-03-05 11:30:15 +00:00
Alain Frisch
8461db39f1
Attributes on module/module type/recursive module declarations in interfaces.
...
Module:
[^^id expr] [^^id expr] ...
module X : S
[@@id expr] [@@id expr] ...
Module types:
[^^id expr] [^^id expr] ...
module type X = S
[@@id expr] [@@id expr] ...
Recursive modules:
module rec [^^id expr] [^^id expr] X1 : S1 [@@id expr] [@@id expr] ...
and [^^id expr] [^^id expr] X1 : S1 [@@id expr] [@@id expr] ...
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/extension_points@13344 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-03-04 17:39:07 +00:00
Alain Frisch
a5059464fe
Attributes on open/include in signatures.
...
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/extension_points@13343 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-03-04 16:36:32 +00:00
Alain Frisch
46c790a663
Attributes on exception declarations.
...
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/extension_points@13342 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-03-04 16:20:49 +00:00
Alain Frisch
2825f94d5b
Attributes on value declared in signatures.
...
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/extension_points@13341 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-03-04 16:03:20 +00:00
Alain Frisch
a3f6606793
Prefix attributes for 'items'.
...
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/extension_points@13340 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-03-04 15:53:43 +00:00
Alain Frisch
f8706985c2
Adding prefix syntax for attributes [^id expr] ...
...
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/extension_points@13339 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-03-04 15:48:24 +00:00
Alain Frisch
5f0aead005
Adding attributes on constructor declarations (type t = A [@id expr] | B [@id expr] of ...), and switch to a record type to represent those constructor declarations in the Parsetree.
...
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/extension_points@13338 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-03-04 15:35:47 +00:00
Alain Frisch
70bc46ef0c
New syntax:
...
Attributes: ... [@id expr]
Extension: [#id expr]
Attributes on items: ... [@@id expr]
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/extension_points@13337 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-03-04 15:00:30 +00:00
Alain Frisch
be76a15a6b
Attributes/extensions as module types.
...
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/extension_points@13336 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-03-04 14:11:15 +00:00
Alain Frisch
a2acbc8d3b
Adding extension/attribute on patterns.
...
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/extension_points@13335 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-03-04 13:52:23 +00:00
Alain Frisch
99bc01985f
Fix.
...
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/extension_points@13334 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-03-04 12:58:14 +00:00
Alain Frisch
e58b2cd036
Continue.
...
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/extension_points@13333 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-03-04 12:54:57 +00:00
Alain Frisch
c8d3ff52a2
Cleanup + support attributes on type declarations (syntax: type t = ... with (:a1 expr1) (:a2 expr2) ... (:an exprn)).
...
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/extension_points@13332 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-03-01 12:44:04 +00:00
Alain Frisch
666d6574d7
More uniform syntax:
...
Attributes:
expr (:foo expr)
type (:foo expr)
str_item ..(:foo expr)
Extension nodes:
expr (&foo expr)
type (&foo expr)
str_item ..(&foo expr)
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/extension_points@13331 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-03-01 09:27:14 +00:00
Alain Frisch
152255e512
First version with attributes and extensions on expressions, type expressions and structure items.
...
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/extension_points@13330 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-02-28 16:51:59 +00:00
Jacques Garrigue
1b5d02346c
Fix PR#5911: substituting in submodules should not be allowed
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13282 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-01-29 00:54:06 +00:00
Gabriel Scherer
06d3dfc6fb
fix a benign typo in the parser, spotted by Frédéric Bour
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13265 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-01-20 17:20:25 +00:00
Damien Doligez
f559b6e8f0
better locations
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13129 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-12-13 12:48:51 +00:00
Damien Doligez
7e263248d7
fix wrong locations in AST
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13122 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-12-08 20:56:07 +00:00
Damien Doligez
06e853389f
fix missing locations
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13116 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-12-06 15:41:43 +00:00
Hongbo Zhang
fe894aec5f
Ptyp_poly consistent in both methods and binding
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13061 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-11-03 02:58:08 +00:00
Alain Frisch
238814e293
#5770 : Syntax error messages involving unclosed parens are sometimes incorrect.
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13019 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-10-16 14:04:33 +00:00
Damien Doligez
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
Damien Doligez
d228342e8a
update comment; remove spurious commas
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12918 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-09-10 10:32:49 +00:00
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
Alain Frisch
f6f54d325d
#4762 : QUESTIONQUESTION is no longer a token.
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12795 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-30 10:15:10 +00:00
Alain Frisch
7630d3c41f
#5657 : fix location of punned record fields (for patterns as well).
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12637 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-06-21 17:07:19 +00:00
Alain Frisch
98748d213d
#5657 : fix location of punned record fields.
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12636 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-06-21 17:00:46 +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
1b782a0122
PR#5585: typo explicitely -> explicitly
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12353 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-04-13 12:44:29 +00:00
Jacques Garrigue
b3e0f2e72a
Fix PR#5553: do not allow a type variable to have the same name as a local type
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12257 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-03-23 02:20:24 +00:00
Alain Frisch
7f7dc416fd
Reverting the let.expr syntax (no consensus on the proposal). Sorry for the noise.
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11960 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-12-27 09:08:34 +00:00
Alain Frisch
d79455bc76
New syntax for 'custom let bindings': let.simple_expr pat = expr in expr
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11906 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-12-21 08:58:56 +00:00
Alain Frisch
16c26c6de3
let-like operators.
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11894 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-12-20 11:22:32 +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
01dceea3cc
remove conflict
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11309 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-12-14 08:59:07 +00:00
Damien Doligez
893a3bed36
cleanup white space and robustify mkuminus
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11290 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-11-29 15:49:25 +00:00
Jacques Garrigue
6c78f42d36
merge branches/gadts-devel
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11284 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-11-24 09:02:48 +00:00
Pierre Weis
87946c9536
Get rid of spurious warnings
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11252 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-10-28 21:21:55 +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 Le Normand
80b18d194f
changed the syntax back
...
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/gadts@10885 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-12-05 15:25:44 +00:00
Jacques Le Normand
b16b083526
changed syntax of constructors
...
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/gadts@10883 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-12-03 17:20:18 +00:00
Jacques Le Normand
eddcc06798
fixed bug in syntactic sugar translation
...
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/gadts@10879 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-12-03 01:49:08 +00:00
Jacques Le Normand
775d35a2b8
& types are no longer created during for the new type syntax annotation
...
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/gadts@10852 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-11-24 13:37:24 +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
1680403fb9
clean up
...
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/gadts@10784 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-11-10 06:01:27 +00:00
Jacques Le Normand
727e447d0d
variance of underscore type arguments can now be specified
...
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/gadts@10766 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-11-08 07:53:23 +00:00
Jacques Le Normand
ff78b8ee75
exhaustiveness check has been _completely_ rewritten
...
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/gadts@10764 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-11-08 07:34:09 +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
10f670297c
added lookup of constructors by type in env.ml and specification of constructors types in Ppat_construct
...
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/gadts@10736 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-10-21 07:53:39 +00:00
Jacques Le Normand
a1910000e3
fixed bug in syntax extension. Made unification of variants and objects local. Removed personal comments
...
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/gadts@10724 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-10-19 05:24:36 +00:00
Jacques Le Normand
7f749ff335
one more time
...
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/gadts@10723 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-10-18 07:29:04 +00:00
Jacques Le Normand
d5f16fae7a
fixed small bug in syntax extension
...
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/gadts@10722 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-10-18 07:26:46 +00:00
Jacques Le Normand
90a6348480
added syntactic sugar for mixing newtypes and polytypes
...
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/gadts@10721 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-10-18 04:54:24 +00:00
Jacques Le Normand
6f05398661
should have been in last commit
...
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/gadts@10701 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-10-01 05:44:11 +00:00
Jacques Le Normand
a8a5d86f67
made type parameters ellidable in type declarations
...
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/gadts@10684 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-09-21 05:30:25 +00:00
Jacques Le Normand
56624533fb
switched to abstract types, still needs work on exhaustion type. the code needs to be cleaned up. printfs need to be removed
...
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/gadts@10682 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-09-19 04:55:40 +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
Pierre Weis
f5c2201cc0
PR#5062
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10498 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-06-04 16:44:08 +00:00
Alain Frisch
3067d05221
Adding some error rules.
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10313 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-04-26 18:37:25 +00:00
Alain Frisch
1f8e12830f
Fix PR #5034 .
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10312 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-04-26 18:27:14 +00:00
Jacques Garrigue
49a83dd965
merge branches/sigsubst 9626:10205
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10263 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-04-17 14:45:12 +00:00
Jacques Garrigue
e09c0b1fcb
resolve shift/reduce conflict
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10251 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-04-08 07:46:08 +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
Alain Frisch
980f7c3b7d
Better parsing for (module M : S) expressions.
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10232 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-04-06 09:15:57 +00:00
Xavier Leroy
ab550592ef
Adding "module type of <module-expr>" in the class of <module-type>.
...
Merge of branches/moduletypeof -r 9636:10226
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10227 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-04-02 12:53:33 +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
Pierre Weis
7ad9cd975b
To deal with printf output for %F format, adding a unary + operator.
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9454 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2009-12-07 16:40:39 +00:00
Pierre Weis
769be0ebbd
Including bug correction (signed numeric constants may begin with a + sign).
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9437 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2009-12-01 09:57:02 +00:00
Alain Frisch
89107ae6ff
Merge the letopenin branch in (svn merge -r9386:9397 /svn/ocaml/branches/letopenin) and update Changes.
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9406 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2009-11-01 21:52:29 +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
Jacques Garrigue
023fda3fb4
merge polymorphic recursion
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9396 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2009-10-26 07:11:36 +00:00
Alain Frisch
09cb552e17
Import changes from the newtypein branch (svn merge -r 9367:9381 https://yquem.inria.fr/caml/svn/ocaml/branches/newtypein ).
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9382 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2009-10-20 07:06:43 +00:00
Alain Frisch
db5a053fb4
Import changes from the newtypein branch (svn merge -r 9361:9367 https://frisch@yquem.inria.fr/caml/svn/ocaml/branches/newtypein ).
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9368 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2009-10-06 12:51:42 +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
Xavier Leroy
b01621e848
Added syntactic sugar for record expressions and record patterns:
...
{ lbl } stands for { lbl = lbl }.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9324 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2009-08-27 08:19:08 +00:00
Xavier Leroy
11217e8f70
Added option -no-app-funct to turn off applicative functors
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9316 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2009-07-15 14:06: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
Xavier Leroy
91d39feb72
PR#4223, PR#1508: added unsafe variants of Bigarray.Array{1,2,3}.{get,set}
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8911 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-07-14 09:09:53 +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
Jun FURUSE / 古瀬 淳
db0afa58a4
workaround for the problem of optional argument type parsing caused when we redefine option type
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8888 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-06-11 23:47:12 +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
Pierre Weis
59e0723455
It works: compilers and camlp4 are fully bootstrapped. The ast magic number is not yet changed.
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8418 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-10-09 10:29:37 +00:00
Jacques Garrigue
1b6890c1e2
PR#4186
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7770 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2006-12-15 04:51:11 +00:00
Damien Doligez
1279ab4b76
fusion des changements 3.09.1 -> 3.09.2
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7382 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2006-04-16 23:28:22 +00:00
Jacques Garrigue
602146f892
add virtual instance variables
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7372 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2006-04-05 02:28:13 +00:00
Jacques Garrigue
ef396b4e5a
merge fixedtypes branch
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6821 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2005-03-23 03:08:37 +00:00
Damien Doligez
669b82bba4
alias (::)(a,b) pour (a::b) (suggestion Monniaux)
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6786 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2005-02-16 14:38:02 +00:00
Jacques Garrigue
b3a50ac0ed
add location info in Ptype_variant and Ptype_record
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6633 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2004-10-06 13:06:11 +00:00
Damien Doligez
ea4d1da556
mauvais argument a unclosed
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6310 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2004-05-19 12:15:19 +00:00
Damien Doligez
f981f63f80
PR#1978
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6028 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-12-18 13:16:22 +00:00
Jacques Garrigue
e32f8e9858
fast and compact classes
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5976 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-11-25 08:46:45 +00:00
Damien Doligez
331fe042f6
changement de statut de "parser"
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5799 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-08-25 13:15:47 +00:00
Xavier Leroy
35293da681
Suppression vieux code mis en commentaires
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5782 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-08-20 10:10:21 +00:00
Xavier Leroy
3e4bf9252b
Revu representation des declarations de type private
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5643 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-07-02 09:14:35 +00:00
Damien Doligez
be5cd6de3e
reparation module ... : SIG with type ... and type ...
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5606 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-06-20 15:16:57 +00:00
Damien Doligez
510294058e
documentation
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5603 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-06-19 18:12:59 +00:00
Xavier Leroy
1fa763e0c5
Merge branch with recursive modules
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5602 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-06-19 15:53:53 +00:00
Damien Doligez
176bfafcac
meilleure syntaxe pour les types virtuels
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5577 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-05-23 14:29:47 +00:00
Pierre Weis
e77055aad9
Complete move from virtual to private for concrete types with private
...
constructors (or labels).
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5524 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-05-01 22:22:37 +00:00
Pierre Weis
2eed3c25e5
Getting rid of conflicts recently introduced.
...
One step more towards use of keyword private instead of virtual for
algebraic concrete types with private constructors or labels
(previously known as virtual types).
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5522 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-04-29 07:03:36 +00:00
Xavier Leroy
7abcc8799e
Ajout des litteraux de type int32, nativeint, int64
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5510 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-04-25 12:27:31 +00:00
Damien Doligez
1e16182dc0
amelioration des locations
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5500 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-04-06 12:45:03 +00:00
Damien Doligez
b06262074d
ghosts
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5488 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-04-02 16:03:33 +00:00
Damien Doligez
a57475167b
changements ghost locations
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5476 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-04-02 01:17:19 +00:00
Damien Doligez
d15be1d409
mauvais types de locations
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5472 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-03-31 17:11:06 +00:00
Damien Doligez
ded35d5bce
PR#1584
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5432 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-03-12 16:33:38 +00:00
Michel Mauny
d98aa4b06d
Forbidden [| `A ] in the syntax (space between [ and | becomes necessary).
...
Reordered last production of simple_core_type2
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5431 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-03-12 13:39:36 +00:00
Damien Doligez
02b019f24f
PR#1553, suite
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5419 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-03-05 14:59:34 +00:00
Pierre Weis
b5d0102c05
Nouveau format %$. Introduction des types virtuels: step 1 sans inclusion dans Camlp4
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5409 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-02-28 06:59:19 +00:00
Damien Doligez
0483c6ac92
PR#1553
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5408 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-02-25 16:38:30 +00:00
Luc Maranget
2258980625
merci damien (locations fantomes)
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5400 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-02-24 15:13:01 +00:00
Damien Doligez
6112f1860d
PR#1464
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5194 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-10-28 21:47:41 +00:00
Damien Doligez
37bf95c248
detabisation
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5029 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-07-23 14:12:03 +00:00
Jacques Garrigue
0a8236066f
vive les methodes polymorphes!
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4694 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-04-18 07:27:47 +00:00
Damien Doligez
8ea64b58dc
byterun/finalise.c: support pour les lazy finalises
...
byterun/gc_ctrl.c: ajout Gc.major_slice
byterun/major_gc.c: gros bug dans les valeurs finalisees + ajout Gc.major_slice
byterun/major_gc.h: gros bug dans les valeurs finalisees + ajout Gc.major_slice
byterun/memory.c: typo dans un commentaire
byterun/minor_gc.c: petit bug, ajout Gc.major_slice
parsing/parser.mly: plus de conflits; l'automate reste identique
stdlib/gc.ml: ajout Gc.major_slice
stdlib/gc.mli: ajout Gc.major_slice
stdlib/sys.ml: ajout Sys.ocaml_version
stdlib/sys.mli: ajout Sys.ocaml_version
utils/config.mlp: ajout Sys.ocaml_version
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4357 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-02-05 17:11:33 +00:00
Damien Doligez
2599866c9e
suppression de conflits sans changement dans l'automate
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4337 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-02-01 12:26:09 +00:00
Damien Doligez
0dbce74fc8
lazy a la Tolmach
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4291 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-01-20 17:39:10 +00:00
Jacques Garrigue
42d1811a93
enrich variant types
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@3788 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2001-09-25 09:54:18 +00:00
Daniel de Rauglaudre
98fce1d671
Suppression du parsage des streams et des parseurs (comme prévu, maintenant
...
que Camlp4 est inclus).
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@3743 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2001-09-09 11:39:34 +00:00
Damien Doligez
fc53c99cda
detabisation
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@3573 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2001-07-12 12:54:24 +00:00
Damien Doligez
b80c77b025
fix -noassert pour que le typage des assertions soit toujours fait
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@3353 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2000-12-04 15:37:05 +00:00
Xavier Leroy
ab73fdc7f1
Ajout de la construction 'include' dans les structures
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@3350 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2000-12-01 09:35:00 +00:00
Jacques Garrigue
5dfbff7f5e
change variance syntax
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@3298 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2000-09-07 10:57:32 +00:00
Damien Doligez
ee0828c9c4
bug begin end
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@3295 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2000-09-06 14:18:32 +00:00
Jacques Garrigue
83ca813e4b
ajout des variances
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@3294 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2000-09-06 10:21:07 +00:00
Jacques Garrigue
1b1e463092
Simpifie les types de variantes, change le typage des matchings ouverts
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@3195 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2000-06-11 14:34:10 +00:00
Jacques Garrigue
780b65fca6
nouvelle syntaxe avec tilde
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@3061 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2000-04-12 03:43:25 +00:00
Jacques Garrigue
e3dd2e98c4
ajout de "of" dans les types de variantes
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@3025 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2000-04-03 01:59:28 +00:00
Xavier Leroy
c4801c35fb
Ajout du renommage d'exceptions
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@2947 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2000-03-12 13:10:29 +00:00
Xavier Leroy
aa1695e196
Ajout notation a.{i,j,k}
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@2858 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2000-02-24 17:42:32 +00:00
Jacques Garrigue
d645ee43e9
#name notation to automatically generate or-pattern from variant type name
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@2844 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2000-02-22 03:08:08 +00:00
Damien Doligez
57872a7078
les conflits sont de retour
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@2766 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2000-01-24 16:21:07 +00:00
Damien Doligez
9e072eea62
quelques conflits de moins
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@2763 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2000-01-21 19:01:39 +00:00
Damien Doligez
fb92168f40
ajout d'une barre verticale optionnelle; suppression de 18 conflits
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@2743 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2000-01-07 16:40:34 +00:00
Damien Doligez
e3f101b756
detabisation
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@2742 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2000-01-07 16:35:15 +00:00
Jacques Garrigue
b1231d6d1d
variant types
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@2678 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
1999-12-08 17:25:36 +00:00
Jacques Garrigue
77d4f18ce6
changed label_pattern syntax
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@2677 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
1999-12-08 08:21:57 +00:00
Jacques Garrigue
bacf15f614
changed syntax for default values
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@2673 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
1999-12-07 15:00:37 +00:00
Jacques Garrigue
79850cc585
elimine le conflit reduce/reduce sur []
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@2672 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
1999-12-06 17:16:59 +00:00
Jacques Garrigue
870788858b
recover [] as constructor in type definitions
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@2668 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
1999-12-03 11:10:59 +00:00
Jacques Garrigue
ad6a333f08
add directives #modern and #warnings
...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@2667 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
1999-12-03 10:26:08 +00:00