diff options
author | François Pottier <francois.pottier@inria.fr> | 2015-10-23 15:08:33 +0200 |
---|---|---|
committer | François Pottier <francois.pottier@inria.fr> | 2015-10-23 15:17:50 +0200 |
commit | 136986c204af19341aeb455d72fe817b16fa6fff (patch) | |
tree | 02e9178d9f2cf942bd32366891d480ff161406f6 /backend/PrintCminor.ml | |
parent | c46723c0169145d41d1879c236f53314456f1ba1 (diff) | |
parent | 1cb3d93ff278ebbd0c6967c5f9401a97f9b618b4 (diff) | |
download | compcert-136986c204af19341aeb455d72fe817b16fa6fff.tar.gz compcert-136986c204af19341aeb455d72fe817b16fa6fff.zip |
Merge remote branch 'upstream/master' into clean
Conflicts:
Makefile.extr
Diffstat (limited to 'backend/PrintCminor.ml')
-rw-r--r-- | backend/PrintCminor.ml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/backend/PrintCminor.ml b/backend/PrintCminor.ml index 19f4c839..9b6b1488 100644 --- a/backend/PrintCminor.ml +++ b/backend/PrintCminor.ml @@ -139,7 +139,7 @@ let rec expr p (prec, e) = if assoc = LtoR then (prec', prec' + 1) else (prec' + 1, prec') in - if prec' < prec + if prec' < prec then fprintf p "@[<hov 2>(" else fprintf p "@[<hov 2>"; begin match e with @@ -238,14 +238,14 @@ let rec print_stmt p s = print_expr_list (true, el) print_sig (ef_sig ef) | Sbuiltin(Some id, ef, el) -> - fprintf p "@[<hv 2>%s =@ builtin %s@,(@[<hov 0>%a@]) : @[<hov 0>%a@];@]" + fprintf p "@[<hv 2>%s =@ builtin %s@,(@[<hov 0>%a@]) : @[<hov 0>%a@];@]" (ident_name id) (name_of_external ef) print_expr_list (true, el) print_sig (ef_sig ef) | Sseq(s1,s2) when just_skips s1 && just_skips s2 -> () - | Sseq(s1, s2) when just_skips s1 -> + | Sseq(s1, s2) when just_skips s1 -> print_stmt p s2 | Sseq(s1, s2) when just_skips s2 -> print_stmt p s1 @@ -277,7 +277,7 @@ let rec print_stmt p s = (if long then "l" else "") print_expr e; List.iter (fun (n, x) -> - fprintf p "@ case %s%s: exit %d;" + fprintf p "@ case %s%s: exit %d;" (Z.to_string n) (if long then "LL" else "") (Nat.to_int x)) @@ -334,12 +334,12 @@ let print_init_data p = function let rec print_init_data_list p = function | [] -> () | [item] -> print_init_data p item - | item::rest -> + | item::rest -> (print_init_data p item; fprintf p ","; print_init_data_list p rest) -let print_globvar p gv = +let print_globvar p gv = if (gv.gvar_readonly) then fprintf p "readonly "; if (gv.gvar_volatile) then |