diff options
author | Jacques-Henri Jourdan <jacques-henri.jourdan@inria.fr> | 2015-11-04 03:04:21 +0100 |
---|---|---|
committer | Jacques-Henri Jourdan <jacques-henri.jourdan@inria.fr> | 2015-11-04 03:04:21 +0100 |
commit | 5664fddcab15ef4482d583673c75e07bd1e96d0a (patch) | |
tree | 878b22860e69405ba5cf6fd2798731dac8ce660c /cparser/Transform.ml | |
parent | b960c83725d7e185ac5c6e3c0d6043c7dcd2f556 (diff) | |
parent | fe73ed58ef80da7c53c124302a608948fb190229 (diff) | |
download | compcert-5664fddcab15ef4482d583673c75e07bd1e96d0a.tar.gz compcert-5664fddcab15ef4482d583673c75e07bd1e96d0a.zip |
Merge remote-tracking branch 'origin/master' into parser_fix
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)} |