Changeset 2740:31105c1fc01d

Timestamp:

01/17/11 09:56:09 (16 months ago)

Author:

Wenceslas Godard <wenceslas.godard(at)eads.net>

Children:

2741:eda78acc6b56, 2746:357c8beeaf55

Branch:

default

Tags:

delivery-airbus-110117

Message:

typing info for translating the case expression (t466)

Files:

• src/ada2newspeak/normalize.ml (modified) (1 diff)
• tests/ada2newspeak/Makefile (modified) (1 diff)
• tests/ada2newspeak/t466.adb (added)
• tests/ada2newspeak/t466.spec (added)

src/ada2newspeak/normalize.ml

@@ -1622 +1622 @@
   | Exit -> [Ast.Exit, loc]
   | Case (e, choices, default) ->
-            [Ast.Case (normalize_exp e,
-                  List.map (fun (e,block) ->
-                              normalize_exp e,
-                              normalize_block ?return_type block)
-                      choices,
-                  Ada_utils.may (fun x -> normalize_block ?return_type x)
-                                default
-                  ),loc]
+      let case_exp = normalize_exp e in
+      let (_, case_t) = case_exp in 
+        [Ast.Case (case_exp ,
+                   List.map (fun (e,block) ->
+                               normalize_exp e ~expected_type:case_t,
+                               normalize_block ?return_type block)
+                     choices,
+                   Ada_utils.may (fun x -> normalize_block ?return_type x)
+                     default
+                  ),loc
+        ]
   | Block (dp,blk) -> 
       Sym.enter_context ~desc:"Declare block" gtbl;

tests/ada2newspeak/Makefile

@@ -70 +70 @@
       t441      t444  t447  t449 t450 \
       t454 t455 t456 t457 t458 t459 t460 \
-      t461 t462 t463 t464 t465
+      t461 t462 t463 t464 t465 t466
 
 include ../common.Makefile