Ekdohibs
/
ocaml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bootstrap camlp4 

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14203 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
master
Jacques Garrigue 2013-10-01 01:32:58 +00:00
parent cc31694f7c
commit 2d5bd02021
2 changed files with 697 additions and 198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

853
camlp4/boot/Camlp4.ml
View File

File diff suppressed because it is too large Load Diff

42
camlp4/boot/camlp4boot.ml
View File

@ -1915,7 +1915,19 @@ New syntax:\
((fun () -> ((fun () ->
(None, (None,
[ ((Some "top"), (Some Camlp4.Sig.Grammar.RightA), [ ((Some "top"), (Some Camlp4.Sig.Grammar.RightA),
[ ([ Gram.Skeyword "object"; [ ([ Gram.Sself; Gram.Skeyword "[@";
Gram.Snterm
(Gram.Entry.obj
(a_LIDENT : 'a_LIDENT Gram.Entry.t));
Gram.Snterm
(Gram.Entry.obj
(str_items : 'str_items Gram.Entry.t));
Gram.Skeyword "]" ],
(Gram.Action.mk
(fun _ (str : 'str_items) (s : 'a_LIDENT) _
(e : 'expr) (_loc : Gram.Loc.t) ->
(Ast.ExAtt (_loc, s, str, e) : 'expr))));
([ Gram.Skeyword "object";
Gram.Snterm Gram.Snterm
(Gram.Entry.obj (Gram.Entry.obj
(opt_class_self_patt : (opt_class_self_patt :
@ -3586,7 +3598,20 @@ New syntax:\
Gram.extend (patt : 'patt Gram.Entry.t) Gram.extend (patt : 'patt Gram.Entry.t)
((fun () -> ((fun () ->
(None, (None,
[ ((Some "|"), (Some Camlp4.Sig.Grammar.LeftA), [ ((Some "attribute"), None,
[ ([ Gram.Sself; Gram.Skeyword "[@";
Gram.Snterm
(Gram.Entry.obj
(a_LIDENT : 'a_LIDENT Gram.Entry.t));
Gram.Snterm
(Gram.Entry.obj
(str_items : 'str_items Gram.Entry.t));
Gram.Skeyword "]" ],
(Gram.Action.mk
(fun _ (str : 'str_items) (s : 'a_LIDENT) _
(e : 'patt) (_loc : Gram.Loc.t) ->
(Ast.PaAtt (_loc, s, str, e) : 'patt)))) ]);
((Some "|"), (Some Camlp4.Sig.Grammar.LeftA),
[ ([ Gram.Sself; Gram.Skeyword "|"; Gram.Sself ], [ ([ Gram.Sself; Gram.Skeyword "|"; Gram.Sself ],
(Gram.Action.mk (Gram.Action.mk
(fun (p2 : 'patt) _ (p1 : 'patt) (fun (p2 : 'patt) _ (p1 : 'patt)
@ -4947,6 +4972,19 @@ New syntax:\
| Invalid_argument s -> | Invalid_argument s ->
raise (Stream.Error s) : raise (Stream.Error s) :
'ctyp)))) ]); 'ctyp)))) ]);
((Some "attribute"), None,
[ ([ Gram.Sself; Gram.Skeyword "[@";
Gram.Snterm
(Gram.Entry.obj
(a_LIDENT : 'a_LIDENT Gram.Entry.t));
Gram.Snterm
(Gram.Entry.obj
(str_items : 'str_items Gram.Entry.t));
Gram.Skeyword "]" ],
(Gram.Action.mk
(fun _ (str : 'str_items) (s : 'a_LIDENT) _
(e : 'ctyp) (_loc : Gram.Loc.t) ->
(Ast.TyAtt (_loc, s, str, e) : 'ctyp)))) ]);
((Some "simple"), None, ((Some "simple"), None,
[ ([ Gram.Skeyword "("; Gram.Skeyword "module"; [ ([ Gram.Skeyword "("; Gram.Skeyword "module";
Gram.Snterm Gram.Snterm