From: Jacques Garrigue <garrigue@kurims.kyoto-u.ac.jp>
To: artboreb@netscape.net
Cc: caml-list@inria.fr
Subject: Re: [Caml-list] ocaml 3.07 and optional arguments
Date: Wed, 01 Oct 2003 09:04:42 +0900 [thread overview]
Message-ID: <20031001090442K.garrigue@kurims.kyoto-u.ac.jp> (raw)
In-Reply-To: <24CC0396.359C27FF.00958B05@netscape.net>
This was fixed in CVS by Michel Mauny.
I join the patch relative to 3.07, since many people seem to be
concerned.
Jacques Garrigue
From: artboreb@netscape.net (Arturo Borquez)
> Jacques Garrigue <garrigue@kurims.kyoto-u.ac.jp> wrote:
>
> >After another bug report, it seems that a parsing bug went into camlp4
> >just before the release :-(
> >
> > Camlp4 Parsing version 3.07
> >
> ># fun (f : ?x:int -> bool -> float) -> f true;;
> >This expression has type bool but is here used with type ?x:int -> bool
> ># fun (f : ?x:int -> bool -> float) -> f;;
> >- : ((?x:int -> bool) -> float) -> (?x:int -> bool) -> float = <fun>
>
> Is there a patch planned soon to solve this issue?
Index: camlp4/camlp4/ast2pt.ml
===================================================================
RCS file: /net/pauillac/caml/repository/csl/camlp4/camlp4/ast2pt.ml,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ast2pt.ml 2003/07/16 18:59:12 1.25
+++ ast2pt.ml 2003/09/30 14:39:26 1.26
@@ -10,7 +10,7 @@
(* *)
(***********************************************************************)
-(* $Id: ast2pt.ml,v 1.25 2003/07/16 18:59:12 mauny Exp $ *)
+(* $Id: ast2pt.ml,v 1.26 2003/09/30 14:39:26 mauny Exp $ *)
open Stdpp;
open MLast;
@@ -177,10 +177,10 @@
| TyObj loc fl v -> mktyp loc (Ptyp_object (meth_list loc fl v))
| TyCls loc id ->
mktyp loc (Ptyp_class (long_id_of_string_list loc id) [] [])
- | TyLab loc _ _ -> error loc "labeled type not allowed here"
+ | TyLab loc _ _ -> error loc "labelled type not allowed here"
| TyLid loc s -> mktyp loc (Ptyp_constr (lident s) [])
- | TyMan loc _ _ -> error loc "type manifest not allowed here"
- | TyOlb loc lab _ -> error loc "labeled type not allowed here"
+ | TyMan loc _ _ -> error loc "manifest type not allowed here"
+ | TyOlb loc lab _ -> error loc "labelled type not allowed here"
| TyPol loc pl t -> mktyp loc (Ptyp_poly pl (ctyp t))
| TyQuo loc s -> mktyp loc (Ptyp_var s)
| TyRec loc _ _ -> error loc "record type not allowed here"
Index: camlp4/etc/pa_o.ml
===================================================================
RCS file: /net/pauillac/caml/repository/csl/camlp4/etc/pa_o.ml,v
retrieving revision 1.52
retrieving revision 1.54
diff -u -r1.52 -r1.54
--- pa_o.ml 2003/09/25 12:05:05 1.52
+++ pa_o.ml 2003/09/30 14:39:38 1.54
@@ -10,7 +10,7 @@
(* *)
(***********************************************************************)
-(* $Id: pa_o.ml,v 1.52 2003/09/25 12:05:05 mauny Exp $ *)
+(* $Id: pa_o.ml,v 1.54 2003/09/30 14:39:38 mauny Exp $ *)
open Stdpp;
open Pcaml;
@@ -1148,16 +1148,16 @@
| i = LIDENT -> [i] ] ]
;
(* Labels *)
- ctyp: AFTER "arrow"
- [ NONA
+ ctyp: LEVEL "arrow"
+ [ RIGHTA
[ i = lident_colon; t1 = ctyp LEVEL "star"; "->"; t2 = SELF ->
- <:ctyp< ~ $i$ : $t1$ -> $t2$ >>
+ <:ctyp< ( ~ $i$ : $t1$ ) -> $t2$ >>
| i = OPTLABEL; t1 = ctyp LEVEL "star"; "->"; t2 = SELF ->
- <:ctyp< ? $i$ : $t1$ -> $t2$ >>
+ <:ctyp< ( ? $i$ : $t1$ ) -> $t2$ >>
| i = QUESTIONIDENT; ":"; t1 = ctyp LEVEL "star"; "->"; t2 = SELF ->
- <:ctyp< ? $i$ : $t1$ -> $t2$ >>
+ <:ctyp< ( ? $i$ : $t1$ ) -> $t2$ >>
| "?"; i=lident_colon;t1 = ctyp LEVEL "star"; "->"; t2 = SELF ->
- <:ctyp< ? $i$ : $t1$ -> $t2$ >> ] ]
+ <:ctyp< ( ? $i$ : $t1$ ) -> $t2$ >> ] ]
;
ctyp: LEVEL "simple"
[ [ "["; OPT "|"; rfl = LIST1 row_field SEP "|"; "]" ->
Index: camlp4/meta/pa_r.ml
===================================================================
RCS file: /net/pauillac/caml/repository/csl/camlp4/meta/pa_r.ml,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- pa_r.ml 2003/09/25 12:05:06 1.53
+++ pa_r.ml 2003/09/30 10:20:06 1.54
@@ -10,7 +10,7 @@
(* *)
(***********************************************************************)
-(* $Id: pa_r.ml,v 1.53 2003/09/25 12:05:06 mauny Exp $ *)
+(* $Id: pa_r.ml,v 1.54 2003/09/30 10:20:06 mauny Exp $ *)
open Stdpp;
open Pcaml;
@@ -748,8 +748,8 @@
| i = LIDENT -> [i] ] ]
;
(* Labels *)
- ctyp: AFTER "arrow"
- [ NONA
+ ctyp: LEVEL "arrow"
+ [ RIGHTA
[ i = TILDEIDENT; ":"; t = SELF -> <:ctyp< ~ $i$ : $t$ >>
| i = LABEL; t = SELF -> <:ctyp< ~ $i$ : $t$ >>
| i = QUESTIONIDENT; ":"; t = SELF -> <:ctyp< ? $i$ : $t$ >>
Index: camlp4/meta/q_MLast.ml
===================================================================
RCS file: /net/pauillac/caml/repository/csl/camlp4/meta/q_MLast.ml,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- q_MLast.ml 2003/07/16 12:50:08 1.51
+++ q_MLast.ml 2003/09/30 11:38:04 1.52
@@ -10,7 +10,7 @@
(* *)
(***********************************************************************)
-(* $Id: q_MLast.ml,v 1.51 2003/07/16 12:50:08 mauny Exp $ *)
+(* $Id: q_MLast.ml,v 1.52 2003/09/30 11:38:04 mauny Exp $ *)
value gram = Grammar.gcreate (Plexer.gmake ());
@@ -127,7 +127,9 @@
value a_STRING = Grammar.Entry.create gram "a_STRING";
value a_CHAR = Grammar.Entry.create gram "a_CHAR";
value a_TILDEIDENT = Grammar.Entry.create gram "a_TILDEIDENT";
+value a_LABEL = Grammar.Entry.create gram "a_LABEL";
value a_QUESTIONIDENT = Grammar.Entry.create gram "a_QUESTIONIDENT";
+value a_OPTLABEL = Grammar.Entry.create gram "a_OPTLABEL";
value o2b =
fun
@@ -1007,10 +1009,13 @@
| i = a_LIDENT -> Qast.List [i] ] ]
;
(* Labels *)
- ctyp: AFTER "arrow"
- [ NONA
+ ctyp: LEVEL "arrow"
+ [ RIGHTA
[ i = a_TILDEIDENT; ":"; t = SELF -> Qast.Node "TyLab" [Qast.Loc; i; t]
+ | i = a_LABEL; t = SELF -> Qast.Node "TyLab" [Qast.Loc; i; t]
| i = a_QUESTIONIDENT; ":"; t = SELF ->
+ Qast.Node "TyOlb" [Qast.Loc; i; t]
+ | i = a_OPTLABEL; t = SELF ->
Qast.Node "TyOlb" [Qast.Loc; i; t] ] ]
;
ctyp: LEVEL "simple"
@@ -1044,11 +1049,16 @@
| "#"; sl = mod_ident -> Qast.Node "PaTyp" [Qast.Loc; sl]
| i = a_TILDEIDENT; ":"; p = SELF ->
Qast.Node "PaLab" [Qast.Loc; i; Qast.Option (Some p)]
+ | i = a_LABEL; p = SELF ->
+ Qast.Node "PaLab" [Qast.Loc; i; Qast.Option (Some p)]
| i = a_TILDEIDENT -> Qast.Node "PaLab" [Qast.Loc; i; Qast.Option None]
| i = a_QUESTIONIDENT; ":"; "("; p = patt_tcon; eo = SOPT eq_expr;
")" ->
Qast.Node "PaOlb"
[Qast.Loc; i; Qast.Option (Some (Qast.Tuple [p; eo]))]
+ | i = a_OPTLABEL; "("; p = patt_tcon; eo = SOPT eq_expr; ")" ->
+ Qast.Node "PaOlb"
+ [Qast.Loc; i; Qast.Option (Some (Qast.Tuple [p; eo]))]
| i = a_QUESTIONIDENT ->
Qast.Node "PaOlb" [Qast.Loc; i; Qast.Option None]
| "?"; "("; p = patt_tcon; eo = SOPT eq_expr; ")" ->
@@ -1063,11 +1073,16 @@
ipatt:
[ [ i = a_TILDEIDENT; ":"; p = SELF ->
Qast.Node "PaLab" [Qast.Loc; i; Qast.Option (Some p)]
+ | i = a_LABEL; p = SELF ->
+ Qast.Node "PaLab" [Qast.Loc; i; Qast.Option (Some p)]
| i = a_TILDEIDENT -> Qast.Node "PaLab" [Qast.Loc; i; Qast.Option None]
| i = a_QUESTIONIDENT; ":"; "("; p = ipatt_tcon; eo = SOPT eq_expr;
")" ->
Qast.Node "PaOlb"
[Qast.Loc; i; Qast.Option (Some (Qast.Tuple [p; eo]))]
+ | i = a_OPTLABEL; "("; p = ipatt_tcon; eo = SOPT eq_expr; ")" ->
+ Qast.Node "PaOlb"
+ [Qast.Loc; i; Qast.Option (Some (Qast.Tuple [p; eo]))]
| i = a_QUESTIONIDENT ->
Qast.Node "PaOlb" [Qast.Loc; i; Qast.Option None]
| "?"; "("; p = ipatt_tcon; eo = SOPT eq_expr; ")" ->
@@ -1086,9 +1101,13 @@
[ "label" NONA
[ i = a_TILDEIDENT; ":"; e = SELF ->
Qast.Node "ExLab" [Qast.Loc; i; Qast.Option (Some e)]
+ | i = a_LABEL; e = SELF ->
+ Qast.Node "ExLab" [Qast.Loc; i; Qast.Option (Some e)]
| i = a_TILDEIDENT -> Qast.Node "ExLab" [Qast.Loc; i; Qast.Option None]
| i = a_QUESTIONIDENT; ":"; e = SELF ->
Qast.Node "ExOlb" [Qast.Loc; i; Qast.Option (Some e)]
+ | i = a_OPTLABEL; e = SELF ->
+ Qast.Node "ExOlb" [Qast.Loc; i; Qast.Option (Some e)]
| i = a_QUESTIONIDENT ->
Qast.Node "ExOlb" [Qast.Loc; i; Qast.Option None] ] ]
;
@@ -1335,9 +1354,15 @@
[ [ "~"; a = ANTIQUOT -> antiquot "" loc a
| s = TILDEIDENT -> Qast.Str s ] ]
;
+ a_LABEL:
+ [ [ s = LABEL -> Qast.Str s ] ]
+ ;
a_QUESTIONIDENT:
[ [ "?"; a = ANTIQUOT -> antiquot "" loc a
| s = QUESTIONIDENT -> Qast.Str s ] ]
+ ;
+ a_OPTLABEL:
+ [ [ s = OPTLABEL -> Qast.Str s ] ]
;
END;
Index: camlp4/ocaml_src/camlp4/ast2pt.ml
===================================================================
RCS file: /net/pauillac/caml/repository/csl/camlp4/ocaml_src/camlp4/ast2pt.ml,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ast2pt.ml 2003/07/23 22:26:18 1.24
+++ ast2pt.ml 2003/09/30 14:39:38 1.25
@@ -169,10 +169,10 @@
| TyObj (loc, fl, v) -> mktyp loc (Ptyp_object (meth_list loc fl v))
| TyCls (loc, id) ->
mktyp loc (Ptyp_class (long_id_of_string_list loc id, [], []))
- | TyLab (loc, _, _) -> error loc "labeled type not allowed here"
+ | TyLab (loc, _, _) -> error loc "labelled type not allowed here"
| TyLid (loc, s) -> mktyp loc (Ptyp_constr (lident s, []))
- | TyMan (loc, _, _) -> error loc "type manifest not allowed here"
- | TyOlb (loc, lab, _) -> error loc "labeled type not allowed here"
+ | TyMan (loc, _, _) -> error loc "manifest type not allowed here"
+ | TyOlb (loc, lab, _) -> error loc "labelled type not allowed here"
| TyPol (loc, pl, t) -> mktyp loc (Ptyp_poly (pl, ctyp t))
| TyQuo (loc, s) -> mktyp loc (Ptyp_var s)
| TyRec (loc, _, _) -> error loc "record type not allowed here"
Index: camlp4/ocaml_src/meta/pa_r.ml
===================================================================
RCS file: /net/pauillac/caml/repository/csl/camlp4/ocaml_src/meta/pa_r.ml,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- pa_r.ml 2003/09/25 12:05:07 1.48
+++ pa_r.ml 2003/09/30 10:20:06 1.49
@@ -2241,8 +2241,8 @@
(fun (l : 'class_longident) _ (m : string) (loc : int * int) ->
(m :: l : 'class_longident))]];
Grammar.Entry.obj (ctyp : 'ctyp Grammar.Entry.e),
- Some (Gramext.After "arrow"),
- [None, Some Gramext.NonA,
+ Some (Gramext.Level "arrow"),
+ [None, Some Gramext.RightA,
[[Gramext.Stoken ("OPTLABEL", ""); Gramext.Sself],
Gramext.action
(fun (t : 'ctyp) (i : string) (loc : int * int) ->
Index: camlp4/ocaml_src/meta/q_MLast.ml
===================================================================
RCS file: /net/pauillac/caml/repository/csl/camlp4/ocaml_src/meta/q_MLast.ml,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- q_MLast.ml 2003/07/23 22:26:19 1.56
+++ q_MLast.ml 2003/09/30 11:38:04 1.57
@@ -153,7 +153,9 @@
let a_STRING = Grammar.Entry.create gram "a_STRING";;
let a_CHAR = Grammar.Entry.create gram "a_CHAR";;
let a_TILDEIDENT = Grammar.Entry.create gram "a_TILDEIDENT";;
+let a_LABEL = Grammar.Entry.create gram "a_LABEL";;
let a_QUESTIONIDENT = Grammar.Entry.create gram "a_QUESTIONIDENT";;
+let a_OPTLABEL = Grammar.Entry.create gram "a_OPTLABEL";;
let o2b =
function
@@ -626,7 +628,7 @@
Qast.Tuple [xx1; xx2; xx3] -> xx1, xx2, xx3
| _ ->
match () with
- _ -> raise (Match_failure ("q_MLast.ml", 300, 19))
+ _ -> raise (Match_failure ("q_MLast.ml", 302, 19))
in
Qast.Node ("StExc", [Qast.Loc; c; tl; b]) :
'str_item));
@@ -896,7 +898,7 @@
Qast.Tuple [xx1; xx2; xx3] -> xx1, xx2, xx3
| _ ->
match () with
- _ -> raise (Match_failure ("q_MLast.ml", 358, 19))
+ _ -> raise (Match_failure ("q_MLast.ml", 360, 19))
in
Qast.Node ("SgExc", [Qast.Loc; c; tl]) :
'sig_item));
@@ -3345,9 +3347,15 @@
(fun (l : 'class_longident) _ (m : 'a_UIDENT) (loc : int * int) ->
(Qast.Cons (m, l) : 'class_longident))]];
Grammar.Entry.obj (ctyp : 'ctyp Grammar.Entry.e),
- Some (Gramext.After "arrow"),
- [None, Some Gramext.NonA,
+ Some (Gramext.Level "arrow"),
+ [None, Some Gramext.RightA,
[[Gramext.Snterm
+ (Grammar.Entry.obj (a_OPTLABEL : 'a_OPTLABEL Grammar.Entry.e));
+ Gramext.Sself],
+ Gramext.action
+ (fun (t : 'ctyp) (i : 'a_OPTLABEL) (loc : int * int) ->
+ (Qast.Node ("TyOlb", [Qast.Loc; i; t]) : 'ctyp));
+ [Gramext.Snterm
(Grammar.Entry.obj
(a_QUESTIONIDENT : 'a_QUESTIONIDENT Grammar.Entry.e));
Gramext.Stoken ("", ":"); Gramext.Sself],
@@ -3355,6 +3363,12 @@
(fun (t : 'ctyp) _ (i : 'a_QUESTIONIDENT) (loc : int * int) ->
(Qast.Node ("TyOlb", [Qast.Loc; i; t]) : 'ctyp));
[Gramext.Snterm
+ (Grammar.Entry.obj (a_LABEL : 'a_LABEL Grammar.Entry.e));
+ Gramext.Sself],
+ Gramext.action
+ (fun (t : 'ctyp) (i : 'a_LABEL) (loc : int * int) ->
+ (Qast.Node ("TyLab", [Qast.Loc; i; t]) : 'ctyp));
+ [Gramext.Snterm
(Grammar.Entry.obj (a_TILDEIDENT : 'a_TILDEIDENT Grammar.Entry.e));
Gramext.Stoken ("", ":"); Gramext.Sself],
Gramext.action
@@ -3518,6 +3532,30 @@
(fun (i : 'a_QUESTIONIDENT) (loc : int * int) ->
(Qast.Node ("PaOlb", [Qast.Loc; i; Qast.Option None]) : 'patt));
[Gramext.Snterm
+ (Grammar.Entry.obj (a_OPTLABEL : 'a_OPTLABEL Grammar.Entry.e));
+ Gramext.Stoken ("", "(");
+ Gramext.Snterm
+ (Grammar.Entry.obj (patt_tcon : 'patt_tcon Grammar.Entry.e));
+ Gramext.srules
+ [[Gramext.Sopt
+ (Gramext.Snterm
+ (Grammar.Entry.obj (eq_expr : 'eq_expr Grammar.Entry.e)))],
+ Gramext.action
+ (fun (a : 'eq_expr option) (loc : int * int) ->
+ (Qast.Option a : 'a_opt));
+ [Gramext.Snterm
+ (Grammar.Entry.obj (a_opt : 'a_opt Grammar.Entry.e))],
+ Gramext.action
+ (fun (a : 'a_opt) (loc : int * int) -> (a : 'a_opt))];
+ Gramext.Stoken ("", ")")],
+ Gramext.action
+ (fun _ (eo : 'a_opt) (p : 'patt_tcon) _ (i : 'a_OPTLABEL)
+ (loc : int * int) ->
+ (Qast.Node
+ ("PaOlb",
+ [Qast.Loc; i; Qast.Option (Some (Qast.Tuple [p; eo]))]) :
+ 'patt));
+ [Gramext.Snterm
(Grammar.Entry.obj
(a_QUESTIONIDENT : 'a_QUESTIONIDENT Grammar.Entry.e));
Gramext.Stoken ("", ":"); Gramext.Stoken ("", "(");
@@ -3548,6 +3586,13 @@
(fun (i : 'a_TILDEIDENT) (loc : int * int) ->
(Qast.Node ("PaLab", [Qast.Loc; i; Qast.Option None]) : 'patt));
[Gramext.Snterm
+ (Grammar.Entry.obj (a_LABEL : 'a_LABEL Grammar.Entry.e));
+ Gramext.Sself],
+ Gramext.action
+ (fun (p : 'patt) (i : 'a_LABEL) (loc : int * int) ->
+ (Qast.Node ("PaLab", [Qast.Loc; i; Qast.Option (Some p)]) :
+ 'patt));
+ [Gramext.Snterm
(Grammar.Entry.obj (a_TILDEIDENT : 'a_TILDEIDENT Grammar.Entry.e));
Gramext.Stoken ("", ":"); Gramext.Sself],
Gramext.action
@@ -3606,6 +3651,30 @@
(fun (i : 'a_QUESTIONIDENT) (loc : int * int) ->
(Qast.Node ("PaOlb", [Qast.Loc; i; Qast.Option None]) : 'ipatt));
[Gramext.Snterm
+ (Grammar.Entry.obj (a_OPTLABEL : 'a_OPTLABEL Grammar.Entry.e));
+ Gramext.Stoken ("", "(");
+ Gramext.Snterm
+ (Grammar.Entry.obj (ipatt_tcon : 'ipatt_tcon Grammar.Entry.e));
+ Gramext.srules
+ [[Gramext.Sopt
+ (Gramext.Snterm
+ (Grammar.Entry.obj (eq_expr : 'eq_expr Grammar.Entry.e)))],
+ Gramext.action
+ (fun (a : 'eq_expr option) (loc : int * int) ->
+ (Qast.Option a : 'a_opt));
+ [Gramext.Snterm
+ (Grammar.Entry.obj (a_opt : 'a_opt Grammar.Entry.e))],
+ Gramext.action
+ (fun (a : 'a_opt) (loc : int * int) -> (a : 'a_opt))];
+ Gramext.Stoken ("", ")")],
+ Gramext.action
+ (fun _ (eo : 'a_opt) (p : 'ipatt_tcon) _ (i : 'a_OPTLABEL)
+ (loc : int * int) ->
+ (Qast.Node
+ ("PaOlb",
+ [Qast.Loc; i; Qast.Option (Some (Qast.Tuple [p; eo]))]) :
+ 'ipatt));
+ [Gramext.Snterm
(Grammar.Entry.obj
(a_QUESTIONIDENT : 'a_QUESTIONIDENT Grammar.Entry.e));
Gramext.Stoken ("", ":"); Gramext.Stoken ("", "(");
@@ -3636,6 +3705,13 @@
(fun (i : 'a_TILDEIDENT) (loc : int * int) ->
(Qast.Node ("PaLab", [Qast.Loc; i; Qast.Option None]) : 'ipatt));
[Gramext.Snterm
+ (Grammar.Entry.obj (a_LABEL : 'a_LABEL Grammar.Entry.e));
+ Gramext.Sself],
+ Gramext.action
+ (fun (p : 'ipatt) (i : 'a_LABEL) (loc : int * int) ->
+ (Qast.Node ("PaLab", [Qast.Loc; i; Qast.Option (Some p)]) :
+ 'ipatt));
+ [Gramext.Snterm
(Grammar.Entry.obj (a_TILDEIDENT : 'a_TILDEIDENT Grammar.Entry.e));
Gramext.Stoken ("", ":"); Gramext.Sself],
Gramext.action
@@ -3669,6 +3745,13 @@
(fun (i : 'a_QUESTIONIDENT) (loc : int * int) ->
(Qast.Node ("ExOlb", [Qast.Loc; i; Qast.Option None]) : 'expr));
[Gramext.Snterm
+ (Grammar.Entry.obj (a_OPTLABEL : 'a_OPTLABEL Grammar.Entry.e));
+ Gramext.Sself],
+ Gramext.action
+ (fun (e : 'expr) (i : 'a_OPTLABEL) (loc : int * int) ->
+ (Qast.Node ("ExOlb", [Qast.Loc; i; Qast.Option (Some e)]) :
+ 'expr));
+ [Gramext.Snterm
(Grammar.Entry.obj
(a_QUESTIONIDENT : 'a_QUESTIONIDENT Grammar.Entry.e));
Gramext.Stoken ("", ":"); Gramext.Sself],
@@ -3682,6 +3765,13 @@
(fun (i : 'a_TILDEIDENT) (loc : int * int) ->
(Qast.Node ("ExLab", [Qast.Loc; i; Qast.Option None]) : 'expr));
[Gramext.Snterm
+ (Grammar.Entry.obj (a_LABEL : 'a_LABEL Grammar.Entry.e));
+ Gramext.Sself],
+ Gramext.action
+ (fun (e : 'expr) (i : 'a_LABEL) (loc : int * int) ->
+ (Qast.Node ("ExLab", [Qast.Loc; i; Qast.Option (Some e)]) :
+ 'expr));
+ [Gramext.Snterm
(Grammar.Entry.obj (a_TILDEIDENT : 'a_TILDEIDENT Grammar.Entry.e));
Gramext.Stoken ("", ":"); Gramext.Sself],
Gramext.action
@@ -4427,6 +4517,11 @@
Gramext.action
(fun (a : string) _ (loc : int * int) ->
(antiquot "" loc a : 'a_TILDEIDENT))]];
+ Grammar.Entry.obj (a_LABEL : 'a_LABEL Grammar.Entry.e), None,
+ [None, None,
+ [[Gramext.Stoken ("LABEL", "")],
+ Gramext.action
+ (fun (s : string) (loc : int * int) -> (Qast.Str s : 'a_LABEL))]];
Grammar.Entry.obj (a_QUESTIONIDENT : 'a_QUESTIONIDENT Grammar.Entry.e),
None,
[None, None,
@@ -4437,7 +4532,12 @@
[Gramext.Stoken ("", "?"); Gramext.Stoken ("ANTIQUOT", "")],
Gramext.action
(fun (a : string) _ (loc : int * int) ->
- (antiquot "" loc a : 'a_QUESTIONIDENT))]]];;
+ (antiquot "" loc a : 'a_QUESTIONIDENT))]];
+ Grammar.Entry.obj (a_OPTLABEL : 'a_OPTLABEL Grammar.Entry.e), None,
+ [None, None,
+ [[Gramext.Stoken ("OPTLABEL", "")],
+ Gramext.action
+ (fun (s : string) (loc : int * int) -> (Qast.Str s : 'a_OPTLABEL))]]];;
let apply_entry e =
let f s = Grammar.Entry.parse e (Stream.of_string s) in
-------------------
To unsubscribe, mail caml-list-request@inria.fr Archives: http://caml.inria.fr
Bug reports: http://caml.inria.fr/bin/caml-bugs FAQ: http://caml.inria.fr/FAQ/
Beginner's list: http://groups.yahoo.com/group/ocaml_beginners
next prev parent reply other threads:[~2003-10-01 0:04 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-09-30 19:18 Arturo Borquez
2003-10-01 0:04 ` Jacques Garrigue [this message]
2003-10-01 8:43 ` Christophe Raffalli
2003-10-01 15:45 ` Yaron Minsky
2003-10-01 15:54 ` Alain.Frisch
-- strict thread matches above, loose matches on Subject: below --
2003-10-01 20:28 Arturo Borquez
2003-10-01 23:51 ` Jacques Garrigue
2003-09-29 18:13 Vincent Barichard
2003-09-30 1:24 ` Jacques Garrigue
2003-09-30 3:07 ` Jacques Garrigue
2003-09-30 5:29 ` Vincent Barichard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20031001090442K.garrigue@kurims.kyoto-u.ac.jp \
--to=garrigue@kurims.kyoto-u.ac.jp \
--cc=artboreb@netscape.net \
--cc=caml-list@inria.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).