diff options
| author | Jacques Garrigue <garrigue at math.nagoya-u.ac.jp> | 2013-09-30 13:54:59 +0000 |
|---|---|---|
| committer | Jacques Garrigue <garrigue at math.nagoya-u.ac.jp> | 2013-09-30 13:54:59 +0000 |
| commit | 5f68db9cf0abc36fd0e392e5bc3d426cb6ae7784 (patch) | |
| tree | 9084e2861ff435ced1f15bf1b3dca7effc129109 /debugger/eval.ml | |
| parent | 4c5e9bbe6b98d6138f7943f7b017fbd411f109c8 (diff) | |
| parent | cc31694f7ca1043080fc290e5a82520513cf7f94 (diff) | |
Merge trunk at revision 14200. Now everything works except private types
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/module-alias@14201 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'debugger/eval.ml')
| -rw-r--r-- | debugger/eval.ml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/debugger/eval.ml b/debugger/eval.ml index aa006332b..1d1ab3886 100644 --- a/debugger/eval.ml +++ b/debugger/eval.ml @@ -147,13 +147,13 @@ let rec expression event env = function and find_label lbl env ty path tydesc pos = function [] -> raise(Error(Wrong_label(ty, lbl))) - | (name, mut, ty_arg) :: rem -> - if Ident.name name = lbl then begin + | {ld_id; ld_type} :: rem -> + if Ident.name ld_id = lbl then begin let ty_res = Btype.newgenty(Tconstr(path, tydesc.type_params, ref Mnil)) in (pos, - try Ctype.apply env [ty_res] ty_arg [ty] with Ctype.Cannot_apply -> + try Ctype.apply env [ty_res] ld_type [ty] with Ctype.Cannot_apply -> abstract_type) end else find_label lbl env ty path tydesc (pos + 1) rem |