aboutsummaryrefslogtreecommitdiff
path: root/src/boot/me/trans.ml
diff options
context:
space:
mode:
authorGraydon Hoare <[email protected]>2010-10-12 12:28:46 -0700
committerGraydon Hoare <[email protected]>2010-10-12 12:28:46 -0700
commitbeb4c07e26794dde482b4de85107f1e078375036 (patch)
tree84bff2b8cddc28b6f0020c9dffc1e6dacec873cb /src/boot/me/trans.ml
parentChanges to make rustboot compile on OCaml 3.12 (diff)
downloadrust-beb4c07e26794dde482b4de85107f1e078375036.tar.xz
rust-beb4c07e26794dde482b4de85107f1e078375036.zip
Git index wins again.
Diffstat (limited to 'src/boot/me/trans.ml')
-rw-r--r--src/boot/me/trans.ml8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/boot/me/trans.ml b/src/boot/me/trans.ml
index 2697c8b5..cb0b7c83 100644
--- a/src/boot/me/trans.ml
+++ b/src/boot/me/trans.ml
@@ -1368,7 +1368,8 @@ let trans_visitor
and get_obj_vtbl (id:node_id) : Il.operand =
let obj =
match Hashtbl.find cx.ctxt_all_defns id with
- DEFN_item { Ast.decl_item=Ast.MOD_ITEM_obj obj; _} -> obj
+ DEFN_item { Ast.decl_item = Ast.MOD_ITEM_obj obj;
+ Ast.decl_params = _} -> obj
| _ -> bug () "Trans.get_obj_vtbl on non-obj referent"
in
trans_crate_rel_data_operand (DATA_obj_vtbl id)
@@ -4755,8 +4756,9 @@ let trans_visitor
match lval with
Ast.LVAL_ext (_, (Ast.COMP_named (Ast.COMP_ident id)))
| Ast.LVAL_ext (_, (Ast.COMP_named (Ast.COMP_app (id, _))))
- | Ast.LVAL_base { node = Ast.BASE_ident id; _ }
- | Ast.LVAL_base { node = Ast.BASE_app (id, _); _ } -> id
+ | Ast.LVAL_base { node = Ast.BASE_ident id; id = _ }
+ | Ast.LVAL_base { node = Ast.BASE_app (id, _); id = _ } ->
+ id
| _ -> bug cx "expected lval ending in ident"
in
let ttag =