diff options
| author | Graydon Hoare <[email protected]> | 2010-07-02 12:02:56 -0700 |
|---|---|---|
| committer | Graydon Hoare <[email protected]> | 2010-07-02 12:02:56 -0700 |
| commit | 285a4735b9565cc75cabd02f7b9c89aa8a70657e (patch) | |
| tree | cd9fbc798e6cc08ec7f758edc1a564a69f672532 /src/boot/me/resolve.ml | |
| parent | Remove nameless node causing errors on doc make. (diff) | |
| download | rust-285a4735b9565cc75cabd02f7b9c89aa8a70657e.tar.xz rust-285a4735b9565cc75cabd02f7b9c89aa8a70657e.zip | |
Parse effect-qualified type definitions.
Diffstat (limited to 'src/boot/me/resolve.ml')
| -rw-r--r-- | src/boot/me/resolve.ml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/boot/me/resolve.ml b/src/boot/me/resolve.ml index 72558ae6..5077d5ce 100644 --- a/src/boot/me/resolve.ml +++ b/src/boot/me/resolve.ml @@ -270,7 +270,7 @@ let type_reference_and_tag_extracting_visitor let visit_mod_item_pre id params item = begin match item.node.Ast.decl_item with - Ast.MOD_ITEM_type ty -> + Ast.MOD_ITEM_type (_, ty) -> begin log cx "extracting references for type node %d" (int_of_node item.id); @@ -395,7 +395,7 @@ and lookup_type_by_name | Some (scopes', id) -> let ty, params = match htab_search cx.ctxt_all_defns id with - Some (DEFN_item { Ast.decl_item = Ast.MOD_ITEM_type t; + Some (DEFN_item { Ast.decl_item = Ast.MOD_ITEM_type (_, t); Ast.decl_params = params }) -> (t, Array.map (fun p -> p.node) params) | Some (DEFN_item { Ast.decl_item = Ast.MOD_ITEM_obj ob; @@ -543,7 +543,7 @@ let type_resolving_visitor begin try match item.node.Ast.decl_item with - Ast.MOD_ITEM_type ty -> + Ast.MOD_ITEM_type (_, ty) -> let ty = resolve_type cx (!scopes) recursive_tag_groups all_tags empty_recur_info ty @@ -838,7 +838,7 @@ let resolve_recursion then begin match Hashtbl.find cx.ctxt_all_defns id with DEFN_item - { Ast.decl_item = Ast.MOD_ITEM_type (Ast.TY_tag _) } -> + { Ast.decl_item = Ast.MOD_ITEM_type (_, (Ast.TY_tag _)) } -> log cx "type %d is a recursive tag" (int_of_node id); Hashtbl.replace recursive_tag_types id () | _ -> |