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

camlp4,bootstrap: again 

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9068 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
master
Nicolas Pouillard 2008-10-05 17:18:25 +00:00
parent 70add65225
commit 35205da90c
2 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
camlp4/boot/Camlp4.ml
View File

@ -17698,6 +17698,9 @@ module Printers =
method mk_patt_list :
Ast.patt -> ((Ast.patt list) * (Ast.patt option))
method simple_module_expr :
formatter -> Ast.module_expr -> unit
method module_expr :
formatter -> Ast.module_expr -> unit
@ -18871,8 +18874,8 @@ module Printers =
| Ast.StExp (_, e) ->
pp f "@[<2>let _ =@ %a%(%)@]" o#expr e semisep
| Ast.StInc (_, me) ->
pp f "@[<2>include@ %a%(%)@]" o#module_expr me
semisep
pp f "@[<2>include@ %a%(%)@]" o#simple_module_expr
me semisep
| Ast.StClt (_, ct) ->
pp f "@[<2>class type %a%(%)@]" o#class_type ct
semisep
@ -18922,6 +18925,19 @@ module Printers =
| Ast.WcAnt (_, s) -> o#anti f s
method module_expr =
fun f me ->
let () = o#node f me Ast.loc_of_module_expr
in
match me with
| Ast.MeNil _ -> assert false
| Ast.MeTyc (_, (Ast.MeStr (_, st)),
(Ast.MtSig (_, sg))) ->
pp f
"@[<2>@[<hv2>struct@ %a@]@ end :@ @[<hv2>sig@ %a@]@ end@]"
o#str_item st o#sig_item sg
| _ -> o#simple_module_expr f me
method simple_module_expr =
fun f me ->
let () = o#node f me Ast.loc_of_module_expr
in
@ -18938,11 +18954,6 @@ module Printers =
| Ast.MeStr (_, st) ->
pp f "@[<hv0>@[<hv2>struct@ %a@]@ end@]" o#str_item
st
| Ast.MeTyc (_, (Ast.MeStr (_, st)),
(Ast.MtSig (_, sg))) ->
pp f
"@[<2>@[<hv2>struct@ %a@]@ end :@ @[<hv2>sig@ %a@]@ end@]"
o#str_item st o#sig_item sg
| Ast.MeTyc (_, me, mt) ->
pp f "@[<1>(%a :@ %a)@]" o#module_expr me
o#module_type mt
@ -19533,10 +19544,18 @@ module Printers =
in
match me with
| Ast.MeApp (_, me1, me2) ->
pp f "@[<2>%a@,(%a)@]" o#module_expr me1
o#module_expr me2
pp f "@[<2>%a@ %a@]" o#module_expr me1
o#simple_module_expr me2
| me -> super#module_expr f me
method simple_module_expr =
fun f me ->
let () = o#node f me Ast.loc_of_module_expr
in
match me with
| Ast.MeApp (_, _, _) -> pp f "(%a)" o#module_expr me
| _ -> super#simple_module_expr f me
method implem = fun f st -> pp f "@[<v0>%a@]@." o#str_item st
method class_type =

2
camlp4/boot/Camlp4Ast.ml
View File

@ -20,7 +20,7 @@ module Make (Loc : Sig.Loc) : Sig.Camlp4Ast with module Loc = Loc =
module Loc = Loc;
module Ast =
struct
include Sig.MakeCamlp4Ast(Loc);
include (Sig.MakeCamlp4Ast Loc);
value safe_string_escaped s =
if ((String.length s) > 2) && ((s.[0] = '\\') && (s.[1] = '$'))
then s