From 512598de80963203cf162d2f353d43b47273ffaf Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Fri, 1 Jul 2016 19:06:04 -0400 Subject: - Small fixes to reader & type-system. - Test suites for reader, lexer and parser got updated. - Added unit-tests for type-system. --- src/lux/type.clj | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/lux/type.clj b/src/lux/type.clj index 70a2f69fa..295d7bfdb 100644 --- a/src/lux/type.clj +++ b/src/lux/type.clj @@ -756,21 +756,15 @@ [(&/$ExQ e!env e!def) _] (with-var (fn [$arg] - (|do [:let [expected* (beta-reduce (->> e!env - (&/$Cons $arg) - (&/$Cons expected)) - e!def)] + (|do [expected* (apply-type expected $arg) =output (check* class-loader fixpoints invariant?? expected* actual) _ (clean $arg actual)] (return =output)))) [_ (&/$ExQ a!env a!def)] - (|do [$arg existential] - (|let [actual* (beta-reduce (->> a!env - (&/$Cons $arg) - (&/$Cons expected)) - a!def)] - (check* class-loader fixpoints invariant?? expected actual*))) + (|do [$arg existential + actual* (apply-type actual $arg)] + (check* class-loader fixpoints invariant?? expected actual*)) [(&/$HostT e!data) (&/$HostT a!data)] (&&host/check-host-types (partial check* class-loader fixpoints true) -- cgit v1.2.3