aboutsummaryrefslogtreecommitdiff
path: root/src/boot
diff options
context:
space:
mode:
authorPatrick Walton <[email protected]>2010-11-05 13:44:08 -0700
committerPatrick Walton <[email protected]>2010-11-05 13:44:37 -0700
commit91b1885ba2a82cd1ac3701a71bb47bf6b7ddd8e9 (patch)
treeb9f6e212a989a300440025ca6fbcf0cfb8621cf5 /src/boot
parenttest_init_fn() in lib-vec.rs doesn't seem to segfault anymore. Un-XFAIL it. (diff)
downloadrust-91b1885ba2a82cd1ac3701a71bb47bf6b7ddd8e9.tar.xz
rust-91b1885ba2a82cd1ac3701a71bb47bf6b7ddd8e9.zip
rustboot: Report mismatched effect qualifiers
Diffstat (limited to 'src/boot')
-rw-r--r--src/boot/me/semant.ml7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/boot/me/semant.ml b/src/boot/me/semant.ml
index 6f442c33..9a5cee15 100644
--- a/src/boot/me/semant.ml
+++ b/src/boot/me/semant.ml
@@ -997,16 +997,19 @@ let rec pretty_ty_str (cx:ctxt) (fallback:(Ast.ty -> string)) (ty:Ast.ty) =
in
let fields = Array.to_list (Array.map format_field fields) in
"rec(" ^ (String.concat ", " fields) ^ ")"
- | Ast.TY_fn (fnsig, _) ->
+ | Ast.TY_fn (fnsig, aux) ->
let format_slot slot =
match slot.Ast.slot_ty with
None -> Common.bug () "no ty in slot"
| Some ty' -> pretty_ty_str cx fallback ty'
in
+ let effect = aux.Ast.fn_effect in
+ let qual = Fmt.sprintf_fmt Ast.fmt_effect_qual () effect in
+ let keyword = if aux.Ast.fn_is_iter then "iter" else "fn" in
let fn_args = Array.map format_slot fnsig.Ast.sig_input_slots in
let fn_args_str = String.concat ", " (Array.to_list fn_args) in
let fn_rv_str = format_slot fnsig.Ast.sig_output_slot in
- Printf.sprintf "fn(%s) -> %s" fn_args_str fn_rv_str
+ Printf.sprintf "%s%s(%s) -> %s" qual keyword fn_args_str fn_rv_str
| Ast.TY_tag { Ast.tag_id = tag_id; Ast.tag_args = _ }
when Hashtbl.mem cx.ctxt_user_tag_names tag_id ->
let name = Hashtbl.find cx.ctxt_user_tag_names tag_id in