From 0ee5ad002dbe88c791bfa48e392094bade72a12c Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 15 Oct 2009 16:50:14 +0000 Subject: Clean up function type system. Unify function types globally, rather than construct a "generic type" locally, since this didn't take into consideration captured bindings, leaving the generic type not as solved as it could be. git-svn-id: http://svn.drobilla.net/resp/tuplr@226 ad02d1e2-f140-0410-9f75-f8b11f17cedd --- src/tuplr.hpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/tuplr.hpp') diff --git a/src/tuplr.hpp b/src/tuplr.hpp index 947a62c..a89b612 100644 --- a/src/tuplr.hpp +++ b/src/tuplr.hpp @@ -375,9 +375,8 @@ struct AFn : public ATuple { return NULL; } }; - Impls impls; - mutable Subst subst; - string name; + Impls impls; + string name; }; /// Function call/application, e.g. "(func arg1 arg2)" @@ -564,10 +563,9 @@ struct TEnv : public Env { } static Subst buildSubst(AType* fnT, const AType& argsT); - typedef map Vars; - typedef map GenericTypes; + typedef map Vars; + Vars vars; - GenericTypes genericTypes; PEnv& penv; unsigned varID; }; -- cgit v1.2.1