Ignore:
Timestamp:
Aug 30, 2011, 6:55:12 PM (8 years ago)
Author:
campbell
Message:

Merge trunk into branch.

Location:
Deliverables/D3.3/id-lookup-branch
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • Deliverables/D3.3/id-lookup-branch

  • Deliverables/D3.3/id-lookup-branch/Clight/toCminor.ma

    r1102 r1153  
    11031103λp.
    11041104  let fun_globals ≝ map … (λid. 〈id,Code〉) (prog_funct_names ?? p) in
    1105   let var_globals ≝ map … (λv. 〈\fst (\fst (\fst v)), \snd (\fst v)〉) (prog_vars ?? p) in
     1105  let var_globals ≝ map … (λv. 〈\fst (\fst v), \snd (\fst v)〉) (prog_vars ?? p) in
    11061106  let globals ≝ fun_globals @ var_globals in
    1107   transform_partial_program2 ???? (translate_fundef globals) (λ_. OK ? it) p.
     1107  transform_partial_program2 ???? (translate_fundef globals) (λi. OK ? (\fst i)) p.
Note: See TracChangeset for help on using the changeset viewer.