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@12855 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
master
Damien Doligez 2012-08-10 07:20:10 +00:00
parent 89077f5f46
commit 2352bbfa8b
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
camlp4/boot/Camlp4.ml
View File

@ -17079,13 +17079,12 @@ module Struct =
let drop_prev_loc = Tools.drop_prev_loc
let add_loc bp parse_fun strm =
let count1 = Stream.count strm in
let x = parse_fun strm in
let count2 = Stream.count strm in
let ep = loc_ep strm in
let loc =
if count1 < count2
then (let ep = loc_ep strm in Loc.merge bp ep)
else Loc.join bp
if (Loc.start_off bp) > (Loc.stop_off ep)
then Loc.join bp
else Loc.merge bp ep
in (x, loc)
let stream_peek_nth strm n =
@ -19158,20 +19157,21 @@ module Printers =
| Ast.BiAnd (_, b1, b2) ->
(o#binding f b1; pp f o#andsep; o#binding f b2)
| Ast.BiEq (_, p, e) ->
let (pl, e) =
let (pl, e') =
(match p with
| Ast.PaTyc (_, _, _) -> ([], e)
| _ -> expr_fun_args e)
in
(match (p, e) with
(match (p, e') with
| (Ast.PaId (_, (Ast.IdLid (_, _))),
Ast.ExTyc (_, e, t)) ->
Ast.ExTyc (_, e', t)) ->
pp f "%a :@ %a =@ %a"
(list o#fun_binding "@ ")
((`patt p) :: pl) o#ctyp t o#expr e
| _ ->
((`patt p) :: pl) o#ctyp t o#expr e'
| (Ast.PaId (_, (Ast.IdLid (_, _))), _) ->
pp f "%a @[<0>%a=@]@ %a" o#simple_patt p
(list' o#fun_binding "" "@ ") pl o#expr e)
(list' o#fun_binding "" "@ ") pl o#expr e'
| _ -> pp f "%a =@ %a" o#simple_patt p o#expr e)
| Ast.BiAnt (_, s) -> o#anti f s
method record_binding =
fun f bi ->