user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rustboot: Emit an error message instead of asserting on a type-param mismatch in tag constructors in patterns

Browse source
This commit is contained in:
Patrick Walton 2010-10-27 11:28:26 -07:00
parent 3d0da75455
commit b3c4c1426a
2 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/boot/me/resolve.ml
View file

@ -768,12 +768,12 @@ let pattern_resolving_visitor
end
in
let resolve_arm { node = arm; id = _ } =
let resolve_arm { node = arm; id = id } =
match fst arm with
Ast.PAT_tag (lval, pats) ->
let lval_nm = lval_to_name lval in
let lval_id = lval_base_id lval in
let tag_ctor_id = (lval_item cx lval).id in
let tag_ctor_id = (lval_item ~node_id:id cx lval).id in
if defn_id_is_item cx tag_ctor_id
(* FIXME (issue #76): we should actually check here that the

12
src/boot/me/semant.ml
View file

@ -1406,7 +1406,7 @@ let exports_permit (view:Ast.mod_view) (ident:Ast.ident) : bool =
;;
(* NB: this will fail if lval is not an item. *)
let rec lval_item (cx:ctxt) (lval:Ast.lval) : Ast.mod_item =
let rec lval_item ?node_id:node_id (cx:ctxt) (lval:Ast.lval) : Ast.mod_item =
match lval with
Ast.LVAL_base _ ->
let defn_id = lval_base_defn_id cx lval in
@ -1429,9 +1429,13 @@ let rec lval_item (cx:ctxt) (lval:Ast.lval) : Ast.mod_item =
in
match htab_search items i with
| Some sub when exports_permit view i ->
assert
((Array.length sub.node.Ast.decl_params) =
(Array.length args));
if Array.length sub.node.Ast.decl_params !=
(Array.length args) then
err node_id
"%a has %d type-params but %d given"
Ast.sprintf_mod_item ("", sub)
(Array.length sub.node.Ast.decl_params)
(Array.length args);
check_concrete base_item.node.Ast.decl_params sub
| _ -> err (Some (lval_base_id lval))
"unknown module item '%s'" i