Ignore:
Timestamp:
Nov 23, 2011, 5:43:24 PM (9 years ago)
Author:
tranquil
Message:

merge of indexed labels branch

File:
1 edited

Legend:

Unmodified
Added
Removed
  • Deliverables/D2.2/8051/src/cminor/cminorFold.ml

    r818 r1542  
    3131
    3232let statement_subs = function
    33   | Cminor.St_skip | Cminor.St_exit _ | Cminor.St_return None
     33  | Cminor.St_skip | (*Cminor.St_exit _ |*) Cminor.St_return None
    3434  | Cminor.St_goto _ -> ([], [])
    3535  | Cminor.St_assign (_, e) | Cminor.St_switch (e, _, _)
     
    4343  | Cminor.St_ifthenelse (e, stmt1, stmt2) ->
    4444    ([e], [stmt1 ; stmt2])
    45   | Cminor.St_loop stmt | Cminor.St_block stmt
    46   | Cminor.St_label (_, stmt) | Cminor.St_cost (_, stmt) ->
     45  (*| Cminor.St_loop stmt | Cminor.St_block stmt *)
     46  | Cminor.St_label (_, stmt) | Cminor.St_cost (_, stmt)
     47  | Cminor.St_ind_0 (_, stmt) | Cminor.St_ind_inc (_, stmt) ->
    4748    ([], [stmt])
    4849
    4950let statement_fill_subs stmt sub_es sub_stmts =
    5051  match stmt, sub_es, sub_stmts with
    51     | (  Cminor.St_skip | Cminor.St_exit _ | Cminor.St_return None
     52    | (  Cminor.St_skip | (*Cminor.St_exit _ |*) Cminor.St_return None
    5253       | Cminor.St_goto _), _, _ -> stmt
    5354    | Cminor.St_assign (x, _), e :: _, _ ->
     
    6768    | Cminor.St_ifthenelse _, e :: _, stmt1 :: stmt2 :: _ ->
    6869      Cminor.St_ifthenelse (e, stmt1, stmt2)
    69     | Cminor.St_loop _, _, stmt :: _ ->
     70 (*   | Cminor.St_loop _, _, stmt :: _ ->
    7071      Cminor.St_loop stmt
    7172    | Cminor.St_block _, _, stmt :: _ ->
    72       Cminor.St_block stmt
     73      Cminor.St_block stmt *)
    7374    | Cminor.St_label (lbl, _), _, stmt :: _ ->
    7475      Cminor.St_label (lbl, stmt)
    7576    | Cminor.St_cost (lbl, _), _, stmt :: _ ->
    7677      Cminor.St_cost (lbl, stmt)
     78    | Cminor.St_ind_0 (i, _), _, stmt :: _ ->
     79      Cminor.St_ind_0 (i, stmt)
     80    | Cminor.St_ind_inc (i, _), _, stmt :: _ ->
     81      Cminor.St_ind_inc (i, stmt)
    7782    | _ -> assert false (* do not use on these arguments *)
    7883
Note: See TracChangeset for help on using the changeset viewer.