Changeset 2430 for Deliverables/D2.2

Timestamp:

Nov 6, 2012, 1:13:27 PM (7 years ago)

Author:

campbell

Message:

Fix casting for conditionals in CompCert?-derived C parser.

File:

• Deliverables/D2.2/8051/cparser/AddCasts.ml (modified) (1 diff)

Deliverables/D2.2/8051/cparser/AddCasts.ml

@@ -100 +100 @@
       in { edesc = desc; etyp = e.etyp }
   | EConditional(e1, e2, e3) ->
+      let e2' = add_expr env e2 in
+      let e3' = add_expr env e3 in
       { edesc = 
-          EConditional(add_expr env e1, add_expr env e2, add_expr env e3);
+          EConditional(add_expr env e1, cast env e2' e.etyp, cast env e3' e.etyp);
         etyp = e.etyp }
   | ECast(ty, e1) ->