diff options
| author |  xleroy <xleroy@fca1b0fc-160b-0410-b1d3-a4f43f01ea2e> | 2012-10-06 15:46:47 +0000 |
|---|---|---|
| committer | xleroy <xleroy@fca1b0fc-160b-0410-b1d3-a4f43f01ea2e> | 2012-10-06 15:46:47 +0000 |
| commit | f7693b3d897b90fd3bc2533be002dc0bdcd9f6c2 (patch) | |
| tree | 93ea9491693324d2d690c4236a2c88c3b461e225 /backend/CMtypecheck.ml | |
| parent | 261ef24f7fd2ef443f73c468b9b1fa496371f3bf (diff) | |
Merge of branch seq-and-or. See Changelog for details.
git-svn-id: https://yquem.inria.fr/compcert/svn/compcert/trunk@2059 fca1b0fc-160b-0410-b1d3-a4f43f01ea2e
Diffstat (limited to 'backend/CMtypecheck.ml')
| -rw-r--r-- | backend/CMtypecheck.ml | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/backend/CMtypecheck.ml b/backend/CMtypecheck.ml index 6e91f5b..4070785 100644 --- a/backend/CMtypecheck.ml +++ b/backend/CMtypecheck.ml @@ -90,8 +90,6 @@ let type_unary_operation = function | Ocast8unsigned -> tint, tint | Ocast16unsigned -> tint, tint | Onegint -> tint, tint - | Oboolval -> tint, tint - | Onotbool -> tint, tint | Onotint -> tint, tint | Onegf -> tfloat, tfloat | Oabsf -> tfloat, tfloat @@ -135,8 +133,6 @@ let name_of_unary_operation = function | Ocast8unsigned -> "cast8unsigned" | Ocast16unsigned -> "cast16unsigned" | Onegint -> "negint" - | Oboolval -> "notbool" - | Onotbool -> "notbool" | Onotint -> "notint" | Onegf -> "negf" | Oabsf -> "absf" @@ -224,24 +220,6 @@ let rec type_expr env lenv e = (name_of_chunk chunk) s)) end; type_chunk chunk - | Econdition(e1, e2, e3) -> - type_condexpr env lenv e1; - let te2 = type_expr env lenv e2 in - let te3 = type_expr env lenv e3 in - begin try - unify te2 te3 - with Error s -> - raise (Error (sprintf "In conditional expression:\n%s" s)) - end; - te2 -(* - | Elet(e1, e2) -> - let te1 = type_expr env lenv e1 in - let te2 = type_expr env (te1 :: lenv) e2 in - te2 - | Eletvar n -> - type_letvar lenv n -*) and type_exprlist env lenv el = match el with |