From b314c01095c5cd4617f71f706e43530a57ffb65b Mon Sep 17 00:00:00 2001 From: Adam Chlipala Date: Wed, 2 May 2012 08:34:50 -0400 Subject: Better discovery of type class instances from recursive definitions --- src/elaborate.sml | 5 ++++- tests/newMessage.ur | 15 +++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 tests/newMessage.ur diff --git a/src/elaborate.sml b/src/elaborate.sml index 852ba2b2..26ec21ec 100644 --- a/src/elaborate.sml +++ b/src/elaborate.sml @@ -3912,8 +3912,11 @@ and elabDecl (dAll as (d, loc), (env, denv, gs)) = expError env (IllegalRec (x, e')); ((x, n, c', e'), gs1 @ gs) end) gs vis + + val vis = map (fn (x, n, t, e) => (x, n, normClassConstraint env t, e)) vis + val d = (L'.DValRec vis, loc) in - ([(L'.DValRec vis, loc)], (env, denv, gs)) + ([d], (E.declBinds env d, denv, gs)) end | L.DSgn (x, sgn) => diff --git a/tests/newMessage.ur b/tests/newMessage.ur new file mode 100644 index 00000000..e6ae3b4e --- /dev/null +++ b/tests/newMessage.ur @@ -0,0 +1,15 @@ +datatype message = NewQuestion of { Id : string} + | Something of {Blah : int} + +fun showMessage (message : message) = + case message of + NewQuestion {Id = a} => a + | Something {Blah = x} => "blah" + +val show_mes = mkShow showMessage + +fun showTwoTuple [a] [b] (_ : show a) (_: show b) = mkShow (fn (two_tuple : {1:a, 2:b}) => + "(" ^ show two_tuple.1 ^ ", " ^ show two_tuple.2 ^ ")" + + ) +val om = show (Something {Blah = 1}, Something {Blah = 2}) -- cgit v1.2.3