Add automatic parameter instantiation. Closes #45.

3 files changed, 43 insertions, 8 deletions

diff --git a/src/Makefile b/src/Makefile
index 39688339..22dd0c56 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -431,6 +431,7 @@ TEST_XFAILS_LLVM := $(TASK_XFAILS) \
                       argv.rs \
                       autoderef-full-lval.rs \
                       autoderef-objfn.rs \
+                      auto-instantiate.rs \
                       basic.rs \
                       basic-1.rs \
                       basic-2.rs \
diff --git a/src/boot/me/type.ml b/src/boot/me/type.ml
index 9e223dab..93f43d3e 100644
--- a/src/boot/me/type.ml
+++ b/src/boot/me/type.ml
@@ -154,7 +154,8 @@ let check_stmt (cx:Semant.ctxt) : (fn_ctx -> Ast.stmt -> unit) =
       | ty -> type_error "record" ty
   in
   let demand_fn
-      ?param_handler:(param_handler=demand)
+      ?param_handler:(param_handler=
+        fun a idx effect -> demand a (Ast.TY_param (idx, effect)))
       (arg_tys:Ast.ty option array)
       (actual:Ast.ty)
       : Ast.ty =
@@ -179,7 +180,8 @@ let check_stmt (cx:Semant.ctxt) : (fn_ctx -> Ast.stmt -> unit) =
           let maybe_demand a_opt b =
             match a_opt, b with
                 None, _ -> ()
-              | Some a, Ast.TY_param _ -> param_handler a b
+              | Some a, Ast.TY_param (idx, effect) ->
+                  param_handler a idx effect
               | Some a, _ -> demand a b
           in
           Common.arr_iter2 maybe_demand arg_tys in_slot_tys;
@@ -504,12 +506,33 @@ let check_stmt (cx:Semant.ctxt) : (fn_ctx -> Ast.stmt -> unit) =
       | TYPAT_fn arg_tys, LTYPE_mono actual ->
           ignore (demand_fn (Array.map (fun ty -> Some ty) arg_tys) actual);
           yield_ty actual
-      | TYPAT_fn _, LTYPE_poly (_, _) ->
-          (* FIXME: auto-instantiate *)
-          Common.unimpl
-            None
-            "instantiation of polymorphic function types; please supply type \
-            parameters explicitly, sorry"
+      | TYPAT_fn arg_tys, (LTYPE_poly (ty_params, ty) as lty) ->
+          (* Perform automatic instantiation of polymorphic types. *)
+          let ty = fundamental_ty ty in
+          let substs = Array.make (Array.length ty_params) None in
+          let param_handler substituted_ty idx _ =
+            match substs.(idx) with
+            | None -> substs.(idx) <- Some substituted_ty
+            | Some substituted_ty' -> demand substituted_ty substituted_ty'
+          in
+          let arg_ty_opts = Array.map (fun ty -> Some ty) arg_tys in
+          ignore (demand_fn ~param_handler:param_handler arg_ty_opts ty);
+          let get_subst subst_opt =
+            match subst_opt with
+                Some subst -> subst
+              | None ->
+                  Common.bug ()
+                    "internal_check_outer_lval: subst not found"
+          in
+          let substs = Array.map get_subst substs in
+          begin
+            match beta_reduce (Semant.lval_base_id lval) lty substs with
+                LTYPE_mono ty -> yield_ty ty
+              | _ ->
+                  Common.bug ()
+                    "internal_check_outer_lval: beta reduction didn't yield \
+                      a monotype"
+          end
       | TYPAT_wild, (LTYPE_poly _ as lty) ->
           Common.err
             None
diff --git a/src/test/run-pass/auto-instantiate.rs b/src/test/run-pass/auto-instantiate.rs
new file mode 100644
index 00000000..58e20e1d
--- /dev/null
+++ b/src/test/run-pass/auto-instantiate.rs
@@ -0,0 +1,11 @@
+// -*- rust -*-
+
+fn f[T,U](&T x, &U y) -> tup(T,U) {
+  ret tup(x, y);
+}
+
+fn main() -> () {
+  log f(tup(3, 4, 5), 4)._0._0;
+  log f(5, 6)._0;
+}
+