diff options
| author | Daniel de Rauglaudre <daniel.de_rauglaudre@inria.fr> | 2002-02-05 14:41:33 +0000 |
|---|---|---|
| committer | Daniel de Rauglaudre <daniel.de_rauglaudre@inria.fr> | 2002-02-05 14:41:33 +0000 |
| commit | daba7e52d3bfc3e3ac0c72e9c390ea00a6af9ef0 (patch) | |
| tree | f6c9ccc47d7c0a61a6174baa69f0b293a35b1766 /camlp4/ocaml_src/meta/pa_r.ml | |
| parent | dce97b975cef182519bf0eabbffe2c20ab4a805a (diff) | |
-
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4352 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'camlp4/ocaml_src/meta/pa_r.ml')
| -rw-r--r-- | camlp4/ocaml_src/meta/pa_r.ml | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/camlp4/ocaml_src/meta/pa_r.ml b/camlp4/ocaml_src/meta/pa_r.ml index f39c8768e..649084fc8 100644 --- a/camlp4/ocaml_src/meta/pa_r.ml +++ b/camlp4/ocaml_src/meta/pa_r.ml @@ -1655,19 +1655,15 @@ Grammar.extend (fun (loc : int * int) -> (loc, [] : 'class_type_parameters))]]; Grammar.Entry.obj (class_fun_def : 'class_fun_def Grammar.Entry.e), None, [None, None, - [[Gramext.Snterml - (Grammar.Entry.obj (patt : 'patt Grammar.Entry.e), "simple"); - Gramext.Sself], - Gramext.action - (fun (cfd : 'class_fun_def) (p : 'patt) (loc : int * int) -> - (MLast.CeFun (loc, p, cfd) : 'class_fun_def)); - [Gramext.Snterml - (Grammar.Entry.obj (patt : 'patt Grammar.Entry.e), "simple"); - Gramext.Stoken ("", "->"); + [[Gramext.Stoken ("", "->"); Gramext.Snterm (Grammar.Entry.obj (class_expr : 'class_expr Grammar.Entry.e))], Gramext.action - (fun (ce : 'class_expr) _ (p : 'patt) (loc : int * int) -> + (fun (ce : 'class_expr) _ (loc : int * int) -> (ce : 'class_fun_def)); + [Gramext.Snterm (Grammar.Entry.obj (ipatt : 'ipatt Grammar.Entry.e)); + Gramext.Sself], + Gramext.action + (fun (ce : 'class_fun_def) (p : 'ipatt) (loc : int * int) -> (MLast.CeFun (loc, p, ce) : 'class_fun_def))]]; Grammar.Entry.obj (class_expr : 'class_expr Grammar.Entry.e), None, [Some "top", None, @@ -1684,12 +1680,13 @@ Grammar.extend (loc : int * int) -> (MLast.CeLet (loc, rf, lb, ce) : 'class_expr)); [Gramext.Stoken ("", "fun"); + Gramext.Snterm (Grammar.Entry.obj (ipatt : 'ipatt Grammar.Entry.e)); Gramext.Snterm (Grammar.Entry.obj (class_fun_def : 'class_fun_def Grammar.Entry.e))], Gramext.action - (fun (cfd : 'class_fun_def) _ (loc : int * int) -> - (cfd : 'class_expr))]; + (fun (ce : 'class_fun_def) (p : 'ipatt) _ (loc : int * int) -> + (MLast.CeFun (loc, p, ce) : 'class_expr))]; Some "apply", Some Gramext.NonA, [[Gramext.Sself; Gramext.Snterml |