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:08:33 +0200 |
| commit | 8b817cda643d180d43ab8c84809ca2d55c7dd3df (patch) | |
| tree | 812fe2f7ec68c03c5f0762f1266f383193bbfe92 /cparser/Transform.ml | |
| parent | c46723c0169145d41d1879c236f53314456f1ba1 (diff) | |
| parent | 1cb3d93ff278ebbd0c6967c5f9401a97f9b618b4 (diff) | |
| download | compcert-8b817cda643d180d43ab8c84809ca2d55c7dd3df.tar.gz compcert-8b817cda643d180d43ab8c84809ca2d55c7dd3df.zip | |
Merge remote branch 'upstream/master' into clean
Conflicts:
Makefile.extr
Diffstat (limited to 'cparser/Transform.ml')
| -rw-r--r-- | cparser/Transform.ml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cparser/Transform.ml b/cparser/Transform.ml index 6cdd8a6b..840234b8 100644 --- a/cparser/Transform.ml +++ b/cparser/Transform.ml @@ -81,7 +81,7 @@ let op_for_assignop = function | Odiv_assign -> Odiv | Omod_assign -> Omod | Oand_assign -> Oand - | Oor_assign -> Oor + | Oor_assign -> Oor | Oxor_assign -> Oxor | Oshl_assign -> Oshl | Oshr_assign -> Oshr @@ -118,7 +118,7 @@ let expand_assignop ~read ~write env ctx op l r ty = ecomma (eassign tmp res) (ecomma (write l tmp) tmp)) let expand_preincrdecr ~read ~write env ctx op l = - expand_assignop ~read ~write env ctx (assignop_for_incr_decr op) + expand_assignop ~read ~write env ctx (assignop_for_incr_decr op) l (intconst 1L IInt) (unary_conversion env l.etyp) let expand_postincrdecr ~read ~write env ctx op l = @@ -147,7 +147,7 @@ let stmt ~expr ?(decl = fun env decl -> assert false) env s = | Sskip -> s | Sdo e -> {s with sdesc = Sdo(expr s.sloc env Effects e)} - | Sseq(s1, s2) -> + | Sseq(s1, s2) -> {s with sdesc = Sseq(stm s1, stm s2)} | Sif(e, s1, s2) -> {s with sdesc = Sif(expr s.sloc env Val e, stm s1, stm s2)} |